bundler 1.2.5 → 1.3.0.pre

data/spec/other/clean_spec.rb

@@ -3,17 +3,17 @@ require "spec_helper"
 describe "bundle clean" do
   def should_have_gems(*gems)
     gems.each do |g|
-      vendored_gems("gems/#{g}").should exist
-      vendored_gems("specifications/#{g}.gemspec").should exist
-      vendored_gems("cache/#{g}.gem").should exist
+      expect(vendored_gems("gems/#{g}")).to exist
+      expect(vendored_gems("specifications/#{g}.gemspec")).to exist
+      expect(vendored_gems("cache/#{g}.gem")).to exist
     end
   end
 
   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
+      expect(vendored_gems("gems/#{g}")).not_to exist
+      expect(vendored_gems("specifications/#{g}.gemspec")).not_to exist
+      expect(vendored_gems("cache/#{g}.gem")).not_to exist
     end
   end
 
@@ -36,12 +36,12 @@ describe "bundle clean" do
 
     bundle :clean
 
-    out.should eq("Removing foo (1.0)")
+    expect(out).to eq("Removing foo (1.0)")
 
     should_have_gems 'thin-1.0', 'rack-1.0.0'
     should_not_have_gems 'foo-1.0'
 
-    vendored_gems("bin/rackup").should exist
+    expect(vendored_gems("bin/rackup")).to exist
   end
 
   it "removes old version of gem if unused" do
@@ -64,12 +64,12 @@ describe "bundle clean" do
 
     bundle :clean
 
-    out.should eq("Removing rack (0.9.1)")
+    expect(out).to eq("Removing rack (0.9.1)")
 
     should_have_gems 'foo-1.0', 'rack-1.0.0'
     should_not_have_gems 'rack-0.9.1'
 
-    vendored_gems("bin/rackup").should exist
+    expect(vendored_gems("bin/rackup")).to exist
   end
 
   it "removes new version of gem if unused" do
@@ -92,12 +92,12 @@ describe "bundle clean" do
 
     bundle :clean
 
-    out.should eq("Removing rack (1.0.0)")
+    expect(out).to eq("Removing rack (1.0.0)")
 
     should_have_gems 'foo-1.0', 'rack-0.9.1'
     should_not_have_gems 'rack-1.0.0'
 
-    vendored_gems("bin/rackup").should exist
+    expect(vendored_gems("bin/rackup")).to exist
   end
 
   it "remove gems in bundle without groups" do
@@ -115,12 +115,12 @@ describe "bundle clean" do
     bundle "install --without test_group"
     bundle :clean
 
-    out.should eq("Removing rack (1.0.0)")
+    expect(out).to eq("Removing rack (1.0.0)")
 
     should_have_gems 'foo-1.0'
     should_not_have_gems 'rack-1.0.0'
 
-    vendored_gems("bin/rackup").should_not exist
+    expect(vendored_gems("bin/rackup")).to_not exist
   end
 
   it "does not remove cached git dir if it's being used" do
@@ -142,7 +142,7 @@ describe "bundle clean" do
     bundle :clean
 
     digest = Digest::SHA1.hexdigest(git_path.to_s)
-    vendored_gems("cache/bundler/git/foo-1.0-#{digest}").should exist
+    expect(vendored_gems("cache/bundler/git/foo-1.0-#{digest}")).to exist
   end
 
   it "removes unused git gems" do
@@ -170,16 +170,16 @@ describe "bundle clean" do
 
     bundle :clean
 
-    out.should eq("Removing foo (#{revision[0..11]})")
+    expect(out).to eq("Removing foo (#{revision[0..11]})")
 
-    vendored_gems("gems/rack-1.0.0").should exist
-    vendored_gems("bundler/gems/foo-#{revision[0..11]}").should_not exist
+    expect(vendored_gems("gems/rack-1.0.0")).to exist
+    expect(vendored_gems("bundler/gems/foo-#{revision[0..11]}")).not_to exist
     digest = Digest::SHA1.hexdigest(git_path.to_s)
-    vendored_gems("cache/bundler/git/foo-#{digest}").should_not exist
+    expect(vendored_gems("cache/bundler/git/foo-#{digest}")).not_to exist
 
-    vendored_gems("specifications/rack-1.0.0.gemspec").should exist
+    expect(vendored_gems("specifications/rack-1.0.0.gemspec")).to exist
 
