bundler 1.0.3 → 1.0.5

data/lib/bundler/ui.rb

@@ -3,6 +3,9 @@ module Bundler
     def warn(message)
     end
 
+    def debug(message)
+    end
+
     def error(message)
     end
 
@@ -13,13 +16,16 @@ module Bundler
     end
 
     class Shell < UI
+      attr_writer :shell
+
       def initialize(shell)
         @shell = shell
         @quiet = false
+        @debug = ENV['DEBUG']
       end
 
       def debug(msg)
-        @shell.say(msg) if ENV['DEBUG'] && !@quiet
+        @shell.say(msg) if @debug && !@quiet
       end
 
       def info(msg)
@@ -41,6 +47,10 @@ module Bundler
       def be_quiet!
         @quiet = true
       end
+
+      def debug!
+        @debug = true
+      end
     end
 
     class RGProxy < Gem::SilentUI

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.0.3" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.5" unless defined?(::Bundler::VERSION)
 end

data/lib/bundler/vlad.rb

@@ -1,7 +1,7 @@
 # Vlad task for Bundler.
 #
 # Just add "require 'bundler/vlad'" in your Vlad deploy.rb, and
-# Bundler will be activated after each new deployment.
+# include the vlad:bundle:install task in your vlad:deploy task.
 require 'bundler/deployment'
 
 namespace :vlad do

data/man/bundle-exec.ronn

@@ -56,6 +56,19 @@ It also modifies Rubygems:
   making system executables work
 * Add all gems in the bundle into Gem.loaded_specs
 
+### Shelling out
+
+When shelling out (using the `system` or backticks methods,
+for example), Bundler's environment changes will propogate to
+the subshell environment. If you desire to shell out without
+Bundler's environment changes, simply employ the `with_clean_env`
+method. It will restore all environment variables to what they
+were before Bundler was activated. For example:
+
+    Bundler.with_clean_env do
+      `brew install wget`
+    end
+
 ## RUBYGEMS PLUGINS
 
 At present, the Rubygems plugin system requires all files

data/man/bundle-install.ronn

@@ -3,9 +3,12 @@ bundle-install(1) -- Install the dependencies specified in your Gemfile
 
 ## SYNOPSIS
 
-`bundle install` [--local] [--quiet] [--gemfile=GEMFILE] [--system]
-                 [--deployment] [--frozen] [--path]
-                 [--binstubs[=DIRECTORY]] [--without=GROUP1[ GROUP2...]]
+`bundle install` [--gemfile=GEMFILE]
+                 [--path PATH] [--system]
+                 [--without=GROUP1[ GROUP2...]]
+                 [--local] [--deployment]
+                 [--binstubs[=DIRECTORY]]
+                 [--quiet]
 
 ## DESCRIPTION
 

data/man/bundle.ronn

@@ -3,7 +3,7 @@ bundle(1) -- Ruby Dependency Management
 
 ## SYNOPSIS
 
-`bundle` [--no-color] COMMAND [ARGS]
+`bundle` COMMAND [--no-color] [--verbose] [ARGS]
 
 ## DESCRIPTION
 
@@ -18,6 +18,9 @@ started, and Gemfile(5) for more information on the `Gemfile` format.
 * `--no-color`:
   Prints all output without color
 
+* `--verbose`:
+  Prints out additional logging information
+
 ## BUNDLE COMMANDS
 
 We divide `bundle` subcommands into primary commands and utilities.

data/spec/cache/gems_spec.rb

@@ -153,6 +153,20 @@ describe "bundle cache" do
       cached_gem("activesupport-2.3.2").should_not exist
     end
 
+    it "removes .gems when gem changes to git source" do
+      build_git "rack"
+
+      install_gemfile <<-G
+        source "file://#{gem_repo2}"
+        gem "rack", :git => "#{lib_path("rack-1.0")}"
+        gem "actionpack"
+      G
+      cached_gem("rack-1.0.0").should_not exist
+      cached_gem("actionpack-2.3.2").should exist
+      cached_gem("activesupport-2.3.2").should exist
+    end
+
+
     it "doesn't remove gems that are for another platform" do
       simulate_platform "java" do
         install_gemfile <<-G

data/spec/cache/git_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 describe "bundle cache with git" do
   it "base_name should strip private repo uris" do
-    source  = Bundler::Source::Git.new("uri" => "git@gitthub.com:bundler.git")
+    source  = Bundler::Source::Git.new("uri" => "git@github.com:bundler.git")
     source.send(:base_name).should == "bundler"
   end
 end

data/spec/install/deploy_spec.rb

@@ -20,8 +20,8 @@ describe "install with --deployment or --frozen" do
 
   it "works after you try to deploy without a lock" do
     bundle "install --deployment"
-    bundle :install, :exit_status => true
-    exitstatus.should == 0
+    bundle :install, :exitstatus => true
+    check exitstatus.should == 0
     should_be_installed "rack 1.0"
   end
 
@@ -34,18 +34,37 @@ describe "install with --deployment or --frozen" do
     should_be_installed "rack 1.0"
   end
 
+  it "works if you exclude a group with a git gem" do
+    build_git "foo"
+    gemfile <<-G
+      group :test do
+        gem "foo", :git => "#{lib_path('foo-1.0')}"
+      end
+    G
+    bundle :install
+    bundle "install --deployment --without test", :exitstatus => true
+    exitstatus.should == 0
+  end
+
+  it "works when you bundle exec bundle" do
+    bundle :install
+    bundle "install --deployment"
+    bundle "exec bundle check", :exitstatus => true
+    exitstatus.should == 0
+  end
+
   describe "with an existing lockfile" do
     before do
       bundle "install"
     end
 
     it "works with the --deployment flag if you didn't change anything" do
-      bundle "install --deployment", :exit_status => true
+      bundle "install --deployment", :exitstatus => true
       exitstatus.should == 0
     end
 
     it "works with the --frozen flag if you didn't change anything" do
-      bundle "install --frozen", :exit_status => true
+      bundle "install --frozen", :exitstatus => true
       exitstatus.should == 0
     end
 

data/spec/install/gems/flex_spec.rb

@@ -269,4 +269,45 @@ describe "bundle flex_install" do
       L
     end
   end
+
+  # This was written to test github issue #636, but it passed.
+  # It's insanoly slow (3.36s) so I'm not going to run it
+  # describe "when a locked child dependency conflicts" do
+  #   before(:each) do
+  #     build_repo2 do
+  #       build_gem "capybara", "0.3.9" do |s|
+  #         s.add_dependency "rack", ">= 1.0.0"
+  #       end
+  #
+  #       build_gem "rack", "1.1.0"
+  #       build_gem "rails", "3.0.0.rc4" do |s|
+  #         s.add_dependency "rack", "~> 1.1.0"
+  #       end
+  #
+  #       build_gem "rack", "1.2.1"
+  #       build_gem "rails", "3.0.0" do |s|
+  #         s.add_dependency "rack", "~> 1.2.1"
+  #       end
+  #     end
+  #   end
+  #
+  #   it "prints the correct error message" do
+  #     # install Rails 3.0.0.rc
+  #     install_gemfile <<-G
+  #       source "file://#{gem_repo2}"
+  #       gem "rails", "3.0.0.rc4"
+  #       gem "capybara", "0.3.9"
+  #     G
+  #
+  #     # upgrade Rails to 3.0.0 and then install again
+  #     install_gemfile <<-G
+  #       source "file://#{gem_repo2}"
+  #       gem "rails", "3.0.0"
+  #       gem "capybara", "0.3.9"
+  #     G
+  #
+  #     out.should match(/Gemfile.lock/)
+  #   end
+  # end
+
 end

data/spec/install/gems/groups_spec.rb

@@ -38,7 +38,7 @@ describe "bundle install with gem sources" do
         check out.should == '1.0.0'
 
         out = run("require 'activesupport'; puts ACTIVESUPPORT")
-        out.should == '2.3.5'
+        check out.should == '2.3.5'
 
         out = run("require 'thin'; puts THIN")
         out.should == '1.0'

data/spec/install/gems/platform_spec.rb

@@ -94,7 +94,7 @@ describe "bundle install across platforms" do
       gem "rack", "1.0.0"
     G
 
-    bundle "install --path vendor"
+    bundle "install --path vendor/bundle"
 
     vendored_gems("gems/rack-1.0.0").should exist
   end
@@ -106,12 +106,12 @@ describe "bundle install across platforms" do
       gem "rack", "1.0.0"
     G
 
-    bundle "install --path vendor"
+    bundle "install --path vendor/bundle"
 
     new_version = Gem::ConfigMap[:ruby_version] == "1.8" ? "1.9.1" : "1.8"
-    FileUtils.mv(vendored_gems, bundled_app("vendor/#{Gem.ruby_engine}/#{new_version}"))
+    FileUtils.mv(vendored_gems, bundled_app("vendor/bundle/#{Gem.ruby_engine}/#{new_version}"))
 
-    bundle "install ./vendor"
+    bundle "install --path ./vendor/bundle"
     vendored_gems("gems/rack-1.0.0").should exist
   end
 end
@@ -132,9 +132,7 @@ describe "bundle install with platform conditionals" do
   it "does not install gems tagged w/ another platforms" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
-
       gem "rack"
-
       platforms :#{not_local_tag} do
         gem "nokogiri"
       end
@@ -144,21 +142,6 @@ describe "bundle install with platform conditionals" do
     should_not_be_installed "nokogiri 1.4.2"
   end
 
-  it "does not install gems tagged w/ another platform" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack"
-
-      platform :#{not_local_tag} do
-        gem "nokogiri"
-      end
-    G
-
-    should_be_installed     "rack 1.0"
-    should_not_be_installed "nokogiri 1.4.2"
-  end
-
   it "installs gems tagged w/ the current platforms inline" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"

