bundler 1.1.pre.4 → 1.1.pre.5

data/spec/install/path_spec.rb

@@ -191,7 +191,7 @@ describe "bundle install with explicit source paths" do
       gemspec :path => "#{lib_path("foo")}"
     G
 
-    check exitstatus.should == 15
+    exitstatus.should eq(15)
     out.should =~ /There are multiple gemspecs/
   end
 

data/spec/lock/lockfile_spec.rb

@@ -318,7 +318,7 @@ describe "the lockfile format" do
             actionpack (= 2.3.2)
             activerecord (= 2.3.2)
             activeresource (= 2.3.2)
-            rake
+            rake (= 0.8.7)
           rake (0.8.7)
 
       PLATFORMS

data/spec/other/check_spec.rb

@@ -8,7 +8,7 @@ describe "bundle check" do
     G
 
     bundle :check, :exitstatus => true
-    check @exitstatus.should == 0
+    @exitstatus.should eq(0)
     out.should == "The Gemfile's dependencies are satisfied"
   end
 
@@ -55,7 +55,7 @@ describe "bundle check" do
     G
 
     bundle :check, :exitstatus => true
-    check @exitstatus.should > 0
+    @exitstatus.should be > 0
     out.should include("could not be satisfied")
   end
 
@@ -89,7 +89,7 @@ describe "bundle check" do
 
     bundle "install --without foo"
     bundle "check", :exitstatus => true
-    check @exitstatus.should == 0
+    @exitstatus.should eq(0)
     out.should include("The Gemfile's dependencies are satisfied")
   end
 
@@ -175,7 +175,7 @@ describe "bundle check" do
 
   it "outputs an error when the default Gemfile is not found" do
     bundle :check, :exitstatus => true
-    check @exitstatus.should == 10
+    @exitstatus.should eq(10)
     out.should include("Could not locate Gemfile")
   end
 
@@ -190,11 +190,35 @@ describe "bundle check" do
     last_out = out
     3.times do |i|
       bundle :check
-      check out.should == last_out
+      out.should eq(last_out)
       err.should be_empty
     end
   end
 
+  context "--path" do
+    before do
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rails"
+      G
+      bundle "install --path vendor/bundle"
+
+      FileUtils.rm_rf(bundled_app(".bundle"))
+    end
+
+    it "returns success" do
+      bundle "check --path vendor/bundle", :exitstatus => true
+      @exitstatus.should eq(0)
+      out.should == "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)
+    end
+  end
+
   describe "when locked" do
     before :each do
       system_gems "rack-1.0.0"
@@ -207,7 +231,7 @@ describe "bundle check" do
     it "returns success when the Gemfile is satisfied" do
       bundle :install
       bundle :check, :exitstatus => true
-      check @exitstatus.should == 0
+      @exitstatus.should eq(0)
       out.should == "The Gemfile's dependencies are satisfied"
     end
 

data/spec/other/exec_spec.rb

@@ -54,7 +54,7 @@ describe "bundle exec" do
 
     bundle "exec rackup"
 
-    check out.should == "0.9.1"
+    out.should eq("0.9.1")
 
     Dir.chdir bundled_app2 do
       bundle "exec rackup"
@@ -74,7 +74,7 @@ describe "bundle exec" do
 
     bundle "exec rackup"
 
-    check out.should == "0.9.1"
+    out.should eq("0.9.1")
     should_not_be_installed "rack_middleware 1.0"
   end
 
@@ -99,7 +99,7 @@ describe "bundle exec" do
     G
 
     bundle "exec foobarbaz", :exitstatus => true
-    check exitstatus.should == 127
+    exitstatus.should eq(127)
     out.should include("bundler: command not found: foobarbaz")
     out.should include("Install missing gem binaries with `bundle install`")
   end
@@ -111,7 +111,7 @@ describe "bundle exec" do
 
     bundle "exec touch foo"
     bundle "exec ./foo", :exitstatus => true
-    check exitstatus.should == 126
+    exitstatus.should eq(126)
     out.should include("bundler: not executable: ./foo")
   end
 
@@ -210,33 +210,4 @@ describe "bundle exec" do
     end
 
   end
-
-  describe "bundling bundler" do
-    before(:each) do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle "install --path vendor/bundle --disable-shared-gems"
-    end
-
-    it "does not explode with --disable-shared-gems" do
-      bundle "exec bundle check", :exitstatus => true
-      exitstatus.should == 0
-    end
-
-    it "does not explode when starting with Bundler.setup" do
-      ruby <<-R
-        require "rubygems"
-        require "bundler"
-        Bundler.setup
-        puts `bundle check`
-        puts $?.exitstatus
-      R
-
-      out.should include("satisfied")
-      out.should include("\n0")
-    end
-  end
 end

data/spec/other/init_spec.rb

@@ -32,9 +32,9 @@ describe "bundle init" do
 
     gemfile = bundled_app("Gemfile").read
     gemfile.should =~ /source :gemcutter/
-    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
+    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)
   end
 
 end

data/spec/other/newgem_spec.rb

@@ -60,4 +60,8 @@ describe "bundle gem" do
       generated_gem.gemspec.email.first.should == "TODO: Write your email address"
     end
   end
-end
+
+  it "requires the version file" do
+    bundled_app("test-gem/lib/test-gem.rb").read.should =~ /require "test-gem\/version"/
+  end
+end

data/spec/other/outdated_spec.rb

@@ -1,13 +1,16 @@
 require "spec_helper"
 
 describe "bundle outdated" do
+
   before :each do
-    build_repo2
+    build_repo2 do
+      build_git "foo", :path => lib_path("foo")
+    end
 
     install_gemfile <<-G
       source "file://#{gem_repo2}"
-      gem "activesupport"
-      gem "rack-obama"
+      gem "activesupport", "2.3.5"
+      gem "foo", :git => "#{lib_path('foo')}"
     G
   end
 
@@ -15,11 +18,12 @@ describe "bundle outdated" do
     it "returns list of outdated gems" do
       update_repo2 do
         build_gem "activesupport", "3.0"
+        update_git "foo", :path => lib_path("foo")
       end
 
       bundle "outdated"
       out.should include("activesupport (3.0 > 2.3.5)")
-      out.should include("rack (1.2 > 1.0.0)")
+      out.should include("foo (1.0")
     end
   end
 
@@ -36,11 +40,37 @@ describe "bundle outdated" do
     it "returns list of outdated gems" do
       update_repo2 do
         build_gem "activesupport", "3.0"
+        update_git "foo", :path => lib_path("foo")
       end
 
-      bundle "outdated rack"
+      bundle "outdated foo"
       out.should_not include("activesupport (3.0 > 2.3.5)")
-      out.should include("rack (1.2 > 1.0.0)")
+      out.should include("foo (1.0")
+    end
+  end
+
+  describe "pre-release gems" do
+    context "without the --pre option" do
+      it "ignores pre-release versions" do
+        update_repo2 do
+          build_gem "activesupport", "3.0.0.beta"
+        end
+
+        bundle "outdated"
+        out.should_not include("activesupport (3.0.0.beta > 2.3.5)")
+      end
+    end
+
+    describe "with the --pre option" do
+      it "includes pre-release versions" do
+        update_repo2 do
+          build_gem "activesupport", "3.0.0.beta"
+        end
+
+        bundle "outdated --pre"
+        out.should include("activesupport (3.0.0.beta > 2.3.5)")
+      end
     end
   end
+
 end

data/spec/quality_spec.rb

@@ -1,5 +1,9 @@
 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 = []
@@ -49,7 +53,7 @@ describe "The library itself" do
   it "can still be built" do
     Dir.chdir(root) do
       `gem build bundler.gemspec`
-      check $?.should == 0
+      $?.should eq(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"
-    check out.should == "two"
+    out.should eq("two")
 
     # specific group
     run "Bundler.require(:bar)"
-    check out.should == "baz\nqux"
+    out.should eq("baz\nqux")
 
     # default and specific group
     run "Bundler.require(:default, :bar)"
-    check out.should == "baz\nqux\ntwo"
+    out.should eq("baz\nqux\ntwo")
 
     # specific group given as a string
     run "Bundler.require('bar')"
-    check out.should == "baz\nqux"
+    out.should eq("baz\nqux")
 
     # specific group declared as a string
     run "Bundler.require(:string)"
-    check out.should == "six"
+    out.should eq("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'"
-      check out.should == "two"
+      out.should eq("two")
 
       bundle "exec ruby -e 'Bundler.require(:bar)'"
-      check out.should == "baz\nqux"
+      out.should eq("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"
-      check out.should == "two\nmodule_two\none"
+      out.should eq("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"
-      check out.should == "two_not_loaded\none\ntwo"
+      out.should eq("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
 
-    check out.should == "1.0.0"
+    out.should eq("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 == ""
-      out.should == "1.0.0"
+      err.should eq("")
+      out.should eq("1.0.0")
     end
   end
 
@@ -41,8 +41,8 @@ describe "Bundler.setup" do
           puts "WIN"
         end
       RUBY
-      err.should == ""
-      out.should == "WIN"
+      err.should eq("")
+      out.should eq("WIN")
     end
 
     it "leaves all groups available if they were already" do
@@ -55,8 +55,8 @@ describe "Bundler.setup" do
         require 'rack'
         puts RACK
       RUBY
-      err.should == ""
-      out.should == "1.0.0"
+      err.should eq("")
+      out.should eq("1.0.0")
     end
   end
 
@@ -528,6 +528,28 @@ describe "Bundler.setup" do
     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
@@ -670,8 +692,8 @@ describe "Bundler.setup" do
         Bundler.load
       RUBY
 
-      err.should == ""
-      out.should == ""
+      err.should eq("")
+      out.should eq("")
     end
   end
 
@@ -685,4 +707,5 @@ describe "Bundler.setup" do
       err.should be_empty
     end
   end
+
 end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 require 'rubygems'
 require 'bundler'
 require 'rspec'
+require 'uri'
 
 # Require the correct version of popen for the current platform
 if RbConfig::CONFIG['host_os'] =~ /mingw|mswin/
@@ -57,11 +58,6 @@ 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