bundler 1.2.5 → 1.3.0.pre

data/spec/install/invalid_spec.rb

@@ -11,7 +11,7 @@ describe "bundle install with deprecated features" do
     G
 
     bundle :install
-    out.should =~ /You passed :lib as an option for gem 'rack', but it is invalid/
+    expect(out).to match(/You passed :lib as an option for gem 'rack', but it is invalid/)
   end
 
 end
@@ -30,6 +30,6 @@ describe "bundle install to a dead symlink" do
     G
 
     bundle "install --path bundle"
-    out.should =~ /invalid symlink/
+    expect(out).to match(/invalid symlink/)
   end
-end
+end

data/spec/install/path_spec.rb

@@ -67,7 +67,7 @@ describe "bundle install with explicit source paths" do
     G
 
     bundle "install --frozen", :exitstatus => true
-    exitstatus.should == 0
+    expect(exitstatus).to eq(0)
   end
 
   it "installs dependencies from the path even if a newer gem is available elsewhere" do
@@ -87,7 +87,7 @@ describe "bundle install with explicit source paths" do
     G
 
     run "require 'rack'"
-    out.should == 'WIN OVERRIDE'
+    expect(out).to eq('WIN OVERRIDE')
   end
 
   it "works" do
@@ -191,8 +191,8 @@ describe "bundle install with explicit source paths" do
       gemspec :path => "#{lib_path("foo")}"
     G
 
-    exitstatus.should eq(15)
-    out.should =~ /There are multiple gemspecs/
+    expect(exitstatus).to eq(15)
+    expect(out).to match(/There are multiple gemspecs/)
   end
 
   it "allows :name to be specified to resolve ambiguity" do
@@ -220,7 +220,7 @@ describe "bundle install with explicit source paths" do
     G
 
     bundle "exec foobar"
-    out.should == "1.0"
+    expect(out).to eq("1.0")
   end
 
   it "handles directories in bin/" do
@@ -231,7 +231,7 @@ describe "bundle install with explicit source paths" do
     install_gemfile <<-G
       gem 'foo', '1.0', :path => "#{lib_path('foo-1.0')}"
     G
-    err.should == ""
+    expect(err).to eq("")
   end
 
   it "removes the .gem file after installing" do
@@ -241,7 +241,7 @@ describe "bundle install with explicit source paths" do
       gem 'foo', :path => "#{lib_path('foo-1.0')}"
     G
 
-    lib_path('foo-1.0').join('foo-1.0.gem').should_not exist
+    expect(lib_path('foo-1.0').join('foo-1.0.gem')).not_to exist
   end
 
   describe "block syntax" do
@@ -297,7 +297,7 @@ describe "bundle install with explicit source paths" do
     G
 
     bundle "exec foo"
-    out.should == "1.0"
+    expect(out).to eq("1.0")
   end
 
   describe "when the gem version in the path is updated" do
@@ -402,4 +402,67 @@ describe "bundle install with explicit source paths" do
       should_be_installed "bar 1.0"
     end
   end
+
+  describe "gem install hooks" do
+    it "runs pre-install hooks" do
+      build_git "foo"
+      gemfile <<-G
+        gem "foo", :git => "#{lib_path('foo-1.0')}"
+      G
+
+      File.open(lib_path("install_hooks.rb"), "w") do |h|
+        h.write <<-H
+          require 'rubygems'
+          Gem.pre_install_hooks << lambda do |inst|
+            STDERR.puts "Ran pre-install hook: \#{inst.spec.full_name}"
+          end
+        H
+      end
+
+      bundle :install, :expect_err => true,
+        :requires => [lib_path('install_hooks.rb')]
+      expect(err).to eq("Ran pre-install hook: foo-1.0")
+    end
+
+    it "runs post-install hooks" do
+      build_git "foo"
+      gemfile <<-G
+        gem "foo", :git => "#{lib_path('foo-1.0')}"
+      G
+
+      File.open(lib_path("install_hooks.rb"), "w") do |h|
+        h.write <<-H
+          require 'rubygems'
+          Gem.post_install_hooks << lambda do |inst|
+            STDERR.puts "Ran post-install hook: \#{inst.spec.full_name}"
+          end
+        H
+      end
+
+      bundle :install, :expect_err => true,
+        :requires => [lib_path('install_hooks.rb')]
+      expect(err).to eq("Ran post-install hook: foo-1.0")
+    end
+
+    it "complains if the install hook fails" do
+      build_git "foo"
+      gemfile <<-G
+        gem "foo", :git => "#{lib_path('foo-1.0')}"
+      G
+
+      File.open(lib_path("install_hooks.rb"), "w") do |h|
+        h.write <<-H
+          require 'rubygems'
+          Gem.pre_install_hooks << lambda do |inst|
+            false
+          end
+        H
+      end
+
+      bundle :install, :expect_err => true,
+        :requires => [lib_path('install_hooks.rb')]
+      expect(out).to include("failed for foo-1.0")
+    end
+  end
+
 end

data/spec/install/upgrade_spec.rb

@@ -13,14 +13,14 @@ describe "bundle install for the first time with v1.0" do
   it "removes lockfiles in 0.9 YAML format" do
     File.open("Gemfile.lock", "w"){|f| YAML.dump({}, f) }
     bundle :install
-    File.read("Gemfile.lock").should_not =~ /^---/
+    expect(File.read("Gemfile.lock")).not_to match(/^---/)
   end
 
   it "removes env.rb if it exists" do
     bundled_app.join(".bundle").mkdir
     bundled_app.join(".bundle/environment.rb").open("w"){|f| f.write("raise 'nooo'") }
     bundle :install
-    bundled_app.join(".bundle/environment.rb").should_not exist
+    expect(bundled_app.join(".bundle/environment.rb")).not_to exist
   end
 
 end

data/spec/integration/inject.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+describe "bundle inject" do
+  before :each do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem "rack"
+    G
+  end
+
+  context "without a lockfile" do
+    it "locks with the injected gems" do
+      expect(bundled_app("Gemfile.lock")).not_to exist
+      bundle "inject 'rack-obama' '> 0'"
+      expect(bundled_app("Gemfile.lock").read).to match(/rack-obama/)
+    end
+  end
+
+  context "with a lockfile" do
+    before do
+      bundle "install"
+    end
+
+    it "adds the injected gems to the gemfile" do
+      expect(bundled_app("Gemfile").read).not_to match(/rack-obama/)
+      bundle "inject 'rack-obama' '> 0'"
+      expect(bundled_app("Gemfile").read).to match(/rack-obama/)
+    end
+
+    it "locks with the injected gems" do
+      expect(bundled_app("Gemfile.lock").read).not_to match(/rack-obama/)
+      bundle "inject 'rack-obama' '> 0'"
+      expect(bundled_app("Gemfile.lock").read).to match(/rack-obama/)
+    end
+  end
+
+  context "with injected gems already in the Gemfile" do
+    it "doesn't add existing gems" do
+      bundle "inject 'rack' '> 0'"
+      expect(out).to match(/cannot specify the same gem twice/i)
+    end
+  end
+
+  context "when frozen" do
+    before do
+      bundle "install"
+      bundle "config --local frozen 1"
+    end
+
+    it "injects anyway" do
+      bundle "inject 'rack-obama' '> 0'"
+      expect(bundled_app("Gemfile").read).to match(/rack-obama/)
+    end
+
+    it "locks with the injected gems" do
+      expect(bundled_app("Gemfile.lock").read).not_to match(/rack-obama/)
+      bundle "inject 'rack-obama' '> 0'"
+      expect(bundled_app("Gemfile.lock").read).to match(/rack-obama/)
+    end
+
+    it "restores frozen afterwards" do
+      bundle "inject 'rack-obama' '> 0'"
+      config = YAML.load(bundled_app(".bundle/config").read)
+      expect(config["BUNDLE_FROZEN"]).to eq("1")
+    end
+
+    it "doesn't allow Gemfile changes" do
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack-obama"
+      G
+      bundle "inject 'rack' '> 0'"
+      expect(out).to match(/trying to install in deployment mode after changing/)
+
+      expect(bundled_app("Gemfile.lock").read).not_to match(/rack-obama/)
+    end
+  end
+end

data/spec/lock/git_spec.rb

@@ -22,14 +22,14 @@ describe "bundle lock with git gems" do
       puts "WIN" unless defined?(FOO_PREV_REF)
     RUBY
 
-    out.should == "WIN"
+    expect(out).to eq("WIN")
   end
 
   it "provides correct #full_gem_path" do
     run <<-RUBY
       puts Bundler.rubygems.find_name('foo').first.full_gem_path
     RUBY
-    out.should == bundle("show foo")
+    expect(out).to eq(bundle("show foo"))
   end
 
 end

data/spec/lock/lockfile_spec.rb

@@ -633,8 +633,8 @@ describe "the lockfile format" do
       gem "rack", "1.1"
     G
 
-    bundled_app("Gemfile.lock").should_not exist
-    out.should include "rack (= 1.0) and rack (= 1.1)"
+    expect(bundled_app("Gemfile.lock")).not_to exist
+    expect(out).to include "rack (= 1.0) and rack (= 1.1)"
   end
 
 
@@ -645,8 +645,8 @@ describe "the lockfile format" do
       gem "rack", :git => "git://hubz.com"
     G
 
-    bundled_app("Gemfile.lock").should_not exist
-    out.should include "rack (>= 0) should come from an unspecified source and git://hubz.com (at master)"
+    expect(bundled_app("Gemfile.lock")).not_to exist
+    expect(out).to include "rack (>= 0) should come from an unspecified source and git://hubz.com (at master)"
   end
 
   it "works correctly with multiple version dependencies" do
@@ -720,7 +720,7 @@ describe "the lockfile format" do
     should_be_installed "omg 1.0"
 
     # Confirm that duplicate specs do not appear
-    File.read(bundled_app('Gemfile.lock')).should == strip_whitespace(<<-L)
+    expect(File.read(bundled_app('Gemfile.lock'))).to eq(strip_whitespace(<<-L))
       GIT
         remote: #{lib_path('omg')}
         revision: #{revision}
@@ -755,7 +755,7 @@ describe "the lockfile format" do
     end
 
     it "generates Gemfile.lock with \\n line endings" do
-      File.read(bundled_app("Gemfile.lock")).should_not match("\r\n")
+      expect(File.read(bundled_app("Gemfile.lock"))).not_to match("\r\n")
       should_be_installed "rack 1.0"
     end
 
@@ -764,8 +764,8 @@ describe "the lockfile format" 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")
+        expect { bundle "update" }.to change { File.mtime(bundled_app('Gemfile.lock')) }
+        expect(File.read(bundled_app("Gemfile.lock"))).not_to match("\r\n")
         should_be_installed "rack 1.2"
       end
 
@@ -775,8 +775,8 @@ describe "the lockfile format" do
         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")
+        expect { bundle "update" }.to change { File.mtime(bundled_app('Gemfile.lock')) }
+        expect(File.read(bundled_app("Gemfile.lock"))).to match("\r\n")
         should_be_installed "rack 1.2"
       end
     end
@@ -784,12 +784,12 @@ describe "the lockfile format" do
     context "when nothing changes" do
 
       it "preserves Gemfile.lock \\n line endings" do
-        lambda { ruby <<-RUBY
+        expect { ruby <<-RUBY
                    require 'rubygems'
                    require 'bundler'
                    Bundler.setup
                  RUBY
-               }.should_not change { File.mtime(bundled_app('Gemfile.lock')) }
+               }.not_to change { File.mtime(bundled_app('Gemfile.lock')) }
       end
 
       it "preserves Gemfile.lock \\n\\r line endings" do
@@ -797,12 +797,12 @@ describe "the lockfile format" do
         File.open(bundled_app("Gemfile.lock"), "wb"){|f| f.puts(win_lock) }
         set_lockfile_mtime_to_known_value
 
-        lambda { ruby <<-RUBY
+        expect { ruby <<-RUBY
                    require 'rubygems'
                    require 'bundler'
                    Bundler.setup
                  RUBY
-               }.should_not change { File.mtime(bundled_app('Gemfile.lock')) }
+               }.not_to change { File.mtime(bundled_app('Gemfile.lock')) }
       end
     end
   end

data/spec/other/check_spec.rb

@@ -8,8 +8,8 @@ describe "bundle check" do
     G
 
     bundle :check, :exitstatus => true
-    @exitstatus.should eq(0)
-    out.should == "The Gemfile's dependencies are satisfied"
+    expect(@exitstatus).to eq(0)
+    expect(out).to eq("The Gemfile's dependencies are satisfied")
   end
 
   it "works with the --gemfile flag when not in the directory" do
@@ -20,7 +20,7 @@ describe "bundle check" do
 
     Dir.chdir tmp
     bundle "check --gemfile bundled_app/Gemfile"
-    out.should == "The Gemfile's dependencies are satisfied"
+    expect(out).to eq("The Gemfile's dependencies are satisfied")
   end
 
   it "creates a Gemfile.lock by default if one did not exist" do
@@ -33,7 +33,7 @@ describe "bundle check" do
 
     bundle "check"
 
-    bundled_app("Gemfile.lock").should exist
+    expect(bundled_app("Gemfile.lock")).to exist
   end
 
   it "does not create a Gemfile.lock if --dry-run was passed" do
@@ -46,7 +46,7 @@ describe "bundle check" do
 
     bundle "check --dry-run"
 
-    bundled_app("Gemfile.lock").should_not exist
+    expect(bundled_app("Gemfile.lock")).not_to exist
   end
 
   it "prints a generic error if the missing gems are unresolvable" do
@@ -58,7 +58,7 @@ describe "bundle check" do
     G
 
     bundle :check
-    out.should include("Your Gemfile's dependencies could not be satisfied")
+    expect(out).to include("Your Gemfile's dependencies could not be satisfied")
   end
 
   it "prints a generic error if a Gemfile.lock does not exist and a toplevel dependency does not exist" do
@@ -68,8 +68,8 @@ describe "bundle check" do
     G
 
     bundle :check, :exitstatus => true
-    @exitstatus.should be > 0
-    out.should include("could not be satisfied")
+    expect(@exitstatus).to be > 0
+    expect(out).to include("could not be satisfied")
   end
 
   it "prints a generic message if you changed your lockfile" do
@@ -89,7 +89,7 @@ describe "bundle check" do
     G
 
     bundle :check
-    out.should include("Your Gemfile's dependencies could not be satisfied")
+    expect(out).to include("Your Gemfile's dependencies could not be satisfied")
   end
 
   it "remembers --without option from install" do
@@ -102,8 +102,8 @@ describe "bundle check" do
 
     bundle "install --without foo"
     bundle "check", :exitstatus => true
-    @exitstatus.should eq(0)
-    out.should include("The Gemfile's dependencies are satisfied")
+    expect(@exitstatus).to eq(0)
+    expect(out).to include("The Gemfile's dependencies are satisfied")
   end
 
   it "ensures that gems are actually installed and not just cached" do
@@ -120,8 +120,8 @@ describe "bundle check" do
     G
 
     bundle "check", :exitstatus => true
-    out.should include("* rack (1.0.0)")
-    @exitstatus.should == 1
+    expect(out).to include("* rack (1.0.0)")
+    expect(@exitstatus).to eq(1)
   end
 
   it "ignores missing gems restricted to other platforms" do
@@ -152,7 +152,7 @@ describe "bundle check" do
     G
 
     bundle :check
-    out.should == "The Gemfile's dependencies are satisfied"
+    expect(out).to eq("The Gemfile's dependencies are satisfied")
   end
 
   it "works with env conditionals" do
@@ -183,19 +183,19 @@ describe "bundle check" do
     G
 
     bundle :check
-    out.should == "The Gemfile's dependencies are satisfied"
+    expect(out).to eq("The Gemfile's dependencies are satisfied")
   end
 
   it "outputs an error when the default Gemfile is not found" do
     bundle :check, :exitstatus => true
-    @exitstatus.should eq(10)
-    out.should include("Could not locate Gemfile")
+    expect(@exitstatus).to eq(10)
+    expect(out).to include("Could not locate Gemfile")
   end
 
   it "does not output fatal error message" do
     bundle :check, :exitstatus => true
-    @exitstatus.should eq(10)
-    out.should_not include("Unfortunately, a fatal error has occurred. ")
+    expect(@exitstatus).to eq(10)
+    expect(out).not_to include("Unfortunately, a fatal error has occurred. ")
   end
 
   it "should not crash when called multiple times on a new machine" do
@@ -209,8 +209,8 @@ describe "bundle check" do
     last_out = out
     3.times do |i|
       bundle :check
-      out.should eq(last_out)
-      err.should be_empty
+      expect(out).to eq(last_out)
+      expect(err).to be_empty
     end
   end
 
@@ -225,7 +225,7 @@ describe "bundle check" do
     FileUtils.rm(bundled_app("Gemfile.lock"))
 
     bundle :check, :exitstatus => true
-    exitstatus.should_not eq(0)
+    expect(exitstatus).not_to eq(0)
   end
 
   context "--path" do
@@ -241,14 +241,14 @@ describe "bundle check" do
 
     it "returns success" do
       bundle "check --path vendor/bundle", :exitstatus => true
-      @exitstatus.should eq(0)
-      out.should == "The Gemfile's dependencies are satisfied"
+      expect(@exitstatus).to eq(0)
+      expect(out).to eq("The Gemfile's dependencies are satisfied")
     end
 
     it "should write to .bundle/config" do
       bundle "check --path vendor/bundle", :exitstatus => true
       bundle "check", :exitstatus => true
-      @exitstatus.should eq(0)
+      expect(@exitstatus).to eq(0)
     end
   end
 
@@ -264,15 +264,15 @@ describe "bundle check" do
     it "returns success when the Gemfile is satisfied" do
       bundle :install
       bundle :check, :exitstatus => true
-      @exitstatus.should eq(0)
-      out.should == "The Gemfile's dependencies are satisfied"
+      expect(@exitstatus).to eq(0)
+      expect(out).to eq("The Gemfile's dependencies are satisfied")
     end
 
     it "shows what is missing with the current Gemfile if it is not satisfied" do
       simulate_new_machine
       bundle :check
-      out.should match(/The following gems are missing/)
-      out.should include("* rack (1.0")
+      expect(out).to match(/The following gems are missing/)
+      expect(out).to include("* rack (1.0")
     end
   end
 end