bundler 1.2.5 → 1.3.0.pre

data/spec/install/gems/env_spec.rb

@@ -104,4 +104,4 @@ describe "bundle install with ENV conditionals" do
       should_be_installed "rack 1.0"
     end
   end
-end
+end

data/spec/install/gems/flex_spec.rb

@@ -188,13 +188,12 @@ describe "bundle flex_install" do
       ruby <<-RUBY, :expect_err => true
         require 'bundler/setup'
       RUBY
-      err.should =~ /could not find gem 'rack-obama/i
+      expect(err).to match(/could not find gem 'rack-obama/i)
     end
 
     it "suggests bundle update when the Gemfile requires different versions than the lock" do
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
         Fetching source index from file:#{gem_repo2}/
-        Resolving dependencies...
         Bundler could not find compatible versions for gem "rack":
           In snapshot (Gemfile.lock):
             rack (0.9.1)
@@ -208,7 +207,7 @@ describe "bundle flex_install" do
       E
 
       bundle :install
-      out.should == nice_error
+      expect(out).to eq(nice_error)
     end
   end
 
@@ -228,13 +227,13 @@ describe "bundle flex_install" do
     end
 
     it "does something" do
-      lambda {
+      expect {
         bundle "install"
-      }.should_not change { File.read(bundled_app('Gemfile.lock')) }
+      }.not_to change { File.read(bundled_app('Gemfile.lock')) }
 
-      out.should include('rack = 0.9.1')
-      out.should include('locked at 1.0.0')
-      out.should include('bundle update rack')
+      expect(out).to include('rack = 0.9.1')
+      expect(out).to include('locked at 1.0.0')
+      expect(out).to include('bundle update rack')
     end
 
     it "should work when you update" do

data/spec/install/gems/groups_spec.rb

@@ -26,7 +26,7 @@ describe "bundle install with gem sources" do
           puts ACTIVESUPPORT
         R
 
-        err.should == "ZOMG LOAD ERROR"
+        expect(err).to eq("ZOMG LOAD ERROR")
       end
 
       it "installs gems with inline :groups into those groups" do
@@ -37,18 +37,18 @@ describe "bundle install with gem sources" do
           puts THIN
         R
 
-        err.should == "ZOMG LOAD ERROR"
+        expect(err).to eq("ZOMG LOAD ERROR")
       end
 
       it "sets up everything if Bundler.setup is used with no groups" do
         out = run("require 'rack'; puts RACK")
-        out.should eq('1.0.0')
+        expect(out).to eq('1.0.0')
 
         out = run("require 'activesupport'; puts ACTIVESUPPORT")
-        out.should eq('2.3.5')
+        expect(out).to eq('2.3.5')
 
         out = run("require 'thin'; puts THIN")
-        out.should eq('1.0')
+        expect(out).to eq('1.0')
       end
 
       it "removes old groups when new groups are set up" do
@@ -58,7 +58,7 @@ describe "bundle install with gem sources" do
           puts THIN
         RUBY
 
-        err.should == "ZOMG LOAD ERROR"
+        expect(err).to eq("ZOMG LOAD ERROR")
       end
 
       it "sets up old groups when they have previously been removed" do
@@ -67,7 +67,7 @@ describe "bundle install with gem sources" do
           Bundler.setup(:default, :emo)
           require 'thin'; puts THIN
         RUBY
-        out.should == '1.0'
+        expect(out).to eq('1.0')
       end
     end
 
@@ -102,13 +102,13 @@ describe "bundle install with gem sources" do
 
         it "does not say it installed gems from the excluded group" do
           bundle :install, :without => "emo"
-          out.should_not include("activesupport")
+          expect(out).not_to include("activesupport")
         end
 
         it "allows Bundler.setup for specific groups" do
           bundle :install, :without => "emo"
           run("require 'rack'; puts RACK", :default)
-          out.should == '1.0.0'
+          expect(out).to eq('1.0.0')
         end
 
         it "does not effect the resolve" do
@@ -138,7 +138,7 @@ describe "bundle install with gem sources" do
           ENV["BUNDLE_WITHOUT"] = "emo"
 
           bundle :install
-          out.should_not include("activesupport")
+          expect(out).not_to include("activesupport")
 
           should_be_installed "rack 1.0.0", :groups => [:default]
           should_not_be_installed "activesupport 2.3.5", :groups => [:default]

data/spec/install/gems/packed_spec.rb

@@ -44,7 +44,7 @@ describe "bundle install with gem sources" do
       end
 
       bundle :install
-      err.should be_empty
+      expect(err).to be_empty
       should_be_installed "rack 1.0"
     end
 
@@ -65,7 +65,7 @@ describe "bundle install with gem sources" do
           gem "platform_specific"
         G
         run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-        out.should == "1.0.0 RUBY"
+        expect(out).to eq("1.0.0 RUBY")
       end
     end
 
@@ -75,10 +75,10 @@ describe "bundle install with gem sources" do
         gem "rack"
       G
       bundled_app("vendor/cache").mkpath
-      bundled_app("vendor/cache").children.should be_empty
+      expect(bundled_app("vendor/cache").children).to be_empty
 
       bundle "install --no-cache"
-      bundled_app("vendor/cache").children.should be_empty
+      expect(bundled_app("vendor/cache").children).to be_empty
     end
   end
 end

data/spec/install/gems/platform_spec.rb

@@ -96,7 +96,7 @@ describe "bundle install across platforms" do
 
     bundle "install --path vendor/bundle"
 
-    vendored_gems("gems/rack-1.0.0").should exist
+    expect(vendored_gems("gems/rack-1.0.0")).to exist
   end
 
   it "works after switching Rubies" do
@@ -112,7 +112,7 @@ describe "bundle install across platforms" do
     FileUtils.mv(vendored_gems, bundled_app("vendor/bundle/#{Gem.ruby_engine}/#{new_version}"))
 
     bundle "install --path ./vendor/bundle"
-    vendored_gems("gems/rack-1.0.0").should exist
+    expect(vendored_gems("gems/rack-1.0.0")).to exist
   end
 end
 
@@ -186,7 +186,7 @@ describe "bundle install with platform conditionals" do
     G
 
     bundle :show, :exitstatus => true
-    exitstatus.should == 0
+    expect(exitstatus).to eq(0)
   end
 
 end

data/spec/install/gems/post_install_spec.rb

@@ -11,12 +11,12 @@ describe 'bundle install with gem sources' do
       G
 
       bundle :install
-      out.should include("Post-install message from rack:")
-      out.should include("Rack's post install message")
-      out.should include("Post-install message from thin:")
-      out.should include("Thin's post install message")
-      out.should include("Post-install message from rack-obama:")
-      out.should include("Rack-obama's post install message")
+      expect(out).to include("Post-install message from rack:")
+      expect(out).to include("Rack's post install message")
+      expect(out).to include("Post-install message from thin:")
+      expect(out).to include("Thin's post install message")
+      expect(out).to include("Post-install message from rack-obama:")
+      expect(out).to include("Rack-obama's post install message")
     end
   end
 
@@ -28,7 +28,7 @@ describe 'bundle install with gem sources' do
       G
 
       bundle :install
-      out.should_not include("Post-install message")
+      expect(out).not_to include("Post-install message")
     end
   end
 
@@ -40,8 +40,8 @@ describe 'bundle install with gem sources' do
       G
 
       bundle :install
-      out.should include("Post-install message from rack:")
-      out.should include("Rack's post install message")
+      expect(out).to include("Post-install message from rack:")
+      expect(out).to include("Rack's post install message")
     end
   end
 end

data/spec/install/gems/resolving_spec.rb

@@ -16,7 +16,7 @@ describe "bundle install with gem sources" do
         puts IMPLICIT_RAKE_DEP
         puts ANOTHER_IMPLICIT_RAKE_DEP
       R
-      out.should == "YES\nYES"
+      expect(out).to eq("YES\nYES")
     end
 
     it "installs gems with a dependency with no type" do
@@ -69,4 +69,4 @@ describe "bundle install with gem sources" do
       end
     end
   end
-end
+end

data/spec/install/gems/simple_case_spec.rb

@@ -8,7 +8,7 @@ describe "bundle install with gem sources" do
       G
 
       bundle :install
-      out.should =~ /no dependencies/
+      expect(out).to match(/no dependencies/)
     end
 
     it "does not make a lockfile if the install fails" do
@@ -16,8 +16,8 @@ describe "bundle install with gem sources" do
         raise StandardError, "FAIL"
       G
 
-      err.should =~ /FAIL \(StandardError\)/
-      bundled_app("Gemfile.lock").should_not exist
+      expect(err).to match(/FAIL \(StandardError\)/)
+      expect(bundled_app("Gemfile.lock")).not_to exist
     end
 
     it "creates a Gemfile.lock" do
@@ -26,7 +26,7 @@ describe "bundle install with gem sources" do
         gem "rack"
       G
 
-      bundled_app('Gemfile.lock').should exist
+      expect(bundled_app('Gemfile.lock')).to exist
     end
 
     it "creates lock files based on the Gemfile name" do
@@ -37,7 +37,7 @@ describe "bundle install with gem sources" do
 
       bundle 'install --gemfile OmgFile'
 
-      bundled_app("OmgFile.lock").should exist
+      expect(bundled_app("OmgFile.lock")).to exist
     end
 
     it "doesn't delete the lockfile if one already exists" do
@@ -52,7 +52,7 @@ describe "bundle install with gem sources" do
         raise StandardError, "FAIL"
       G
 
-      File.read(bundled_app("Gemfile.lock")).should == lockfile
+      expect(File.read(bundled_app("Gemfile.lock"))).to eq(lockfile)
     end
 
     it "does not touch the lockfile if nothing changed" do
@@ -61,7 +61,7 @@ describe "bundle install with gem sources" do
         gem "rack"
       G
 
-      lambda { run '1' }.should_not change { File.mtime(bundled_app('Gemfile.lock')) }
+      expect { run '1' }.not_to change { File.mtime(bundled_app('Gemfile.lock')) }
     end
 
     it "fetches gems" do
@@ -70,7 +70,7 @@ describe "bundle install with gem sources" do
         gem 'rack'
       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.0")
     end
 
@@ -80,7 +80,7 @@ describe "bundle install with gem sources" do
         gem 'rack', "> 0.9", "< 1.0"
       G
 
-      default_bundle_path("gems/rack-0.9.1").should exist
+      expect(default_bundle_path("gems/rack-0.9.1")).to exist
       should_be_installed("rack 0.9.1")
     end
 
@@ -90,7 +90,7 @@ describe "bundle install with gem sources" do
         gem 'rack', "< 1.0", "> 0.9"
       G
 
-      default_bundle_path("gems/rack-0.9.1").should exist
+      expect(default_bundle_path("gems/rack-0.9.1")).to exist
       should_be_installed("rack 0.9.1")
     end
 
@@ -99,7 +99,7 @@ describe "bundle install with gem sources" do
         source "file://#{gem_repo1}"
         gem :rack
       G
-      status.should == 4
+      expect(status).to eq(4)
     end
 
     it "pulls in dependencies" do
@@ -204,7 +204,7 @@ describe "bundle install with gem sources" do
         G
 
         run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-        out.should == "1.0.0 #{Gem::Platform.local}"
+        expect(out).to eq("1.0.0 #{Gem::Platform.local}")
       end
 
       it "falls back on plain ruby" do
@@ -215,7 +215,7 @@ describe "bundle install with gem sources" do
         G
 
         run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-        out.should == "1.0.0 RUBY"
+        expect(out).to eq("1.0.0 RUBY")
       end
 
       it "installs gems for java" do
@@ -226,7 +226,7 @@ describe "bundle install with gem sources" do
         G
 
         run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-        out.should == "1.0.0 JAVA"
+        expect(out).to eq("1.0.0 JAVA")
       end
 
       it "installs gems for windows" do
@@ -238,7 +238,7 @@ describe "bundle install with gem sources" do
         G
 
         run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-        out.should == "1.0.0 MSWIN"
+        expect(out).to eq("1.0.0 MSWIN")
       end
     end
 
@@ -291,14 +291,14 @@ describe "bundle install with gem sources" do
       G
 
       bundle :install, :expect_err => true
-      out.should =~ /Your Gemfile has no remote sources/i
+      expect(out).to match(/Your Gemfile has no remote sources/i)
     end
 
     it "creates a Gemfile.lock on a blank Gemfile" do
       install_gemfile <<-G
       G
 
-      File.exists?(bundled_app("Gemfile.lock")).should be_true
+      expect(File.exists?(bundled_app("Gemfile.lock"))).to be_true
     end
 
     it "gracefully handles error when rubygems server is unavailable" do
@@ -310,8 +310,8 @@ describe "bundle install with gem sources" do
       G
 
       bundle :install
-      out.should include("Could not fetch specs from http://localhost:9384/")
-      out.should_not include("file://")
+      expect(out).to include("Could not reach http://localhost:9384/")
+      expect(out).not_to include("file://")
     end
 
     it "doesn't blow up when the local .bundle/config is empty" do
@@ -323,7 +323,7 @@ describe "bundle install with gem sources" do
 
         gem 'foo'
       G
-      exitstatus.should == 0
+      expect(exitstatus).to eq(0)
     end
 
     it "doesn't blow up when the global .bundle/config is empty" do
@@ -335,7 +335,7 @@ describe "bundle install with gem sources" do
 
         gem 'foo'
       G
-      exitstatus.should == 0
+      expect(exitstatus).to eq(0)
     end
   end
 
@@ -358,7 +358,7 @@ describe "bundle install with gem sources" do
 
       bundle :install, :exitstatus => true
 
-      exitstatus.should == 0
+      expect(exitstatus).to eq(0)
     end
   end
 
@@ -425,8 +425,8 @@ describe "bundle install with gem sources" do
         set_bundle_path(type, bundled_app("vendor2").to_s)
         bundle "install --path vendor/bundle"
 
-        vendored_gems("gems/rack-1.0.0").should be_directory
-        bundled_app("vendor2").should_not be_directory
+        expect(vendored_gems("gems/rack-1.0.0")).to be_directory
+        expect(bundled_app("vendor2")).not_to be_directory
         should_be_installed "rack 1.0.0"
       end
 
@@ -435,7 +435,7 @@ describe "bundle install with gem sources" do
 
         bundle :install
 
-        bundled_app('vendor/gems/rack-1.0.0').should be_directory
+        expect(bundled_app('vendor/gems/rack-1.0.0')).to be_directory
         should_be_installed "rack 1.0.0"
       end
 
@@ -447,7 +447,7 @@ describe "bundle install with gem sources" do
           bundle :install
         end
 
-        bundled_app('vendor/gems/rack-1.0.0').should be_directory
+        expect(bundled_app('vendor/gems/rack-1.0.0')).to be_directory
         should_be_installed "rack 1.0.0"
       end
     end
@@ -457,14 +457,14 @@ describe "bundle install with gem sources" do
 
       bundle :install
 
-      vendored_gems('gems/rack-1.0.0').should be_directory
+      expect(vendored_gems('gems/rack-1.0.0')).to be_directory
       should_be_installed "rack 1.0.0"
     end
 
     it "sets BUNDLE_PATH as the first argument to bundle install" do
       bundle "install --path ./vendor/bundle"
 
-      vendored_gems('gems/rack-1.0.0').should be_directory
+      expect(vendored_gems('gems/rack-1.0.0')).to be_directory
       should_be_installed "rack 1.0.0"
     end
 
@@ -473,7 +473,7 @@ describe "bundle install with gem sources" do
       build_gem "rack", "1.1.0", :to_system => true
       bundle "install --path ./vendor/bundle"
 
-      vendored_gems('gems/rack-1.0.0').should be_directory
+      expect(vendored_gems('gems/rack-1.0.0')).to be_directory
       should_be_installed "rack 1.0.0"
     end
   end
@@ -500,7 +500,7 @@ describe "bundle install with gem sources" do
       G
 
       bundle :install, :quiet => true
-      out.should == ""
+      expect(out).to eq("")
     end
 
     it "should still display warnings" do
@@ -509,7 +509,7 @@ describe "bundle install with gem sources" do
       G
 
       bundle :install, :quiet => true
-      out.should =~ /Your Gemfile has no remote sources/
+      expect(out).to match(/Your Gemfile has no remote sources/)
     end
   end
 
@@ -528,9 +528,9 @@ describe "bundle install with gem sources" do
     it "behaves like bundle install vendor/bundle with --deployment" do
       bundle "install"
       bundle "install --deployment"
-      out.should include("It was installed into ./vendor/bundle")
+      expect(out).to include("It was installed into ./vendor/bundle")
       should_be_installed "rack 1.0.0"
-      bundled_app("vendor/bundle").should exist
+      expect(bundled_app("vendor/bundle")).to exist
     end
 
     it "does not use available system gems with bundle --path vendor/bundle" do
@@ -544,7 +544,7 @@ describe "bundle install with gem sources" do
 
       Dir.chdir(dir) do
         bundle "install --path vendor/bundle"
-        out.should include("installed into ./vendor/bundle")
+        expect(out).to include("installed into ./vendor/bundle")
       end
 
       dir.rmtree
@@ -552,12 +552,12 @@ describe "bundle install with gem sources" do
 
     it "prints a warning to let the user know what has happened with bundle --path vendor/bundle" do
       bundle "install --path vendor/bundle"
-      out.should include("It was installed into ./vendor")
+      expect(out).to include("It was installed into ./vendor")
     end
 
     it "disallows --path vendor/bundle --system" do
       bundle "install --path vendor/bundle --system"
-      out.should include("Please choose.")
+      expect(out).to include("Please choose.")
     end
 
     it "remembers to disable system gems after the first time with bundle --path vendor/bundle" do
@@ -565,7 +565,7 @@ describe "bundle install with gem sources" do
       FileUtils.rm_rf bundled_app('vendor')
       bundle "install"
 
-      vendored_gems('gems/rack-1.0.0').should be_directory
+      expect(vendored_gems('gems/rack-1.0.0')).to be_directory
       should_be_installed "rack 1.0.0"
     end
   end
@@ -590,8 +590,8 @@ describe "bundle install with gem sources" do
         end
       R
 
-      out.should include("1.0")
-      out.should include("no activesupport")
+      expect(out).to include("1.0")
+      expect(out).to include("no activesupport")
     end
   end
 
@@ -608,7 +608,7 @@ describe "bundle install with gem sources" do
         gem "yaml_spec"
       G
       bundle :install
-      err.should be_empty
+      expect(err).to be_empty
     end
 
     it "still installs correctly when using path" do
@@ -617,7 +617,7 @@ describe "bundle install with gem sources" do
       install_gemfile <<-G
         gem 'yaml_spec', :path => "#{lib_path('yaml_spec-1.0')}"
       G
-      err.should == ""
+      expect(err).to eq("")
     end
   end
 
@@ -658,7 +658,6 @@ describe "bundle install with gem sources" do
 
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
         Fetching source index from file:#{gem_repo2}/
-        Resolving dependencies...
         Bundler could not find compatible versions for gem "bundler":
           In Gemfile:
             bundler (= 0.9.2) ruby
@@ -666,7 +665,7 @@ describe "bundle install with gem sources" do
           Current Bundler version:
             bundler (#{Bundler::VERSION})
         E
-      out.should include(nice_error)
+      expect(out).to include(nice_error)
     end
 
     it "works for gems with multiple versions in its dependencies" do
@@ -694,7 +693,7 @@ describe "bundle install with gem sources" do
       G
 
       run "begin; gem 'bundler'; puts 'WIN'; rescue Gem::LoadError; puts 'FAIL'; end"
-      out.should == "WIN"
+      expect(out).to eq("WIN")
     end
 
     it "allows gem 'bundler' when Bundler is not in the Gemfile or its dependencies" do
@@ -704,7 +703,7 @@ describe "bundle install with gem sources" do
       G
 
       run "begin; gem 'bundler'; puts 'WIN'; rescue Gem::LoadError => e; puts e.backtrace; end"
-      out.should == "WIN"
+      expect(out).to eq("WIN")
     end
 
     it "causes a conflict if child dependencies conflict" do
@@ -716,7 +715,6 @@ describe "bundle install with gem sources" do
 
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
         Fetching source index from file:#{gem_repo2}/
-        Resolving dependencies...
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
             activemerchant (>= 0) ruby depends on
@@ -725,7 +723,7 @@ describe "bundle install with gem sources" do
             rails_fail (>= 0) ruby depends on
               activesupport (1.2.3)
       E
-      out.should == nice_error
+      expect(out).to eq(nice_error)
     end
 
     it "causes a conflict if a child dependency conflicts with the Gemfile" do
@@ -737,7 +735,6 @@ describe "bundle install with gem sources" do
 
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
         Fetching source index from file:#{gem_repo2}/
-        Resolving dependencies...
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
             rails_fail (>= 0) ruby depends on
@@ -745,7 +742,7 @@ describe "bundle install with gem sources" do
 
             activesupport (2.3.5)
       E
-      out.should == nice_error
+      expect(out).to eq(nice_error)
     end
 
     it "can install dependencies even if " do
@@ -758,7 +755,7 @@ describe "bundle install with gem sources" do
       #simulate_new_machine
 
       bundle "check"
-      out.should == "The Gemfile's dependencies are satisfied"
+      expect(out).to eq("The Gemfile's dependencies are satisfied")
     end
   end
 
@@ -791,7 +788,7 @@ describe "bundle install with gem sources" do
     it "does not hit the remote a second time" do
       FileUtils.rm_rf gem_repo2
       bundle "install --without rack"
-      err.should be_empty
+      expect(err).to be_empty
     end
   end
 
@@ -799,7 +796,7 @@ describe "bundle install with gem sources" do
     # On OS X, Gem.bindir defaults to /usr/bin, so system_bindir is useful if
     # you want to avoid sudo installs for system gems with OS X's default ruby
     it "overrides Gem.bindir" do
-      Pathname.new("/usr/bin").should_not be_writable
+      expect(Pathname.new("/usr/bin")).not_to be_writable unless Process::euid == 0
       gemfile <<-G
         require 'rubygems'
         def Gem.bindir; "/usr/bin"; end
@@ -810,7 +807,7 @@ describe "bundle install with gem sources" do
       config "BUNDLE_SYSTEM_BINDIR" => system_gem_path('altbin').to_s
       bundle :install
       should_be_installed "rack 1.0.0"
-      system_gem_path("altbin/rackup").should exist
+      expect(system_gem_path("altbin/rackup")).to exist
     end
   end