bundler 1.0.22 → 1.1.pre

data/spec/other/exec_spec.rb

@@ -33,12 +33,6 @@ describe "bundle exec" do
     out.should == "1.0.0"
   end
 
-  it "works when exec'ing something else" do
-    install_gemfile 'gem "rack"'
-    bundle "exec echo exec"
-    out.should == "exec"
-  end
-
   it "handles different versions in different bundles" do
     build_repo2 do
       build_gem "rack_two", "1.0.0" do |s|
@@ -60,7 +54,7 @@ describe "bundle exec" do
 
     bundle "exec rackup"
 
-    out.should eq("0.9.1")
+    check out.should == "0.9.1"
 
     Dir.chdir bundled_app2 do
       bundle "exec rackup"
@@ -80,7 +74,7 @@ describe "bundle exec" do
 
     bundle "exec rackup"
 
-    out.should eq("0.9.1")
+    check out.should == "0.9.1"
     should_not_be_installed "rack_middleware 1.0"
   end
 
@@ -89,8 +83,7 @@ describe "bundle exec" do
       gem "rack"
     G
 
-    rubyopt = ENV['RUBYOPT']
-    rubyopt = "-I#{bundler_path} -rbundler/setup #{rubyopt}"
+    rubyopt = "-I#{bundler_path} -rbundler/setup"
 
     bundle "exec 'echo $RUBYOPT'"
     out.should have_rubyopts(rubyopt)
@@ -105,9 +98,9 @@ describe "bundle exec" do
     G
 
     bundle "exec foobarbaz", :exitstatus => true
-    exitstatus.should eq(127)
+    check exitstatus.should == 127
     out.should include("bundler: command not found: foobarbaz")
-    out.should include("Install missing gem executables with `bundle install`")
+    out.should include("Install missing gem binaries with `bundle install`")
   end
 
   it "errors nicely when the argument is not executable" do
@@ -117,11 +110,11 @@ describe "bundle exec" do
 
     bundle "exec touch foo"
     bundle "exec ./foo", :exitstatus => true
-    exitstatus.should eq(126)
+    check exitstatus.should == 126
     out.should include("bundler: not executable: ./foo")
   end
 
-  describe "with gem executables" do
+  describe "with gem binaries" do
     describe "run from a random directory" do
       before(:each) do
         install_gemfile <<-G

data/spec/other/ext_spec.rb

@@ -14,24 +14,3 @@ describe "Bundler::GemHelpers#generic" do
     generic(pl('x86-darwin-10')).should == pl('ruby')
   end
 end
-
-describe "Gem::SourceIndex#refresh!" do
-  rubygems_1_7 = Gem::Version.new(Gem::VERSION) >= Gem::Version.new("1.7.0")
-
-  before do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-    G
-  end
-
-  it "does not explode when called", :if => rubygems_1_7 do
-    run "Gem.source_index.refresh!"
-    run "Gem::SourceIndex.new([]).refresh!"
-  end
-
-  it "does not explode when called", :unless => rubygems_1_7 do
-    run "Gem.source_index.refresh!"
-    run "Gem::SourceIndex.from_gems_in([]).refresh!"
-  end
-end

data/spec/{bundler → other}/gem_helper_spec.rb

@@ -10,14 +10,6 @@ describe "Bundler::GemHelper tasks" do
       helper.gemspec.name.should == 'test'
     end
 
-    it "interpolates the name for a hidden gemspec" do
-      bundle 'gem test'
-      app = bundled_app("test")
-      FileUtils.mv app.join('test.gemspec'), app.join('.gemspec')
-      helper = Bundler::GemHelper.new(app.to_s)
-      helper.gemspec.name.should == 'test'
-    end
-
     it "should fail when there is no gemspec" do
       bundle 'gem test'
       app = bundled_app("test")
@@ -31,13 +23,6 @@ describe "Bundler::GemHelper tasks" do
       File.open(File.join(app.to_s, 'test2.gemspec'), 'w') {|f| f << ''}
       proc { Bundler::GemHelper.new(app.to_s) }.should raise_error(/Unable to determine name/)
     end