data/spec/install/gems/simple_case_spec.rb

@@ -95,7 +95,7 @@ describe "bundle install with gem sources" do
     end
 
     it "raises an appropriate error when gems are specified using symbols" do
-      status = install_gemfile(<<-G, :exit_status => true)
+      status = install_gemfile(<<-G, :exitstatus => true)
         source "file://#{gem_repo1}"
         gem :rack
       G
@@ -251,19 +251,19 @@ describe "bundle install with gem sources" do
       end
 
       it "works" do
-        bundle "install vendor"
+        bundle "install --path vendor"
         should_be_installed "rack 1.0"
       end
 
       it "allows running bundle install --system without deleting foo" do
-        bundle "install vendor"
+        bundle "install --path vendor"
         bundle "install --system"
         FileUtils.rm_rf(bundled_app("vendor"))
         should_be_installed "rack 1.0"
       end
 
       it "allows running bundle install --system after deleting foo" do
-        bundle "install vendor"
+        bundle "install --path vendor"
         FileUtils.rm_rf(bundled_app("vendor"))
         bundle "install --system"
         should_be_installed "rack 1.0"
@@ -356,7 +356,7 @@ describe "bundle install with gem sources" do
     [:env, :global].each do |type|
       it "installs gems to a path if one is specified" do
         set_bundle_path(type, bundled_app("vendor2").to_s)
-        bundle "install vendor"
+        bundle "install --path vendor/bundle"
 
         vendored_gems("gems/rack-1.0.0").should be_directory
         bundled_app("vendor2").should_not be_directory
@@ -386,7 +386,7 @@ describe "bundle install with gem sources" do
     end
 
     it "installs gems to BUNDLE_PATH from .bundle/config" do
-      config "BUNDLE_PATH" => bundled_app("vendor").to_s
+      config "BUNDLE_PATH" => bundled_app("vendor/bundle").to_s
 
       bundle :install
 
@@ -395,7 +395,7 @@ describe "bundle install with gem sources" do
     end
 
     it "sets BUNDLE_PATH as the first argument to bundle install" do
-      bundle "install ./vendor"
+      bundle "install --path ./vendor/bundle"
 
       vendored_gems('gems/rack-1.0.0').should be_directory
       should_be_installed "rack 1.0.0"
@@ -404,7 +404,7 @@ describe "bundle install with gem sources" do
     it "disables system gems when passing a path to install" do
       # This is so that vendored gems can be distributed to others
       build_gem "rack", "1.1.0", :to_system => true
-      bundle "install ./vendor"
+      bundle "install --path ./vendor/bundle"
 
       vendored_gems('gems/rack-1.0.0').should be_directory
       should_be_installed "rack 1.0.0"
@@ -461,17 +461,24 @@ 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("Your bundle was installed to `vendor/bundle`")
+      out.should include("It was installed into ./vendor/bundle")
       should_be_installed "rack 1.0.0"
       bundled_app("vendor/bundle").should exist
     end
 
     it "prints a warning if you try to use --disable-shared-gems" do
-      bundle "install vendor --disable-shared-gems"
+      bundle "install --path vendor --disable-shared-gems"
       out.should include "The disable-shared-gem option is no longer available"
     end
 
-    ["install vendor", "install --path vendor"].each do |install|
+    ["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"
@@ -479,7 +486,7 @@ describe "bundle install with gem sources" do
 
       it "prints a warning to let the user know what has happened with bundle #{install}" do
         bundle install
-        out.should include("Your bundle was installed to `vendor`")
+        out.should include("It was installed into ./vendor")
       end
 
       it "disallows #{install} --system" do
@@ -594,7 +601,7 @@ describe "bundle install with gem sources" do
         source "file://#{gem_repo1}"
         gem "rack"
       G
-      should_not_be_installed "bundler 0.9.1"
+      should_not_be_installed "bundler #{Bundler::VERSION}"
     end
 
     it "causes a conflict if explicitly requesting a different version" do
@@ -610,7 +617,7 @@ describe "bundle install with gem sources" do
           In Gemfile:
             bundler (= 0.9.2)
 
-          In snapshot (Gemfile.lock):
+          Current Bundler version:
             bundler (#{Bundler::VERSION})
         E
       out.should == nice_error

data/spec/install/gems/sudo_spec.rb

@@ -17,7 +17,7 @@ describe "when using sudo" do
       G
 
       system_gem_path("gems/rack-1.0.0").should exist
-      system_gem_path("gems/rack-1.0.0").stat.uid.should == 0
+      check system_gem_path("gems/rack-1.0.0").stat.uid.should == 0
       should_be_installed "rack 1.0"
     end
 
@@ -33,7 +33,7 @@ describe "when using sudo" do
       G
 
       bundle_path.join("gems/rack-1.0.0").should exist
-      bundle_path.join("gems/rack-1.0.0").stat.uid.should == 0
+      check bundle_path.join("gems/rack-1.0.0").stat.uid.should == 0
       should_be_installed "rack 1.0"
     end