bundler 1.1.2 → 1.1.3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.1.3 (March 23, 2012)
+
+Bugfixes:
+
+  - escape the bundler root path (@tenderlove, #1789)
+
 ## 1.1.2 (March 20, 2012)
 
 Bugfixes:

data/lib/bundler/source.rb

@@ -419,7 +419,7 @@ module Bundler
     private
 
       def relative_path
-        if path.to_s.match(%r{^#{Bundler.root.to_s}})
+        if path.to_s.match(%r{^#{Regexp.escape Bundler.root.to_s}})
           return path.relative_path_from(Bundler.root)
         end
 

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.1.2" unless defined?(::Bundler::VERSION)
+  VERSION = "1.1.3" unless defined?(::Bundler::VERSION)
 end

data/spec/install/gems/simple_case_spec.rb

@@ -339,6 +339,29 @@ describe "bundle install with gem sources" do
     end
   end
 
+  describe "when Bundler root contains regex chars" do
+    before do
+      root_dir = tmp("foo[]bar")
+
+      FileUtils.mkdir_p(root_dir)
+      in_app_root_custom(root_dir)
+    end
+
+    it "doesn't blow up" do
+      build_lib "foo"
+      gemfile = <<-G
+        gem 'foo', :path => "#{lib_path('foo-1.0')}"
+      G
+      File.open('Gemfile', 'w') do |file|
+        file.puts gemfile
+      end
+
+      bundle :install, :exitstatus => true
+
+      exitstatus.should == 0
+    end
+  end
+
   describe "when prerelease gems are available" do
     it "finds prereleases" do
       install_gemfile <<-G

data/spec/support/helpers.rb

@@ -26,6 +26,10 @@ module Spec
       Dir.chdir(bundled_app2, &blk)
     end
 
+    def in_app_root_custom(root, &blk)
+      Dir.chdir(root, &blk)
+    end
+
     def run(cmd, *args)
       opts = args.last.is_a?(Hash) ? args.pop : {}
       expect_err = opts.delete(:expect_err)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-21 00:00:00 Z
+date: 2012-03-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn