bundler 1.1.pre.8 → 1.1.pre.9

data/spec/lock/lockfile_spec.rb

@@ -70,10 +70,9 @@ describe "the lockfile format" do
     G
   end
 
-  it "parses lockfiles w/ crazy shit" do
+  it "generates lockfiles with multiple requirements" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
-
       gem "net-sftp"
     G
 
@@ -671,13 +670,18 @@ describe "the lockfile format" do
 
   end
 
-  context "line endings" do
+  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
     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
@@ -685,22 +689,51 @@ describe "the lockfile format" do
       should_be_installed "rack 1.0"
     end
 
-    it "preserves Gemfile.lock \\n line endings" do
-      update_repo2
+    context "during updates" do
 
-      bundle "update"
-      File.read(bundled_app("Gemfile.lock")).should_not match("\r\n")
-      should_be_installed "rack 1.2"
+      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
+
+        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
     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) }
+    context "when nothing changes" do
 
-      bundle "update"
-      File.read(bundled_app("Gemfile.lock")).should match("\r\n")
-      should_be_installed "rack 1.2"
+      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
     end
   end
 end

data/spec/other/clean_spec.rb

@@ -9,94 +9,99 @@ describe "bundle clean" do
     end
   end
 
-  def should_not_have_gem(rubygem)
-    vendored_gems("gems/#{rubygem}").should_not exist
-    vendored_gems("specifications/#{rubygem}.gemspec").should_not exist
-    vendored_gems("cache/#{rubygem}.gem").should_not exist
+  def should_not_have_gems(*gems)
+    gems.each do |g|
+      vendored_gems("gems/#{g}").should_not exist
+      vendored_gems("specifications/#{g}.gemspec").should_not exist
+      vendored_gems("cache/#{g}.gem").should_not exist
+    end
   end
 
   it "removes unused gems that are different" do
-    gemfile = <<-G
+    gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "thin"
       gem "foo"
     G
 
-    install_gemfile(gemfile, :path => "vendor/bundle")
+    bundle "install --path vendor/bundle --no-clean"
 
-    install_gemfile <<-G
+    gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "thin"
     G
+    bundle "install --no-clean"
 
     bundle :clean
 
-    out.should == "Removing foo (1.0)"
+    out.should eq("Removing foo (1.0)")
 
     should_have_gems 'thin-1.0', 'rack-1.0.0'
-    should_not_have_gem 'foo-1.0'
+    should_not_have_gems 'foo-1.0'
 
     vendored_gems("bin/rackup").should exist
   end
 
   it "removes old version of gem if unused" do
-    gemfile = <<-G
+    gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "rack", "0.9.1"
       gem "foo"
     G
 
-    install_gemfile(gemfile, :path => "vendor/bundle")
+    bundle "install --path vendor/bundle --no-clean"
 
-    install_gemfile <<-G
+    gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "rack", "1.0.0"
       gem "foo"
     G
+    bundle "install --no-clean"
 
     bundle :clean
 
-    out.should == "Removing rack (0.9.1)"
+    out.should eq("Removing rack (0.9.1)")
 
     should_have_gems 'foo-1.0', 'rack-1.0.0'
-    should_not_have_gem 'rack-0.9.1'
+    should_not_have_gems 'rack-0.9.1'
 
     vendored_gems("bin/rackup").should exist
   end
 
   it "removes new version of gem if unused" do
-    gemfile = <<-G
+    gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "rack", "1.0.0"
       gem "foo"
     G
 
-    install_gemfile(gemfile, :path => "vendor/bundle")
+    bundle "install --path vendor/bundle --no-clean"
 
-    install_gemfile <<-G
+    gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "rack", "0.9.1"
       gem "foo"
     G
+    bundle "install --no-clean"
 
     bundle :clean
 
-    out.should == "Removing rack (1.0.0)"
+    out.should eq("Removing rack (1.0.0)")
 
     should_have_gems 'foo-1.0', 'rack-0.9.1'
-    should_not_have_gem 'rack-1.0.0'
+    should_not_have_gems 'rack-1.0.0'
 
     vendored_gems("bin/rackup").should exist
   end
 
   it "remove gems in bundle without groups" do
-    gemfile = <<-G
+    gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "foo"
@@ -106,45 +111,71 @@ describe "bundle clean" do
       end
     G
 
-    install_gemfile(gemfile, :path => "vendor/bundle")
-    bundle "install --without test_group"
+    bundle "install --path vendor/bundle --no-clean"
+    bundle "install --without test_group --no-clean"
     bundle :clean
 
-    out.should == "Removing rack (1.0.0)"
+    out.should eq("Removing rack (1.0.0)")
 
     should_have_gems 'foo-1.0'
-    should_not_have_gem 'rack-1.0.0'
+    should_not_have_gems 'rack-1.0.0'
 
     vendored_gems("bin/rackup").should_not exist
   end
 
+  it "does not remove cached git dir if it's being used" do
+    build_git "foo"
+    revision = revision_for(lib_path("foo-1.0"))
+    git_path = lib_path('foo-1.0')
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "1.0.0"
+      git "#{git_path}", :ref => "#{revision}" do
+        gem "foo"
+      end
+    G
+
+    bundle "install --path vendor/bundle --no-clean"
+
+    bundle :clean
+
+    digest = Digest::SHA1.hexdigest(git_path.to_s)
+    vendored_gems("cache/bundler/git/foo-1.0-#{digest}").should exist
+  end
+
   it "removes unused git gems" do
     build_git "foo"
-    @revision = revision_for(lib_path("foo-1.0"))
+    revision = revision_for(lib_path("foo-1.0"))
+    git_path = lib_path('foo-1.0')
 
