bundler 1.2.5 → 1.3.0.pre

data/spec/install/gems/standalone_spec.rb

@@ -14,7 +14,7 @@ describe "bundle install --standalone" do
     end
 
     it "generates a bundle/bundler/setup.rb" do
-      bundled_app("bundle/bundler/setup.rb").should exist
+      expect(bundled_app("bundle/bundler/setup.rb")).to exist
     end
 
     it "makes the gems available without bundler" do
@@ -26,7 +26,7 @@ describe "bundle install --standalone" do
         puts ACTIONPACK
       RUBY
 
-      out.should be == "2.3.2"
+      expect(out).to eq("2.3.2")
     end
 
     it "works on a different system" do
@@ -41,7 +41,7 @@ describe "bundle install --standalone" do
         puts ACTIONPACK
       RUBY
 
-      out.should be == "2.3.2"
+      expect(out).to eq("2.3.2")
     end
   end
 
@@ -61,7 +61,7 @@ describe "bundle install --standalone" do
     end
 
     it "generates a bundle/bundler/setup.rb" do
-      bundled_app("bundle/bundler/setup.rb").should exist
+      expect(bundled_app("bundle/bundler/setup.rb")).to exist
     end
 
     it "makes the gems available without bundler" do
@@ -75,7 +75,7 @@ describe "bundle install --standalone" do
         puts ACTIONPACK
       RUBY
 
-      out.should be == "1.0\n2.3.2"
+      expect(out).to eq("1.0\n2.3.2")
     end
   end
 
@@ -107,7 +107,7 @@ describe "bundle install --standalone" do
         puts RACK_TEST
       RUBY
 
-      out.should be == "2.3.2\n1.2.7\n1.0"
+      expect(out).to eq("2.3.2\n1.2.7\n1.0")
     end
 
     it "allows creating a standalone file with limited groups" do
@@ -122,8 +122,8 @@ describe "bundle install --standalone" do
         require "spec"
       RUBY
 
-      out.should be == "2.3.2"
-      err.should == "ZOMG LOAD ERROR"
+      expect(out).to eq("2.3.2")
+      expect(err).to eq("ZOMG LOAD ERROR")
     end
 
     it "allows --without to limit the groups used in a standalone" do
@@ -138,8 +138,8 @@ describe "bundle install --standalone" do
         require "spec"
       RUBY
 
-      out.should be == "2.3.2"
-      err.should == "ZOMG LOAD ERROR"
+      expect(out).to eq("2.3.2")
+      expect(err).to eq("ZOMG LOAD ERROR")
     end
 
     it "allows --path to change the location of the standalone bundle" do
@@ -153,7 +153,7 @@ describe "bundle install --standalone" do
         puts ACTIONPACK
       RUBY
 
-      out.should == "2.3.2"
+      expect(out).to eq("2.3.2")
     end
 
     it "allows remembered --without to limit the groups used in a standalone" do
@@ -169,8 +169,8 @@ describe "bundle install --standalone" do
         require "spec"
       RUBY
 
-      out.should be == "2.3.2"
-      err.should == "ZOMG LOAD ERROR"
+      expect(out).to eq("2.3.2")
+      expect(err).to eq("ZOMG LOAD ERROR")
     end
   end
 
@@ -188,7 +188,7 @@ describe "bundle install --standalone" do
       it "should run without errors" do
         bundle "install --standalone", :artifice => "endpoint", :exitstatus => true
 
-        @exitstatus.should be == 0
+        expect(@exitstatus).to eq(0)
       end
 
       it "still makes the gems available to normal bundler" do
@@ -200,7 +200,7 @@ describe "bundle install --standalone" do
       it "generates a bundle/bundler/setup.rb" do
         bundle "install --standalone", :artifice => "endpoint"
 
-        bundled_app("bundle/bundler/setup.rb").should exist
+        expect(bundled_app("bundle/bundler/setup.rb")).to exist
       end
 
       it "makes the gems available without bundler" do
@@ -214,7 +214,7 @@ describe "bundle install --standalone" do
           puts ACTIONPACK
         RUBY
 
-        out.should be == "2.3.2"
+        expect(out).to eq("2.3.2")
       end
 
       it "works on a different system" do
@@ -231,7 +231,7 @@ describe "bundle install --standalone" do
           puts ACTIONPACK
         RUBY
 
-        out.should be == "2.3.2"
+        expect(out).to eq("2.3.2")
       end
     end
   end
@@ -246,14 +246,14 @@ describe "bundle install --standalone" do
 
     it "creates stubs that use the standalone load path" do
       Dir.chdir(bundled_app) do
-        `bin/rails -v`.chomp.should eql "2.3.2"
+        expect(`bin/rails -v`.chomp).to eql "2.3.2"
       end
     end
 
     it "creates stubs that can be executed from anywhere" do
       require 'tmpdir'
       Dir.chdir(Dir.tmpdir) do
-        `#{bundled_app}/bin/rails -v`.chomp.should eql "2.3.2"
+        expect(`#{bundled_app}/bin/rails -v`.chomp).to eql "2.3.2"
       end
     end
   end

data/spec/install/gems/sudo_spec.rb

@@ -13,11 +13,22 @@ describe "when using sudo", :sudo => true do
         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)
+      expect(system_gem_path("gems/rack-1.0.0")).to exist
+      expect(system_gem_path("gems/rack-1.0.0").stat.uid).to eq(0)
       should_be_installed "rack 1.0"
     end
 
+    it "installs rake and a gem dependent on rake in the same session" do
+        gemfile <<-G
+            source "file://#{gem_repo1}"
+            gem "rake"
+            gem "another_implicit_rake_dep"
+          G
+         bundle "install"
+         expect(system_gem_path("gems/another_implicit_rake_dep-1.0")).to exist
+    end
+
+
     it "installs when BUNDLE_PATH is owned by root" do
       bundle_path = tmp("owned_by_root")
       FileUtils.mkdir_p bundle_path
@@ -29,8 +40,8 @@ describe "when using sudo", :sudo => true do
         gem "rack", '1.0'
       G
 
-      bundle_path.join("gems/rack-1.0.0").should exist
-      bundle_path.join("gems/rack-1.0.0").stat.uid.should eq(0)
+      expect(bundle_path.join("gems/rack-1.0.0")).to exist
+      expect(bundle_path.join("gems/rack-1.0.0").stat.uid).to eq(0)
       should_be_installed "rack 1.0"
     end
 
@@ -45,25 +56,29 @@ describe "when using sudo", :sudo => true do
         gem "rack", '1.0'
       G
 
-      default_bundle_path("gems/rack-1.0.0").should exist
+      expect(default_bundle_path("gems/rack-1.0.0")).to exist
       should_be_installed "rack 1.0"
     end
   end
 
-  describe "and GEM_HOME is not writable" do
+  describe "and BUNDLE_PATH is not writable" do
     it "installs" do
-      gem_home = tmp('sudo_gem_home')
-      sudo "mkdir -p #{gem_home}"
-      sudo "chmod ugo-w #{gem_home}"
+      begin
+        gem_home = tmp('sudo_gem_home')
 
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", '1.0'
-      G
+        sudo "mkdir -p #{gem_home}"
+        sudo "chmod ugo-w #{gem_home}"
+        ENV['GEM_HOME'] = gem_home.to_s
+        ENV['GEM_PATH'] = nil
+
+        install_gemfile <<-G
+          source "file://#{gem_repo1}"
+          gem "rack", '1.0'
+        G
 
-      bundle :install, :env => {'GEM_HOME' => gem_home.to_s, 'GEM_PATH' => nil}
-      gem_home.join('bin/rackup').should exist
-      should_be_installed "rack 1.0", :env => {'GEM_HOME' => gem_home.to_s, 'GEM_PATH' => nil}
+        expect(gem_home.join('bin/rackup')).to exist
+        should_be_installed "rack 1.0"
+      end
     end
   end
 

data/spec/install/gems/win32_spec.rb

@@ -21,6 +21,6 @@ describe "bundle install with win32-generated lockfile" do
 
       gem "rack"
     G
-    @exitstatus.should == 0
+    expect(@exitstatus).to eq(0)
   end
 end

data/spec/install/gemspec_spec.rb

@@ -62,7 +62,7 @@ describe "bundle install from an existing gemspec" do
       source "file://#{gem_repo2}"
       gemspec :path => '#{tmp.join("foo")}'
     G
-    error.should match(/There are no gemspecs at #{tmp.join('foo')}/)
+    expect(error).to match(/There are no gemspecs at #{tmp.join('foo')}/)
   end
 
   it "should raise if there are too many gemspecs available" do
@@ -74,7 +74,7 @@ describe "bundle install from an existing gemspec" do
       source "file://#{gem_repo2}"
       gemspec :path => '#{tmp.join("foo")}'
     G
-    error.should match(/There are multiple gemspecs at #{tmp.join('foo')}/)
+    expect(error).to match(/There are multiple gemspecs at #{tmp.join('foo')}/)
   end
 
   it "should pick a specific gemspec" do
@@ -125,9 +125,9 @@ describe "bundle install from an existing gemspec" do
       # 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/)
+      expect(output).not_to match(/You have added to the Gemfile/)
+      expect(output).not_to match(/You have deleted from the Gemfile/)
+      expect(output).not_to match(/install in deployment mode after changing/)
     end
   end
 
@@ -140,7 +140,7 @@ describe "bundle install from an existing gemspec" do
     install_gemfile <<-G, :expect_err => true
       gemspec :path => '#{tmp.join("foo")}'
     G
-    @err.should_not match(/ahh/)
+    expect(@err).not_to match(/ahh/)
   end
 
   context "when child gemspecs conflict with a released gemspec" do

data/spec/install/git_spec.rb

@@ -23,11 +23,11 @@ describe "bundle install with git sources" do
         puts "WIN" unless defined?(FOO_PREV_REF)
       RUBY
 
-      out.should == "WIN"
+      expect(out).to eq("WIN")
     end
 
     it "caches the git repo" do
-      Dir["#{default_bundle_path}/cache/bundler/git/foo-1.0-*"].should have(1).item
+      expect(Dir["#{default_bundle_path}/cache/bundler/git/foo-1.0-*"]).to have(1).item
     end
 
     it "does not update the git source implicitly" do
@@ -47,14 +47,14 @@ describe "bundle install with git sources" do
           puts "fail" if defined?(FOO_PREV_REF)
         RUBY
 
-        out.should be_empty
+        expect(out).to be_empty
       end
     end
 
     it "setups executables" do
       pending_jruby_shebang_fix
       bundle "exec foobar"
-      out.should == "1.0"
+      expect(out).to eq("1.0")
     end
 
     it "complains if pinned specs don't exist in the git repo" do
@@ -64,7 +64,7 @@ describe "bundle install with git sources" do
         gem "foo", "1.1", :git => "#{lib_path('foo-1.0')}"
       G
 
-      out.should include("Source contains 'foo' at: 1.0")
+      expect(out).to include("Source contains 'foo' at: 1.0")
     end
 
     it "still works after moving the application directory" do
@@ -136,7 +136,7 @@ describe "bundle install with git sources" do
         puts "WIN" unless defined?(FOO_PREV_REF)
       RUBY
 
-      out.should == "WIN"
+      expect(out).to eq("WIN")
     end
 
     it "works when the revision is a symbol" do
@@ -145,14 +145,14 @@ describe "bundle install with git sources" do
           gem "foo"
         end
       G
-      err.should eq("")
+      expect(err).to eq("")
 
       run <<-RUBY
         require 'foo'
         puts "WIN" unless defined?(FOO_PREV_REF)
       RUBY
 
-      out.should == "WIN"
+      expect(out).to eq("WIN")
     end
   end
 
@@ -172,10 +172,10 @@ describe "bundle install with git sources" do
 
       bundle %|config local.rack #{lib_path('local-rack')}|
       bundle :install
-      out.should =~ /at #{lib_path('local-rack')}/
+      expect(out).to match(/at #{lib_path('local-rack')}/)
 
       run "require 'rack'"
-      out.should == "LOCAL"
+      expect(out).to eq("LOCAL")
     end
 
     it "chooses the local repository on runtime" do
@@ -194,7 +194,7 @@ describe "bundle install with git sources" do
 
       bundle %|config local.rack #{lib_path('local-rack')}|
       run "require 'rack'"
-      out.should == "LOCAL"
+      expect(out).to eq("LOCAL")
     end
 
     it "updates specs on runtime" do
@@ -218,7 +218,7 @@ describe "bundle install with git sources" do
       run "require 'rack'"
 
       lockfile1 = File.read(bundled_app("Gemfile.lock"))
-      lockfile1.should_not == lockfile0
+      expect(lockfile1).not_to eq(lockfile0)
     end
 
     it "updates ref on install" do
@@ -238,7 +238,7 @@ describe "bundle install with git sources" do
       bundle :install
 
       lockfile1 = File.read(bundled_app("Gemfile.lock"))
-      lockfile1.should_not == lockfile0
+      expect(lockfile1).not_to eq(lockfile0)
     end
 
     it "explodes if given path does not exist on install" do
@@ -251,7 +251,7 @@ describe "bundle install with git sources" do
 
       bundle %|config local.rack #{lib_path('local-rack')}|
       bundle :install
-      out.should =~ /Cannot use local override for rack-0.8 because #{Regexp.escape(lib_path('local-rack').to_s)} does not exist/
+      expect(out).to match(/Cannot use local override for rack-0.8 because #{Regexp.escape(lib_path('local-rack').to_s)} does not exist/)
     end
 
     it "explodes if branch is not given on install" do
@@ -265,7 +265,7 @@ describe "bundle install with git sources" do
 
       bundle %|config local.rack #{lib_path('local-rack')}|
       bundle :install
-      out.should =~ /cannot use local override/i
+      expect(out).to match(/cannot use local override/i)
     end
 
     it "does not explode if disable_local_branch_check is given" do
@@ -280,7 +280,7 @@ describe "bundle install with git sources" do
       bundle %|config local.rack #{lib_path('local-rack')}|
       bundle %|config disable_local_branch_check true|
       bundle :install
-      out.should =~ /Your bundle is complete!/
+      expect(out).to match(/Your bundle is complete!/)
     end
 
     it "explodes on different branches on install" do
@@ -299,7 +299,7 @@ describe "bundle install with git sources" do
 
       bundle %|config local.rack #{lib_path('local-rack')}|
       bundle :install
-      out.should =~ /is using branch another but Gemfile specifies master/
+      expect(out).to match(/is using branch another but Gemfile specifies master/)
     end
 
     it "explodes on invalid revision on install" do
@@ -316,7 +316,7 @@ describe "bundle install with git sources" do
 
       bundle %|config local.rack #{lib_path('local-rack')}|
       bundle :install
-      out.should =~ /The Gemfile lock is pointing to revision \w+/
+      expect(out).to match(/The Gemfile lock is pointing to revision \w+/)
     end
   end
 
@@ -365,7 +365,7 @@ describe "bundle install with git sources" do
       G
 
       run "require 'rack'"
-      out.should == 'WIN OVERRIDE'
+      expect(out).to eq('WIN OVERRIDE')
     end
 
     it "correctly unlocks when changing to a git source" do
@@ -431,7 +431,7 @@ describe "bundle install with git sources" do
       puts "WIN" unless defined?(FOO_PREV_REF)
     RUBY
 
-    out.should == "WIN"
+    expect(out).to eq("WIN")
   end
 
   it "correctly handles cases with invalid gemspecs" do
@@ -512,9 +512,9 @@ describe "bundle install with git sources" do
 
     bundle :install, :expect_err => true
 
-    out.should include("Git error:")
-    err.should include("fatal")
-    err.should include("omgomg")
+    expect(out).to include("Git error:")
+    expect(err).to include("fatal")
+    expect(err).to include("omgomg")
   end
 
   it "works when the gem path has spaces in it" do
@@ -567,7 +567,7 @@ describe "bundle install with git sources" do
         gem "has_submodule"
       end
     G
-    out.should =~ /could not find gem 'submodule/i
+    expect(out).to match(/could not find gem 'submodule/i)
 
     should_not_be_installed "has_submodule 1.0", :expect_err => true
   end
@@ -614,7 +614,7 @@ describe "bundle install with git sources" do
       puts "WIN" if FOO_PREV_REF == '#{git.ref_for("HEAD^^")}'
     RUBY
 
-    out.should == "WIN"
+    expect(out).to eq("WIN")
   end
 
   it "does not to a remote fetch if the revision is cached locally" do
@@ -627,7 +627,7 @@ describe "bundle install with git sources" do
     FileUtils.rm_rf(lib_path('foo-1.0'))
 
     bundle "install"
-    out.should_not =~ /updating/i
+    expect(out).not_to match(/updating/i)
   end
 
   it "doesn't blow up if bundle install is run twice in a row" do
@@ -639,7 +639,7 @@ describe "bundle install with git sources" do
 
     bundle "install"
     bundle "install", :exitstatus => true
-    exitstatus.should == 0
+    expect(exitstatus).to eq(0)
   end
 
   it "does not duplicate git gem sources" do
@@ -655,7 +655,7 @@ describe "bundle install with git sources" do
     G
 
     bundle "install"
-    File.read(bundled_app("Gemfile.lock")).scan('GIT').size.should == 1
+    expect(File.read(bundled_app("Gemfile.lock")).scan('GIT').size).to eq(1)
   end
 
   describe "switching sources" do
@@ -699,7 +699,7 @@ describe "bundle install with git sources" do
       G
 
       run "require 'new_file'"
-      out.should == "USING GIT"
+      expect(out).to eq("USING GIT")
     end
   end
 
@@ -727,7 +727,7 @@ describe "bundle install with git sources" do
         puts VALIM_PREV_REF
       R
 
-      out.should == old_revision
+      expect(out).to eq(old_revision)
     end
   end
 
@@ -743,7 +743,7 @@ describe "bundle install with git sources" do
       simulate_new_machine
 
       bundle "install --deployment", :exitstatus => true
-      exitstatus.should == 0
+      expect(exitstatus).to eq(0)
     end
   end
 
@@ -765,7 +765,7 @@ describe "bundle install with git sources" do
 
       bundle :install, :expect_err => true,
         :requires => [lib_path('install_hooks.rb')]
-      err.should == "Ran pre-install hook: foo-1.0"
+      expect(err).to eq("Ran pre-install hook: foo-1.0")
     end
 
     it "runs post-install hooks" do
@@ -785,7 +785,7 @@ describe "bundle install with git sources" do
 
       bundle :install, :expect_err => true,
         :requires => [lib_path('install_hooks.rb')]
-      err.should == "Ran post-install hook: foo-1.0"
+      expect(err).to eq("Ran post-install hook: foo-1.0")
     end
 
     it "complains if the install hook fails" do
@@ -805,7 +805,7 @@ describe "bundle install with git sources" do
 
       bundle :install, :expect_err => true,
         :requires => [lib_path('install_hooks.rb')]
-      out.should include("failed for foo-1.0")
+      expect(out).to include("failed for foo-1.0")
     end
   end
 end