rspec-support 3.0.0.beta1 → 3.0.0.beta2

data/Changelog.md

@@ -1,5 +1,11 @@
+### 3.0.0.beta2 / 2014-02-17
+[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)
 
 Initial release.
-

data/lib/rspec/support.rb

@@ -2,5 +2,30 @@ require "rspec/support/version"
 
 module RSpec
   module Support
+    # @api private
+    KERNEL_METHOD_METHOD = ::Kernel.instance_method(:method)
+
+    # @api private
+    #
+    # Used internally to get a method handle for a particular object
+    # and method name.
+    #
+    # Includes handling for a few special cases:
+    #
+    #   - Objects that redefine #method (e.g. an HTTPRequest struct)
+    #   - BasicObject subclasses that mixin a Kernel dup (e.g. SimpleDelegator)
+    if RUBY_VERSION.to_i >= 2 && RUBY_ENGINE != 'rbx'
+      def self.method_handle_for(object, method_name)
+        KERNEL_METHOD_METHOD.bind(object).call(method_name)
+      end
+    else
+      def self.method_handle_for(object, method_name)
+        if ::Kernel === object
+          KERNEL_METHOD_METHOD.bind(object).call(method_name)
+        else
+          object.method(method_name)
+        end
+      end
+    end
   end
 end

data/lib/rspec/support/fuzzy_matcher.rb

@@ -0,0 +1,47 @@
+module RSpec
+  module Support
+    # Provides a means to fuzzy-match between two arbitrary objects.
+    # Understands array/hash nesting. Uses `===` or `==` to
+    # perform the matching.
+    module FuzzyMatcher
+      # @api private
+      def self.values_match?(expected, actual)
+        if Array === expected && Enumerable === actual
+          return arrays_match?(expected, actual.to_a)
+        elsif Hash === expected && Hash === actual
+          return hashes_match?(expected, actual)
+        end
+
+        begin
+          actual == expected || expected === actual
+        rescue ArgumentError
+          # Some objects, like 0-arg lambdas on 1.9+, raise
+          # ArgumentError for `expected === actual`.
+          false
+        end
+      end
+
+      # @private
+      def self.arrays_match?(expected_list, actual_list)
+        return false if expected_list.size != actual_list.size
+
+        expected_list.zip(actual_list).all? do |expected, actual|
+          values_match?(expected, actual)
+        end
+      end
+
+      # @private
+      def self.hashes_match?(expected_hash, actual_hash)
+        return false if expected_hash.size != actual_hash.size
+
+        expected_hash.all? do |expected_key, expected_value|
+          actual_value = actual_hash.fetch(expected_key) { return false }
+          values_match?(expected_value, actual_value)
+        end
+      end
+
+      private_class_method :arrays_match?, :hashes_match?
+    end
+  end
+end
+

data/lib/rspec/support/spec.rb

@@ -1,14 +1,57 @@
 require 'rspec/support/spec/deprecation_helpers'
+require 'rspec/support/spec/with_isolated_stderr'
 require 'rspec/support/spec/stderr_splitter'
 
 warning_preventer = $stderr = RSpec::Support::StdErrSplitter.new($stderr)
 
 RSpec.configure do |c|
   c.include RSpecHelpers
+  c.include RSpec::Support::WithIsolatedStdErr
+
   c.before do
     warning_preventer.reset!
   end
+
   c.after do |example|
     warning_preventer.verify_example!(example)
   end
+
+  if c.files_to_run.one?
+    c.full_backtrace = true
+    c.formatter = 'doc' if c.formatters.none?
+  end
+
+  c.filter_run :focus
+  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
+
+    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?
+
+    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/')
+      end
+
+      instance_eval(&block) if block
+    end
+  rescue LoadError
+  ensure
+    $VERBOSE = old_verbose
+  end
 end
+

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

@@ -1,7 +1,21 @@
 module RSpecHelpers
-  def expect_deprecation_with_call_site(file, line)
+
+  def expect_no_deprecation
+    expect(RSpec.configuration.reporter).not_to receive(:deprecation)
+  end
+
+  def expect_deprecation_with_call_site(file, line, snippet=//)
     expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
       expect(options[:call_site]).to include([file, line].join(':'))
+      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]
+      expect(message).to match(snippet)
+      expect(message).to include([file, line].join(':'))
     end
   end
 