-    gemfile = <<-G
+    gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "rack", "1.0.0"
-      git "#{lib_path('foo-1.0')}", :ref => "#{@revision}" do
+      git "#{git_path}", :ref => "#{revision}" do
         gem "foo"
       end
     G
 
-    install_gemfile(gemfile, :path => "vendor/bundle")
+    bundle "install --path vendor/bundle --no-clean"
 
-    install_gemfile <<-G
+    gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "rack", "1.0.0"
     G
+    bundle "install --no-clean"
 
     bundle :clean
 
-    out.should == "Removing foo (1.0 #{@revision[0..11]})"
+    out.should eq("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-#{revision[0..11]}").should_not exist
+    digest = Digest::SHA1.hexdigest(git_path.to_s)
+    vendored_gems("cache/bundler/git/foo-1.0-#{digest}").should_not exist
 
     vendored_gems("specifications/rack-1.0.0.gemspec").should exist
 
@@ -155,7 +186,7 @@ describe "bundle clean" do
     build_git "foo"
     revision = revision_for(lib_path("foo-1.0"))
 
-    gemfile = <<-G
+    gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "rack", "1.0.0"
@@ -164,16 +195,15 @@ describe "bundle clean" do
       end
     G
 
-    install_gemfile(gemfile, :path => "vendor/bundle")
+    bundle "install --path vendor/bundle --no-clean"
 
     update_git "foo"
     revision2 = revision_for(lib_path("foo-1.0"))
 
-    bundle :update
-    bundle :install
+    bundle "update --no-clean"
     bundle :clean
 
-    out.should == "Removing foo (1.0 #{revision[0..11]})"
+    out.should eq("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
@@ -184,6 +214,24 @@ describe "bundle clean" do
     vendored_gems("bin/rackup").should exist
   end
 
+  it "does not remove nested gems in a git repo" do
+    build_lib "activesupport", "3.0", :path => lib_path("rails/activesupport")
+    build_git "rails", "3.0", :path => lib_path("rails") do |s|
+      s.add_dependency "activesupport", "= 3.0"
+    end
+    revision = revision_for(lib_path("rails"))
+
+    gemfile <<-G
+      gem "activesupport", :git => "#{lib_path('rails')}", :ref => '#{revision}'
+    G
+
+    bundle "install --path vendor/bundle --no-clean"
+    bundle :clean
+    out.should eq("")
+
+    vendored_gems("bundler/gems/rails-#{revision[0..11]}").should exist
+  end
+
   it "displays an error when used without --path" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
@@ -193,6 +241,157 @@ describe "bundle clean" do
 
     bundle :clean
 
-    out.should == "Can only use bundle clean when --path is set"
+    out.should == "Can only use bundle clean when --path is set or --force is set"
+  end
+
+  # handling bundle clean upgrade path from the pre's
+  it "removes .gem/.gemspec file even if there's no corresponding gem dir is already moved" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "thin"
+      gem "foo"
+    G
+
+    bundle "install --path vendor/bundle --no-clean"
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "foo"
+    G
+    bundle "install --no-clean"
+
+    FileUtils.rm(vendored_gems("bin/rackup"))
+    FileUtils.rm_rf(vendored_gems("gems/thin-1.0"))
+    FileUtils.rm_rf(vendored_gems("gems/rack-1.0.0"))
+
+    bundle :clean
+
+    should_not_have_gems 'thin-1.0', 'rack-1.0'
+    should_have_gems 'foo-1.0'
+
+    vendored_gems("bin/rackup").should_not exist
+  end
+
+  it "does not call clean automatically when using system gems" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "thin"
+      gem "rack"
+    G
+    bundle :install
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack"
+    G
+    bundle :install
+
+    sys_exec "gem list"
+    out.should include("rack (1.0.0)")
+    out.should include("thin (1.0)")
+  end
+
+  it "--clean should override the bundle setting" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "thin"
+      gem "rack"
+    G
+    bundle "install --path vendor/bundle --no-clean"
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack"
+    G
+    bundle "install --clean"
+
+    should_have_gems 'rack-1.0.0'
+    should_not_have_gems 'thin-1.0'
+  end
+
+  it "clean automatically on --path" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "thin"
+      gem "rack"
+    G
+    bundle "install --path vendor/bundle"
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack"
+    G
+    bundle "install"
+
+    should_have_gems 'rack-1.0.0'
+    should_not_have_gems 'thin-1.0'
+  end
+
+  it "cleans on bundle update with --path" do
+    build_repo2
+
+    gemfile <<-G
+      source "file://#{gem_repo2}"
+
+      gem "foo"
+    G
+    bundle "install --path vendor/bundle"
+
+    update_repo2 do
+      build_gem 'foo', '1.0.1'
+    end
+
+    bundle :update
+    should_not_have_gems 'foo-1.0'
+  end
+
+  it "does not clean on bundle update when using --system" do
+    build_repo2
+
+    gemfile <<-G
+      source "file://#{gem_repo2}"
+
+      gem "foo"
+    G
+    bundle "install"
+
+    update_repo2 do
+      build_gem 'foo', '1.0.1'
+    end
+    bundle :update
+
+    sys_exec "gem list"
+    out.should include("foo (1.0.1, 1.0)")
+  end
+
+  it "cleans system gems when --force is used" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "foo"
+      gem "rack"
+    G
+    bundle :install
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack"
+    G
+    bundle :install
+    bundle "clean --force"
+
+    out.should eq("Removing foo (1.0)")
+    sys_exec "gem list"
+    out.should_not include("foo (1.0)")
+    out.should include("rack (1.0.0)")
   end
 end