Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rubygem-fog-libvirt for openSUSE:Factory checked in at 2021-08-03 22:48:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-fog-libvirt (Old) and /work/SRC/openSUSE:Factory/.rubygem-fog-libvirt.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-fog-libvirt" Tue Aug 3 22:48:36 2021 rev:4 rq:909812 version:0.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-fog-libvirt/rubygem-fog-libvirt.changes 2021-01-21 21:55:39.989806931 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-fog-libvirt.new.1899/rubygem-fog-libvirt.changes 2021-08-03 22:48:44.192497181 +0200 @@ -1,0 +2,6 @@ +Mon Jul 26 05:55:00 UTC 2021 - Stephan Kulow <co...@suse.com> + +updated to version 0.9.0 + no changelog found + +------------------------------------------------------------------- Old: ---- fog-libvirt-0.8.0.gem New: ---- fog-libvirt-0.9.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-fog-libvirt.spec ++++++ --- /var/tmp/diff_new_pack.zXTFpZ/_old 2021-08-03 22:48:45.736495319 +0200 +++ /var/tmp/diff_new_pack.zXTFpZ/_new 2021-08-03 22:48:45.736495319 +0200 @@ -24,12 +24,12 @@ # Name: rubygem-fog-libvirt -Version: 0.8.0 +Version: 0.9.0 Release: 0 %define mod_name fog-libvirt %define mod_full_name %{mod_name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: %{ruby >= 2.0.0} +BuildRequires: %{ruby >= 2.5.0} BuildRequires: %{rubygem gem2rpm} BuildRequires: %{rubygem rdoc > 3.10} BuildRequires: ruby-macros >= 5 ++++++ fog-libvirt-0.8.0.gem -> fog-libvirt-0.9.0.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md --- old/README.md 2021-01-10 00:24:59.000000000 +0100 +++ new/README.md 2021-07-16 16:46:49.000000000 +0200 @@ -2,7 +2,7 @@ fog-libvirt is a libvirt provider for [fog](https://github.com/fog/fog). -[](http://travis-ci.org/fog/fog-libvirt) +[](https://github.com/fog/fog-libvirt/actions/workflows/ruby.yml) [](https://gemnasium.com/fog/fog-libvirt) [](https://codeclimate.com/github/fog/fog-libvirt) [](http://badge.fury.io/rb/fog-libvirt) Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fog-libvirt.gemspec new/fog-libvirt.gemspec --- old/fog-libvirt.gemspec 2021-01-10 00:24:59.000000000 +0100 +++ new/fog-libvirt.gemspec 2021-07-16 16:46:49.000000000 +0200 @@ -23,7 +23,7 @@ s.rdoc_options = ["--charset=UTF-8"] s.extra_rdoc_files = %w[README.md] - s.required_ruby_version = '>= 2.0.0' + s.required_ruby_version = '>= 2.5.0' s.add_dependency("fog-core", ">= 1.27.4") s.add_dependency("fog-json") @@ -40,7 +40,7 @@ s.add_development_dependency("shindo", "~> 0.3.4") s.add_development_dependency("simplecov") s.add_development_dependency("yard") - s.add_development_dependency("mocha", "~> 1.1.0") + s.add_development_dependency("mocha", "~> 1.13.0") # Let's not ship dot files and gemfiles git_files = `git ls-files`.split("\n") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/fog/libvirt/compute.rb new/lib/fog/libvirt/compute.rb --- old/lib/fog/libvirt/compute.rb 2021-01-10 00:24:59.000000000 +0100 +++ new/lib/fog/libvirt/compute.rb 2021-07-16 16:46:49.000000000 +0200 @@ -120,16 +120,16 @@ # on macosx, chances are we are using libvirt through homebrew # the client will default to a socket location based on it's own location (/opt) # we conveniently point it to /var/run/libvirt/libvirt-sock - # if no socket option has been specified explicitly + # if no socket option has been specified explicitly and + # if the socket exists - if RUBY_PLATFORM =~ /darwin/ + socketpath="/var/run/libvirt/libvirt-sock" + if RUBY_PLATFORM =~ /darwin/ && File.exist?(socketpath) querystring=::URI.parse(uri).query if querystring.nil? - append="?socket=/var/run/libvirt/libvirt-sock" - else - if !::CGI.parse(querystring).key?("socket") - append="&socket=/var/run/libvirt/libvirt-sock" - end + append="?socket=#{socketpath}" + elsif !::CGI.parse(querystring).key?("socket") + append="&socket=#{socketpath}" end end uri+append diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/fog/libvirt/models/compute/server.rb new/lib/fog/libvirt/models/compute/server.rb --- old/lib/fog/libvirt/models/compute/server.rb 2021-01-10 00:24:59.000000000 +0100 +++ new/lib/fog/libvirt/models/compute/server.rb 2021-07-16 16:46:49.000000000 +0200 @@ -347,6 +347,9 @@ ip_address.chomp end + # Locale-friendly removal of non-alpha nums + DOMAIN_CLEANUP_REGEXP = Regexp.compile('[\W_-]') + # This retrieves the ip address of the mac address using ip_command # It returns an array of public and private ip addresses # Currently only one ip address is returned, but in the future this could be multiple @@ -360,7 +363,7 @@ ip_command_global=service_arg.ip_command.nil? ? 'grep $mac /var/log/arpwatch.log|sed -e "s/new station//"|sed -e "s/changed ethernet address//g" |sed -e "s/reused old ethernet //" |tail -1 |cut -d ":" -f 4-| cut -d " " -f 3' : service_arg.ip_command ip_command_local=options[:ip_command].nil? ? ip_command_global : options[:ip_command] - ip_command="mac=#{mac}; server_name=#{name}; "+ip_command_local + ip_command="mac=#{mac}; server_name=#{name.gsub(DOMAIN_CLEANUP_REGEXP, '_')}; "+ip_command_local ip_address=nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/fog/libvirt/models/compute/templates/server.xml.erb new/lib/fog/libvirt/models/compute/templates/server.xml.erb --- old/lib/fog/libvirt/models/compute/templates/server.xml.erb 2021-01-10 00:24:59.000000000 +0100 +++ new/lib/fog/libvirt/models/compute/templates/server.xml.erb 2021-07-16 16:46:49.000000000 +0200 @@ -110,6 +110,13 @@ <backend model='<%= rng_backend_model %>'/> <% end -%> </rng> +<% if arch == "s390x" -%> + <controller type="scsi" index="0" model="virtio-scsi"/> + <console type="pty"> + <target type="sclp"/> + </console> + <memballoon model="virtio"/> +<% else -%> <serial type='pty'> <target port='0'/> </serial> @@ -118,6 +125,7 @@ </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> +<% end -%> <% display_type = display[:type] @@ -137,9 +145,11 @@ display_password = "passwd='#{display[:password]}'" end -%> +<% if arch != "s390x" -%> <graphics type='<%= display_type %>' port='<%= display_port %>' autoport='<%= autoport %>' <%= display_listen %> <%= display_password %> /> <video> <model type='cirrus' vram='9216' heads='1'/> </video> +<% end -%> </devices> </domain> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/fog/libvirt/models/compute/templates/volume.xml.erb new/lib/fog/libvirt/models/compute/templates/volume.xml.erb --- old/lib/fog/libvirt/models/compute/templates/volume.xml.erb 2021-01-10 00:24:59.000000000 +0100 +++ new/lib/fog/libvirt/models/compute/templates/volume.xml.erb 2021-07-16 16:46:49.000000000 +0200 @@ -5,8 +5,12 @@ <target> <format type="<%= format_type %>"/> <permissions> + <% if owner -%> <owner><%= owner %></owner> + <% end -%> + <% if group -%> <group><%= group %></group> + <% end -%> <mode>0744</mode> <label>virt_image_t</label> </permissions> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/fog/libvirt/models/compute/volume.rb new/lib/fog/libvirt/models/compute/volume.rb --- old/lib/fog/libvirt/models/compute/volume.rb 2021-01-10 00:24:59.000000000 +0100 +++ new/lib/fog/libvirt/models/compute/volume.rb 2021-07-16 16:46:49.000000000 +0200 @@ -108,8 +108,8 @@ :name => randomized_name, :capacity => "10G", :allocation => "1G", - :owner => "0", - :group => "0", + :owner => nil, + :group => nil, } end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/fog/libvirt/requests/compute/list_networks.rb new/lib/fog/libvirt/requests/compute/list_networks.rb --- old/lib/fog/libvirt/requests/compute/list_networks.rb 2021-01-10 00:24:59.000000000 +0100 +++ new/lib/fog/libvirt/requests/compute/list_networks.rb 2021-07-16 16:46:49.000000000 +0200 @@ -31,7 +31,7 @@ begin bridge_name = net.bridge_name - rescue Libvirt::Error + rescue ::Libvirt::Error bridge_name = '' end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/fog/libvirt/version.rb new/lib/fog/libvirt/version.rb --- old/lib/fog/libvirt/version.rb 2021-01-10 00:24:59.000000000 +0100 +++ new/lib/fog/libvirt/version.rb 2021-07-16 16:46:49.000000000 +0200 @@ -1,5 +1,5 @@ module Fog module Libvirt - VERSION = '0.8.0' + VERSION = '0.9.0' end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2021-01-10 00:24:59.000000000 +0100 +++ new/metadata 2021-07-16 16:46:49.000000000 +0200 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: fog-libvirt version: !ruby/object:Gem::Version - version: 0.8.0 + version: 0.9.0 platform: ruby authors: - geemus (Wesley Beary) autorequire: bindir: bin cert_chain: [] -date: 2021-01-09 00:00:00.000000000 Z +date: 2021-07-16 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: fog-core @@ -212,14 +212,14 @@ requirements: - - "~>" - !ruby/object:Gem::Version - version: 1.1.0 + version: 1.13.0 type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - "~>" - !ruby/object:Gem::Version - version: 1.1.0 + version: 1.13.0 description: This library can be used as a module for 'fog' or as standalone libvirt provider. email: gee...@gmail.com @@ -321,14 +321,14 @@ requirements: - - ">=" - !ruby/object:Gem::Version - version: 2.0.0 + version: 2.5.0 required_rubygems_version: !ruby/object:Gem::Requirement requirements: - - ">=" - !ruby/object:Gem::Version version: '0' requirements: [] -rubygems_version: 3.1.4 +rubygems_version: 3.2.15 signing_key: specification_version: 2 summary: Module for the 'fog' gem to support libvirt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitests/server/user_data_iso_test.rb new/minitests/server/user_data_iso_test.rb --- old/minitests/server/user_data_iso_test.rb 2021-01-10 00:24:59.000000000 +0100 +++ new/minitests/server/user_data_iso_test.rb 2021-07-16 16:46:49.000000000 +0200 @@ -32,7 +32,6 @@ end def test_volume_is_created_during_user_data_iso_generation - iso_path = "iso_file_path" @server.stubs(:system).returns(true) Fog::Libvirt::Compute::Volumes.any_instance.expects(:create). with(has_entries(:name => @server.cloud_init_volume_name)). @@ -43,7 +42,6 @@ end def test_volume_is_uploaded_during_user_data_iso_generation - iso_path = "iso_file_path" @server.stubs(:system).returns(true) Fog::Libvirt::Compute::Volumes.any_instance.stubs(:create).returns(@compute.volumes.new) Fog::Libvirt::Compute::Volume.any_instance.expects(:upload_image).returns(true) @@ -52,7 +50,6 @@ end def test_iso_file_is_set_during_user_data_iso_generation - iso_path = "iso_file_path" @server.stubs(:system).returns(true) Fog::Libvirt::Compute::Volumes.any_instance.stubs(:create).returns(@compute.volumes.new) Fog::Libvirt::Compute::Volume.any_instance.stubs(:upload_image) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitests/test_helper.rb new/minitests/test_helper.rb --- old/minitests/test_helper.rb 2021-01-10 00:24:59.000000000 +0100 +++ new/minitests/test_helper.rb 2021-07-16 16:46:49.000000000 +0200 @@ -1,5 +1,5 @@ require 'minitest/autorun' -require 'mocha/mini_test' +require 'mocha/minitest' require 'fileutils' $: << File.join(File.dirname(__FILE__), '..', 'lib') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tests/helper.rb new/tests/helper.rb --- old/tests/helper.rb 2021-01-10 00:24:59.000000000 +0100 +++ new/tests/helper.rb 2021-07-16 16:46:49.000000000 +0200 @@ -3,7 +3,7 @@ require 'fog/libvirt' -Excon.defaults.merge!(:debug_request => true, :debug_response => true) +Excon.defaults.merge!(debug_request: true, debug_response: true) require File.expand_path(File.join(File.dirname(__FILE__), 'helpers', 'mock_helper')) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tests/helpers/formats_helper.rb new/tests/helpers/formats_helper.rb --- old/tests/helpers/formats_helper.rb 2021-01-10 00:24:59.000000000 +0100 +++ new/tests/helpers/formats_helper.rb 2021-07-16 16:46:49.000000000 +0200 @@ -1,4 +1,6 @@ -require "fog/schema/data_validator" +# frozen_string_literal: true + +require 'fog/schema/data_validator' # format related hackery # allows both true.is_a?(Fog::Boolean) and false.is_a?(Fog::Boolean) @@ -15,62 +17,62 @@ module Array; end end end -[FalseClass, TrueClass].each {|klass| klass.send(:include, Fog::Boolean)} -[FalseClass, TrueClass, NilClass, Fog::Boolean].each {|klass| klass.send(:include, Fog::Nullable::Boolean)} -[NilClass, String].each {|klass| klass.send(:include, Fog::Nullable::String)} -[NilClass, Time].each {|klass| klass.send(:include, Fog::Nullable::Time)} -[Integer, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Integer)} -[Float, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Float)} -[Hash, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Hash)} -[Array, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Array)} +[FalseClass, TrueClass].each { |klass| klass.send(:include, Fog::Boolean) } +[FalseClass, TrueClass, NilClass, Fog::Boolean].each { |klass| klass.send(:include, Fog::Nullable::Boolean) } +[NilClass, String].each { |klass| klass.send(:include, Fog::Nullable::String) } +[NilClass, Time].each { |klass| klass.send(:include, Fog::Nullable::Time) } +[Integer, NilClass].each { |klass| klass.send(:include, Fog::Nullable::Integer) } +[Float, NilClass].each { |klass| klass.send(:include, Fog::Nullable::Float) } +[Hash, NilClass].each { |klass| klass.send(:include, Fog::Nullable::Hash) } +[Array, NilClass].each { |klass| klass.send(:include, Fog::Nullable::Array) } module Shindo + # Generates a Shindo test that compares a hash schema to the result + # of the passed in block returning true if they match. + # + # The schema that is passed in is a Hash or Array of hashes that + # have Classes in place of values. When checking the schema the + # value should match the Class. + # + # Strict mode will fail if the data has additional keys. Setting + # +strict+ to +false+ will allow additional keys to appear. + # + # @param [Hash] schema A Hash schema + # @param [Hash] options Options to change validation rules + # @option options [Boolean] :allow_extra_keys + # If +true+ does not fail when keys are in the data that are + # not specified in the schema. This allows new values to + # appear in API output without breaking the check. + # @option options [Boolean] :allow_optional_rules + # If +true+ does not fail if extra keys are in the schema + # that do not match the data. Not recommended! + # @yield Data to check with schema + # + # @example Using in a test + # Shindo.tests("comparing welcome data against schema") do + # data = {:welcome => "Hello" } + # data_matches_schema(:welcome => String) { data } + # end + # + # comparing welcome data against schema + # + data matches schema + # + # @example Example schema + # { + # "id" => String, + # "ram" => Integer, + # "disks" => [ + # { + # "size" => Float + # } + # ], + # "dns_name" => Fog::Nullable::String, + # "active" => Fog::Boolean, + # "created" => DateTime + # } + # + # @return [Boolean] class Tests - # Generates a Shindo test that compares a hash schema to the result - # of the passed in block returning true if they match. - # - # The schema that is passed in is a Hash or Array of hashes that - # have Classes in place of values. When checking the schema the - # value should match the Class. - # - # Strict mode will fail if the data has additional keys. Setting - # +strict+ to +false+ will allow additional keys to appear. - # - # @param [Hash] schema A Hash schema - # @param [Hash] options Options to change validation rules - # @option options [Boolean] :allow_extra_keys - # If +true+ does not fail when keys are in the data that are - # not specified in the schema. This allows new values to - # appear in API output without breaking the check. - # @option options [Boolean] :allow_optional_rules - # If +true+ does not fail if extra keys are in the schema - # that do not match the data. Not recommended! - # @yield Data to check with schema - # - # @example Using in a test - # Shindo.tests("comparing welcome data against schema") do - # data = {:welcome => "Hello" } - # data_matches_schema(:welcome => String) { data } - # end - # - # comparing welcome data against schema - # + data matches schema - # - # @example Example schema - # { - # "id" => String, - # "ram" => Integer, - # "disks" => [ - # { - # "size" => Float - # } - # ], - # "dns_name" => Fog::Nullable::String, - # "active" => Fog::Boolean, - # "created" => DateTime - # } - # - # @return [Boolean] def data_matches_schema(schema, options = {}) test('data matches schema') do validator = Fog::Schema::DataValidator.new @@ -84,9 +86,9 @@ def formats(format, strict = true) test('has proper format') do if strict - options = {:allow_extra_keys => false, :allow_optional_rules => true} + options = { allow_extra_keys: false, allow_optional_rules: true } else - options = {:allow_extra_keys => true, :allow_optional_rules => true} + options = { allow_extra_keys: true, allow_optional_rules: true } end validator = Fog::Schema::DataValidator.new valid = validator.validate(yield, format, options) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tests/helpers/formats_helper_tests.rb new/tests/helpers/formats_helper_tests.rb --- old/tests/helpers/formats_helper_tests.rb 2021-01-10 00:24:59.000000000 +0100 +++ new/tests/helpers/formats_helper_tests.rb 2021-07-16 16:46:49.000000000 +0200 @@ -1,37 +1,37 @@ Shindo.tests('test_helper', 'meta') do tests('comparing welcome data against schema') do - data = {:welcome => "Hello" } - data_matches_schema(:welcome => String) { data } + data = { welcome: 'Hello' } + data_matches_schema(welcome: String) { data } end tests('#data_matches_schema') do tests('when value matches schema expectation') do - data_matches_schema({"key" => String}) { {"key" => "Value"} } + data_matches_schema('key' => String) { { 'key' => 'Value' } } end tests('when values within an array all match schema expectation') do - data_matches_schema({"key" => [Integer]}) { {"key" => [1, 2]} } + data_matches_schema('key' => [Integer]) { { 'key' => [1, 2] } } end tests('when nested values match schema expectation') do - data_matches_schema({"key" => {:nested_key => String}}) { {"key" => {:nested_key => "Value"}} } + data_matches_schema('key' => { nested_key: String }) { { 'key' => { nested_key: 'Value' } } } end tests('when collection of values all match schema expectation') do - data_matches_schema([{"key" => String}]) { [{"key" => "Value"}, {"key" => "Value"}] } + data_matches_schema([{ 'key' => String }]) { [{ 'key' => 'Value' }, { 'key' => 'Value' }] } end tests('when collection is empty although schema covers optional members') do - data_matches_schema([{"key" => String}], {:allow_optional_rules => true}) { [] } + data_matches_schema([{ 'key' => String }], allow_optional_rules: true) { [] } end tests('when additional keys are passed and not strict') do - data_matches_schema({"key" => String}, {:allow_extra_keys => true}) { {"key" => "Value", :extra => "Bonus"} } + data_matches_schema({ 'key' => String }, allow_extra_keys: true) { { 'key' => 'Value', extra: 'Bonus' } } end tests('when value is nil and schema expects NilClass') do - data_matches_schema({"key" => NilClass}) { {"key" => nil} } + data_matches_schema('key' => NilClass) { { 'key' => nil } } end tests('when value and schema match as hashes') do @@ -43,46 +43,45 @@ end tests('when value is a Time') do - data_matches_schema({"time" => Time}) { {"time" => Time.now} } + data_matches_schema('time' => Time) { { 'time' => Time.now } } end tests('when key is missing but value should be NilClass (#1477)') do - data_matches_schema({"key" => NilClass}, {:allow_optional_rules => true}) { {} } + data_matches_schema({ 'key' => NilClass }, allow_optional_rules: true) { {} } end tests('when key is missing but value is nullable (#1477)') do - data_matches_schema({"key" => Fog::Nullable::String}, {:allow_optional_rules => true}) { {} } + data_matches_schema({ 'key' => Fog::Nullable::String }, allow_optional_rules: true) { {} } end end tests('#formats backwards compatible changes') do - tests('when value matches schema expectation') do - formats({"key" => String}) { {"key" => "Value"} } + formats('key' => String) { { 'key' => 'Value' } } end tests('when values within an array all match schema expectation') do - formats({"key" => [Integer]}) { {"key" => [1, 2]} } + formats('key' => [Integer]) { { 'key' => [1, 2] } } end tests('when nested values match schema expectation') do - formats({"key" => {:nested_key => String}}) { {"key" => {:nested_key => "Value"}} } + formats('key' => { nested_key: String }) { { 'key' => { nested_key: 'Value' } } } end tests('when collection of values all match schema expectation') do - formats([{"key" => String}]) { [{"key" => "Value"}, {"key" => "Value"}] } + formats([{ 'key' => String }]) { [{ 'key' => 'Value' }, { 'key' => 'Value' }] } end tests('when collection is empty although schema covers optional members') do - formats([{"key" => String}]) { [] } + formats([{ 'key' => String }]) { [] } end tests('when additional keys are passed and not strict') do - formats({"key" => String}, false) { {"key" => "Value", :extra => "Bonus"} } + formats({ 'key' => String }, false) { { 'key' => 'Value', :extra => 'Bonus' } } end tests('when value is nil and schema expects NilClass') do - formats({"key" => NilClass}) { {"key" => nil} } + formats('key' => NilClass) { { 'key' => nil } } end tests('when value and schema match as hashes') do @@ -94,17 +93,15 @@ end tests('when value is a Time') do - formats({"time" => Time}) { {"time" => Time.now} } + formats('time' => Time) { { 'time' => Time.now } } end tests('when key is missing but value should be NilClass (#1477)') do - formats({"key" => NilClass}) { {} } + formats('key' => NilClass) { {} } end tests('when key is missing but value is nullable (#1477)') do - formats({"key" => Fog::Nullable::String}) { {} } + formats('key' => Fog::Nullable::String) { {} } end - end - end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tests/helpers/mock_helper.rb new/tests/helpers/mock_helper.rb --- old/tests/helpers/mock_helper.rb 2021-01-10 00:24:59.000000000 +0100 +++ new/tests/helpers/mock_helper.rb 2021-07-16 16:46:49.000000000 +0200 @@ -9,6 +9,6 @@ # if in mocked mode, fill in some fake credentials for us if Fog.mock? Fog.credentials = { - :libvirt_uri => 'qemu://libvirt/system', + libvirt_uri: 'qemu://libvirt/system', }.merge(Fog.credentials) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tests/helpers/succeeds_helper.rb new/tests/helpers/succeeds_helper.rb --- old/tests/helpers/succeeds_helper.rb 2021-01-10 00:24:59.000000000 +0100 +++ new/tests/helpers/succeeds_helper.rb 2021-07-16 16:46:49.000000000 +0200 @@ -1,8 +1,8 @@ module Shindo class Tests - def succeeds + def succeeds(&block) test('succeeds') do - !!instance_eval(&Proc.new) + !instance_eval(&Proc.new(&block)).nil? end end end