@@ -9,6 +23,10 @@ module RSpecHelpers
     allow(RSpec.configuration.reporter).to receive(:deprecation)
   end
 
+  def expect_no_deprecations
+    expect(RSpec.configuration.reporter).not_to receive(:deprecation)
+  end
+
   def expect_warning_without_call_site(expected = //)
     expect(::Kernel).to receive(:warn) do |message|
       expect(message).to match expected

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

@@ -31,8 +31,8 @@ module RSpec
         end
       else
         def in_sub_process
-          pending "This spec requires forking to work properly, " +
-                  "and your platform does not support forking"
+          skip "This spec requires forking to work properly, " +
+               "and your platform does not support forking"
         end
       end
     end

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

@@ -0,0 +1,14 @@
+module RSpec
+  module Support
+    module WithIsolatedStdErr
+
+      def with_isolated_stderr
+        original = $stderr
+        $stderr = StringIO.new
+        yield
+        $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.0.beta1'
+      STRING = '3.0.0.beta2'
     end
   end
 end

data/lib/rspec/support/version_checker.rb

@@ -0,0 +1,53 @@
+module RSpec
+  module Support
+    LibraryVersionTooLowError = Class.new(StandardError)
+
+    # @private
+    class VersionChecker
+      def initialize(library_name, library_version, min_patch_level)
+        @library_name, @library_version = library_name, library_version
+        @min_patch_level = min_patch_level
+
+        @major,     @minor,     @patch     = parse_version(library_version)
+        @min_major, @min_minor, @min_patch = parse_version(min_patch_level)
+
+        @comparison_result = compare_version
+      end
+
+      def check_version!
+        raise_too_low_error if too_low?
+      end
+
+    private
+
+      def too_low?
+        @comparison_result == :too_low
+      end
+
+      def raise_too_low_error
+        raise LibraryVersionTooLowError,
+          "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
+        end
+      end
+
+      def version_requirement
+        ">= #{@min_patch_level}"
+      end
+
+      def parse_version(version)
+        version.split('.').map { |v| v.to_i }
+      end
+    end
+  end
+end

data/lib/rspec/support/warnings.rb

@@ -34,6 +34,7 @@ module RSpec
   # 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

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rspec-support
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta1
+  version: 3.0.0.beta2
+  prerelease: 6
 platform: ruby
 authors:
 - David Chelimsky
@@ -13,41 +14,57 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURqakNDQW5hZ0F3SUJB
-  Z0lCQVRBTkJna3Foa2lHOXcwQkFRVUZBREJHTVJJd0VBWURWUVFEREFseWMz
-  QmwKWXkxa1pYWXhHekFaQmdvSmtpYUprL0lzWkFFWkZndG5iMjluYkdWbmIz
-  VndjekVUTUJFR0NnbVNKb21UOGl4awpBUmtXQTJOdmJUQWVGdzB4TXpFeE1E
-  Y3hPVFF5TlRsYUZ3MHhOREV4TURjeE9UUXlOVGxhTUVZeEVqQVFCZ05WCkJB
-  TU1DWEp6Y0dWakxXUmxkakViTUJrR0NnbVNKb21UOGl4a0FSa1dDMmR2YjJk
-  c1pXZHZkWEJ6TVJNd0VRWUsKQ1pJbWlaUHlMR1FCR1JZRFkyOXRNSUlCSWpB
-  TkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQQpuaENlWm91
-  RExYV081NW5vK0VkWk5DdGpYamZKUTFYOVRiUGN2QkREMjlPeXBJVWNlMmgv
-  VmRLWEIyZ0k3WkhzCkY1TmtQZ2dzbFRFckdGbVdBdElpdXI3dTk0M1JWcUhP
-  c3lvSXN5MDY1RjlmQ3RyeWtrQSsyMmVsdlREaGE0SXoKUlVDdnVoUTNrbGF0
-  WWs0akYrY0d0MWpOT05OVmRMT2l5MGJNeW52Y003aG9WUTJBb213R3MrY0VP
-  V1EvNGRrRApKY05WM3FmekY1UUJjVEQyMzcyWE5NNTNiMjVuWVZRU1gyS0g1
-  RkY3QmhsS3lvdjMzYk9tMmdBOU0rbVdJdWpXCnFna3l4VmxmcmxFK1pCZ1Yz
-  d1huMUNvamcxTHBUcTM1eU9Bcmd3aW95cnd3bFpaSlI5am9OOXMvbkRrbGZy
-  NUEKK2R5RVRqRmM2Y21FUFdacnQyY0pCUUlEQVFBQm80R0dNSUdETUFrR0Ex
-  VWRFd1FDTUFBd0N3WURWUjBQQkFRRApBZ1N3TUIwR0ExVWREZ1FXQkJTVytX
-  RDdobjFzd0oxQTdpOHRidUZldU5DSkNqQWtCZ05WSFJFRUhUQWJnUmx5CmMz
-  QmxZeTFrWlhaQVoyOXZaMnhsWjI5MWNITXVZMjl0TUNRR0ExVWRFZ1FkTUJ1
-  QkdYSnpjR1ZqTFdSbGRrQm4KYjI5bmJHVm5iM1Z3Y3k1amIyMHdEUVlKS29a
-  SWh2Y05BUUVGQlFBRGdnRUJBSDI3akFaOHNEN3ZuWHVwajZZKwpCYUJkZkh0
-  Q2tGYXNsTEowYUt1TURJVlh3WXVLZnFvVzE1Y1pQRExtU0lFQnVRRk0zbHc2
-  ZC9oRUVMNFVvMmpaCkZ2dG1INU94aWZQRHpGeVV0Q0w0eXA2cWdOZS9YZjZz
-  RHNSZzZGbUtjcGdxQ3dOT21zVmlhZjBMUFNVSC9HWVEKM1Rlb3o4UUNhRGJE
-  N0FLc2ZmVDdlRHJuYkhuS3dlTzFYZGVtUkpDOTh1L3lZeG5Hek1TV0tFc24w
-  OWV0QmxaOQo3SDY3azVaM3VmNmNmTFpnVG9XTDZ6U2h6WlkzTnVuNXI3M1lz
-  TmYyL1FaT2U0VVplNHZmR3ZuNmJhdzUzeXM5CjF5SEMxQWNTWXB2aTJkQWJP
-  aUhUNWlRRitrcm00d3NlOEtjdFhnVE5uak1zSEVvR0t1bEpTMi9zWmw5MGpj
-  Q3oKbXVBPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-11-08 00:00:00.000000000 Z
+- ! '-----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
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +72,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +80,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +88,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +96,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +104,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -95,38 +117,42 @@ extra_rdoc_files: []
 files:
 - lib/rspec/support.rb
 - lib/rspec/support/caller_filter.rb
+- lib/rspec/support/fuzzy_matcher.rb
 - lib/rspec/support/spec.rb
 - lib/rspec/support/spec/deprecation_helpers.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
+- LICENSE.txt
 - Changelog.md
 homepage: https://github.com/rspec/rspec-support
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --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: 2.0.7
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
-summary: rspec-support-3.0.0.beta1
+specification_version: 3
+summary: rspec-support-3.0.0.beta2
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTY1ODMyNjMwYTQ5NmNiYTE2ZDE0Yzg4NmNjYjM3MTg1Y2M1OGMwOA==
-  data.tar.gz: !binary |-
-    ZDUyM2RhMTFkYjYwZGMwZTQwNzhjYzM4ZDE4Y2Y3OTMwMjQxYzE0Zg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    N2M3ZjE0Y2VhMGY4NWQ0YmM2ODk4NmNkNDQ3ZjI5M2M1MzQ5ZjZiMjE0NzA2
-    MGE5MzMxOWI1MTRjZDAwNzhiNDE1ZDBmYjMyZGY3NmNjMjZjZTBlZGY4ZWM2
-    OWVjMjM5NDQ0Y2EyMjM1YTZhNDA2NTAxYWUwZjk5NWU0ZDE4MmU=
-  data.tar.gz: !binary |-
-    ZTI5ZTRiNjFjYTQyNjY2ZTY4YzU5NDJiYzAwMDlkMWE1ZjYyN2E3NzMzYzVm
-    NzcwY2YxMTc3YTZlMDZhNzMxOGExMTg2Y2ViOWFmODg1ODBhMTk5ZGVkYTFk
-    OTRiMWUzMmUzNjJhMjU1M2E3Yzg3YjdhYzY0OGFjZWMzYzg2ZWQ=