-
-    it "handles namespaces and converting to CamelCase" do
-      bundle 'gem test-foo_bar'
-      lib = bundled_app('test-foo_bar').join('lib/test-foo_bar.rb').read
-      lib.should include("module Test")
-      lib.should include("module FooBar")
-    end
   end
 
   context "gem management" do
@@ -133,7 +118,7 @@ describe "Bundler::GemHelper tasks" do
           `git config user.name "name"`
           `git remote add origin file://#{gem_repo1}`
           `git commit -a -m "initial commit"`
-          sys_exec("git push origin master", true)
+          Open3.popen3("git push origin master") # use popen3 to silence output...
           `git commit -a -m "another commit"`
         }
         @helper.release_gem

data/spec/other/help_spec.rb

@@ -7,8 +7,7 @@ describe "bundle help" do
     system_gems "bundler-0.8.1"
 
     bundle "help", :expect_err => true
-    err.should include("Please remove Bundler 0.8 versions.")
-    err.should include("This can be done by running `gem cleanup bundler`.")
+    err.should == "Please remove older versions of bundler. This can be done by running `gem cleanup bundler`."
   end
 
   it "uses groff when available" do

data/spec/other/init_spec.rb

@@ -32,9 +32,9 @@ describe "bundle init" do
 
     gemfile = bundled_app("Gemfile").read
     gemfile.should =~ /source :gemcutter/
-    gemfile.scan(/gem "rack", "= 1.0.1"/).size.should eq(1)
-    gemfile.scan(/gem "rspec", "= 1.2"/).size.should eq(1)
-    gemfile.scan(/group :development/).size.should eq(1)
+    check gemfile.scan(/gem "rack", "= 1.0.1"/).size.should == 1
+    check gemfile.scan(/gem "rspec", "= 1.2"/).size.should == 1
+    check gemfile.scan(/group :development/).size.should == 1
   end
 
 end

data/spec/other/newgem_spec.rb

@@ -21,26 +21,4 @@ describe "bundle gem" do
     bundled_app("test-gem/lib/test-gem/version.rb").read.should =~ /module Test\n  module Gem/
     bundled_app("test-gem/lib/test-gem.rb").read.should =~ /module Test\n  module Gem/
   end
-
-  it "requires the version file" do
-    bundled_app("test-gem/lib/test-gem.rb").read.should =~ /require "test-gem\/version"/
-  end
-
-  it "runs rake without problems" do
-    system_gems ["rake-0.8.7"]
-
-    rakefile = <<-RAKEFILE
-      task :default do
-        puts 'SUCCESS'
-      end
-RAKEFILE
-    File.open(bundled_app("test-gem/Rakefile"), 'w') do |file|
-      file.puts rakefile
-    end
-
-    Dir.chdir(bundled_app("test-gem")) do
-      sys_exec("rake")
-      out.should include("SUCCESS")
-    end
-  end
-end
+end

data/spec/pack/gems_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+describe "bundle pack with gems" do
+  describe "when there are only gemsources" do
+    before :each do
+      gemfile <<-G
+        gem 'rack'
+      G
+
+      system_gems "rack-1.0.0"
+      bundle :pack
+    end
+
+    it "locks the gemfile" do
+      bundled_app("Gemfile.lock").should exist
+    end
+
+    it "caches the gems" do
+      bundled_app("vendor/cache/rack-1.0.0.gem").should exist
+    end
+  end
+end

data/spec/quality_spec.rb

@@ -1,9 +1,5 @@
 require "spec_helper"
 
-if defined?(Encoding)
-  Encoding.default_external = "UTF-8"
-end
-
 describe "The library itself" do
   def check_for_tab_characters(filename)
     failing_lines = []
@@ -42,7 +38,7 @@ describe "The library itself" do
     error_messages = []
     Dir.chdir(File.expand_path("../..", __FILE__)) do
       `git ls-files`.split("\n").each do |filename|
-        next if filename =~ /\.gitmodules|fixtures/
+        next if filename =~ /\.gitmodules|\.marshal|fixtures|vendor/
         error_messages << check_for_tab_characters(filename)
         error_messages << check_for_extra_spaces(filename)
       end
@@ -53,7 +49,7 @@ describe "The library itself" do
   it "can still be built" do
     Dir.chdir(root) do
       `gem build bundler.gemspec`
-      $?.should eq(0)
+      check $?.should == 0
 
       # clean up the .gem generated
       system("rm bundler-#{Bundler::VERSION}.gem")

data/spec/runtime/require_spec.rb

@@ -48,23 +48,23 @@ describe "Bundler.require" do
   it "requires the gems" do
     # default group
     run "Bundler.require"
-    out.should eq("two")
+    check out.should == "two"
 
     # specific group
     run "Bundler.require(:bar)"
-    out.should eq("baz\nqux")
+    check out.should == "baz\nqux"
 
     # default and specific group
     run "Bundler.require(:default, :bar)"
-    out.should eq("baz\nqux\ntwo")
+    check out.should == "baz\nqux\ntwo"
 
     # specific group given as a string
     run "Bundler.require('bar')"
-    out.should eq("baz\nqux")
+    check out.should == "baz\nqux"
 
     # specific group declared as a string
     run "Bundler.require(:string)"
-    out.should eq("six")
+    check out.should == "six"
 
     # required in resolver order instead of gemfile order
     run("Bundler.require(:not)")
@@ -95,10 +95,10 @@ describe "Bundler.require" do
   describe "using bundle exec" do
     it "requires the locked gems" do
       bundle "exec ruby -e 'Bundler.require'"
-      out.should eq("two")
+      check out.should == "two"
 
       bundle "exec ruby -e 'Bundler.require(:bar)'"
-      out.should eq("baz\nqux")
+      check out.should == "baz\nqux"
 
       bundle "exec ruby -e 'Bundler.require(:default, :bar)'"
       out.should == "baz\nqux\ntwo"
@@ -138,7 +138,7 @@ describe "Bundler.require" do
       G
 
       run "Bundler.require"
-      out.should eq("two\nmodule_two\none")
+      check out.should == "two\nmodule_two\none"
     end
 
     describe "a gem with different requires for different envs" do
@@ -178,7 +178,7 @@ describe "Bundler.require" do
       G
 
       run "Bundler.require"
-      out.should eq("two_not_loaded\none\ntwo")
+      check out.should == "two_not_loaded\none\ntwo"
     end
 
     describe "with busted gems" do
@@ -225,7 +225,7 @@ describe "Bundler.require with platform specific dependencies" do
 
     run "Bundler.require; puts RACK", :expect_err => true
 
-    out.should eq("1.0.0")
+    check out.should == "1.0.0"
     err.should be_empty
   end
 end

data/spec/runtime/setup_spec.rb

@@ -16,8 +16,8 @@ describe "Bundler.setup" do
         require 'rack'
         puts RACK
       RUBY
-      err.should eq("")
-      out.should eq("1.0.0")
+      err.should == ""
+      out.should == "1.0.0"
     end
   end
 
@@ -25,7 +25,6 @@ describe "Bundler.setup" do
     before(:each) do
       install_gemfile <<-G
         source "file://#{gem_repo1}"
-        gem "yard"
         gem "rack", :group => :test
       G
     end
@@ -42,8 +41,8 @@ describe "Bundler.setup" do
           puts "WIN"
         end
       RUBY
-      err.should eq("")
-      out.should eq("WIN")
+      err.should == ""
+      out.should == "WIN"
     end
 
     it "leaves all groups available if they were already" do
@@ -56,26 +55,8 @@ describe "Bundler.setup" do
         require 'rack'
         puts RACK
       RUBY
-      err.should eq("")
-      out.should eq("1.0.0")
-    end
-
-    it "leaves :default available if setup is called twice" do
-      ruby <<-RUBY
-        require 'rubygems'
-        require 'bundler'
-        Bundler.setup(:default)
-        Bundler.setup(:default, :test)
-
-        begin
-          require 'yard'
-          puts "WIN"
-        rescue LoadError
-          puts "FAIL"
-        end
-      RUBY
-      err.should eq("")
-      out.should match("WIN")
+      err.should == ""
+      out.should == "1.0.0"
     end
   end
 
@@ -185,7 +166,7 @@ describe "Bundler.setup" do
     should_be_installed "rack 1.0.0"
   end
 
-  describe "integrate with rubygems" do
+  describe "crippling rubygems" do
     describe "by replacing #gem" do
       before :each do
         install_gemfile <<-G
@@ -233,7 +214,7 @@ describe "Bundler.setup" do
         out.should == "WIN"
       end
 
-      it "version_requirement is now deprecated in rubygems 1.4.0+ when the version is wrong" do
+      it "version_requirement is now deprecated in rubygesm 1.4.0+  when the version is wrong" do
         run <<-R, :expect_err => true
           begin
             gem "rack", "1.0.0"
@@ -450,7 +431,7 @@ describe "Bundler.setup" do
           end
         R
 
-        out.should == "You have already activated thin 1.1, but your Gemfile requires thin 1.0. Using bundle exec may solve this."
+        out.should == "You have already activated thin 1.1, but your Gemfile requires thin 1.0. Consider using bundle exec."
       end
 
       it "version_requirement is now deprecated in rubygems 1.4.0+" do
@@ -541,34 +522,12 @@ describe "Bundler.setup" do
 
     run <<-R
       Gem.refresh
-      puts Bundler.rubygems.find_name("rack").inspect
+      puts Gem.source_index.find_name("rack").inspect
     R
 
     out.should == "[]"
   end
 
-  describe "when a vendored gem specification uses the :path option" do
-    it "should resolve paths relative to the Gemfile" do
-      path = bundled_app(File.join('vendor', 'foo'))
-      build_lib "foo", :path => path
-
-      # If the .gemspec exists, then Bundler handles the path differently.
-      # See Source::Path.load_spec_files for details.
-      FileUtils.rm(File.join(path, 'foo.gemspec'))
-
-      install_gemfile <<-G
-        gem 'foo', '1.2.3', :path => 'vendor/foo'
-      G
-
-      Dir.chdir(bundled_app.parent) do
-        run <<-R, :env => {"BUNDLE_GEMFILE" => bundled_app('Gemfile')}
-          require 'foo'
-        R
-      end
-      err.should == ""
-    end
-  end
-
   describe "with git gems that don't have gemspecs" do
     before :each do
       build_git "no-gemspec", :gemspec => false
@@ -711,8 +670,8 @@ describe "Bundler.setup" do
         Bundler.load
       RUBY
 
-      err.should eq("")
-      out.should eq("")
+      err.should == ""
+      out.should == ""
     end
   end
 
@@ -726,5 +685,4 @@ describe "Bundler.setup" do
       err.should be_empty
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -1,13 +1,6 @@
 $:.unshift File.expand_path('..', __FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
 
-begin
-  require 'psych'
-rescue LoadError
-ensure
-  require 'yaml'
-end
-
 require 'fileutils'
 require 'rubygems'
 require 'bundler'
@@ -25,7 +18,7 @@ else
 end
 
 Dir["#{File.expand_path('../support', __FILE__)}/*.rb"].each do |file|
-  require file
+  require file unless file =~ /fakeweb\/.*\.rb/
 end
 
 $debug    = false
@@ -46,13 +39,8 @@ RSpec.configure do |config|
   config.include Spec::Platforms
   config.include Spec::Sudo
 
-  if Spec::Sudo.test_sudo?
-    config.filter_run :sudo => true
-  else
-    config.filter_run_excluding :sudo => true
-  end
-
   config.filter_run :focused => true unless ENV['CI']
+  config.filter_run_excluding :sudo => true unless Spec::Sudo.test_sudo?
   config.run_all_when_everything_filtered = true
   config.alias_example_to :fit, :focused => true
 
@@ -64,6 +52,11 @@ RSpec.configure do |config|
     pending "JRuby executables do not have a proper shebang" if RUBY_PLATFORM == "java"
   end
 
+  def check(*args)
+    # suppresses ruby warnings about "useless use of == in void context"
+    # e.g. check foo.should == bar
+  end
+
   config.before :all do
     build_repo1
   end