rspec-support 3.0.4 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71ada7066e53a0b40d343dd8f26528715c2fbf24
-  data.tar.gz: 712553112d6764d89e35fa1a1657a268f16d2d83
+  metadata.gz: 4617d19ee06926ebbcff3a74a7b9f4f4b33c5cea
+  data.tar.gz: d604a3eea3884a0bfdb9e6752d0c9661cab04a57
 SHA512:
-  metadata.gz: 2e5ffa54dcf62a550f3b87fdbfb1c548e2db1ac97f70a5b3608c9c51955fd81b496738b37050e991987788b32bbdd8d76179ef86fa091e99437593c34145947d
-  data.tar.gz: a394b169979e054239c96ec27a10326f96273098ae993159a78c9db9e72f2fbc1ea334c3513f73d48b39771f47f31f16a339824c1ce602ea913230d0800fd0a8
+  metadata.gz: 7e1921b73a9af0bd4c3877d51eeac845c47708e1c3bfbe2c4a33a1501d41b2260ca567ee7f5e9c9f46d2102a5a85705c53d37dddf823eedf14fa07d826a649c4
+  data.tar.gz: 98b5498e60ee2901a87243c33b28bc85f60d0815e7a04bf32fb69833dd5dd9f6973d81c52e9a46e726e15a3540ec3aef4987bfb1f5d2de63c6d51e622c4e05b4

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-J�9�u�Ʃ�_s+�Y�$e�/C�[��y��B��Up��֤�*ϖ&]�0�H�궢�1L+���0�^g��Xf�r��
-�֮
+{�BUg�
+1<�"&����
rq'!�an�~WeǺ��e��zD=(�������Xx��a����K„�z���$�7K�\�ޝ�7h톎��n�8o^O���>k��"j|��"�������Xb�@���"q9�qQy37db���:3��EG

data/Changelog.md

@@ -1,3 +1,13 @@
+### 3.1.0 / 2014-09-04
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.0.4...v3.1.0)
+
+Bug Fixes:
+
+* Fix `FuzzyMatcher` so that it does not wrongly match a struct against
+  an array. (Myron Marston, #97)
+* Prevent infinitely recursing `#flatten` methods from causing the differ
+  to hang. (Jon Rowe, #101)
+
 ### 3.0.4 / 2014-08-14
 [Full Changelog](http://github.com/rspec/rspec-support/compare/v3.0.3...v3.0.4)
 

data/lib/rspec/support/caller_filter.rb

@@ -4,7 +4,6 @@ module RSpec
   # the code using the library, which is far more useful than the particular
   # internal method that raised an error.
   class CallerFilter
-
     RSPEC_LIBS = %w[
       core
       mocks
@@ -41,7 +40,7 @@ module RSpec
         i         = 1
         line      = nil
 
-        while !line
+        until line
           stack = caller(i, increment)
           raise "No non-lib lines in stack" unless stack
 

data/lib/rspec/support/differ.rb

@@ -5,6 +5,7 @@ require 'pp'
 
 module RSpec
   module Support
+    # rubocop:disable ClassLength
     class Differ
       def diff(actual, expected)
         diff = ""
@@ -22,6 +23,7 @@ module RSpec
         diff.to_s
       end
 
+      # rubocop:disable MethodLength
       def diff_as_string(actual, expected)
         @encoding = pick_encoding actual, expected
 
@@ -35,21 +37,20 @@ module RSpec
             if current_hunk.overlaps?(prev_hunk)
               add_old_hunk_to_hunk(current_hunk, prev_hunk)
             else
-              add_to_output(output, prev_hunk.diff(format).to_s)
+              add_to_output(output, prev_hunk.diff(format_type).to_s)
             end
           ensure
             add_to_output(output, "\n")
           end
         end
 
-        if hunks.last
-          finalize_output(output, hunks.last.diff(format).to_s)
-        end
+        finalize_output(output, hunks.last.diff(format_type).to_s) if hunks.last
 
         color_diff output
       rescue Encoding::CompatibilityError
         handle_encoding_errors
       end
+      # rubocop:enable MethodLength
 
       def diff_as_object(actual, expected)
         actual_as_string = object_to_string(actual)
@@ -68,19 +69,19 @@ module RSpec
     private
 
       def no_procs?(*args)
-        args.flatten.none? { |a| Proc === a}
+        safely_flatten(args).none? { |a| Proc === a }
       end
 
       def all_strings?(*args)
-        args.flatten.all? { |a| String === a}
+        safely_flatten(args).all? { |a| String === a }
       end
 
       def any_multiline_strings?(*args)
-        all_strings?(*args) && args.flatten.any? { |a| multiline?(a) }
+        all_strings?(*args) && safely_flatten(args).any? { |a| multiline?(a) }
       end
 
       def no_numbers?(*args)
-        args.flatten.none? { |a| Numeric === a}
+        safely_flatten(args).none? { |a| Numeric === a }
       end
 
       def coerce_to_string(string_or_array)
@@ -125,7 +126,12 @@ module RSpec
         hunk.merge(oldhunk)
       end
 
-      def format
+      def safely_flatten(array)
+        array = array.flatten(1) until (array == array.flatten(1))
+        array
+      end
+
+      def format_type
         :unified
       end
 
@@ -152,7 +158,7 @@ module RSpec
       def color_diff(diff)
         return diff unless color?
 
-        diff.lines.map { |line|
+        diff.lines.map do |line|
           case line[0].chr
           when "+"
             green line
@@ -163,7 +169,7 @@ module RSpec
           else
             normal(line)
           end
-        }.join
+        end.join
       end
 
       def object_to_string(object)
@@ -179,7 +185,7 @@ module RSpec
         when String
           object =~ /\n/ ? object : object.inspect
         else
-          PP.pp(object,"")
+          PP.pp(object, "")
         end
       end
 
@@ -188,18 +194,21 @@ module RSpec
           Encoding.compatible?(source_a, source_b) || Encoding.default_external
         end
       else
-        def pick_encoding(source_a, source_b)
+        def pick_encoding(_source_a, _source_b)
         end
       end
 
       def handle_encoding_errors
         if @actual.source_encoding != @expected.source_encoding
-          "Could not produce a diff because the encoding of the actual string (#{@actual.source_encoding}) "+
-            "differs from the encoding of the expected string (#{@expected.source_encoding})"
+          "Could not produce a diff because the encoding of the actual string " \
+          "(#{@actual.source_encoding}) differs from the encoding of the expected " \
+          "string (#{@expected.source_encoding})"
         else
-          "Could not produce a diff because of the encoding of the string (#{@expected.source_encoding})"
+          "Could not produce a diff because of the encoding of the string " \
+          "(#{@expected.source_encoding})"
         end
       end
     end
+    # rubocop:enable ClassLength
   end
 end

data/lib/rspec/support/directory_maker.rb

@@ -0,0 +1,30 @@
+module RSpec
+  module Support
+    # @api private
+    #
+    # Replacement for fileutils#mkdir_p because we don't want to require parts
+    # of stdlib in RSpec.
+    class DirectoryMaker
+      # @api private
+      #
+      # Implements nested directory construction
+      def self.mkdir_p(path)
+        stack = path.start_with?(File::SEPARATOR) ? File::SEPARATOR : "."
+        path.split(File::SEPARATOR).each do |part|
+          stack = File.join(stack, part)
+
+          begin
+            Dir.mkdir(stack) unless directory_exists?(stack)
+          rescue Errno::ENOTDIR => e
+            raise Errno::EEXIST, e.message
+          end
+        end
+      end
+
+      def self.directory_exists?(dirname)
+        File.exist?(dirname) && File.directory?(dirname)
+      end
+      private_class_method :directory_exists?
+    end
+  end
+end

data/lib/rspec/support/encoded_string.rb

@@ -2,10 +2,9 @@ module RSpec
   module Support
     # @private
     class EncodedString
-
       MRI_UNICODE_UNKOWN_CHARACTER = "\xEF\xBF\xBD"
 
-      def initialize(string, encoding = nil)
+      def initialize(string, encoding=nil)
         @encoding = encoding
         @source_encoding = detect_source_encoding(string)
         @string = matching_encoding(string)
@@ -30,9 +29,10 @@ module RSpec
       end
       alias :to_str :to_s
 
-    private
-
       if String.method_defined?(:encoding)
+
+        private
+
         def matching_encoding(string)
           string.encode(@encoding)
         rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
@@ -53,11 +53,14 @@ module RSpec
           string.encoding
         end
       else
+
+        private
+
         def matching_encoding(string)
           string
         end
 
-        def detect_source_encoding(string)
+        def detect_source_encoding(_string)
           'US-ASCII'
         end
       end

data/lib/rspec/support/fuzzy_matcher.rb

@@ -6,7 +6,7 @@ module RSpec
     module FuzzyMatcher
       # @api private
       def self.values_match?(expected, actual)
-        if Array === expected && Enumerable === actual
+        if Array === expected && Enumerable === actual && !(Struct === actual)
           return arrays_match?(expected, actual.to_a)
         elsif Hash === expected && Hash === actual
           return hashes_match?(expected, actual)
@@ -46,4 +46,3 @@ module RSpec
     end
   end
 end
-

data/lib/rspec/support/hunk_generator.rb

@@ -42,7 +42,6 @@ module RSpec
       def context_lines
         3
       end
-
     end
   end
 end

data/lib/rspec/support/matcher_definition.rb

@@ -0,0 +1,31 @@
+module RSpec
+  module Support
+    # @private
+    def self.matcher_definitions
+      @matcher_definitions ||= []
+    end
+
+    # Used internally to break cyclic dependency between mocks, expectations,
+    # and support. We don't currently have a consistent implementation of our
+    # matchers, though we are considering changing that:
+    # https://github.com/rspec/rspec-mocks/issues/513
+    #
+    # @private
+    def self.register_matcher_definition(&block)
+      matcher_definitions << block
+    end
+
+    # Remove a previously registered matcher. Useful for cleaning up after
+    # yourself in specs.
+    #
+    # @private
+    def self.deregister_matcher_definition(&block)
+      matcher_definitions.delete(block)
+    end
+
+    # @private
+    def self.is_a_matcher?(object)
+      matcher_definitions.any? { |md| md.call(object) }
+    end
+  end
+end

data/lib/rspec/support/method_signature_verifier.rb

@@ -1,5 +1,6 @@
 require 'rspec/support'
 RSpec::Support.require_rspec_support "ruby_features"
+RSpec::Support.require_rspec_support "matcher_definition"
 
 module RSpec
   module Support
@@ -17,12 +18,17 @@ module RSpec
 
       def non_kw_args_arity_description
         case max_non_kw_args
-          when min_non_kw_args then min_non_kw_args.to_s
-          when INFINITY then "#{min_non_kw_args} or more"
-          else "#{min_non_kw_args} to #{max_non_kw_args}"
+        when min_non_kw_args then min_non_kw_args.to_s
+        when INFINITY then "#{min_non_kw_args} or more"
+        else "#{min_non_kw_args} to #{max_non_kw_args}"
         end
       end
 
+      def valid_non_kw_args?(positional_arg_count)
+        min_non_kw_args <= positional_arg_count &&
+          positional_arg_count <= max_non_kw_args
+      end
+
       if RubyFeatures.optional_and_splat_args_supported?
         def description
           @description ||= begin
@@ -40,9 +46,7 @@ module RSpec
               parts << "required keyword args (#{@required_kw_args.map(&:inspect).join(", ")})"
             end
 
-            if @allows_any_kw_args
-              parts << "any additional keyword args"
-            end
+            parts << "any additional keyword args" if @allows_any_kw_args
 
             parts.join(" and ")
           end
@@ -58,9 +62,13 @@ module RSpec
         end
 
         def has_kw_args_in?(args)
-          return false unless Hash === args.last
-          return false if args.count <= min_non_kw_args
+          Hash === args.last && could_contain_kw_args?(args)
+        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
 
@@ -71,18 +79,18 @@ module RSpec
 
           @method.parameters.each do |(type, name)|
             case type
-              # def foo(a:)
-              when :keyreq  then @required_kw_args << name
-              # def foo(a: 1)
-              when :key     then @optional_kw_args << name
-              # def foo(**kw_args)
-              when :keyrest then @allows_any_kw_args = true
-              # def foo(a)
-              when :req     then @min_non_kw_args += 1
-              # def foo(a = 1)
-              when :opt     then optional_non_kw_args += 1
-              # def foo(*a)
-              when :rest    then optional_non_kw_args = INFINITY
+            # def foo(a:)
+            when :keyreq  then @required_kw_args << name
+            # def foo(a: 1)
+            when :key     then @optional_kw_args << name
+            # def foo(**kw_args)
+            when :keyrest then @allows_any_kw_args = true
+            # def foo(a)
+            when :req     then @min_non_kw_args += 1
+            # def foo(a = 1)
+            when :opt     then optional_non_kw_args += 1
+            # def foo(*a)
+            when :rest    then optional_non_kw_args = INFINITY
             end
           end
 
@@ -94,15 +102,15 @@ module RSpec
           "arity of #{non_kw_args_arity_description}"
         end
 
-        def missing_kw_args_from(given_kw_args)
+        def missing_kw_args_from(_given_kw_args)
           []
         end
 
-        def invalid_kw_args_from(given_kw_args)
+        def invalid_kw_args_from(_given_kw_args)
           []
         end
 
-        def has_kw_args_in?(args)
+        def has_kw_args_in?(_args)
           false
         end
 
@@ -120,16 +128,16 @@ module RSpec
         end
       end
 
-      INFINITY = 1/0.0
+      INFINITY = 1 / 0.0
     end
 
     # Deals with the slightly different semantics of block arguments.
     # For methods, arguments are required unless a default value is provided.
     # For blocks, arguments are optional, even if no default value is provided.
     #
-    # However, we want to treat block args as required since you virtually always
-    # want to pass a value for each received argument and our `and_yield` has
-    # treated block args as required for many years.
+    # However, we want to treat block args as required since you virtually
+    # always want to pass a value for each received argument and our
+    # `and_yield` has treated block args as required for many years.
     #
     # @api private
     class BlockSignature < MethodSignature
@@ -141,10 +149,9 @@ module RSpec
       end
     end
 
-    # Figures out wheter a given method can accept various arguments.
-    # Surprisingly non-trivial.
+    # Abstract base class for signature verifiers.
     #
-    # @private
+    # @api private
     class MethodSignatureVerifier
       attr_reader :non_kw_args, :kw_args
 
@@ -154,7 +161,7 @@ module RSpec
       end
 
       def valid?
-         missing_kw_args.empty? &&
+        missing_kw_args.empty? &&
           invalid_kw_args.empty? &&
           valid_non_kw_args?
       end
@@ -179,8 +186,7 @@ module RSpec
     private
 
       def valid_non_kw_args?
-        actual = non_kw_args.length
-        @signature.min_non_kw_args <= actual && actual <= @signature.max_non_kw_args
+        @signature.valid_non_kw_args?(non_kw_args.length)
       end
 
       def missing_kw_args
@@ -193,12 +199,69 @@ module RSpec
 
       def split_args(*args)
         kw_args = if @signature.has_kw_args_in?(args)
-          args.pop.keys
-        else
+                    args.pop.keys
+                  else
+                    []
+                  end
+
+        [args, kw_args]
+      end
+    end
+
+    # Figures out wether a given method can accept various arguments.
+    # Surprisingly non-trivial.
+    #
+    # @private
+    StrictSignatureVerifier = MethodSignatureVerifier
+
+    # Allows matchers to be used instead of providing keyword arguments. In
+    # practice, when this happens only the arity of the method is verified.
+    #
+    # @private
+    class LooseSignatureVerifier < MethodSignatureVerifier
+    private
+
+      def split_args(*args)
+        if RSpec::Support.is_a_matcher?(args.last) && @signature.could_contain_kw_args?(args)
+          args.pop
+          @signature = SignatureWithKeywordArgumentsMatcher.new(@signature)
+        end
+
+        super(*args)
+      end
+
+      # If a matcher is used in a signature in place of keyword arguments, all
+      # keyword argument validation needs to be skipped since the matcher is
+      # opaque.
+      #
+      # Instead, keyword arguments will be validated when the method is called
+      # and they are actually known.
+      #
+      # @private
+      class SignatureWithKeywordArgumentsMatcher
+        def initialize(signature)
+          @signature = signature
+        end
+
+        def missing_kw_args_from(_kw_args)
           []
         end
 
-        [args, kw_args]
+        def invalid_kw_args_from(_kw_args)
+          []
+        end
+
+        def non_kw_args_arity_description
+          @signature.non_kw_args_arity_description
+        end
+
+        def valid_non_kw_args?(*args)
+          @signature.valid_non_kw_args?(*args)
+        end
+
+        def has_kw_args_in?(args)
+          @signature.has_kw_args_in?(args)
+        end
       end
     end
   end

data/lib/rspec/support/recursive_const_methods.rb

@@ -0,0 +1,76 @@
+module RSpec
+  module Support
+    # Provides recursive constant lookup methods useful for
+    # constant stubbing.
+    module RecursiveConstMethods
+      # We only want to consider constants that are defined directly on a
+      # particular module, and not include top-level/inherited constants.
+      # Unfortunately, the constant API changed between 1.8 and 1.9, so
+      # we need to conditionally define methods to ignore the top-level/inherited
+      # constants.
+      #
+      # Given:
+      #   class A; B = 1; end
+      #   class C < A; end
+      #
+      # On 1.8:
+      #   - C.const_get("Hash") # => ::Hash
+      #   - C.const_defined?("Hash") # => false
+      #   - C.constants # => ["B"]
+      #   - None of these methods accept the extra `inherit` argument
+      # On 1.9:
+      #   - C.const_get("Hash") # => ::Hash
+      #   - C.const_defined?("Hash") # => true
+      #   - C.const_get("Hash", false) # => raises NameError
+      #   - C.const_defined?("Hash", false) # => false
+      #   - C.constants # => [:B]
+      #   - C.constants(false) #=> []
+      if Module.method(:const_defined?).arity == 1
+        def const_defined_on?(mod, const_name)
+          mod.const_defined?(const_name)
+        end
+
+        def get_const_defined_on(mod, const_name)
+          return mod.const_get(const_name) if const_defined_on?(mod, const_name)
+
+          raise NameError, "uninitialized constant #{mod.name}::#{const_name}"
+        end
+
+        def constants_defined_on(mod)
+          mod.constants.select { |c| const_defined_on?(mod, c) }
+        end
+      else
+        def const_defined_on?(mod, const_name)
+          mod.const_defined?(const_name, false)
+        end
+
+        def get_const_defined_on(mod, const_name)
+          mod.const_get(const_name, false)
+        end
+
+        def constants_defined_on(mod)
+          mod.constants(false)
+        end
+      end
+
+      def recursive_const_get(const_name)
+        normalize_const_name(const_name).split('::').inject(Object) do |mod, name|
+          get_const_defined_on(mod, name)
+        end
+      end
+
+      def recursive_const_defined?(const_name)
+        parts = normalize_const_name(const_name).split('::')
+        parts.inject([Object, '']) do |(mod, full_name), name|
+          yield(full_name, name) if block_given? && !(Module === mod)
+          return false unless const_defined_on?(mod, name)
+          [get_const_defined_on(mod, name), [mod, name].join('::')]
+        end
+      end
+
+      def normalize_const_name(const_name)
+        const_name.sub(/\A::/, '')
+      end
+    end
+  end
+end

data/lib/rspec/support/spec.rb

@@ -3,6 +3,7 @@ RSpec::Support.require_rspec_support "spec/deprecation_helpers"
 RSpec::Support.require_rspec_support "spec/with_isolated_stderr"
 RSpec::Support.require_rspec_support "spec/stderr_splitter"
 RSpec::Support.require_rspec_support "spec/formatting_support"
+RSpec::Support.require_rspec_support "spec/with_isolated_directory"
 
 warning_preventer = $stderr = RSpec::Support::StdErrSplitter.new($stderr)
 
@@ -30,33 +31,41 @@ RSpec.configure do |c|
   c.run_all_when_everything_filtered = true
 end
 
-module RSpec::Support::Spec
-  def self.setup_simplecov(&block)
-    # Simplecov emits some ruby warnings when loaded, so silence them.
-    old_verbose, $VERBOSE = $VERBOSE, false
+module RSpec
+  module Support
+    module Spec
+      def self.setup_simplecov(&block)
+        # Simplecov emits some ruby warnings when loaded, so silence them.
+        old_verbose, $VERBOSE = $VERBOSE, false
 
-    return if ENV['NO_COVERAGE'] || RUBY_VERSION < '1.9.3' || RUBY_ENGINE != 'ruby'
+        return if ENV['NO_COVERAGE'] || RUBY_VERSION < '1.9.3' || RUBY_ENGINE != 'ruby'
 
-    # Don't load it when we're running a single isolated
-    # test file rather than the whole suite.
-    return if RSpec.configuration.files_to_run.one?
+        # Don't load it when we're running a single isolated
+        # test file rather than the whole suite.
+        return if RSpec.configuration.files_to_run.one?
 
-    require 'simplecov'
-
-    SimpleCov.start do
-      add_filter "./bundle/"
-      add_filter "./tmp/"
-      add_filter do |source_file|
-        # Filter out `spec` directory except when it is under `lib`
-        # (as is the case in rspec-support)
-        source_file.filename.include?('/spec/') && !source_file.filename.include?('/lib/')
+        require 'simplecov'
+        start_simplecov(&block)
+      rescue LoadError
+        warn "Simplecov could not be loaded"
+      ensure
+        $VERBOSE = old_verbose
       end
 
-      instance_eval(&block) if block
+      def self.start_simplecov(&block)
+        SimpleCov.start do
+          add_filter "./bundle/"
+          add_filter "./tmp/"
+          add_filter do |source_file|
+            # Filter out `spec` directory except when it is under `lib`
+            # (as is the case in rspec-support)
+            source_file.filename.include?('/spec/') && !source_file.filename.include?('/lib/')
+          end
+
+          instance_eval(&block) if block
+        end
+      end
+      private_class_method :start_simplecov
     end
-  rescue LoadError
-  ensure
-    $VERBOSE = old_verbose
   end
 end
-

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

@@ -1,5 +1,4 @@
 module RSpecHelpers
-
   def expect_no_deprecation
     expect(RSpec.configuration.reporter).not_to receive(:deprecation)
   end
@@ -41,14 +40,14 @@ module RSpecHelpers
     expect(RSpec.configuration.reporter).not_to receive(:deprecation)
   end
 
-  def expect_warning_without_call_site(expected = //)
+  def expect_warning_without_call_site(expected=//)
     expect(::Kernel).to receive(:warn) do |message|
       expect(message).to match expected
       expect(message).to_not match(/Called from/)
     end
   end
 
-  def expect_warning_with_call_site(file, line, expected = //)
+  def expect_warning_with_call_site(file, line, expected=//)
     expect(::Kernel).to receive(:warn) do |message|
       expect(message).to match expected
       expect(message).to match(/Called from #{file}:#{line}/)

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

@@ -3,6 +3,8 @@ module RSpec
     module InSubProcess
       if Process.respond_to?(:fork) && !(RUBY_PLATFORM == 'java' && RUBY_VERSION == '1.8.7')
         # Useful as a way to isolate a global change to a subprocess.
+
+        # rubocop:disable MethodLength
         def in_sub_process
           readme, writeme = IO.pipe
 
@@ -31,10 +33,11 @@ module RSpec
         end
       else
         def in_sub_process
-          skip "This spec requires forking to work properly, " +
+          skip "This spec requires forking to work properly, " \
                "and your platform does not support forking"
         end
       end
+      # rubocop:enable MethodLength
     end
   end
 end

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

@@ -0,0 +1,44 @@
+require 'rspec/support/spec/shell_out'
+
+module RSpec
+  module Support
+    module WarningsPrevention
+      def files_to_require_for(lib)
+        slash         = File::SEPARATOR
+        lib_path_re   = /#{slash + lib}[^#{slash}]*#{slash}lib/
+        load_path     = $LOAD_PATH.grep(lib_path_re).first
+        files         = Dir["#{load_path}/**/*.rb"]
+        extract_regex = /#{Regexp.escape(load_path) + File::SEPARATOR}(.+)\.rb$/
+
+        # We sort to ensure the files are loaded in a consistent order, regardless
+        # of OS. Otherwise, it could load in a different order on Travis than
+        # locally, and potentially trigger a "circular require considered harmful"
+        # warning or similar.
+        files.sort.map { |file| file[extract_regex, 1] }
+      end
+    end
+  end
+end
+
+RSpec.shared_examples_for "a library that issues no warnings when loaded" do |lib, *preamble_stmnts|
+  include RSpec::Support::ShellOut
+  include RSpec::Support::WarningsPrevention
+
+  it "issues no warnings when loaded", :slow do
+    # We want to explicitly load every file because each lib has some files that
+    # aren't automatically loaded, instead being delayed based on an autoload
+    # (such as for rspec-expectations' matchers) or based on a config option
+    # (e.g. `config.mock_with :rr` => 'rspec/core/mocking_adapters/rr').
+    statements = preamble_stmnts + files_to_require_for(lib).map do |file|
+      "require '#{file}'"
+    end
+
+    command = statements.join("; ")
+
+    stdout, stderr, status = run_ruby_with_current_load_path(command, "-w")
+
+    expect(stdout).to eq("")
+    expect(stderr).to eq("")
+    expect(status.exitstatus).to eq(0)
+  end
+end

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

@@ -0,0 +1,54 @@
+require 'open3'
+require 'rake/file_utils'
+require 'shellwords'
+
+module RSpec
+  module Support
+    module ShellOut
+      def with_env(vars)
+        original = ENV.to_hash
+        vars.each { |k, v| ENV[k] = v }
+
+        begin
+          yield
+        ensure
+          ENV.replace(original)
+        end
+      end
+
+      if Open3.respond_to?(:capture3) # 1.9+
+        def shell_out(*command)
+          Open3.capture3(*command)
+        end
+      else # 1.8.7
+        def shell_out(*command)
+          stdout = stderr = nil
+
+          Open3.popen3(*command) do |_in, out, err|
+            stdout = out.read
+            stderr = err.read
+          end
+
+          # popen3 doesn't provide the exit status so we fake it out.
+          status = instance_double(Process::Status, :exitstatus => 0)
+          return stdout, stderr, status
+        end
+      end
+
+      def run_ruby_with_current_load_path(ruby_command, *flags)
+        command = [
+          FileUtils::RUBY,
+          "-I#{$LOAD_PATH.map(&:shellescape).join(File::PATH_SEPARATOR)}",
+          "-e", ruby_command, *flags
+        ]
+
+        # Unset these env vars because `ruby -w` will issue warnings whenever
+        # they are set to non-default values.
+        with_env 'RUBY_GC_HEAP_FREE_SLOTS' => nil, 'RUBY_GC_MALLOC_LIMIT' => nil,
+                 'RUBY_FREE_MIN' => nil do
+          shell_out(*command)
+        end
+      end
+    end
+  end
+end

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

@@ -25,10 +25,10 @@ module RSpec
       # To work around JRuby error:
       # TypeError: $stderr must have write method, RSpec::StdErrSplitter given
       def write(line)
-        if line !~ %r{^\S+/gems/\S+:\d+: warning:} # http://rubular.com/r/kqeUIZOfPG
-          @orig_stderr.write(line)
-          @output_tracker.write(line)
-        end
+        return if line =~ %r{^\S+/gems/\S+:\d+: warning:} # http://rubular.com/r/kqeUIZOfPG
+
+        @orig_stderr.write(line)
+        @output_tracker.write(line)
       end
 
       def has_output?
@@ -40,14 +40,13 @@ module RSpec
       end
 
       def verify_example!(example)
-        example.send(:fail,"Warnings were generated: #{output}") if has_output?
+        example.send(:fail, "Warnings were generated: #{output}") if has_output?
         reset!
       end
 
       def output
         @output_tracker.string
       end
-
     end
   end
 end

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

@@ -0,0 +1,9 @@
+require 'tmpdir'
+
+RSpec.shared_context "isolated directory", :isolated_directory => true do
+  around do |ex|
+    Dir.mktmpdir do |tmp_dir|
+      Dir.chdir(tmp_dir, &ex)
+    end
+  end
+end

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

@@ -1,7 +1,6 @@
 module RSpec
   module Support
     module WithIsolatedStdErr
-
       def with_isolated_stderr
         original = $stderr
         $stderr = StringIO.new
@@ -9,7 +8,6 @@ module RSpec
       ensure
         $stderr = original
       end
-
     end
   end
 end

data/lib/rspec/support/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Support
     module Version
-      STRING = '3.0.4'
+      STRING = '3.1.0'
     end
   end
 end

data/lib/rspec/support/version_checker.rb

@@ -26,18 +26,18 @@ module RSpec
 
       def raise_too_low_error
         raise LibraryVersionTooLowError,
-          "You are using #{@library_name} #{@library_version}. " +
-          "RSpec requires version #{version_requirement}."
+              "You are using #{@library_name} #{@library_version}. " \
+              "RSpec requires version #{version_requirement}."
       end
 
       def compare_version
         case
-          when @major < @min_major then :too_low
-          when @major > @min_major then :ok
-          when @minor < @min_minor then :too_low
-          when @minor > @min_minor then :ok
-          when @patch < @min_patch then :too_low
-          else :ok
+        when @major < @min_major then :too_low
+        when @major > @min_major then :ok
+        when @minor < @min_minor then :too_low
+        when @minor > @min_minor then :ok
+        when @patch < @min_patch then :too_low
+        else :ok
         end
       end
 

data/lib/rspec/support/warnings.rb

@@ -4,7 +4,7 @@ RSpec::Support.require_rspec_support "caller_filter"
 module RSpec
   module Support
     module Warnings
-      def deprecate(deprecated, options = {})
+      def deprecate(deprecated, options={})
         warn_with "DEPRECATION: #{deprecated} is deprecated.", options
       end
 
@@ -12,7 +12,7 @@ module RSpec
       #
       # Used internally to print deprecation warnings
       # when rspec-core isn't loaded
-      def warn_deprecation(message, options = {})
+      def warn_deprecation(message, options={})
         warn_with "DEPRECATION: \n #{message}", options
       end
 
@@ -26,7 +26,7 @@ module RSpec
       # @private
       #
       # Used internally to print longer warnings
-      def warn_with(message, options = {})
+      def warn_with(message, options={})
         call_site = options.fetch(:call_site) { CallerFilter.first_non_rspec_line }
         message << " Use #{options[:replacement]} instead." if options[:replacement]
         message << " Called from #{call_site}." if call_site

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-support
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.1.0
 platform: ruby
 authors:
 - David Chelimsky
@@ -36,7 +36,7 @@ cert_chain:
   1yHC1AcSYpvi2dAbOiHT5iQF+krm4wse8KctXgTNnjMsHEoGKulJS2/sZl90jcCz
   muA=
   -----END CERTIFICATE-----
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0.pre
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0.pre
 description: Support utilities for RSpec gems
 email: rspec-users@rubyforge.org
 executables: []
@@ -92,16 +78,22 @@ files:
 - lib/rspec/support.rb
 - lib/rspec/support/caller_filter.rb
 - lib/rspec/support/differ.rb
+- lib/rspec/support/directory_maker.rb
 - lib/rspec/support/encoded_string.rb
 - lib/rspec/support/fuzzy_matcher.rb
 - lib/rspec/support/hunk_generator.rb
+- lib/rspec/support/matcher_definition.rb
 - lib/rspec/support/method_signature_verifier.rb
+- lib/rspec/support/recursive_const_methods.rb
 - lib/rspec/support/ruby_features.rb
 - lib/rspec/support/spec.rb
 - lib/rspec/support/spec/deprecation_helpers.rb
 - lib/rspec/support/spec/formatting_support.rb
 - lib/rspec/support/spec/in_sub_process.rb
+- lib/rspec/support/spec/prevent_load_time_warnings.rb
+- lib/rspec/support/spec/shell_out.rb
 - lib/rspec/support/spec/stderr_splitter.rb
+- lib/rspec/support/spec/with_isolated_directory.rb
 - lib/rspec/support/spec/with_isolated_stderr.rb
 - lib/rspec/support/version.rb
 - lib/rspec/support/version_checker.rb
@@ -130,5 +122,5 @@ rubyforge_project: rspec
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-support-3.0.4
+summary: rspec-support-3.1.0
 test_files: []