-    vendored_gems("bin/rackup").should exist
+    expect(vendored_gems("bin/rackup")).to exist
   end
 
   it "removes old git gems" do
@@ -203,15 +203,15 @@ describe "bundle clean" do
     bundle "update"
     bundle :clean
 
-    out.should eq("Removing foo-bar (#{revision[0..11]})")
+    expect(out).to eq("Removing foo-bar (#{revision[0..11]})")
 
-    vendored_gems("gems/rack-1.0.0").should exist
-    vendored_gems("bundler/gems/foo-bar-#{revision[0..11]}").should_not exist
-    vendored_gems("bundler/gems/foo-bar-#{revision2[0..11]}").should exist
+    expect(vendored_gems("gems/rack-1.0.0")).to exist
+    expect(vendored_gems("bundler/gems/foo-bar-#{revision[0..11]}")).not_to exist
+    expect(vendored_gems("bundler/gems/foo-bar-#{revision2[0..11]}")).to exist
 
-    vendored_gems("specifications/rack-1.0.0.gemspec").should exist
+    expect(vendored_gems("specifications/rack-1.0.0.gemspec")).to exist
 
-    vendored_gems("bin/rackup").should exist
+    expect(vendored_gems("bin/rackup")).to exist
   end
 
   it "does not remove nested gems in a git repo" do
@@ -227,9 +227,9 @@ describe "bundle clean" do
 
     bundle "install --path vendor/bundle"
     bundle :clean
-    out.should eq("")
+    expect(out).to eq("")
 
-    vendored_gems("bundler/gems/rails-#{revision[0..11]}").should exist
+    expect(vendored_gems("bundler/gems/rails-#{revision[0..11]}")).to exist
   end
 
   it "does not remove git sources that are in without groups" do
@@ -251,10 +251,10 @@ describe "bundle clean" do
 
     bundle :clean
 
-    out.should eq("")
-    vendored_gems("bundler/gems/foo-#{revision[0..11]}").should exist
+    expect(out).to eq("")
+    expect(vendored_gems("bundler/gems/foo-#{revision[0..11]}")).to exist
     digest = Digest::SHA1.hexdigest(git_path.to_s)
-    vendored_gems("cache/bundler/git/foo-#{digest}").should_not exist
+    expect(vendored_gems("cache/bundler/git/foo-#{digest}")).to_not exist
   end
 
   it "does not blow up when using without groups" do
@@ -271,10 +271,9 @@ describe "bundle clean" do
     bundle "install --path vendor/bundle --without development"
 
     bundle :clean, :exitstatus => true
-    exitstatus.should == 0
+    expect(exitstatus).to eq(0)
   end
 
-
   it "displays an error when used without --path" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
@@ -284,8 +283,8 @@ describe "bundle clean" do
 
     bundle :clean, :exitstatus => true
 
-    exitstatus.should eq(1)
-    out.should == "Can only use bundle clean when --path is set or --force is set"
+    expect(exitstatus).to eq(1)
+    expect(out).to eq("Can only use bundle clean when --path is set or --force is set")
   end
 
   # handling bundle clean upgrade path from the pre's
@@ -315,7 +314,7 @@ describe "bundle clean" do
     should_not_have_gems 'thin-1.0', 'rack-1.0'
     should_have_gems 'foo-1.0'
 
-    vendored_gems("bin/rackup").should_not exist
+    expect(vendored_gems("bin/rackup")).not_to exist
   end
 
   it "does not call clean automatically when using system gems" do
@@ -335,8 +334,8 @@ describe "bundle clean" do
     bundle :install
 
     sys_exec "gem list"
-    out.should include("rack (1.0.0)")
-    out.should include("thin (1.0)")
+    expect(out).to include("rack (1.0.0)")
+    expect(out).to include("thin (1.0)")
   end
 
   it "--clean should override the bundle setting on install" do
@@ -432,7 +431,7 @@ describe "bundle clean" do
     bundle :update
 
     sys_exec "gem list"
-    out.should include("foo (1.0.1, 1.0)")
+    expect(out).to include("foo (1.0.1, 1.0)")
   end
 
   it "cleans system gems when --force is used" do
@@ -452,10 +451,10 @@ describe "bundle clean" do
     bundle :install
     bundle "clean --force"
 
-    out.should eq("Removing foo (1.0)")
+    expect(out).to eq("Removing foo (1.0)")
     sys_exec "gem list"
