rspec-core 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8d443beb68dc62c6262fe56753f49aaf78d185a
-  data.tar.gz: 09e2c21ad474f97b97ace68c74d63e1c1d64e289
+  metadata.gz: 35ac596a199f064ae9b3002b53abd89c610828a0
+  data.tar.gz: 79d6993acfd0a779f412dbaeb76fbd69a76c3fe6
 SHA512:
-  metadata.gz: 17c41f5e26ba11c31020e0f6be81192f9045578721b005a0594db764a53f16280abb8ab0e462f3a58680abf4cd62068e800a6eb7eb70b1fa0c79dacd7973e353
-  data.tar.gz: daa45d7357c26db4db246e35292c5783281b5340c93fac275a1ac9917460ad1ea3a2b18b1b35f4692c96bbf630ce0df7aa547c310b515d24187b893b6af6e786
+  metadata.gz: e8c9201434ac482cc45b97a9e9d879e4877879339c1cc13bf77fd14ec7c385e9c3ccb6c7ea3c8042d220f71fab8140102d57f3561e512037be7a038e382c034d
+  data.tar.gz: 3325b9ab89c7aa273354e0db5c55ab17e2d1c1b92870cf2d3e6d90f7c81428ff68d024c515cf54c26440c43f43dd603a1e23c82d5f4428b773183610b55ad008

data/Changelog.md

@@ -1,3 +1,16 @@
+### 3.1.5 / 2014-09-29
+[Full Changelog](http://github.com/rspec/rspec-core/compare/v3.1.4...v3.1.5)
+
+Bug Fixes:
+
+* Fix issue with the rake task incorrectly escaping strings on Windows.
+  (Jon Rowe #1718)
+* Support absolute path patterns. While this wasn't officially supported
+  previously, setting `rake_task.pattern` to an absolute path pattern in
+  RSpec 3.0 and before worked since it delegated to `FileList` internally
+  (but now just forwards the pattern on to the `rspec` command).
+  (Myron Marston, #1726)
+
 ### 3.1.4 / 2014-09-18
 [Full Changelog](http://github.com/rspec/rspec-core/compare/v3.1.3...v3.1.4)
 

data/lib/rspec/core/configuration.rb

@@ -1336,9 +1336,28 @@ module RSpec
       end
 
       def get_matching_files(path, pattern)
+        Dir[file_glob_from(path, pattern)].map { |file| File.expand_path(file) }
+      end
+
+      def file_glob_from(path, pattern)
         stripped = "{#{pattern.gsub(/\s*,\s*/, ',')}}"
-        files = (pattern =~ /^(\.\/)?#{Regexp.escape path}/) ? Dir[stripped] : Dir["#{path}/#{stripped}"]
-        files.map { |file| File.expand_path(file) }
+        return stripped if pattern =~ /^(\.\/)?#{Regexp.escape path}/ || absolute_pattern?(pattern)
+        File.join(path, stripped)
+      end
+
+      if RSpec::Support::OS.windows?
+        def absolute_pattern?(pattern)
+          pattern =~ /\A[A-Z]:\\/ || windows_absolute_network_path?(pattern)
+        end
+
+        def windows_absolute_network_path?(pattern)
+          return false unless ::File::ALT_SEPARATOR
+          pattern.start_with?(::File::ALT_SEPARATOR + ::File::ALT_SEPARATOR)
+        end
+      else
+        def absolute_pattern?(pattern)
+          pattern.start_with?(File::Separator)
+        end
       end
 
       def extract_location(path)

data/lib/rspec/core/rake_task.rb

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/tasklib'
-require 'shellwords'
+require 'rbconfig'
 
 module RSpec
   module Core
@@ -115,7 +115,7 @@ module RSpec
         if ENV['SPEC']
           FileList[ ENV['SPEC']].sort
         elsif String === pattern && !File.exist?(pattern)
-          "--pattern #{pattern.shellescape}"
+          "--pattern #{escape pattern}"
         else
           # Before RSpec 3.1, we used `FileList` to get the list of matched files, and
           # then pass that along to the `rspec` command. Starting with 3.1, we prefer to
@@ -135,12 +135,26 @@ module RSpec
           # a `pattern` option that will not work with `--pattern`.
           #
           # TODO: consider deprecating support for this and removing it in RSpec 4.
-          FileList[pattern].sort.map(&:shellescape)
+          FileList[pattern].sort.map { |file| escape file }
+        end
+      end
+
+      # Manaully comparing because in 3.2 we have RSpec::Support::OS.windows?
+      # but in 3.1 we don't and requiring rspec/world would be weighty here.
+      if RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/
+        def escape(shell_command)
+          "'#{shell_command.gsub("'", "\'")}'"
+        end
+      else
+        require 'shellwords'
+
+        def escape(shell_command)
+          shell_command.shellescape
         end
       end
 
       def file_exclusion_specification
-        " --exclude-pattern #{exclude_pattern.shellescape}" if exclude_pattern
+        " --exclude-pattern #{escape exclude_pattern}" if exclude_pattern
       end
 
       def spec_command
@@ -165,7 +179,7 @@ module RSpec
             /#{File::SEPARATOR}rspec-(core|support)[^#{File::SEPARATOR}]*#{File::SEPARATOR}lib/
           )
 
-          "-I#{core_and_support.map(&:shellescape).join(File::PATH_SEPARATOR)}"
+          "-I#{core_and_support.map { |file| escape file }.join(File::PATH_SEPARATOR)}"
         end
       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.4'
+      STRING = '3.1.5'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -1,3 +1,5 @@
+require 'rbconfig'
+
 module RSpec
   module Core
     # @api private

metadata

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