rspec-support 3.0.0.beta2 → 3.0.0.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8056b6ffe2b19796122cb63098b5f5d31818b0bb
+  data.tar.gz: faa2a0e043eaa9c0a6c97675e1560640f40582c5
+SHA512:
+  metadata.gz: dd81e590c2160e0656ff7fc4f87d238d1c20b055ba0de0c6149aa74204e78275963b5737c0d9aa699eb35a6c678c717aebaf05a4a5eab9e441bd9b14e0e32edb
+  data.tar.gz: 7ca41367d6087c33f9146bf34089ef9b651be5ed8bd263e8e1ef61289df193171f940dc2ca4f4324560ca4a287ffd7e5d67bd6946716725e0036fd040ec70a39

data.tar.gz.sig

@@ -1,2 +1,3 @@
-��|�q�1�%�q��lPM���t�H�@W����g0��"k���4 `��D�V�l�e'݁��y�R�/)
-l26�����N� ���b}�v>]��>���X��y���=uR#p��AqU�#7�C��"
+���e��6d+�{oe���r�x�l���?�aٞ��,#�aEh}��d��m�P����T?,�����iP�\u��������*�7'�����+\b��RUg����z���֠S�
+?.�Dj��G�v�qs�
+l���Փ

data/Changelog.md

@@ -1,11 +1,14 @@
+### 3.0.0.rc1 / 2014-05-18
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.0.0.beta2...v3.0.0.rc1)
+
 ### 3.0.0.beta2 / 2014-02-17
-[full changelog](http://github.com/rspec/rspec-support/compare/v3.0.0.beta1...v3.0.0.beta2)
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.0.0.beta1...v3.0.0.beta2)
 
 Bug Fixes:
 
 * Issue message when :replacement is passed to `RSpec.warn_with`. (Jon Rowe)
 
 ### 3.0.0.beta1 / 2013-11-07
-[full changelog](https://github.com/rspec/rspec-support/compare/0dc12d1bdbbacc757a9989f8c09cd08ef3a4837e...v3.0.0.beta1)
+[Full Changelog](https://github.com/rspec/rspec-support/compare/0dc12d1bdbbacc757a9989f8c09cd08ef3a4837e...v3.0.0.beta1)
 
 Initial release.

data/lib/rspec/support.rb

@@ -1,7 +1,33 @@
-require "rspec/support/version"
-
 module RSpec
   module Support
+    # @api private
+    #
+    # Defines a helper method that is optimized to require files from the
+    # named lib. The passed block MUST be `{ |f| require_relative f }`
+    # because for `require_relative` to work properly from within the named
+    # lib the line of code must be IN that lib.
+    #
+    # `require_relative` is preferred when available because it is always O(1),
+    # regardless of the number of dirs in $LOAD_PATH. `require`, on the other
+    # hand, does a linear O(N) search over the dirs in the $LOAD_PATH until
+    # it can resolve the file relative to one of the dirs.
+    def self.define_optimized_require_for_rspec(lib, &require_relative)
+      name = "require_rspec_#{lib}"
+
+      if Kernel.respond_to?(:require_relative)
+        (class << self; self; end).__send__(:define_method, name) do |f|
+          require_relative.call("#{lib}/#{f}")
+        end
+      else
+        (class << self; self; end).__send__(:define_method, name) do |f|
+          require "rspec/#{lib}/#{f}"
+        end
+      end
+    end
+
+    define_optimized_require_for_rspec(:support) { |f| require_relative(f) }
+    require_rspec_support "version"
+
     # @api private
     KERNEL_METHOD_METHOD = ::Kernel.instance_method(:method)
 

data/lib/rspec/support/caller_filter.rb

@@ -18,6 +18,14 @@ module RSpec
 
     LIB_REGEX = %r{/lib/rspec/(#{(RSPEC_LIBS + ADDITIONAL_TOP_LEVEL_FILES).join('|')})(\.rb|/)}
 
+    # rubygems/core_ext/kernel_require.rb isn't actually part of rspec (obviously) but we want
+    # it ignored when we are looking for the first meaningful line of the backtrace outside
+    # of RSpec. It can show up in the backtrace as the immediate first caller
+    # when `CallerFilter.first_non_rspec_line` is called from the top level of a required
+    # file, but it depends on if rubygems is loaded or not. We don't want to have to deal
+    # with this complexity in our `RSpec.deprecate` calls, so we ignore it here.
+    IGNORE_REGEX = Regexp.union(LIB_REGEX, "rubygems/core_ext/kernel_require.rb")
+
     if RUBY_VERSION >= '2.0.0'
       def self.first_non_rspec_line
         # `caller` is an expensive method that scales linearly with the size of
@@ -37,7 +45,7 @@ module RSpec
           stack = caller(i, increment)
           raise "No non-lib lines in stack" unless stack
 
-          line = stack.find { |l| l !~ LIB_REGEX }
+          line = stack.find { |l| l !~ IGNORE_REGEX }
 
           i         += increment
           increment *= 2 # The choice of two here is arbitrary.
@@ -49,7 +57,7 @@ module RSpec
       # Earlier rubies do not support the two argument form of `caller`. This
       # fallback is logically the same, but slower.
       def self.first_non_rspec_line
-        caller.find { |line| line !~ LIB_REGEX }
+        caller.find { |line| line !~ IGNORE_REGEX }
       end
     end
   end

data/lib/rspec/support/differ.rb

@@ -0,0 +1,205 @@
+RSpec::Support.require_rspec_support 'encoded_string'
+RSpec::Support.require_rspec_support 'hunk_generator'
+
+require 'pp'
+
+module RSpec
+  module Support
+    class Differ
+      def diff(actual, expected)
+        diff = ""
+
+        if actual && expected
+          if all_strings?(actual, expected)
+            if any_multiline_strings?(actual, expected)
+              diff = diff_as_string(coerce_to_string(actual), coerce_to_string(expected))
+            end
+          elsif no_procs?(actual, expected) && no_numbers?(actual, expected)
+            diff = diff_as_object(actual, expected)
+          end
+        end
+
+        diff
+      end
+
+      def diff_as_string(actual, expected)
+        @encoding = pick_encoding actual, expected
+
+        @actual   = EncodedString.new(actual, @encoding)
+        @expected = EncodedString.new(expected, @encoding)
+
+        output = EncodedString.new("\n", @encoding)
+
+        hunks.each_cons(2) do |prev_hunk, current_hunk|
+          begin
+            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)
+            end
+          ensure
+            add_to_output(output, "\n")
+          end
+        end
+
+        if hunks.last
+          finalize_output(output, hunks.last.diff(format).to_s)
+        end
+
+        color_diff output
+      rescue Encoding::CompatibilityError
+        handle_encoding_errors
+      end
+
+      def diff_as_object(actual, expected)
+        actual_as_string = object_to_string(actual)
+        expected_as_string = object_to_string(expected)
+        diff_as_string(actual_as_string, expected_as_string)
+      end
+
+      attr_reader :color
+      alias_method :color?, :color
+
+      def initialize(opts={})
+        @color = opts.fetch(:color, false)
+        @object_preparer = opts.fetch(:object_preparer, lambda { |string| string })
+      end
+
+    private
+
+      def no_procs?(*args)
+        args.flatten.none? { |a| Proc === a}
+      end
+
+      def all_strings?(*args)
+        args.flatten.all? { |a| String === a}
+      end
+
+      def any_multiline_strings?(*args)
+        all_strings?(*args) && args.flatten.any? { |a| multiline?(a) }
+      end
+
+      def no_numbers?(*args)
+        args.flatten.none? { |a| Numeric === a}
+      end
+
+      def coerce_to_string(string_or_array)
+        return string_or_array unless Array === string_or_array
+        diffably_stringify(string_or_array).join("\n")
+      end
+
+      def diffably_stringify(array)
+        array.map do |entry|
+          if Array === entry
+            entry.inspect
+          else
+            entry.to_s.gsub("\n", "\\n")
+          end
+        end
+      end
+
+      if String.method_defined?(:encoding)
+        def multiline?(string)
+          string.include?("\n".encode(string.encoding))
+        end
+      else
+        def multiline?(string)
+          string.include?("\n")
+        end
+      end
+
+      def hunks
+        @hunks ||= HunkGenerator.new(@actual, @expected).hunks
+      end
+
+      def finalize_output(output, final_line)
+        add_to_output(output, final_line)
+        add_to_output(output, "\n")
+      end
+
+      def add_to_output(output, string)
+        output << string
+      end
+
+      def add_old_hunk_to_hunk(hunk, oldhunk)
+        hunk.merge(oldhunk)
+      end
+
+      def format
+        :unified
+      end
+
+      def color(text, color_code)
+        "\e[#{color_code}m#{text}\e[0m"
+      end
+
+      def red(text)
+        color(text, 31)
+      end
+
+      def green(text)
+        color(text, 32)
+      end
+
+      def blue(text)
+        color(text, 34)
+      end
+
+      def normal(text)
+        color(text, 0)
+      end
+
+      def color_diff(diff)
+        return diff unless color?
+
+        diff.lines.map { |line|
+          case line[0].chr
+          when "+"
+            green line
+          when "-"
+            red line
+          when "@"
+            line[1].chr == "@" ? blue(line) : normal(line)
+          else
+            normal(line)
+          end
+        }.join
+      end
+
+      def object_to_string(object)
+        object = @object_preparer.call(object)
+        case object
+        when Hash
+          object.keys.sort_by { |k| k.to_s }.map do |key|
+            pp_key   = PP.singleline_pp(key, "")
+            pp_value = PP.singleline_pp(object[key], "")
+
+            "#{pp_key} => #{pp_value},"
+          end.join("\n")
+        when String
+          object =~ /\n/ ? object : object.inspect
+        else
+          PP.pp(object,"")
+        end
+      end
+
+      if String.method_defined?(:encoding)
+        def pick_encoding(source_a, source_b)
+          Encoding.compatible?(source_a, source_b) || Encoding.default_external
+        end
+      else
+        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})"
+        else
+          "Could not produce a diff because of the encoding of the string (#{@expected.source_encoding})"
+        end
+      end
+    end
+  end
+end

data/lib/rspec/support/encoded_string.rb

@@ -0,0 +1,66 @@
+module RSpec
+  module Support
+    # @private
+    class EncodedString
+
+      MRI_UNICODE_UNKOWN_CHARACTER = "\xEF\xBF\xBD"
+
+      def initialize(string, encoding = nil)
+        @encoding = encoding
+        @source_encoding = detect_source_encoding(string)
+        @string = matching_encoding(string)
+      end
+      attr_reader :source_encoding
+
+      delegated_methods = String.instance_methods.map(&:to_s) & %w[eql? lines == encoding empty?]
+      delegated_methods.each do |name|
+        define_method(name) { |*args, &block| @string.__send__(name, *args, &block) }
+      end
+
+      def <<(string)
+        @string << matching_encoding(string)
+      end
+
+      def split(regex_or_string)
+        @string.split(matching_encoding(regex_or_string))
+      end
+
+      def to_s
+        @string
+      end
+      alias :to_str :to_s
+
+    private
+
+      if String.method_defined?(:encoding)
+        def matching_encoding(string)
+          string.encode(@encoding)
+        rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
+          normalize_missing(string.encode(@encoding, :invalid => :replace, :undef => :replace))
+        rescue Encoding::ConverterNotFoundError
+          normalize_missing(string.force_encoding(@encoding).encode(:invalid => :replace))
+        end
+
+        def normalize_missing(string)
+          if @encoding.to_s == "UTF-8"
+            string.gsub(MRI_UNICODE_UNKOWN_CHARACTER.force_encoding(@encoding), "?")
+          else
+            string
+          end
+        end
+
+        def detect_source_encoding(string)
+          string.encoding
+        end
+      else
+        def matching_encoding(string)
+          string
+        end
+
+        def detect_source_encoding(string)
+          'US-ASCII'
+        end
+      end
+    end
+  end
+end

data/lib/rspec/support/hunk_generator.rb

@@ -0,0 +1,48 @@
+require 'diff/lcs'
+require 'diff/lcs/hunk'
+
+module RSpec
+  module Support
+    # @private
+    class HunkGenerator
+      def initialize(actual, expected)
+        @actual = actual
+        @expected = expected
+      end
+
+      def hunks
+        @file_length_difference = 0
+        @hunks ||= diffs.map do |piece|
+          build_hunk(piece)
+        end
+      end
+
+    private
+
+      def diffs
+        Diff::LCS.diff(expected_lines, actual_lines)
+      end
+
+      def expected_lines
+        @expected.split("\n").map! { |e| e.chomp }
+      end
+
+      def actual_lines
+        @actual.split("\n").map! { |e| e.chomp }
+      end
+
+      def build_hunk(piece)
+        Diff::LCS::Hunk.new(
+          expected_lines, actual_lines, piece, context_lines, @file_length_difference
+        ).tap do |h|
+          @file_length_difference = h.file_length_difference
+        end
+      end
+
+      def context_lines
+        3
+      end
+
+    end
+  end
+end

data/lib/rspec/support/method_signature_verifier.rb

@@ -0,0 +1,205 @@
+require 'rspec/support'
+RSpec::Support.require_rspec_support "ruby_features"
+
+module RSpec
+  module Support
+    # Extracts info about the number of arguments and allowed/required
+    # keyword args of a given method.
+    #
+    # @private
+    class MethodSignature
+      attr_reader :min_non_kw_args, :max_non_kw_args
+
+      def initialize(method)
+        @method = method
+        classify_parameters
+      end
+
+      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}"
+        end
+      end
+
+      if RubyFeatures.optional_and_splat_args_supported?
+        def description
+          @description ||= begin
+            parts = []
+
+            unless non_kw_args_arity_description == "0"
+              parts << "arity of #{non_kw_args_arity_description}"
+            end
+
+            if @optional_kw_args.any?
+              parts << "optional keyword args (#{@optional_kw_args.map(&:inspect).join(", ")})"
+            end
+
+            if @required_kw_args.any?
+              parts << "required keyword args (#{@required_kw_args.map(&:inspect).join(", ")})"
+            end
+
+            if @allows_any_kw_args
+              parts << "any additional keyword args"
+            end
+
+            parts.join(" and ")
+          end
+        end
+
+        def missing_kw_args_from(given_kw_args)
+          @required_kw_args - given_kw_args
+        end
+
+        def invalid_kw_args_from(given_kw_args)
+          return [] if @allows_any_kw_args
+          given_kw_args - @allowed_kw_args
+        end
+
+        def has_kw_args_in?(args)
+          return false unless Hash === args.last
+          return false if args.count <= min_non_kw_args
+
+          @allows_any_kw_args || @allowed_kw_args.any?
+        end
+
+        def classify_parameters
+          optional_non_kw_args = @min_non_kw_args = 0
+          @optional_kw_args, @required_kw_args = [], []
+          @allows_any_kw_args = false
+
+          @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
+            end
+          end
+
+          @max_non_kw_args = @min_non_kw_args  + optional_non_kw_args
+          @allowed_kw_args = @required_kw_args + @optional_kw_args
+        end
+      else
+        def description
+          "arity of #{non_kw_args_arity_description}"
+        end
+
+        def missing_kw_args_from(given_kw_args)
+          []
+        end
+
+        def invalid_kw_args_from(given_kw_args)
+          []
+        end
+
+        def has_kw_args_in?(args)
+          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
+      end
+
+      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.
+    #
+    # @api private
+    class BlockSignature < MethodSignature
+      if RubyFeatures.optional_and_splat_args_supported?
+        def classify_parameters
+          super
+          @min_non_kw_args = @max_non_kw_args unless @max_non_kw_args == INFINITY
+        end
+      end
+    end
+
+    # Figures out wheter a given method can accept various arguments.
+    # Surprisingly non-trivial.
+    #
+    # @private
+    class MethodSignatureVerifier
+      attr_reader :non_kw_args, :kw_args
+
+      def initialize(signature, args)
+        @signature = signature
+        @non_kw_args, @kw_args = split_args(*args)
+      end
+
+      def valid?
+         missing_kw_args.empty? &&
+          invalid_kw_args.empty? &&
+          valid_non_kw_args?
+      end
+
+      def error_message
+        if missing_kw_args.any?
+          "Missing required keyword arguments: %s" % [
+            missing_kw_args.join(", ")
+          ]
+        elsif invalid_kw_args.any?
+          "Invalid keyword arguments provided: %s" % [
+            invalid_kw_args.join(", ")
+          ]
+        elsif !valid_non_kw_args?
+          "Wrong number of arguments. Expected %s, got %s." % [
+            @signature.non_kw_args_arity_description,
+            non_kw_args.length
+          ]
+        end
+      end
+
+    private
+
+      def valid_non_kw_args?
+        actual = non_kw_args.length
+        @signature.min_non_kw_args <= actual && actual <= @signature.max_non_kw_args
+      end
+
+      def missing_kw_args
+        @signature.missing_kw_args_from(kw_args)
+      end
+
+      def invalid_kw_args
+        @signature.invalid_kw_args_from(kw_args)
+      end
+
+      def split_args(*args)
+        kw_args = if @signature.has_kw_args_in?(args)
+          args.pop.keys
+        else
+          []
+        end
+
+        [args, kw_args]
+      end
+    end
+  end
+end

data/lib/rspec/support/ruby_features.rb

@@ -0,0 +1,29 @@
+module RSpec
+  module Support
+    # @api private
+    #
+    # Provides query methods for ruby features that differ among
+    # implementations.
+    module RubyFeatures
+      def optional_and_splat_args_supported?
+        Method.method_defined?(:parameters)
+      end
+      module_function :optional_and_splat_args_supported?
+
+      def kw_args_supported?
+        RUBY_VERSION >= '2.0.0' && RUBY_ENGINE != 'rbx'
+      end
+      module_function :kw_args_supported?
+
+      def required_kw_args_supported?
+        RUBY_VERSION >= '2.1.0' && RUBY_ENGINE != 'rbx'
+      end
+      module_function :required_kw_args_supported?
+
+      def module_prepends_supported?
+        RUBY_VERSION.to_f >= 2.0
+      end
+      module_function :module_prepends_supported?
+    end
+  end
+end

data/lib/rspec/support/spec.rb

@@ -1,24 +1,29 @@
-require 'rspec/support/spec/deprecation_helpers'
-require 'rspec/support/spec/with_isolated_stderr'
-require 'rspec/support/spec/stderr_splitter'
+require 'rspec/support'
+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"
 
 warning_preventer = $stderr = RSpec::Support::StdErrSplitter.new($stderr)
 
 RSpec.configure do |c|
   c.include RSpecHelpers
   c.include RSpec::Support::WithIsolatedStdErr