-    out.should_not include("foo (1.0)")
-    out.should include("rack (1.0.0)")
+    expect(out).not_to include("foo (1.0)")
+    expect(out).to include("rack (1.0.0)")
   end
 
   it "cleans git gems with a 7 length git revision" do
@@ -483,9 +482,9 @@ describe "bundle clean" do
 
     bundle :clean
 
-    out.should_not include("Removing foo (1.0 #{revision[0..6]})")
+    expect(out).not_to include("Removing foo (1.0 #{revision[0..6]})")
 
-    vendored_gems("bundler/gems/foo-1.0-#{revision[0..6]}").should exist
+    expect(vendored_gems("bundler/gems/foo-1.0-#{revision[0..6]}")).to exist
   end
 
   it "when using --force on system gems, it doesn't remove binaries" do
@@ -508,8 +507,8 @@ describe "bundle clean" do
 
     sys_status "foo"
 
-    exitstatus.should eq(0)
-    out.should eq("1.0")
+    expect(exitstatus).to eq(0)
+    expect(out).to eq("1.0")
   end
 
   it "doesn't blow up on path gems without a .gempsec" do
@@ -530,6 +529,6 @@ describe "bundle clean" do
     bundle "install --path vendor/bundle"
     bundle :clean, :exitstatus => true
 
-    exitstatus.should eq(0)
+    expect(exitstatus).to eq(0)
   end
 end

data/spec/other/config_spec.rb

@@ -13,8 +13,8 @@ describe ".bundle/config" do
       ENV['BUNDLE_APP_CONFIG'] = tmp('foo/bar').to_s
       bundle "install --path vendor/bundle"
 
-      bundled_app('.bundle').should_not exist
-      tmp('foo/bar/config').should exist
+      expect(bundled_app('.bundle')).not_to exist
+      expect(tmp('foo/bar/config')).to exist
       should_be_installed "rack 1.0.0"
     end
 
@@ -25,8 +25,8 @@ describe ".bundle/config" do
       ENV['BUNDLE_APP_CONFIG'] = "../foo"
       bundle "install --path vendor/bundle"
 
-      bundled_app(".bundle").should_not exist
-      bundled_app("../foo/config").should exist
+      expect(bundled_app(".bundle")).not_to exist
+      expect(bundled_app("../foo/config")).to exist
       should_be_installed "rack 1.0.0"
     end
 
@@ -36,7 +36,7 @@ describe ".bundle/config" do
       bundle "install"
       FileUtils.touch tmp('foo/bar/environment.rb')
       should_be_installed "rack 1.0.0"
-      tmp('foo/bar/environment.rb').should_not exist
+      expect(tmp('foo/bar/environment.rb')).not_to exist
     end
   end
 
@@ -46,23 +46,23 @@ describe ".bundle/config" do
     it "is the default" do
       bundle "config foo global"
       run "puts Bundler.settings[:foo]"
-      out.should == "global"
+      expect(out).to eq("global")
     end
 
     it "can also be set explicitly" do
       bundle "config --global foo global"
       run "puts Bundler.settings[:foo]"
-      out.should == "global"
+      expect(out).to eq("global")
     end
 
     it "has lower precedence than local" do
       bundle "config --local  foo local"
 
       bundle "config --global foo global"
-      out.should =~ /Your application has set foo to "local"/
+      expect(out).to match(/Your application has set foo to "local"/)
 
       run "puts Bundler.settings[:foo]"
-      out.should == "local"
+      expect(out).to eq("local")
     end
 
     it "has lower precedence than env" do
@@ -70,10 +70,10 @@ describe ".bundle/config" do
         ENV["BUNDLE_FOO"] = "env"
 
         bundle "config --global foo global"
-        out.should =~ /You have a bundler environment variable for foo set to "env"/
+        expect(out).to match(/You have a bundler environment variable for foo set to "env"/)
 
         run "puts Bundler.settings[:foo]"
-        out.should == "env"
+        expect(out).to eq("env")
       ensure
         ENV.delete("BUNDLE_FOO")
       end
@@ -84,16 +84,16 @@ describe ".bundle/config" do
       bundle "config --delete foo"
 
       run "puts Bundler.settings[:foo] == nil"
-      out.should == "true"
+      expect(out).to eq("true")
     end
 
     it "warns when overriding" do
       bundle "config --global foo previous"
       bundle "config --global foo global"
-      out.should =~ /You are replacing the current global value of foo/
+      expect(out).to match(/You are replacing the current global value of foo/)
 
       run "puts Bundler.settings[:foo]"
-      out.should == "global"
+      expect(out).to eq("global")
     end
   end
 
@@ -103,7 +103,7 @@ describe ".bundle/config" do
     it "can also be set explicitly" do
       bundle "config --local foo local"
       run "puts Bundler.settings[:foo]"
-      out.should == "local"
+      expect(out).to eq("local")
     end
 
     it "has higher precedence than env" do
@@ -112,7 +112,7 @@ describe ".bundle/config" do
         bundle "config --local foo local"
 
         run "puts Bundler.settings[:foo]"
-        out.should == "local"
+        expect(out).to eq("local")
       ensure
         ENV.delete("BUNDLE_FOO")
       end
@@ -123,16 +123,16 @@ describe ".bundle/config" do
       bundle "config --delete foo"
 
       run "puts Bundler.settings[:foo] == nil"
-      out.should == "true"
+      expect(out).to eq("true")
     end
 
     it "warns when overriding" do
       bundle "config --local foo previous"
       bundle "config --local foo local"
-      out.should =~ /You are replacing the current local value of foo/
+      expect(out).to match(/You are replacing the current local value of foo/)
 
       run "puts Bundler.settings[:foo]"
-      out.should == "local"
+      expect(out).to eq("local")
     end
   end
-end
+end

data/spec/other/console_spec.rb

@@ -15,7 +15,7 @@ describe "bundle console" do
       input.puts("puts RACK")
       input.puts("exit")
     end
-    out.should include("0.9.1")
+    expect(out).to include("0.9.1")
   end
 
   it "doesn't load any other groups" do
@@ -23,7 +23,7 @@ describe "bundle console" do
       input.puts("puts ACTIVESUPPORT")
       input.puts("exit")
     end
-    out.should include("NameError")
+    expect(out).to include("NameError")
   end
 
   describe "when given a group" do
@@ -32,7 +32,7 @@ describe "bundle console" do
         input.puts("puts ACTIVESUPPORT")
         input.puts("exit")
       end
-      out.should include("2.3.5")
+      expect(out).to include("2.3.5")
     end
 
     it "loads the default group" do
@@ -40,7 +40,7 @@ describe "bundle console" do
         input.puts("puts RACK")
         input.puts("exit")
       end
-      out.should include("0.9.1")
+      expect(out).to include("0.9.1")
     end
 
     it "doesn't load other groups" do
@@ -48,7 +48,7 @@ describe "bundle console" do
         input.puts("puts RACK_MIDDLEWARE")
         input.puts("exit")
       end
-      out.should include("NameError")
+      expect(out).to include("NameError")
     end
   end
 end

data/spec/other/exec_spec.rb

@@ -11,7 +11,7 @@ describe "bundle exec" do
     G
 
     bundle "exec rackup"
-    out.should == "0.9.1"
+    expect(out).to eq("0.9.1")
   end
 
   it "works when the bins are in ~/.bundle" do
@@ -20,7 +20,7 @@ describe "bundle exec" do
     G
 
     bundle "exec rackup"
-    out.should == "1.0.0"
+    expect(out).to eq("1.0.0")
   end
 
   it "works when running from a random directory" do
@@ -30,13 +30,37 @@ describe "bundle exec" do
 
     bundle "exec 'cd #{tmp('gems')} && rackup'"
 
-    out.should == "1.0.0"
+    expect(out).to eq("1.0.0")
   end
 
   it "works when exec'ing something else" do
     install_gemfile 'gem "rack"'
     bundle "exec echo exec"
-    out.should == "exec"
+    expect(out).to eq("exec")
+  end
+
+  it "accepts --verbose" do
+    install_gemfile 'gem "rack"'
+    bundle "exec --verbose echo foobar"
+    expect(out).to eq("foobar")
+  end
+
+  it "passes --verbose to command if it is given after the command" do
+    install_gemfile 'gem "rack"'
+    bundle "exec echo --verbose"
+    expect(out).to eq("--verbose")
+  end
+
+  it "can run a command named --verbose" do
+    install_gemfile 'gem "rack"'
+    File.open("--verbose", 'w') do |f|
+      f.puts "#!/bin/sh"
+      f.puts "echo foobar"
+    end
+    File.chmod(0744, "--verbose")
+    ENV['PATH'] = "."
+    bundle "exec -- --verbose"
+    expect(out).to eq("foobar")
   end
 
   it "handles different versions in different bundles" do
@@ -60,11 +84,11 @@ describe "bundle exec" do
 
     bundle "exec rackup"
 
-    out.should eq("0.9.1")
+    expect(out).to eq("0.9.1")
 
     Dir.chdir bundled_app2 do
       bundle "exec rackup"
-      out.should == "1.0.0"
+      expect(out).to eq("1.0.0")
     end
   end
 
@@ -80,7 +104,7 @@ describe "bundle exec" do
 
     bundle "exec rackup"
 
-    out.should eq("0.9.1")
+    expect(out).to eq("0.9.1")
     should_not_be_installed "rack_middleware 1.0"
   end
 
@@ -93,10 +117,10 @@ describe "bundle exec" do
     rubyopt = "-I#{bundler_path} -rbundler/setup #{rubyopt}"
 
     bundle "exec 'echo $RUBYOPT'"
-    out.should have_rubyopts(rubyopt)
+    expect(out).to have_rubyopts(rubyopt)
 
     bundle "exec 'echo $RUBYOPT'", :env => {"RUBYOPT" => rubyopt}
-    out.should have_rubyopts(rubyopt)
+    expect(out).to have_rubyopts(rubyopt)
   end
 
   it "errors nicely when the argument doesn't exist" do
@@ -105,9 +129,9 @@ describe "bundle exec" do
     G
 
     bundle "exec foobarbaz", :exitstatus => true
-    exitstatus.should eq(127)
-    out.should include("bundler: command not found: foobarbaz")
-    out.should include("Install missing gem executables with `bundle install`")
+    expect(exitstatus).to eq(127)
+    expect(out).to include("bundler: command not found: foobarbaz")
+    expect(out).to include("Install missing gem executables with `bundle install`")
   end
 
   it "errors nicely when the argument is not executable" do
@@ -117,8 +141,8 @@ describe "bundle exec" do
 
     bundle "exec touch foo"
     bundle "exec ./foo", :exitstatus => true
-    exitstatus.should eq(126)
-    out.should include("bundler: not executable: ./foo")
+    expect(exitstatus).to eq(126)
+    expect(out).to include("bundler: not executable: ./foo")
   end
 
   it "errors nicely when no arguments are passed" do
@@ -127,8 +151,8 @@ describe "bundle exec" do
     G
 
     bundle "exec", :exitstatus => true
-    # exitstatus.should eq(128)
-    out.should include("bundler: exec needs a command to run")
+    expect(exitstatus).to eq(128)
+    expect(out).to include("bundler: exec needs a command to run")
   end
 
   describe "with gem executables" do
@@ -141,14 +165,13 @@ describe "bundle exec" do
 
       it "works when unlocked" do
         bundle "exec 'cd #{tmp('gems')} && rackup'"
-        out.should == "1.0.0"
+        expect(out).to eq("1.0.0")
       end
 
       it "works when locked" do
-        bundle "lock"
         should_be_locked
         bundle "exec 'cd #{tmp('gems')} && rackup'"
-        out.should == "1.0.0"
+        expect(out).to eq("1.0.0")
       end
     end
 
@@ -165,15 +188,14 @@ describe "bundle exec" do
 
       it "works when unlocked" do
         bundle "exec fizz"
-        out.should == "1.0"
+        expect(out).to eq("1.0")
       end
 
       it "works when locked" do
-        bundle "lock"
         should_be_locked
 
         bundle "exec fizz"
-        out.should == "1.0"
+        expect(out).to eq("1.0")
       end
     end
 
@@ -190,14 +212,13 @@ describe "bundle exec" do
 
       it "works when unlocked" do
         bundle "exec fizz_git"
-        out.should == "1.0"
+        expect(out).to eq("1.0")
       end
 
       it "works when locked" do
-        bundle "lock"
         should_be_locked
         bundle "exec fizz_git"
-        out.should == "1.0"
+        expect(out).to eq("1.0")
       end
     end
 
@@ -214,14 +235,13 @@ describe "bundle exec" do
 
       it "works when unlocked" do
         bundle "exec fizz_no_gemspec"
-        out.should == "1.0"
+        expect(out).to eq("1.0")
       end
 
       it "works when locked" do
-        bundle "lock"
         should_be_locked
         bundle "exec fizz_no_gemspec"
-        out.should == "1.0"
+        expect(out).to eq("1.0")
       end
     end