rspec-core 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2b3632b51db161f35c5b34de9edc51e46d9cf3d
-  data.tar.gz: 3c8b1ce86cafdcc09fe9dbca4cecc32c2b10efb7
+  metadata.gz: dc437d7748b2d4e51abc67ecdee4b3222ddbee53
+  data.tar.gz: fa6c35c84c11393fa3f72dd0bdd8712e31b8ca9e
 SHA512:
-  metadata.gz: cf9a1a0778774bc4f4c19b2ca537e9cc6a96e48e52e0d4ffb1de7254ec92338a9e103dea333a3b61050b040328518ee2ac77ffab82b35af357b6c863d2c71d46
-  data.tar.gz: 41557dacbba9ce26a55a7d04ff315664fa5d23c9a8d1d451cdd3812fc33c3cbd086b13fb2b13e51d97faa3fe8efc8fd52331a2e6c7a79b3894fd802f9a965707
+  metadata.gz: cc7190d5420cb26fa663b62e4355284b6a869300c118b6ea535d37f5d86bfc8ce9199259f1c1036be7b4193090e03db2e57ef8b7e41574cfb69c239349479a54
+  data.tar.gz: 0f213b46212dfe8233f1d7466f7e519ef375b6eb1757db8f4a3cdaf630554d43588bf248385eaa79ae0b0d523acb3800493e84e3c31d9c26b1dfc23867db161a

data/Changelog.md

@@ -1,3 +1,19 @@
+### 3.1.7 / 2014-10-11
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.1.6...v3.1.7)
+
+Bug Fixes:
+
+* Fix `Metadata.relative_path` so that for a current directory of
+  `/foo/bar`, `/foo/bar_1` is not wrongly converted to `._1`.
+  (Akos Vandra, #1730)
+* Prevent constant lookup mistakenly finding `RSpec::ExampleGroups` generated
+  constants on 1.9.2 by appending a trailing `_` to the generated names.
+  (Jon Rowe, #1737)
+* Fix bug in `:pending` metadata. If it got set in any way besides passing
+  it as part of the metadata literal passed to `it` (such as by using
+  `define_derived_metadata`), it did not have the desired effect,
+  instead marking the example as `:passed`. (Myron Marston, #1739)
+
 ### 3.1.6 / 2014-10-08
 [Full Changelog](http://github.com/rspec/rspec-core/compare/v3.1.5...v3.1.6)
 

data/lib/rspec/core/example.rb

@@ -140,6 +140,7 @@ module RSpec
         RSpec.current_example = self
 
         start(reporter)
+        Pending.mark_pending!(self, pending) if pending?
 
         begin
           if skipped?

data/lib/rspec/core/example_group.rb

@@ -109,21 +109,11 @@ module RSpec
       def self.define_example_method(name, extra_options={})
         define_singleton_method(name) do |*all_args, &block|
           desc, *args = *all_args
+
           options = Metadata.build_hash_from(args)
           options.update(:skip => RSpec::Core::Pending::NOT_YET_IMPLEMENTED) unless block
           options.update(extra_options)
 
-          # Metadata inheritance normally happens in `Example#initialize`,
-          # but for `:pending` specifically we need it earlier.
-          pending_metadata = options[:pending] || metadata[:pending]
-
-          if pending_metadata
-            options, block = ExampleGroup.pending_metadata_and_block_for(
-              options.merge(:pending => pending_metadata),
-              block
-            )
-          end
-
           examples << RSpec::Core::Example.new(self, desc, options, block)
           examples.last
         end
@@ -546,30 +536,6 @@ module RSpec
       def self.set_ivars(instance, ivars)
         ivars.each { |name, value| instance.instance_variable_set(name, value) }
       end
-
-      # @private
-      def self.pending_metadata_and_block_for(options, block)
-        if String === options[:pending]
-          reason = options[:pending]
-        else
-          options[:pending] = true
-          reason = RSpec::Core::Pending::NO_REASON_GIVEN
-        end
-
-        # Assign :caller so that the callback's source_location isn't used
-        # as the example location.
-        options[:caller] ||= Metadata.backtrace_from(block)
-
-        # This will fail if no block is provided, which is effectively the
-        # same as failing the example so it will be marked correctly as
-        # pending.
-        callback = Proc.new do
-          pending(reason)
-          instance_exec(&block)
-        end
-
-        return options, callback
-      end
     end
 
     # @private
@@ -618,6 +584,16 @@ module RSpec
       name
     end
 
+    if RUBY_VERSION == '1.9.2'
+      class << self
+        alias _base_name_for base_name_for
+        def base_name_for(group)
+          _base_name_for(group) + '_'
+        end
+      end
+      private_class_method :_base_name_for
+    end
+
     def self.disambiguate(name, const_scope)
       return name unless const_defined_on?(const_scope, name)
 

data/lib/rspec/core/metadata.rb

@@ -30,7 +30,18 @@ module RSpec
       # @param line [String] current code line
       # @return [String] relative path to line
       def self.relative_path(line)
-        line = line.sub(File.expand_path("."), ".")
+        # Matches strings either at the beginning of the input or prefixed with a whitespace,
+        # containing the current path, either postfixed with the separator, or at the end of the string.
+        # Match groups are the character before and the character after the string if any.
+        #
+        # http://rubular.com/r/fT0gmX6VJX
+        # http://rubular.com/r/duOrD4i3wb
+        # http://rubular.com/r/sbAMHFrOx1
+        #
+
+        regex = /(\A|\s)#{File.expand_path('.')}(#{File::SEPARATOR}|\s|\Z)/
+
+        line = line.sub(regex, "\\1.\\2")
         line = line.sub(/\A([^:]+:\d+)$/, '\\1')
         return nil if line == '-e:1'
         line

data/lib/rspec/core/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Core.
     module Version
       # Current version of RSpec Core, in semantic versioning format.
-      STRING = '3.1.6'
+      STRING = '3.1.7'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - Steven Baker
@@ -34,7 +34,7 @@ cert_chain:
   1yHC1AcSYpvi2dAbOiHT5iQF+krm4wse8KctXgTNnjMsHEoGKulJS2/sZl90jcCz
   muA=
   -----END CERTIFICATE-----
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -266,6 +266,6 @@ rubyforge_project: rspec
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-core-3.1.6
+summary: rspec-core-3.1.7
 test_files: []
 has_rdoc: