bundler 1.0.3 → 1.0.5

data/spec/install/gems/win32_spec.rb

@@ -16,7 +16,7 @@ describe "bundle install with win32-generated lockfile" do
       f << "  rack\r\n"
     end
 
-    install_gemfile <<-G, :exit_status => true
+    install_gemfile <<-G, :exitstatus => true
       source "file://#{gem_repo1}"
 
       gem "rack"

data/spec/install/git_spec.rb

@@ -68,7 +68,7 @@ describe "bundle install with git sources" do
     end
 
     it "still works after moving the application directory" do
-      bundle "install vendor"
+      bundle "install --path vendor/bundle"
       FileUtils.mv bundled_app, tmp('bundled_app.bck')
 
       Dir.chdir tmp('bundled_app.bck')
@@ -76,7 +76,7 @@ describe "bundle install with git sources" do
     end
 
     it "can still install after moving the application directory" do
-      bundle "install vendor"
+      bundle "install --path vendor/bundle"
       FileUtils.mv bundled_app, tmp('bundled_app.bck')
 
       update_git "foo", "1.1", :path => lib_path("foo-1.0")
@@ -118,11 +118,13 @@ describe "bundle install with git sources" do
   end
 
   describe "when specifying a revision" do
-    it "works" do
+    before(:each) do
       build_git "foo"
       @revision = revision_for(lib_path("foo-1.0"))
       update_git "foo"
+    end
 
+    it "works" do
       install_gemfile <<-G
         git "#{lib_path('foo-1.0')}", :ref => "#{@revision}" do
           gem "foo"
@@ -136,6 +138,22 @@ describe "bundle install with git sources" do
 
       out.should == "WIN"
     end
+
+    it "works when the revision is a symbol" do
+      install_gemfile <<-G
+        git "#{lib_path('foo-1.0')}", :ref => #{@revision.to_sym.inspect} do
+          gem "foo"
+        end
+      G
+      check err.should == ""
+
+      run <<-RUBY
+        require 'foo'
+        puts "WIN" unless defined?(FOO_PREV_REF)
+      RUBY
+
+      out.should == "WIN"
+    end
   end
 
   describe "specified inline" do
@@ -457,7 +475,7 @@ describe "bundle install with git sources" do
     G
 
     bundle "install"
-    bundle "install", :exit_status => true
+    bundle "install", :exitstatus => true
     exitstatus.should == 0
   end
 
@@ -546,7 +564,7 @@ describe "bundle install with git sources" do
 
       simulate_new_machine
 
-      bundle "install --deployment", :exit_status => true
+      bundle "install --deployment", :exitstatus => true
       exitstatus.should == 0
     end
   end

data/spec/install/path_spec.rb

@@ -46,6 +46,30 @@ describe "bundle install with explicit source paths" do
     should_be_installed("foo 1.0")
   end
 
+  it "expands paths relative to Bundler.root" do
+    build_lib "foo", :path => bundled_app("foo-1.0")
+
+    install_gemfile <<-G
+      gem 'foo', :path => "./foo-1.0"
+    G
+
+    bundled_app("subdir").mkpath
+    Dir.chdir(bundled_app("subdir")) do
+      should_be_installed("foo 1.0")
+    end
+  end
+
+  it "expands paths when comparing locked paths to Gemfile paths" do
+    build_lib "foo", :path => bundled_app("foo-1.0")
+
+    install_gemfile <<-G
+      gem 'foo', :path => File.expand_path("../foo-1.0", __FILE__)
+    G
+
+    bundle "install --frozen", :exitstatus => true
+    exitstatus.should == 0
+  end
+
   it "installs dependencies from the path even if a newer gem is available elsewhere" do
     system_gems "rack-1.0.0"
 
@@ -122,11 +146,11 @@ describe "bundle install with explicit source paths" do
       s.write "bar.gemspec"
     end
 
-    install_gemfile <<-G, :exit_status => true
+    install_gemfile <<-G, :exitstatus => true
       gemspec :path => "#{lib_path("foo")}"
     G
 
-    @exitstatus.should == 15
+    check exitstatus.should == 15
     out.should =~ /There are multiple gemspecs/
   end
 
@@ -135,7 +159,7 @@ describe "bundle install with explicit source paths" do
       s.write "bar.gemspec"
     end
 
-    install_gemfile <<-G, :exit_status => true
+    install_gemfile <<-G, :exitstatus => true
       gemspec :path => "#{lib_path("foo")}", :name => "foo"
     G
 
@@ -287,12 +311,12 @@ describe "bundle install with explicit source paths" do
       end
 
       install_gemfile <<-G
-        source "http://#{gem_repo1}"
+        source "file://#{gem_repo1}"
         gem "bar", :git => "#{lib_path('bar')}"
       G
 
       install_gemfile <<-G
-        source "http://#{gem_repo1}"
+        source "file://#{gem_repo1}"
         gem "bar", :path => "#{lib_path('bar')}"
       G
 
@@ -306,7 +330,7 @@ describe "bundle install with explicit source paths" do
       end
 
       install_gemfile <<-G
-        source "http://#{gem_repo1}"
+        source "file://#{gem_repo1}"
         gem "bar"
         path "#{lib_path('foo')}" do
           gem "foo"
@@ -316,7 +340,7 @@ describe "bundle install with explicit source paths" do
       build_lib "bar", "1.0", :path => lib_path("foo/bar")
 
       install_gemfile <<-G
-        source "http://#{gem_repo1}"
+        source "file://#{gem_repo1}"
         path "#{lib_path('foo')}" do
           gem "foo"
           gem "bar"

data/spec/lock/{flex_spec.rb → lockfile_spec.rb}

@@ -647,4 +647,37 @@ describe "the lockfile format" do
     G
 
   end
+
+  context "line endings" do
+    before(:each) do
+      build_repo2
+      install_gemfile <<-G
+        source "file://#{gem_repo2}"
+        gem "rack"
+      G
+    end
+
+    it "generates Gemfile.lock with \\n line endings" do
+      File.read(bundled_app("Gemfile.lock")).should_not match("\r\n")
+      should_be_installed "rack 1.0"
+    end
+
+    it "preserves Gemfile.lock \\n line endings" do
+      update_repo2
+
+      bundle "update"
+      File.read(bundled_app("Gemfile.lock")).should_not match("\r\n")
+      should_be_installed "rack 1.2"
+    end
+
+    it "preserves Gemfile.lock \\n\\r line endings" do
+      update_repo2
+      win_lock = File.read(bundled_app("Gemfile.lock")).gsub(/\n/, "\r\n")
+      File.open(bundled_app("Gemfile.lock"), "wb"){|f| f.puts(win_lock) }
+
+      bundle "update"
+      File.read(bundled_app("Gemfile.lock")).should match("\r\n")
+      should_be_installed "rack 1.2"
+    end
+  end
 end

data/spec/other/check_spec.rb

@@ -7,7 +7,7 @@ describe "bundle check" do
       gem "rails"
     G
 
-    bundle :check, :exit_status => true
+    bundle :check, :exitstatus => true
     check @exitstatus.should == 0
     out.should == "The Gemfile's dependencies are satisfied"
   end
@@ -54,7 +54,7 @@ describe "bundle check" do
       gem "rails"
     G
 
-    bundle :check, :exit_status => true
+    bundle :check, :exitstatus => true
     check @exitstatus.should > 0
     out.should include("could not be satisfied")
   end
@@ -88,7 +88,7 @@ describe "bundle check" do
     G
 
     bundle "install --without foo"
-    bundle "check", :exit_status => true
+    bundle "check", :exitstatus => true
     check @exitstatus.should == 0
     out.should include("The Gemfile's dependencies are satisfied")
   end
@@ -106,7 +106,7 @@ describe "bundle check" do
       gem "rack"
     G
 
-    bundle "check", :exit_status => true
+    bundle "check", :exitstatus => true
     out.should include("* rack (1.0.0)")
     @exitstatus.should == 1
   end
@@ -174,7 +174,7 @@ describe "bundle check" do
   end
 
   it "outputs an error when the default Gemfile is not found" do
-    bundle :check, :exit_status => true
+    bundle :check, :exitstatus => true
     check @exitstatus.should == 10
     out.should include("Could not locate Gemfile")
   end
@@ -190,7 +190,7 @@ describe "bundle check" do
     last_out = out
     3.times do |i|
       bundle :check
-      out.should == last_out
+      check out.should == last_out
       err.should be_empty
     end
   end
@@ -206,7 +206,7 @@ describe "bundle check" do
 
     it "returns success when the Gemfile is satisfied" do
       bundle :install
-      bundle :check, :exit_status => true
+      bundle :check, :exitstatus => true
       check @exitstatus.should == 0
       out.should == "The Gemfile's dependencies are satisfied"
     end

data/spec/other/config_spec.rb

@@ -10,7 +10,7 @@ describe ".bundle/config" do
 
   it "can be moved with an environment variable" do
     ENV['BUNDLE_APP_CONFIG'] = tmp('foo/bar').to_s
-    bundle "install vendor"
+    bundle "install --path vendor/bundle"
 
     bundled_app('.bundle').should_not exist
     tmp('foo/bar/config').should exist
@@ -22,7 +22,7 @@ describe ".bundle/config" do
     Dir.chdir bundled_app('omg')
 
     ENV['BUNDLE_APP_CONFIG'] = "../foo"
-    bundle "install vendor"
+    bundle "install --path vendor/bundle"
 
     bundled_app(".bundle").should_not exist
     bundled_app("../foo/config").should exist

data/spec/other/exec_spec.rb

@@ -97,8 +97,8 @@ describe "bundle exec" do
       gem "rack"
     G
 
-    bundle "exec foobarbaz", :exit_status => true
-    @exitstatus.should == 127
+    bundle "exec foobarbaz", :exitstatus => true
+    check exitstatus.should == 127
     out.should include("bundler: command not found: foobarbaz")
     out.should include("Install missing gem binaries with `bundle install`")
   end
@@ -109,8 +109,8 @@ describe "bundle exec" do
     G
 
     bundle "exec touch foo"
-    bundle "exec ./foo", :exit_status => true
-    @exitstatus.should == 126
+    bundle "exec ./foo", :exitstatus => true
+    check exitstatus.should == 126
     out.should include("bundler: not executable: ./foo")
   end
 
@@ -217,11 +217,11 @@ describe "bundle exec" do
         gem "rack"
       G
 
-      bundle "install vendor --disable-shared-gems"
+      bundle "install --path vendor/bundle --disable-shared-gems"
     end
 
     it "does not explode with --disable-shared-gems" do
-      bundle "exec bundle check", :exit_status => true
+      bundle "exec bundle check", :exitstatus => true
       exitstatus.should == 0
     end
 

data/spec/other/ext_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Gem::Specification#match_platform" do
-  it "works" do
+  it "does not match platforms other than the gem platform" do
     darwin = gem "lol", "1.0", "platform_specific-1.0-x86-darwin-10"
     darwin.match_platform(pl('java')).should be_false
   end
@@ -10,7 +10,7 @@ end
 describe "Bundler::GemHelpers#generic" do
   include Bundler::GemHelpers
 
-  it "works" do
+  it "converts non-windows platforms into ruby" do
     generic(pl('x86-darwin-10')).should == pl('ruby')
   end
 end

data/spec/other/gem_helper_spec.rb

@@ -73,7 +73,9 @@ describe "Bundler::GemHelper tasks" do
         @helper.should_receive(:build_gem) do
           # write an invalid gem file, so we can simulate install failure...
           FileUtils.mkdir_p(File.join(@app.to_s, 'pkg'))
-          File.open("#{@app.to_s}/pkg/test-0.0.1.gem", 'w'){|f| f << "not actually a gem"}
+          path = "#{@app.to_s}/pkg/test-0.0.1.gem"
+          File.open(path, 'w'){|f| f << "not actually a gem"}
+          path
         end
         proc { @helper.install_gem }.should raise_error
       end
@@ -87,23 +89,33 @@ describe "Bundler::GemHelper tasks" do
       it 'raises an appropriate error if there is no git remote' do
         Bundler.ui.stub(:confirm => nil, :error => nil) # silence messages
 
+        Dir.chdir(gem_repo1) {
+          `git init --bare`
+        }
         Dir.chdir(@app) {
-          `git init --bare #{gem_repo1}`
+          `git init`
+          `git config user.email "you@example.com"`
+          `git config user.name "name"`
           `git commit -a -m "initial commit"`
         }
 
-        proc { @helper.release_gem }.should raise_error(/No destination configured to push to/)
+        proc { @helper.release_gem }.should raise_error
       end
 
       it "releases" do
         mock_build_message
-        mock_confirm_message /Tagged [\da-f]+ with v0.0.1/
-        mock_confirm_message "Pushed git commits and tags"
+        mock_confirm_message(/Tagged v0.0.1/)
+        mock_confirm_message("Pushed git commits and tags")
 
         @helper.should_receive(:rubygem_push).with(bundled_app('test/pkg/test-0.0.1.gem').to_s)
 
+        Dir.chdir(gem_repo1) {
+          `git init --bare`
+        }
         Dir.chdir(@app) {
-          `git init --bare #{gem_repo1}`
+          `git init`
+          `git config user.email "you@example.com"`
+          `git config user.name "name"`
           `git remote add origin file://#{gem_repo1}`
           `git commit -a -m "initial commit"`
           Open3.popen3("git push origin master") # use popen3 to silence output...

data/spec/other/help_spec.rb

@@ -25,7 +25,7 @@ describe "bundle help" do
   it "simply outputs the txt file when there is no groff on the path" do
     kill_path!
 
-    bundle "help install"
+    bundle "help install", :expect_err => true
     out.should =~ /BUNDLE-INSTALL/
   end
 

data/spec/other/init_spec.rb

@@ -32,9 +32,9 @@ describe "bundle init" do
 
     gemfile = bundled_app("Gemfile").read
     gemfile.should =~ /source :gemcutter/
-    gemfile.scan(/gem "rack", "= 1.0.1"/).size.should == 1
-    gemfile.scan(/gem "rspec", "= 1.2"/).size.should == 1
-    gemfile.scan(/group :development/).size.should == 1
+    check gemfile.scan(/gem "rack", "= 1.0.1"/).size.should == 1
+    check gemfile.scan(/gem "rspec", "= 1.2"/).size.should == 1
+    check gemfile.scan(/group :development/).size.should == 1
   end
 
 end

data/spec/quality_spec.rb

@@ -50,6 +50,9 @@ describe "The library itself" do
     Dir.chdir(root) do
       `gem build bundler.gemspec`
       $?.should == 0
+
+      # clean up the .gem generated
+      system("rm bundler-#{Bundler::VERSION}.gem")
     end
   end
 end

data/spec/resolver/platform_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe "Resolving platform craziness" do
-  describe "with semi real cases" do
+  describe "with cross-platform gems" do
     before :each do
       @index = an_awesome_index
     end
@@ -13,14 +13,14 @@ describe "Resolving platform craziness" do
       should_resolve_as %w(nokogiri-1.4.2 nokogiri-1.4.2-java weakling-0.0.3)
     end
 
-    it "doesn't pull gems when it doesn't exist for the current platform" do
+    it "doesn't pull gems that don't exist for the current platform" do
       dep "nokogiri"
       platforms "ruby"
 
       should_resolve_as %w(nokogiri-1.4.2)
     end
 
-    it "doesn't pulls gems when the version is available for all requested platforms" do
+    it "doesn't pull gems when the version is available for all requested platforms" do
       dep "nokogiri"
       platforms "mswin32"
 
@@ -28,6 +28,31 @@ describe "Resolving platform craziness" do
     end
   end
 
+  describe "with mingw32" do
+
+    before :each do
+      @index = build_index do
+        platforms "mingw32 mswin32" do |platform|
+          gem "thin", "1.2.7", platform
+        end
+      end
+    end
+
+    it "finds mswin gems" do
+      # win32 is hardcoded to get CPU x86 in rubygems
+      platforms "mswin32"
+      dep "thin"
+      should_resolve_as %w(thin-1.2.7-x86-mswin32)
+    end
+
+    it "finds mingw gems" do
+      # mingw is _not_ hardcoded to add CPU x86 in rubygems
+      platforms "x86-mingw32"
+      dep "thin"
+      should_resolve_as %w(thin-1.2.7-x86-mingw32)
+    end
+  end
+
   describe "with conflicting cases" do
     before :each do
       @index = build_index do
@@ -47,7 +72,7 @@ describe "Resolving platform craziness" do
       end
     end
 
-    it "does something" do
+    it "reports on the conflict" do
       platforms "ruby", "java"
       dep "foo"