rspec-core 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de35fb8af71557f3b94da1039900a1f59dd369c7
-  data.tar.gz: 125f5fd4a44a2b725c10e7f6c7fcf27a5c5a519d
+  metadata.gz: f8d443beb68dc62c6262fe56753f49aaf78d185a
+  data.tar.gz: 09e2c21ad474f97b97ace68c74d63e1c1d64e289
 SHA512:
-  metadata.gz: f6b05499ca1958817b42849bb529dc94ae6d6b6d92ba4885f5d9b6cf7f956e28c6c871f7b85d794c65ca27617799797106fbeffbeb821574571135f19e88d4b1
-  data.tar.gz: f9b83d585f0913cc72c1bf167d107208658889c65de1eb93254554cee333faf5f517b5c4705a17ec6b0c950dd2b60d4ca55ee9c1fb1339b36d5470bafb422e9f
+  metadata.gz: 17c41f5e26ba11c31020e0f6be81192f9045578721b005a0594db764a53f16280abb8ab0e462f3a58680abf4cd62068e800a6eb7eb70b1fa0c79dacd7973e353
+  data.tar.gz: daa45d7357c26db4db246e35292c5783281b5340c93fac275a1ac9917460ad1ea3a2b18b1b35f4692c96bbf630ce0df7aa547c310b515d24187b893b6af6e786

data/Changelog.md

@@ -1,3 +1,15 @@
+### 3.1.4 / 2014-09-18
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.1.3...v3.1.4)
+
+Bug Fixes:
+
+* Fix implicit `subject` when using `describe false` or `describe nil`
+  so that it returns the provided primitive rather than the string
+  representation. (Myron Marston, #1710)
+* Fix backtrace filtering to allow code in subdirectories of your
+  current working directory (such as vendor/bundle/...) to be filtered
+  from backtraces. (Myron Marston, #1708)
+
 ### 3.1.3 / 2014-09-15
 [Full Changelog](http://github.com/rspec/rspec-core/compare/v3.1.2...v3.1.3)
 

data/lib/rspec/core/backtrace_formatter.rb

@@ -12,23 +12,22 @@ module RSpec
         patterns << "org/jruby/" if RUBY_PLATFORM == 'java'
         patterns.map! { |s| Regexp.new(s.gsub("/", File::SEPARATOR)) }
 
-        @system_exclusion_patterns = [Regexp.union(RSpec::CallerFilter::IGNORE_REGEX, *patterns)]
-        @exclusion_patterns = [] + @system_exclusion_patterns
-        @inclusion_patterns = [Regexp.new(Dir.getwd)]
+        @exclusion_patterns = [Regexp.union(RSpec::CallerFilter::IGNORE_REGEX, *patterns)]
+        @inclusion_patterns = []
+
+        return unless matches?(@exclusion_patterns, File.join(Dir.getwd, "lib", "foo.rb:13"))
+        inclusion_patterns << Regexp.new(Dir.getwd)
       end
 
       attr_writer :full_backtrace
 
       def full_backtrace?
-        @full_backtrace || @exclusion_patterns.empty?
+        @full_backtrace || exclusion_patterns.empty?
       end
 
       def filter_gem(gem_name)
         sep = File::SEPARATOR
-        pattern = /#{sep}#{gem_name}(-[^#{sep}]+)?#{sep}/
-
-        @exclusion_patterns        << pattern
-        @system_exclusion_patterns << pattern
+        exclusion_patterns << /#{sep}#{gem_name}(-[^#{sep}]+)?#{sep}/
       end
 
       def format_backtrace(backtrace, options={})
@@ -54,9 +53,7 @@ module RSpec
 
       def exclude?(line)
         return false if @full_backtrace
-        relative_line = Metadata.relative_path(line)
-        return false unless matches?(@exclusion_patterns, relative_line)
-        matches?(@system_exclusion_patterns, relative_line) || !matches?(@inclusion_patterns, line)
+        matches?(exclusion_patterns, line) && !matches?(inclusion_patterns, line)
       end
 
     private

data/lib/rspec/core/memoized_helpers.rb

@@ -55,7 +55,7 @@ module RSpec
       def subject
         __memoized.fetch(:subject) do
           __memoized[:subject] = begin
-            described = described_class || self.class.description
+            described = described_class || self.class.metadata.fetch(:description_args).first
             Class === described ? described.new : described
           end
         end

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.3'
+      STRING = '3.1.4'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Steven Baker
@@ -34,7 +34,7 @@ cert_chain:
   1yHC1AcSYpvi2dAbOiHT5iQF+krm4wse8KctXgTNnjMsHEoGKulJS2/sZl90jcCz
   muA=
   -----END CERTIFICATE-----
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-09-18 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.3
+summary: rspec-core-3.1.4
 test_files: []
 has_rdoc: