bundler 1.0.22 → 1.1.pre

data/spec/install/gems/sudo_spec.rb

@@ -10,11 +10,10 @@ describe "when using sudo", :sudo => true do
       install_gemfile <<-G
         source "file://#{gem_repo1}"
         gem "rack", '1.0'
-        gem "thin"
       G
 
       system_gem_path("gems/rack-1.0.0").should exist
-      system_gem_path("gems/rack-1.0.0").stat.uid.should eq(0)
+      check system_gem_path("gems/rack-1.0.0").stat.uid.should == 0
       should_be_installed "rack 1.0"
     end
 
@@ -30,7 +29,7 @@ describe "when using sudo", :sudo => true do
       G
 
       bundle_path.join("gems/rack-1.0.0").should exist
-      bundle_path.join("gems/rack-1.0.0").stat.uid.should eq(0)
+      check bundle_path.join("gems/rack-1.0.0").stat.uid.should == 0
       should_be_installed "rack 1.0"
     end
 

data/spec/install/gemspec_spec.rb

@@ -22,23 +22,6 @@ describe "bundle install from an existing gemspec" do
     should_be_installed "bar-dev 1.0.0", :groups => :development
   end
 
-  it "that is hidden should install runtime and development dependencies" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.write("Gemfile", "source :rubygems\ngemspec")
-      s.add_dependency "bar", "=1.0.0"
-      s.add_development_dependency "bar-dev", '=1.0.0'
-    end
-    FileUtils.mv tmp.join('foo', 'foo.gemspec'), tmp.join('foo', '.gemspec')
-
-    install_gemfile <<-G
-      source "file://#{gem_repo2}"
-      gemspec :path => '#{tmp.join("foo")}'
-    G
-
-    should_be_installed "bar 1.0.0"
-    should_be_installed "bar-dev 1.0.0", :groups => :development
-  end
-
   it "should handle a list of requirements" do
     build_gem "baz", "1.0", :to_system => true
     build_gem "baz", "1.1", :to_system => true
@@ -110,27 +93,6 @@ describe "bundle install from an existing gemspec" do
     should_be_installed "bar-dev 1.0.0", :groups => :dev
   end
 
-  it "should match a lockfile even if the gemspec defines development dependencies" do
-    build_lib("foo", :path => tmp.join("foo")) do |s|
-      s.write("Gemfile", "source 'file://#{gem_repo1}'\ngemspec")
-      s.add_dependency "actionpack", "=2.3.2"
-      s.add_development_dependency "rake", '=0.8.7'
-    end
-
-    Dir.chdir(tmp.join("foo")) do
-      bundle "install"
-      # This should really be able to rely on $stderr, but, it's not written
-      # right, so we can't. In fact, this is a bug negation test, and so it'll
-      # ghost pass in future, and will only catch a regression if the message
-      # doesn't change. Exit codes should be used correctly (they can be more
-      # than just 0 and 1).
-      output = bundle("install --deployment")
-      output.should_not match(/You have added to the Gemfile/)
-      output.should_not match(/You have deleted from the Gemfile/)
-      output.should_not match(/install in deployment mode after changing/)
-    end
-  end
-
   it "should evaluate the gemspec in its directory" do
     build_lib("foo", :path => tmp.join("foo"))
     File.open(tmp.join("foo/foo.gemspec"), "w") do |s|

data/spec/install/git_spec.rb

@@ -145,7 +145,7 @@ describe "bundle install with git sources" do
           gem "foo"
         end
       G
-      err.should eq("")
+      check err.should == ""
 
       run <<-RUBY
         require 'foo'
@@ -348,9 +348,10 @@ describe "bundle install with git sources" do
 
     bundle :install, :expect_err => true
 
-    out.should include("Git error:")
+    out.should include("An error has occurred in git")
     err.should include("fatal")
     err.should include("omgomg")
+    err.should include("fatal: The remote end hung up unexpectedly")
   end
 
   it "works when the gem path has spaces in it" do
@@ -403,7 +404,7 @@ describe "bundle install with git sources" do
         gem "has_submodule"
       end
     G
-    out.should =~ /could not find gem 'submodule/i
+    out.should =~ /Could not find gem 'submodule'/
 
     should_not_be_installed "has_submodule 1.0", :expect_err => true
   end

data/spec/install/invalid_spec.rb

@@ -15,21 +15,3 @@ describe "bundle install with deprecated features" do
   end
 
 end
-
-describe "bundle install to a dead symlink" do
-  before do
-    in_app_root do
-      `ln -s /tmp/idontexist bundle`
-    end
-  end
-
-  it "reports the symlink is dead" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-    G
-
-    bundle "install --path bundle"
-    out.should =~ /invalid symlink/
-  end
-end

data/spec/install/path_spec.rb

@@ -141,47 +141,6 @@ describe "bundle install with explicit source paths" do
     should_be_installed "rack 1.0"
   end
 
-  it "doesn't automatically unlock dependencies when using the gemspec syntax" do
-    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-      s.add_dependency "rack", ">= 1.0"
-    end
-
-    Dir.chdir lib_path("foo")
-
-    install_gemfile lib_path("foo/Gemfile"), <<-G
-      source "file://#{gem_repo1}"
-      gemspec
-    G
-
-    build_gem "rack", "1.0.1", :to_system => true
-
-    bundle "install"
-
-    should_be_installed "foo 1.0"
-    should_be_installed "rack 1.0"
-  end
-
-  it "doesn't automatically unlock dependencies when using the gemspec syntax and the gem has development dependencies" do
-    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
-      s.add_dependency "rack", ">= 1.0"
-      s.add_development_dependency "activesupport"
-    end
-
-    Dir.chdir lib_path("foo")
-
-    install_gemfile lib_path("foo/Gemfile"), <<-G
-      source "file://#{gem_repo1}"
-      gemspec
-    G
-
-    build_gem "rack", "1.0.1", :to_system => true
-
-    bundle "install"
-
-    should_be_installed "foo 1.0"
-    should_be_installed "rack 1.0"
-  end
-
   it "raises if there are multiple gemspecs" do
     build_lib "foo", "1.0", :path => lib_path("foo") do |s|
       s.write "bar.gemspec"
@@ -191,7 +150,7 @@ describe "bundle install with explicit source paths" do
       gemspec :path => "#{lib_path("foo")}"
     G
 
-    exitstatus.should eq(15)
+    check exitstatus.should == 15
     out.should =~ /There are multiple gemspecs/
   end
 
@@ -223,17 +182,6 @@ describe "bundle install with explicit source paths" do
     out.should == "1.0"
   end
 
-  it "handles directories in bin/" do
-    build_lib "foo"
-    lib_path("foo-1.0").join("foo.gemspec").rmtree
-    lib_path("foo-1.0").join("bin/performance").mkpath
-
-    install_gemfile <<-G
-      gem 'foo', '1.0', :path => "#{lib_path('foo-1.0')}"
-    G
-    err.should == ""
-  end
-
   it "removes the .gem file after installing" do
     build_lib "foo"
 

data/spec/lock/git_spec.rb

@@ -27,7 +27,7 @@ describe "bundle lock with git gems" do
 
   it "provides correct #full_gem_path" do
     run <<-RUBY
-      puts Bundler.rubygems.find_name('foo').first.full_gem_path
+      puts Gem.source_index.find_name('foo').first.full_gem_path
     RUBY
     out.should == bundle("show foo")
   end

data/spec/lock/lockfile_spec.rb

@@ -70,9 +70,10 @@ describe "the lockfile format" do
     G
   end
 
-  it "generates lockfiles with multiple requirements" do
+  it "parses lockfiles w/ crazy shit" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
+
       gem "net-sftp"
     G
 
@@ -317,7 +318,7 @@ describe "the lockfile format" do
             actionpack (= 2.3.2)
             activerecord (= 2.3.2)
             activeresource (= 2.3.2)
-            rake (= 0.8.7)
+            rake
           rake (0.8.7)
 
       PLATFORMS
@@ -328,29 +329,6 @@ describe "the lockfile format" do
     G
   end
 
-  it "orders dependencies according to version" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem 'double_deps'
-    G
-
-    lockfile_should_be <<-G
-      GEM
-        remote: file:#{gem_repo1}/
-        specs:
-          double_deps (1.0)
-            net-ssh
-            net-ssh (>= 1.0.0)
-          net-ssh (1.0)
-
-      PLATFORMS
-        #{generic(Gem::Platform.local)}
-
-      DEPENDENCIES
-        double_deps
-    G
-  end
-
   it "does not add the :require option to the lockfile" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
@@ -670,18 +648,13 @@ describe "the lockfile format" do
 
   end
 
-  describe "line endings" do
-    def set_lockfile_mtime_to_known_value
-      time = Time.local(2000, 1, 1, 0, 0, 0)
-      File.utime(time, time, bundled_app('Gemfile.lock'))
-    end
+  context "line endings" do
     before(:each) do
       build_repo2
       install_gemfile <<-G
         source "file://#{gem_repo2}"
         gem "rack"
       G
-      set_lockfile_mtime_to_known_value
     end
 
     it "generates Gemfile.lock with \\n line endings" do
@@ -689,51 +662,22 @@ describe "the lockfile format" do
       should_be_installed "rack 1.0"
     end
 
-    context "during updates" do
-
-      it "preserves Gemfile.lock \\n line endings" do
-        update_repo2
-
-        lambda { bundle "update" }.should change { File.mtime(bundled_app('Gemfile.lock')) }
-        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) }
-        set_lockfile_mtime_to_known_value
+    it "preserves Gemfile.lock \\n line endings" do
+      update_repo2
 
-        lambda { bundle "update" }.should change { File.mtime(bundled_app('Gemfile.lock')) }
-        File.read(bundled_app("Gemfile.lock")).should match("\r\n")
-        should_be_installed "rack 1.2"
-      end
+      bundle "update"
+      File.read(bundled_app("Gemfile.lock")).should_not match("\r\n")
+      should_be_installed "rack 1.2"
     end
 
-    context "when nothing changes" do
+    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) }
 
-      it "preserves Gemfile.lock \\n line endings" do
-        lambda { ruby <<-RUBY
-                   require 'rubygems'
-                   require 'bundler'
-                   Bundler.setup
-                 RUBY
-               }.should_not change { File.mtime(bundled_app('Gemfile.lock')) }
-      end
-
-      it "preserves Gemfile.lock \\n\\r line endings" do
-        win_lock = File.read(bundled_app("Gemfile.lock")).gsub(/\n/, "\r\n")
-        File.open(bundled_app("Gemfile.lock"), "wb"){|f| f.puts(win_lock) }
-        set_lockfile_mtime_to_known_value
-
-        lambda { ruby <<-RUBY
-                   require 'rubygems'
-                   require 'bundler'
-                   Bundler.setup
-                 RUBY
-               }.should_not change { File.mtime(bundled_app('Gemfile.lock')) }
-      end
+      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

@@ -8,7 +8,7 @@ describe "bundle check" do
     G
 
     bundle :check, :exitstatus => true
-    @exitstatus.should eq(0)
+    check @exitstatus.should == 0
     out.should == "The Gemfile's dependencies are satisfied"
   end
 
@@ -55,7 +55,7 @@ describe "bundle check" do
     G
 
     bundle :check, :exitstatus => true
-    @exitstatus.should be > 0
+    check @exitstatus.should > 0
     out.should include("could not be satisfied")
   end
 
@@ -89,7 +89,7 @@ describe "bundle check" do
 
     bundle "install --without foo"
     bundle "check", :exitstatus => true
-    @exitstatus.should eq(0)
+    check @exitstatus.should == 0
     out.should include("The Gemfile's dependencies are satisfied")
   end
 
@@ -175,7 +175,7 @@ describe "bundle check" do
 
   it "outputs an error when the default Gemfile is not found" do
     bundle :check, :exitstatus => true
-    @exitstatus.should eq(10)
+    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 eq(last_out)
+      check out.should == last_out
       err.should be_empty
     end
   end
@@ -207,7 +207,7 @@ describe "bundle check" do
     it "returns success when the Gemfile is satisfied" do
       bundle :install
       bundle :check, :exitstatus => true
-      @exitstatus.should eq(0)
+      check @exitstatus.should == 0
       out.should == "The Gemfile's dependencies are satisfied"
     end
 

data/spec/other/clean_spec.rb

@@ -0,0 +1,202 @@
+require "spec_helper"
+
+describe "bundle clean" do
+  it "removes unused gems that are different" do
+    gemfile = <<-G
+      source "file://#{gem_repo1}"
+
+      gem "thin"
+      gem "foo"
+    G
+
+    install_gemfile(gemfile, :path => "vendor/bundle")
+
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "thin"
+    G
+
+    bundle :clean
+
+    out.should == "Removing foo (1.0)"
+
+    vendored_gems("gems/thin-1.0").should exist
+    vendored_gems("gems/rack-1.0.0").should exist
+    vendored_gems("gems/foo-1.0").should_not exist
+
+    vendored_gems("specifications/thin-1.0.gemspec").should exist
+    vendored_gems("specifications/rack-1.0.0.gemspec").should exist
+    vendored_gems("specifications/foo-1.0.gemspec").should_not exist
+
+    vendored_gems("bin/rackup").should exist
+  end
+
+  it "removes old version of gem if unused" do
+    gemfile = <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "0.9.1"
+      gem "foo"
+    G
+
+    install_gemfile(gemfile, :path => "vendor/bundle")
+
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "1.0.0"
+      gem "foo"
+    G
+
+    bundle :clean
+
+    out.should == "Removing rack (0.9.1)"
+
+    vendored_gems("gems/foo-1.0").should exist
+    vendored_gems("gems/rack-1.0.0").should exist
+    vendored_gems("gems/rack-0.9.1").should_not exist
+
+    vendored_gems("specifications/foo-1.0.gemspec").should exist
+    vendored_gems("specifications/rack-1.0.0.gemspec").should exist
+    vendored_gems("specifications/rack-0.9.1.gemspec").should_not exist
+
+    vendored_gems("bin/rackup").should exist
+  end
+
+  it "removes new version of gem if unused" do
+    gemfile = <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "1.0.0"
+      gem "foo"
+    G
+
+    install_gemfile(gemfile, :path => "vendor/bundle")
+
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "0.9.1"
+      gem "foo"
+    G
+
+    bundle :clean
+
+    out.should == "Removing rack (1.0.0)"
+
+    vendored_gems("gems/foo-1.0").should exist
+    vendored_gems("gems/rack-0.9.1").should exist
+    vendored_gems("gems/rack-1.0.0").should_not exist
+
+    vendored_gems("specifications/foo-1.0.gemspec").should exist
+    vendored_gems("specifications/rack-0.9.1.gemspec").should exist
+    vendored_gems("specifications/rack-1.0.0.gemspec").should_not exist
+
+    vendored_gems("bin/rackup").should exist
+  end
+
+  it "remove gems in bundle without groups" do
+    gemfile = <<-G
+      source "file://#{gem_repo1}"
+
+      gem "foo"
+
+      group :test_group do
+        gem "rack", "1.0.0"
+      end
+    G
+
+    install_gemfile(gemfile, :path => "vendor/bundle")
+    bundle "install --without test_group"
+    bundle :clean
+
+    out.should == "Removing rack (1.0.0)"
+
+    vendored_gems("gems/foo-1.0").should exist
+    vendored_gems("gems/rack-1.0.0").should_not exist
+
+    vendored_gems("specifications/foo-1.0.gemspec").should exist
+    vendored_gems("specifications/rack-1.0.0.gemspec").should_not exist
+
+    vendored_gems("bin/rackup").should_not exist
+  end
+
+  it "removes unused git gems" do
+    build_git "foo"
+    @revision = revision_for(lib_path("foo-1.0"))
+
+    gemfile = <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "1.0.0"
+      git "#{lib_path('foo-1.0')}", :ref => "#{@revision}" do
+        gem "foo"
+      end
+    G
+
+    install_gemfile(gemfile, :path => "vendor/bundle")
+
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "1.0.0"
+    G
+
+    bundle :clean
+
+    out.should == "Removing foo (1.0 #{@revision[0..11]})"
+
+    vendored_gems("gems/rack-1.0.0").should exist
+    vendored_gems("bundler/gems/foo-1.0-#{@revision[0..11]}").should_not exist
+
+    vendored_gems("specifications/rack-1.0.0.gemspec").should exist
+
+    vendored_gems("bin/rackup").should exist
+  end
+
+  it "removes old git gems" do
+    build_git "foo"
+    revision = revision_for(lib_path("foo-1.0"))
+
+    gemfile = <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "1.0.0"
+      git "#{lib_path('foo-1.0')}" do
+        gem "foo"
+      end
+    G
+
+    install_gemfile(gemfile, :path => "vendor/bundle")
+
+    update_git "foo"
+    revision2 = revision_for(lib_path("foo-1.0"))
+
+    bundle :update
+    bundle :install
+    bundle :clean
+
+    out.should == "Removing foo (1.0 #{revision[0..11]})"
+
+    vendored_gems("gems/rack-1.0.0").should exist
+    vendored_gems("bundler/gems/foo-1.0-#{revision[0..11]}").should_not exist
+    vendored_gems("bundler/gems/foo-1.0-#{revision2[0..11]}").should exist
+
+    vendored_gems("specifications/rack-1.0.0.gemspec").should exist
+
+    vendored_gems("bin/rackup").should exist
+  end
+
+  it "displays an error when used without --path" do
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "1.0.0"
+    G
+
+    bundle :clean
+
+    out.should == "Can only use bundle clean when --path is set"
+  end
+end