bundler 1.0.21 → 1.1.rc

data/spec/install/gems/post_install_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe 'bundle install with gem sources' do
+  describe 'when gems include post install messages' do
+    it "should display the post-install messages after installing" do
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem 'rack'
+        gem 'thin'
+        gem 'rack-obama'
+      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")
+    end
+  end
+
+  describe 'when gems do not include post install messages' do
+    it "should not display any post-install messages" do
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "activesupport"
+      G
+
+      bundle :install
+      out.should_not include("Post-install message")
+    end
+  end
+
+  describe "when a dependecy includes a post install message" do
+    it "should display the post install message" do
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem 'rack_middleware'
+      G
+
+      bundle :install
+      out.should include("Post-install message from rack:")
+      out.should include("Rack's post install message")
+    end
+  end
+end

data/spec/install/gems/simple_case_spec.rb

@@ -293,6 +293,26 @@ describe "bundle install with gem sources" do
       bundle :install, :expect_err => true
       out.should =~ /Your Gemfile doesn't have any 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
+    end
+
+    it "gracefully handles error when rubygems server is unavailable" do
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        source "http://localhost:9384"
+
+        gem 'foo'
+      G
+
+      bundle :install
+      out.should include("Could not reach http://localhost:9384/")
+      out.should_not include("file://")
+    end
   end
 
   describe "when prerelease gems are available" do
@@ -466,9 +486,9 @@ describe "bundle install with gem sources" do
       bundled_app("vendor/bundle").should exist
     end
 
-    it "prints a warning if you try to use --disable-shared-gems" do
-      bundle "install --path vendor --disable-shared-gems"
-      out.should include "The disable-shared-gem option is no longer available"
+    it "does not use available system gems with bundle --path vendor/bundle" do
+      bundle "install --path vendor/bundle"
+      should_be_installed "rack 1.0.0"
     end
 
     it "handles paths with regex characters in them" do
@@ -483,37 +503,23 @@ describe "bundle install with gem sources" do
       dir.rmtree
     end
 
-    ["install vendor/bundle", "install --path vendor/bundle"].each do |install|
-      if install == "install vendor/bundle"
-        it "displays the deprecation warning for path as an argument to install" do
-          bundle install
-          out.should include("The path argument to `bundle install` is deprecated.")
-        end
-      end
-
-      it "does not use available system gems with bundle #{install}" do
-        bundle install
-        should_be_installed "rack 1.0.0"
-      end
-
-      it "prints a warning to let the user know what has happened with bundle #{install}" do
-        bundle install
-        out.should include("It was installed into ./vendor")
-      end
+    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")
+    end
 
-      it "disallows #{install} --system" do
-        bundle "#{install} --system"
-        out.should include("Please choose.")
-      end
+    it "disallows --path vendor/bundle --system" do
+      bundle "install --path vendor/bundle --system"
+      out.should include("Please choose.")
+    end
 
-      it "remembers to disable system gems after the first time with bundle #{install}" do
-        bundle install
-        FileUtils.rm_rf bundled_app('vendor')
-        bundle "install"
+    it "remembers to disable system gems after the first time with bundle --path vendor/bundle" do
+      bundle "install --path vendor/bundle"
+      FileUtils.rm_rf bundled_app('vendor')
+      bundle "install"
 
-        vendored_gems('gems/rack-1.0.0').should be_directory
-        should_be_installed "rack 1.0.0"
-      end
+      vendored_gems('gems/rack-1.0.0').should be_directory
+      should_be_installed "rack 1.0.0"
     end
   end
 
@@ -522,7 +528,7 @@ describe "bundle install with gem sources" do
       install_gemfile <<-G
         source "file://#{gem_repo1}"
         gem "rack"
-        gem "activesupport", :group => :development
+        gem "activesupport", :groups => :development
       G
 
       ruby <<-R
@@ -568,35 +574,6 @@ describe "bundle install with gem sources" do
     end
   end
 
-  describe "when the gem has an architecture in its platform" do
-    it "still installs correctly" do
-      simulate_platform mswin
-
-      gemfile <<-G
-        # Set up pretend http gem server with FakeWeb
-        $LOAD_PATH.unshift '#{Dir[base_system_gems.join("gems/fakeweb*/lib")].first}'
-        require 'fakeweb'
-        FakeWeb.allow_net_connect = false
-        files = [ 'specs.4.8.gz',
-                  'prerelease_specs.4.8.gz',
-                  'quick/Marshal.4.8/rcov-1.0-mswin32.gemspec.rz',
-                  'gems/rcov-1.0-mswin32.gem' ]
-        files.each do |file|
-          FakeWeb.register_uri(:get, "http://localgemserver.com/\#{file}",
-            :body => File.read("#{gem_repo1}/\#{file}"))
-        end
-        FakeWeb.register_uri(:get, "http://localgemserver.com/gems/rcov-1.0-x86-mswin32.gem",
-          :status => ["404", "Not Found"])
-
-        # Try to install gem with nil arch
-        source "http://localgemserver.com/"
-        gem "rcov"
-      G
-      bundle :install
-      should_be_installed "rcov 1.0.0"
-    end
-  end
-
   describe "bundler dependencies" do
     before(:each) do
       build_repo2 do
@@ -633,7 +610,7 @@ describe "bundle install with gem sources" do
       G
 
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
-        Fetching source index for file:#{gem_repo2}/
+        Fetching source index from file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "bundler":
           In Gemfile:
             bundler (= 0.9.2) ruby
@@ -690,7 +667,7 @@ describe "bundle install with gem sources" do
       G
 
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
-        Fetching source index for file:#{gem_repo2}/
+        Fetching source index from file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
             activemerchant (>= 0) ruby depends on
@@ -710,7 +687,7 @@ describe "bundle install with gem sources" do
       G
 
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
-        Fetching source index for file:#{gem_repo2}/
+        Fetching source index from file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
             rails_fail (>= 0) ruby depends on
@@ -767,4 +744,24 @@ describe "bundle install with gem sources" do
       err.should be_empty
     end
   end
+
+  describe "when system_bindir is set" 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
+      gemfile <<-G
+        require 'rubygems'
+        def Gem.bindir; "/usr/bin"; end
+        source "file://#{gem_repo1}"
+        gem "rack"
+      G
+
+      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
+    end
+  end
+
 end

data/spec/install/gems/standalone_spec.rb

@@ -0,0 +1,238 @@
+require "spec_helper"
+
+describe "bundle install --standalone" do
+  describe "with simple gems" do
+    before do
+      install_gemfile <<-G, :standalone => true
+        source "file://#{gem_repo1}"
+        gem "rails"
+      G
+    end
+
+    it "still makes the gems available to normal bundler" do
+      should_be_installed "actionpack 2.3.2", "rails 2.3.2"
+    end
+
+    it "generates a bundle/bundler/setup.rb" do
+      bundled_app("bundle/bundler/setup.rb").should exist
+    end
+
+    it "makes the gems available without bundler" do
+      ruby <<-RUBY, :no_lib => true
+        $:.unshift File.expand_path("bundle")
+        require "bundler/setup"
+
+        require "actionpack"
+        puts ACTIONPACK
+      RUBY
+
+      out.should be == "2.3.2"
+    end
+
+    it "works on a different system" do
+      FileUtils.mv(bundled_app, "#{bundled_app}2")
+      Dir.chdir("#{bundled_app}2")
+
+      ruby <<-RUBY, :no_lib => true
+        $:.unshift File.expand_path("bundle")
+        require "bundler/setup"
+
+        require "actionpack"
+        puts ACTIONPACK
+      RUBY
+
+      out.should be == "2.3.2"
+    end
+  end
+
+  describe "with a combination of gems and git repos" do
+    before do
+      build_git "devise", "1.0"
+
+      install_gemfile <<-G, :standalone => true
+        source "file://#{gem_repo1}"
+        gem "rails"
+        gem "devise", :git => "#{lib_path('devise-1.0')}"
+      G
+    end
+
+    it "still makes the gems available to normal bundler" do
+      should_be_installed "actionpack 2.3.2", "rails 2.3.2", "devise 1.0"
+    end
+
+    it "generates a bundle/bundler/setup.rb" do
+      bundled_app("bundle/bundler/setup.rb").should exist
+    end
+
+    it "makes the gems available without bundler" do
+      ruby <<-RUBY, :no_lib => true
+        $:.unshift File.expand_path("bundle")
+        require "bundler/setup"
+
+        require "devise"
+        require "actionpack"
+        puts DEVISE
+        puts ACTIONPACK
+      RUBY
+
+      out.should be == "1.0\n2.3.2"
+    end
+  end
+
+  describe "with groups" do
+    before do
+      build_git "devise", "1.0"
+
+      install_gemfile <<-G, :standalone => true
+        source "file://#{gem_repo1}"
+        gem "rails"
+
+        group :test do
+          gem "rspec"
+          gem "rack-test"
+        end
+      G
+    end
+
+    it "makes the gems available without bundler" do
+      ruby <<-RUBY, :no_lib => true
+        $:.unshift File.expand_path("bundle")
+        require "bundler/setup"
+
+        require "actionpack"
+        require "spec"
+        require "rack/test"
+        puts ACTIONPACK
+        puts SPEC
+        puts RACK_TEST
+      RUBY
+
+      out.should be == "2.3.2\n1.2.7\n1.0"
+    end
+
+    it "allows creating a standalone file with limited groups" do
+      bundle "install --standalone default"
+
+      load_error_ruby <<-RUBY, 'spec', :no_lib => true
+        $:.unshift File.expand_path("bundle")
+        require "bundler/setup"
+
+        require "actionpack"
+        puts ACTIONPACK
+        require "spec"
+      RUBY
+
+      out.should be == "2.3.2"
+      err.should == "ZOMG LOAD ERROR"
+    end
+
+    it "allows --without to limit the groups used in a standalone" do
+      bundle "install --standalone --without test"
+
+      load_error_ruby <<-RUBY, 'spec', :no_lib => true
+        $:.unshift File.expand_path("bundle")
+        require "bundler/setup"
+
+        require "actionpack"
+        puts ACTIONPACK
+        require "spec"
+      RUBY
+
+      out.should be == "2.3.2"
+      err.should == "ZOMG LOAD ERROR"
+    end
+
+    it "allows --path to change the location of the standalone bundle" do
+      bundle "install --standalone --path path/to/bundle"
+
+      ruby <<-RUBY, :no_lib => true, :expect_err => false
+        $:.unshift File.expand_path("path/to/bundle")
+        require "bundler/setup"
+
+        require "actionpack"
+        puts ACTIONPACK
+      RUBY
+
+      out.should == "2.3.2"
+    end
+
+    it "allows remembered --without to limit the groups used in a standalone" do
+      bundle "install --without test"
+      bundle "install --standalone"
+
+      load_error_ruby <<-RUBY, 'spec', :no_lib => true
+        $:.unshift File.expand_path("bundle")
+        require "bundler/setup"
+
+        require "actionpack"
+        puts ACTIONPACK
+        require "spec"
+      RUBY
+
+      out.should be == "2.3.2"
+      err.should == "ZOMG LOAD ERROR"
+    end
+  end
+
+  describe "with gemcutter's dependency API" do
+    let(:source_uri) { "http://localgemserver.test" }
+
+    describe "simple gems" do
+      before do
+        gemfile <<-G
+          source "#{source_uri}"
+          gem "rails"
+        G
+      end
+
+      it "should run without errors" do
+        bundle "install --standalone", :artifice => "endpoint", :exitstatus => true
+
+        @exitstatus.should be == 0
+      end
+
+      it "still makes the gems available to normal bundler" do
+        bundle "install --standalone", :artifice => "endpoint"
+
+        should_be_installed "actionpack 2.3.2", "rails 2.3.2"
+      end
+
+      it "generates a bundle/bundler/setup.rb" do
+        bundle "install --standalone", :artifice => "endpoint"
+
+        bundled_app("bundle/bundler/setup.rb").should exist
+      end
+
+      it "makes the gems available without bundler" do
+        bundle "install --standalone", :artifice => "endpoint"
+
+        ruby <<-RUBY, :no_lib => true
+          $:.unshift File.expand_path("bundle")
+          require "bundler/setup"
+
+          require "actionpack"
+          puts ACTIONPACK
+        RUBY
+
+        out.should be == "2.3.2"
+      end
+
+      it "works on a different system" do
+        bundle "install --standalone", :artifice => "endpoint"
+
+        FileUtils.mv(bundled_app, "#{bundled_app}2")
+        Dir.chdir("#{bundled_app}2")
+
+        ruby <<-RUBY, :no_lib => true
+          $:.unshift File.expand_path("bundle")
+          require "bundler/setup"
+
+          require "actionpack"
+          puts ACTIONPACK
+        RUBY
+
+        out.should be == "2.3.2"
+      end
+    end
+  end
+end

data/spec/install/git_spec.rb

@@ -567,4 +567,66 @@ describe "bundle install with git sources" do
       exitstatus.should == 0
     end
   end
+
+  describe "gem install hooks" do
+    it "runs pre-install hooks" do
+      build_git "foo"
+      gemfile <<-G
+        gem "foo", :git => "#{lib_path('foo-1.0')}"
+      G
+
+      File.open(lib_path("install_hooks.rb"), "w") do |h|
+        h.write <<-H
+          require 'rubygems'
+          Gem.pre_install_hooks << lambda do |inst|
+            STDERR.puts "Ran pre-install hook: \#{inst.spec.full_name}"
+          end
+        H
+      end
+
+      bundle :install, :expect_err => true,
+        :requires => [lib_path('install_hooks.rb')]
+      err.should == "Ran pre-install hook: foo-1.0"
+    end
+
+    it "runs post-install hooks" do
+      build_git "foo"
+      gemfile <<-G
+        gem "foo", :git => "#{lib_path('foo-1.0')}"
+      G
+
+      File.open(lib_path("install_hooks.rb"), "w") do |h|
+        h.write <<-H
+          require 'rubygems'
+          Gem.post_install_hooks << lambda do |inst|
+            STDERR.puts "Ran post-install hook: \#{inst.spec.full_name}"
+          end
+        H
+      end
+
+      bundle :install, :expect_err => true,
+        :requires => [lib_path('install_hooks.rb')]
+      err.should == "Ran post-install hook: foo-1.0"
+    end
+
+    it "complains if the install hook fails" do
+      build_git "foo"
+      gemfile <<-G
+        gem "foo", :git => "#{lib_path('foo-1.0')}"
+      G
+
+      File.open(lib_path("install_hooks.rb"), "w") do |h|
+        h.write <<-H
+          require 'rubygems'
+          Gem.pre_install_hooks << lambda do |inst|
+            false
+          end
+        H
+      end
+
+      bundle :install, :expect_err => true,
+        :requires => [lib_path('install_hooks.rb')]
+      err.should include("failed for foo-1.0")
+    end
+  end
 end

data/spec/other/check_spec.rb

@@ -179,6 +179,12 @@ describe "bundle check" do
     out.should include("Could not locate Gemfile")
   end
 
+  it "does not output fatal error message" do
+    bundle :check, :exitstatus => true
+    @exitstatus.should eq(10)
+    out.should_not include("Unfortunately, a fatal error has occurred. ")
+  end
+
   it "should not crash when called multiple times on a new machine" do
     gemfile <<-G
       gem 'rails', '3.0.0.beta3'
@@ -195,6 +201,30 @@ describe "bundle check" do
     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"