rspec-support 3.7.1 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0fe50cb7f542a64bbfaf228bf0d4222210131c9c
-  data.tar.gz: 3252ea5991d2b3583a042f16843f81195ea60ffb
+SHA256:
+  metadata.gz: 5c8cd61c982e4ac70aa43e70803e06e76018107daa69d666eb489734ccf78e91
+  data.tar.gz: 68f0a5ab651d9adfb6c53708bbf0b694eb40fe2781da413afd795a375dabbb5f
 SHA512:
-  metadata.gz: 505b60919c61f1615270f98a9c6cdafcb8553eef14661423a1ca32bef71bd7bd1aae7e9f8fef6da4cd6de0c207cf666aa429e525915b41310b1f7195d1703932
-  data.tar.gz: 2a8d7ffcd478cd7e9dfd90dd97daf14e9296b32fad88e39391d60e785c9326c02db0940b47873ba04dcb98c252dca9535171f9a56633992fbfe7e0930042fc60
+  metadata.gz: 57f69f0570273c83d2eca2570a40e203afa78bc259591770e97b330b8ebac66884db77f906244916becfbcd5e13bbd1365db05833c1336b520f6d21c07345162
+  data.tar.gz: 76eb5e023bdce42de00e3194491530bb7c32819aae9975b95536734c064af676890f30d3618fb04a4d000e6934e3644af577593fd5708496c61ac9ae647bdac9

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-X+�
ӄ��kʕH���|��Ǫձ�(+��4'��i.���tI����DM���٢ �ii���b�n�����
0����(�YQds��!�sA�֒�� $ ��b�Oy��
TV�{ϒ=�߂fDg��s�1�<"�.~w����T{�5x\��	wGݿ�����=��4�ϐ�@J��Z��{��k��t�6�e�`
�P�|^k��{C~I6��۵�?�#���
+�y�>k�k�ce�;�m���(#�h�n����Գ�G{{-�������(:��N3���D�'j��/:/�ί�4W�}2��a����%%�&�o�:l���k�!�P|�^	F,��΀nz�̉�W���uة1",��/�����_U�� ��ݽ�Z�3T�,,['(�7o��P��yt�/
+�`
+.���(>k�8�o��!�ڷQ�+����qH����<P���I�������g�_6�SG@�R�XR��5�]�
60�qs�ž�,֤�6���N�@�;�E����3�Nآ	-�ٴB}65����&�F%i�epO�M&C�Î�O�;PҘF�n��Et�V�ZG�	���������>�t�4�'`���9��]VE��q�P�j���a7����џ�^c2]&�B-�?����_�,�a���/�\����+��[9�M~<륦�k-q��Ȅ��!C<�e�^8��,y�b��%�#�{�O���0��e�t�ok�yw-�����'�

data/Changelog.md

@@ -1,3 +1,51 @@
+### 3.9.1 / 2019-12-28
+
+Bug Fixes:
+
+* Remove warning caused by keyword arguments on Ruby 2.7.0.
+  (Jon Rowe, #392)
+
+### 3.9.0 / 2019-10-07
+
+*NO CHANGES*
+
+Version 3.9.0 was released to allow other RSpec gems to release 3.9.0.
+
+### 3.8.3 / 2019-10-02
+
+Bug Fixes:
+
+* Escape \r when outputting strings inside arrays.
+  (Tomita Masahiro, Jon Rowe, #378)
+* Ensure that optional hash arguments are recognised correctly vs keyword
+  arguments. (Evgeni Dzhelyov, #366)
+
+### 3.8.2 / 2019-06-10
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.8.1...v3.8.2)
+
+Bug Fixes:
+
+* Ensure that an empty hash is recognised as empty keyword arguments when
+  applicable. (Thomas Walpole, #375)
+* Ensure that diffing truthy values produce diffs consistently.
+  (Lucas Nestor, #377)
+
+### 3.8.1 / 2019-03-03
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.8.0...v3.8.1)
+
+Bug Fixes:
+
+* Ensure that inspecting a `SimpleDelegator` based object works regardless of
+  visibilty of the `__getobj__` method. (Jon Rowe, #369)
+
+### 3.8.0 / 2018-08-04
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.7.1...v3.8.0)
+
+Bug Fixes:
+
+* Order hash keys before diffing to improve diff accuracy when using mocked calls.
+  (James Crisp, #334)
+
 ### 3.7.1 / 2018-01-29
 [Full Changelog](http://github.com/rspec/rspec-support/compare/v3.7.0...v3.7.1)
 

data/README.md

@@ -13,7 +13,7 @@ RSpec repos as well. Add the following to your `Gemfile`:
 
 ```ruby
 %w[rspec-core rspec-expectations rspec-mocks rspec-support].each do |lib|
-  gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => 'master'
+  gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => 'master'
 end
 ```
 

data/lib/rspec/support.rb

@@ -139,7 +139,7 @@ module RSpec
       end
     end
 
-    # The Differ is only needed when a a spec fails with a diffable failure.
+    # The Differ is only needed when a spec fails with a diffable failure.
     # In the more common case of all specs passing or the only failures being
     # non-diffable, we can avoid the extra cost of loading the differ, diff-lcs,
     # pp, etc by avoiding an unnecessary require. Instead, autoload will take

data/lib/rspec/support/differ.rb

@@ -11,7 +11,7 @@ module RSpec
       def diff(actual, expected)
         diff = ""
 
-        if actual && expected
+        unless actual.nil? || expected.nil?
           if all_strings?(actual, expected)
             if any_multiline_strings?(actual, expected)
               diff = diff_as_string(coerce_to_string(actual), coerce_to_string(expected))
@@ -97,7 +97,7 @@ module RSpec
           if Array === entry
             entry.inspect
           else
-            entry.to_s.gsub("\n", "\\n")
+            entry.to_s.gsub("\n", "\\n").gsub("\r", "\\r")
           end
         end
       end

data/lib/rspec/support/encoded_string.rb

@@ -112,11 +112,40 @@ module RSpec
           string = remove_invalid_bytes(string)
           string.encode(@encoding)
         rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
-          string.encode(@encoding, ENCODE_UNCONVERTABLE_BYTES)
+          encode_unconvertable_bytes(string)
         rescue Encoding::ConverterNotFoundError
-          string.dup.force_encoding(@encoding).encode(ENCODE_NO_CONVERTER)
+          encode_no_converter(string.dup.force_encoding(@encoding))
         end
 
+        private
+
+        # On Ruby 2.7.0 keyword arguments mixed with conventional cause a warning to
+        # be issued requiring us to be explicit by using a ** to pass the hash as
+        # keyword arguments. Any keyword argument supporting Ruby supports this.
+        if RubyFeatures.kw_args_supported?
+          # Note on non keyword supporting Ruby ** causes a syntax error hence
+          # we must use eval. To be removed in RSpec 4.
+          binding.eval(<<-CODE, __FILE__, __LINE__)
+          def encode_unconvertable_bytes(string)
+            string.encode(@encoding, **ENCODE_UNCONVERTABLE_BYTES)
+          end
+
+          def encode_no_converter(string)
+            string.encode(**ENCODE_NO_CONVERTER)
+          end
+          CODE
+        else
+          def encode_unconvertable_bytes(string)
+            string.encode(@encoding, ENCODE_UNCONVERTABLE_BYTES)
+          end
+
+          def encode_no_converter(string)
+            string.encode(ENCODE_NO_CONVERTER)
+          end
+        end
+
+        public
+
         # Prevents raising ArgumentError
         if String.method_defined?(:scrub)
           # https://github.com/ruby/ruby/blob/eeb05e8c11/doc/NEWS-2.1.0#L120-L123

data/lib/rspec/support/method_signature_verifier.rb

@@ -33,6 +33,18 @@ module RSpec
           optional_max_arg_count <= max_non_kw_args
       end
 
+      def classify_arity(arity=@method.arity)
+        if arity < 0
+          # `~` inverts the one's complement and gives us the
+          # number of required args
+          @min_non_kw_args = ~arity
+          @max_non_kw_args = INFINITY
+        else
+          @min_non_kw_args = arity
+          @max_non_kw_args = arity
+        end
+      end
+
       if RubyFeatures.optional_and_splat_args_supported?
         def description
           @description ||= begin
@@ -65,14 +77,19 @@ module RSpec
           given_kw_args - @allowed_kw_args
         end
 
+        # If the last argument is Hash, Ruby will treat only symbol keys as keyword arguments
+        # the rest will be grouped in another Hash and passed as positional argument.
         def has_kw_args_in?(args)
-          Hash === args.last && could_contain_kw_args?(args)
+          Hash === args.last &&
+            could_contain_kw_args?(args) &&
+            (args.last.empty? || args.last.keys.any? { |x| x.is_a?(Symbol) })
         end
 
         # Without considering what the last arg is, could it
         # contain keyword arguments?
         def could_contain_kw_args?(args)
           return false if args.count <= min_non_kw_args
+
           @allows_any_kw_args || @allowed_kw_args.any?
         end
 
@@ -137,36 +154,58 @@ module RSpec
           false
         end
 
-        def classify_parameters
-          arity = @method.arity
-          if arity < 0
-            # `~` inverts the one's complement and gives us the
-            # number of required args
-            @min_non_kw_args = ~arity
-            @max_non_kw_args = INFINITY
-          else
-            @min_non_kw_args = arity
-            @max_non_kw_args = arity
-          end
-        end
+        alias_method :classify_parameters, :classify_arity
       end
 
       INFINITY = 1 / 0.0
     end
 
-    # Some versions of JRuby have a nasty bug we have to work around :(.
-    # https://github.com/jruby/jruby/issues/2816
-    if RSpec::Support::Ruby.jruby? &&
-       RubyFeatures.optional_and_splat_args_supported? &&
-       Class.new { attr_writer :foo }.instance_method(:foo=).parameters == []
+    if RSpec::Support::Ruby.jruby?
+      # JRuby has only partial support for UnboundMethod#parameters, so we fall back on using #arity
+      # https://github.com/jruby/jruby/issues/2816 and https://github.com/jruby/jruby/issues/2817
+      if RubyFeatures.optional_and_splat_args_supported? &&
+         Java::JavaLang::String.instance_method(:char_at).parameters == []
 
-      class MethodSignature < remove_const(:MethodSignature)
-      private
+        class MethodSignature < remove_const(:MethodSignature)
+        private
 
-        def classify_parameters
-          super
-          return unless @method.parameters == [] && @method.arity == 1
-          @max_non_kw_args = @min_non_kw_args = 1
+          def classify_parameters
+            super
+            if (arity = @method.arity) != 0 && @method.parameters.empty?
+              classify_arity(arity)
+            end
+          end
+        end
+      end
+
+      # JRuby used to always report -1 arity for Java proxy methods.
+      # The workaround essentially makes use of Java's introspection to figure
+      # out matching methods (which could be more than one partly because Java
+      # supports multiple overloads, and partly because JRuby introduces
+      # aliases to make method names look more Rubyesque). If there is only a
+      # single match, we can use that methods arity directly instead of the
+      # default -1 arity.
+      #
+      # This workaround only works for Java proxy methods, and in order to
+      # support regular methods and blocks, we need to be careful about calling
+      # owner and java_class as they might not be available
+      if Java::JavaLang::String.instance_method(:char_at).arity == -1
+        class MethodSignature < remove_const(:MethodSignature)
+        private
+
+          def classify_parameters
+            super
+            return unless @method.arity == -1
+            return unless @method.respond_to?(:owner)
+            return unless @method.owner.respond_to?(:java_class)
+            java_instance_methods = @method.owner.java_class.java_instance_methods
+            compatible_overloads = java_instance_methods.select do |java_method|
+              @method == @method.owner.instance_method(java_method.name)
+            end
+            if compatible_overloads.size == 1
+              classify_arity(compatible_overloads.first.arity)
+            end
+          end
         end
       end
     end
@@ -323,7 +362,14 @@ module RSpec
 
       def split_args(*args)
         kw_args = if @signature.has_kw_args_in?(args)
-                    args.pop.keys
+                    last = args.pop
+                    non_kw_args = last.reject { |k, _| k.is_a?(Symbol) }
+                    if non_kw_args.empty?
+                      last.keys
+                    else
+                      args << non_kw_args
+                      last.select { |k, _| k.is_a?(Symbol) }.keys
+                    end
                   else
                     []
                   end

data/lib/rspec/support/object_formatter.rb

@@ -5,7 +5,7 @@ module RSpec
     # Provide additional output details beyond what `inspect` provides when
     # printing Time, DateTime, or BigDecimal
     # @api private
-    class ObjectFormatter # rubocop:disable Style/ClassLength
+    class ObjectFormatter # rubocop:disable Metrics/ClassLength
       ELLIPSIS = "..."
 
       attr_accessor :max_formatted_output_length
@@ -31,15 +31,15 @@ module RSpec
 
       def format(object)
         if max_formatted_output_length.nil?
-          return prepare_for_inspection(object).inspect
+          prepare_for_inspection(object).inspect
         else
           formatted_object = prepare_for_inspection(object).inspect
           if formatted_object.length < max_formatted_output_length
-            return formatted_object
+            formatted_object
           else
             beginning = truncate_string formatted_object, 0, max_formatted_output_length / 2
             ending = truncate_string formatted_object, -max_formatted_output_length / 2, -1
-            return beginning + ELLIPSIS + ending
+            beginning + ELLIPSIS + ending
           end
         end
       end
@@ -73,7 +73,7 @@ module RSpec
 
       def prepare_hash(input_hash)
         with_entering_structure(input_hash) do
-          input_hash.inject({}) do |output_hash, key_and_value|
+          sort_hash_keys(input_hash).inject({}) do |output_hash, key_and_value|
             key, value = key_and_value.map { |element| prepare_element(element) }
             output_hash[key] = value
             output_hash
@@ -81,6 +81,14 @@ module RSpec
         end
       end
 
+      def sort_hash_keys(input_hash)
+        if input_hash.keys.all? { |k| k.is_a?(String) || k.is_a?(Symbol) }
+          Hash[input_hash.sort_by { |k, _v| k.to_s }]
+        else
+          input_hash
+        end
+      end
+
       def prepare_element(element)
         if recursive_structure?(element)
           case element
@@ -217,7 +225,7 @@ module RSpec
         end
 
         def inspect
-          "#<#{object.class}(#{formatter.format(object.__getobj__)})>"
+          "#<#{object.class}(#{formatter.format(object.send(:__getobj__))})>"
         end
       end
 

data/lib/rspec/support/ruby_features.rb

@@ -56,6 +56,22 @@ module RSpec
     module RubyFeatures
       module_function
 
+      if Ruby.jruby?
+        # On JRuby 1.7 `--1.8` mode, `Process.respond_to?(:fork)` returns true,
+        # but when you try to fork, it raises an error:
+        #   NotImplementedError: fork is not available on this platform
+        #
+        # When we drop support for JRuby 1.7 and/or Ruby 1.8, we can drop
+        # this special case.
+        def fork_supported?
+          false
+        end
+      else
+        def fork_supported?
+          Process.respond_to?(:fork)
+        end
+      end
+
       def optional_and_splat_args_supported?
         Method.method_defined?(:parameters)
       end
@@ -74,6 +90,15 @@ module RSpec
         end
       end
 
+      if RUBY_VERSION.to_f >= 2.7
+        def supports_taint?
+          false
+        end
+      else
+        def supports_taint?
+          true
+        end
+      end
       ripper_requirements = [ComparableVersion.new(RUBY_VERSION) >= '1.9.2']
 
       ripper_requirements.push(false) if Ruby.rbx?
@@ -109,7 +134,6 @@ module RSpec
         end
       else
         # RBX / JRuby et al support is unknown for keyword arguments
-        # rubocop:disable Lint/Eval
         begin
           eval("o = Object.new; def o.m(a: 1); end;"\
                " raise SyntaxError unless o.method(:m).parameters.include?([:key, :a])")
@@ -147,7 +171,6 @@ module RSpec
             false
           end
         end
-        # rubocop:enable Lint/Eval
       end
 
       def module_refinement_supported?

data/lib/rspec/support/spec/shell_out.rb

@@ -59,10 +59,15 @@ module RSpec
           l =~ %r{bundler/source/rubygems} ||
           # Ignore bundler + rubygems warning.
           l =~ %r{site_ruby/\d\.\d\.\d/rubygems} ||
+          l =~ %r{jruby-\d\.\d\.\d\.\d/lib/ruby/stdlib/rubygems} ||
           # This is required for windows for some reason
           l =~ %r{lib/bundler/rubygems} ||
           # This is a JRuby file that generates warnings on 9.0.3.0
-          l =~ %r{lib/ruby/stdlib/jar}
+          l =~ %r{lib/ruby/stdlib/jar} ||
+          # This is a JRuby file that generates warnings on 9.1.7.0
+          l =~ %r{org/jruby/RubyKernel\.java} ||
+          # Remove blank lines
+          l == "" || l.nil?
         end.join("\n")
       end
 

data/lib/rspec/support/spec/stderr_splitter.rb

@@ -38,6 +38,10 @@ module RSpec
       def write(line)
         return if line =~ %r{^\S+/gems/\S+:\d+: warning:} # http://rubular.com/r/kqeUIZOfPG
 
+        # Ruby 2.7.0 complains about hashes used in place of keyword arguments
+        # Aruba 0.14.2 uses this internally triggering that here
+        return if line =~ %r{lib/ruby/2\.7\.0/fileutils\.rb:622: warning:}
+
         @orig_stderr.write(line)
         @output_tracker.write(line)
       end

data/lib/rspec/support/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Support
     module Version
-      STRING = '3.7.1'
+      STRING = '3.9.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-support
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.9.1
 platform: ruby
 authors:
 - David Chelimsky
@@ -48,22 +48,8 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2019-12-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +121,12 @@ files:
 homepage: https://github.com/rspec/rspec-support
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/rspec/rspec-support/issues
+  changelog_uri: https://github.com/rspec/rspec-support/blob/v3.9.1/Changelog.md
+  documentation_uri: https://rspec.info/documentation/
+  mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
+  source_code_uri: https://github.com/rspec/rspec-support
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -152,9 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: rspec-support-3.7.1
+summary: rspec-support-3.9.1
 test_files: []