+  c.include RSpec::Support::FormattingSupport
 
-  c.before do
-    warning_preventer.reset!
-  end
+  unless defined?(Debugger) # debugger causes warnings when used
+    c.before do
+      warning_preventer.reset!
+    end
 
-  c.after do |example|
-    warning_preventer.verify_example!(example)
+    c.after do |example|
+      warning_preventer.verify_example!(example)
+    end
   end
 
   if c.files_to_run.one?
     c.full_backtrace = true
-    c.formatter = 'doc' if c.formatters.none?
+    c.default_formatter = 'doc'
   end
 
   c.filter_run :focus

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

@@ -11,6 +11,13 @@ module RSpecHelpers
     end
   end
 
+  def expect_deprecation_without_call_site(snippet=//)
+    expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
+      expect(options[:call_site]).to eq nil
+      expect(options[:deprecated]).to match(snippet)
+    end
+  end
+
   def expect_warn_deprecation_with_call_site(file, line, snippet=//)
     expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
       message = options[:message]
@@ -19,6 +26,13 @@ module RSpecHelpers
     end
   end
 
+  def expect_warn_deprecation(snippet=//)
+    expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
+      message = options[:message]
+      expect(message).to match(snippet)
+    end
+  end
+
   def allow_deprecation
     allow(RSpec.configuration.reporter).to receive(:deprecation)
   end

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

@@ -0,0 +1,9 @@
+module RSpec
+  module Support
+    module FormattingSupport
+      def dedent(string)
+        string.gsub(/^\s+\|/, '').chomp
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ require 'stringio'
 
 module RSpec
   module Support
-    class StdErrSplitter < (defined?(::BasicObject) ? ::BasicObject : ::Object)
+    class StdErrSplitter
       def initialize(original)
         @orig_stderr    = original
         @output_tracker = ::StringIO.new
@@ -24,9 +24,11 @@ module RSpec
 
       # To work around JRuby error:
       # TypeError: $stderr must have write method, RSpec::StdErrSplitter given
-      def write(*args)
-        @orig_stderr.write(*args)
-        @output_tracker.write(*args)
+      def write(line)
+        if line !~ /^\S+gems\/ruby\-\S+:\d+: warning:/
+          @orig_stderr.write(line)
+          @output_tracker.write(line)
+        end
       end
 
       def has_output?
@@ -45,6 +47,7 @@ module RSpec
       def output
         @output_tracker.string
       end
+
     end
   end
 end

data/lib/rspec/support/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Support
     module Version
-      STRING = '3.0.0.beta2'
+      STRING = '3.0.0.rc1'
     end
   end
 end

data/lib/rspec/support/warnings.rb

@@ -1,42 +1,36 @@
 module RSpec
+  module Support
+    module Warnings
+      def deprecate(deprecated, options = {})
+        warn_with "DEPRECATION: #{deprecated} is deprecated.", options
+      end
 
-  unless respond_to?(:deprecate)
+      # @private
+      #
+      # Used internally to print deprecation warnings
+      # when rspec-core isn't loaded
+      def warn_deprecation(message, options = {})
+        warn_with "DEPRECATION: \n #{message}", options
+      end
 
-    # @private
-    #
-    # Used internally to print deprecation warnings
-    # when rspec-core isn't loaded
-    def self.deprecate(deprecated, options = {})
-      warn_with "DEPRECATION: #{deprecated} is deprecated.", options
-    end
-  end
+      # @private
+      #
+      # Used internally to print warnings
+      def warning(text, options={})
+        warn_with "WARNING: #{text}.", options
+      end
 
-  unless respond_to?(:warn_deprecation)
-
-    # @private
-    #
-    # Used internally to print deprecation warnings
-    # when rspec-core isn't loaded
-    def self.warn_deprecation(message)
-      warn_with "DEPRECATION: \n #{message}"
+      # @private
+      #
+      # Used internally to print longer warnings
+      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
+        ::Kernel.warn message
+      end
     end
   end
 
-  # @private
-  #
-  # Used internally to print warnings
-  def self.warning(text, options={})
-    warn_with "WARNING: #{text}.", options
-  end
-
-  # @private
-  #
-  # Used internally to print longer warnings
-  def self.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
-    ::Kernel.warn message
-  end
-
+  extend RSpec::Support::Warnings
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-support
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta2
-  prerelease: 6
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - David Chelimsky
@@ -14,99 +13,71 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain:
-- ! '-----BEGIN CERTIFICATE-----
-
+- |
+  -----BEGIN CERTIFICATE-----
   MIIDjjCCAnagAwIBAgIBATANBgkqhkiG9w0BAQUFADBGMRIwEAYDVQQDDAlyc3Bl
-
   Yy1kZXYxGzAZBgoJkiaJk/IsZAEZFgtnb29nbGVnb3VwczETMBEGCgmSJomT8ixk
-
   ARkWA2NvbTAeFw0xMzExMDcxOTQyNTlaFw0xNDExMDcxOTQyNTlaMEYxEjAQBgNV
-
   BAMMCXJzcGVjLWRldjEbMBkGCgmSJomT8ixkARkWC2dvb2dsZWdvdXBzMRMwEQYK
-
   CZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-
   nhCeZouDLXWO55no+EdZNCtjXjfJQ1X9TbPcvBDD29OypIUce2h/VdKXB2gI7ZHs
-
   F5NkPggslTErGFmWAtIiur7u943RVqHOsyoIsy065F9fCtrykkA+22elvTDha4Iz
-
   RUCvuhQ3klatYk4jF+cGt1jNONNVdLOiy0bMynvcM7hoVQ2AomwGs+cEOWQ/4dkD
-
   JcNV3qfzF5QBcTD2372XNM53b25nYVQSX2KH5FF7BhlKyov33bOm2gA9M+mWIujW
-
   qgkyxVlfrlE+ZBgV3wXn1Cojg1LpTq35yOArgwioyrwwlZZJR9joN9s/nDklfr5A
-
   +dyETjFc6cmEPWZrt2cJBQIDAQABo4GGMIGDMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-
   AgSwMB0GA1UdDgQWBBSW+WD7hn1swJ1A7i8tbuFeuNCJCjAkBgNVHREEHTAbgRly
-
   c3BlYy1kZXZAZ29vZ2xlZ291cHMuY29tMCQGA1UdEgQdMBuBGXJzcGVjLWRldkBn
-
   b29nbGVnb3Vwcy5jb20wDQYJKoZIhvcNAQEFBQADggEBAH27jAZ8sD7vnXupj6Y+
-
   BaBdfHtCkFaslLJ0aKuMDIVXwYuKfqoW15cZPDLmSIEBuQFM3lw6d/hEEL4Uo2jZ
-
   FvtmH5OxifPDzFyUtCL4yp6qgNe/Xf6sDsRg6FmKcpgqCwNOmsViaf0LPSUH/GYQ
-
   3Teoz8QCaDbD7AKsffT7eDrnbHnKweO1XdemRJC98u/yYxnGzMSWKEsn09etBlZ9
-
   7H67k5Z3uf6cfLZgToWL6zShzZY3Nun5r73YsNf2/QZOe4UZe4vfGvn6baw53ys9
-
   1yHC1AcSYpvi2dAbOiHT5iQF+krm4wse8KctXgTNnjMsHEoGKulJS2/sZl90jcCz
-
   muA=
-
   -----END CERTIFICATE-----
-
-'
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0.pre
 description: Support utilities for RSpec gems
@@ -115,44 +86,49 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Changelog.md
+- LICENSE.txt
+- README.md
 - lib/rspec/support.rb
 - lib/rspec/support/caller_filter.rb
+- lib/rspec/support/differ.rb
+- lib/rspec/support/encoded_string.rb
 - lib/rspec/support/fuzzy_matcher.rb
+- lib/rspec/support/hunk_generator.rb
+- lib/rspec/support/method_signature_verifier.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/stderr_splitter.rb
 - lib/rspec/support/spec/with_isolated_stderr.rb
 - lib/rspec/support/version.rb
 - lib/rspec/support/version_checker.rb
 - lib/rspec/support/warnings.rb
-- README.md
-- LICENSE.txt
-- Changelog.md
 homepage: https://github.com/rspec/rspec-support
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: rspec-support-3.0.0.beta2
+specification_version: 4
+summary: rspec-support-3.0.0.rc1
 test_files: []