bundler 1.0.21 → 1.1.rc

data/lib/bundler.rb

@@ -16,26 +16,31 @@ require 'bundler/version'
 module Bundler
   ORIGINAL_ENV = ENV.to_hash
 
-  autoload :Definition,          'bundler/definition'
-  autoload :Dependency,          'bundler/dependency'
-  autoload :Dsl,                 'bundler/dsl'
-  autoload :Environment,         'bundler/environment'
-  autoload :GemHelper,           'bundler/gem_helper'
-  autoload :GemInstaller,        'bundler/gem_installer'
-  autoload :Graph,               'bundler/graph'
-  autoload :Index,               'bundler/index'
-  autoload :Installer,           'bundler/installer'
-  autoload :LazySpecification,   'bundler/lazy_specification'
-  autoload :LockfileParser,      'bundler/lockfile_parser'
-  autoload :RemoteSpecification, 'bundler/remote_specification'
-  autoload :Resolver,            'bundler/resolver'
-  autoload :Runtime,             'bundler/runtime'
-  autoload :Settings,            'bundler/settings'
-  autoload :SharedHelpers,       'bundler/shared_helpers'
-  autoload :SpecSet,             'bundler/spec_set'
-  autoload :Source,              'bundler/source'
-  autoload :Specification,       'bundler/shared_helpers'
-  autoload :UI,                  'bundler/ui'
+  autoload :Definition,            'bundler/definition'
+  autoload :Dependency,            'bundler/dependency'
+  autoload :DepProxy,              'bundler/dep_proxy'
+  autoload :Dsl,                   'bundler/dsl'
+  autoload :EndpointSpecification, 'bundler/endpoint_specification'
+  autoload :Environment,           'bundler/environment'
+  autoload :Fetcher,               'bundler/fetcher'
+  autoload :GemHelper,             'bundler/gem_helper'
+  autoload :GemHelpers,            'bundler/gem_helpers'
+  autoload :GemInstaller,          'bundler/gem_installer'
+  autoload :Graph,                 'bundler/graph'
+  autoload :Index,                 'bundler/index'
+  autoload :Installer,             'bundler/installer'
+  autoload :LazySpecification,     'bundler/lazy_specification'
+  autoload :LockfileParser,        'bundler/lockfile_parser'
+  autoload :MatchPlatform,         'bundler/match_platform'
+  autoload :RemoteSpecification,   'bundler/remote_specification'
+  autoload :Resolver,              'bundler/resolver'
+  autoload :Runtime,               'bundler/runtime'
+  autoload :Settings,              'bundler/settings'
+  autoload :SharedHelpers,         'bundler/shared_helpers'
+  autoload :SpecSet,               'bundler/spec_set'
+  autoload :Source,                'bundler/source'
+  autoload :Specification,         'bundler/shared_helpers'
+  autoload :UI,                    'bundler/ui'
 
   class BundlerError < StandardError
     def self.status_code(code)
@@ -54,6 +59,7 @@ module Bundler
   class DslError         < BundlerError; status_code(15) ; end
   class ProductionError  < BundlerError; status_code(16) ; end
   class InvalidOption    < DslError                      ; end
+  class HTTPError        < BundlerError; status_code(17) ; end
 
 
   WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
@@ -185,7 +191,7 @@ module Bundler
       @settings ||= Settings.new(app_config_path)
     end
 
-    def with_clean_env
+    def with_original_env
       bundled_env = ENV.to_hash
       ENV.replace(ORIGINAL_ENV)
       yield
@@ -193,6 +199,21 @@ module Bundler
       ENV.replace(bundled_env.to_hash)
     end
 
+    def with_clean_env
+      with_original_env do
+        ENV.delete_if { |k,_| k[0,7] == 'BUNDLE_' }
+        yield
+      end
+    end
+
+    def clean_system(*args)
+      with_clean_env { Kernel.system(*args) }
+    end
+
+    def clean_exec(*args)
+      with_clean_env { Kernel.exec(*args) }
+    end
+
     def default_gemfile
       SharedHelpers.default_gemfile
     end
@@ -201,15 +222,27 @@ module Bundler
       SharedHelpers.default_lockfile
     end
 
+    def system_bindir
+      # Gem.bindir doesn't always return the location that Rubygems will install
+      # system binaries. If you put '-n foo' in your .gemrc, Rubygems will
+      # install binstubs there instead. Unfortunately, Rubygems doesn't expose
+      # that directory at all, so rather than parse .gemrc ourselves, we allow
+      # the directory to be set as well, via `bundle config bindir foo`.
+      Bundler.settings[:system_bindir] || Bundler.rubygems.gem_bindir
+    end
+
     def requires_sudo?
-      return @requires_sudo if defined?(@checked_for_sudo) && @checked_for_sudo
+      return @requires_sudo if defined?(@checked_for_sudo)
 
       path = bundle_path
       path = path.parent until path.exist?
       sudo_present = !(`which sudo` rescue '').empty?
+      bin_dir = Pathname.new(Bundler.system_bindir)
+      bin_dir = bin_dir.parent until bin_dir.exist?
 
       @checked_for_sudo = true
-      @requires_sudo = settings.allow_sudo? && !File.writable?(path) && sudo_present
+      sudo_gems = !File.writable?(path) || !File.writable?(bin_dir)
+      @requires_sudo = settings.allow_sudo? && sudo_gems && sudo_present
     end
 
     def mkdir_p(path)

data/man/bundle-install.ronn

@@ -8,6 +8,7 @@ bundle-install(1) -- Install the dependencies specified in your Gemfile
                  [--without=GROUP1[ GROUP2...]]
                  [--local] [--deployment]
                  [--binstubs[=DIRECTORY]]
+                 [--standalone[=GROUP1[ GROUP2...]]]
                  [--quiet]
 
 ## DESCRIPTION
@@ -69,6 +70,12 @@ update process below under [CONSERVATIVE UPDATING][].
   a `bin/rails` executable that ensures that all dependencies used
   come from the bundled gems.
 
+* `--standalone[=<list>]`:
+  Make a bundle that can work without Ruby Gems or Bundler at runtime.
+  It takes a space separated list of groups to install. It creates a
+  `bundle` directory and installs the bundle there. It also generates
+  a `bundle/bundler/setup.rb` file to replace Bundler's own setup.
+
 ## DEPLOYMENT MODE
 
 Bundler's defaults are optimized for development. To switch to

data/man/bundle.ronn

@@ -55,6 +55,9 @@ We divide `bundle` subcommands into primary commands and utilities.
 * `bundle show(1)`:
   Show the source location of a particular gem in the bundle
 
+* `bundle outdated(1)`:
+  Show all of the outdated gems in the current bundle
+
 * `bundle console(1)`:
   Start an IRB session in the context of the current bundle
 

data/man/gemfile.5.ronn

@@ -45,19 +45,19 @@ Each _gem_ `MAY` have one or more version specifiers.
 
 ### REQUIRE AS (:require)
 
-Each _gem_ `MAY` specify its main file, which should be used when autorequiring
-(`Bundler.require`).
+Each _gem_ `MAY` specify files that should be used when autorequiring via
+`Bundler.require`. You may pass an array with multiple files, or `false` to
+prevent any file from being autorequired.
 
     gem "sqlite3-ruby", :require => "sqlite3"
+    gem "redis", :require => ["redis/connection/hiredis", "redis"]
+    gem "webmock", :require => false
 
-This defaults to the name of the gem itself. For instance, these are identical:
+The argument defaults to the name of the gem. For example, these are identical:
 
     gem "nokogiri"
     gem "nokogiri", :require => "nokogiri"
 
-Specify `:require => false` to prevent bundler from requiring the gem, but still
-install it and maintain dependencies.
-
 ### GROUPS (:group or :groups)
 
 Each _gem_ `MAY` specify membership in one or more groups. Any _gem_ that does

data/spec/bundler/dsl_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Bundler::Dsl do
+  describe '#_normalize_options' do
+    before do
+      @rubygems = mock("rubygems")
+      Bundler::Source::Rubygems.stub(:new){ @rubygems }
+    end
+
+    it "should convert :github to :git" do
+      subject.gem("sparks", :github => "indirect/sparks")
+      github_uri = "git://github.com/indirect/sparks.git"
+      subject.dependencies.first.source.uri.should == github_uri
+    end
+
+    it "should convert 'rails' to 'rails/rails'" do
+      subject.gem("rails", :github => "rails")
+      github_uri = "git://github.com/rails/rails.git"
+      subject.dependencies.first.source.uri.should == github_uri
+    end
+  end
+end

data/spec/bundler/source_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Bundler::Source::Rubygems do
+  before do
+    Bundler.stub(:root){ Pathname.new("root") }
+  end
+
+  describe "caches" do
+    it "should include Bundler.app_cache" do
+      subject.caches.should include(Bundler.app_cache)
+    end
+
+    it "should include GEM_PATH entries" do
+      Gem.path.each do |path|
+        subject.caches.should include(File.expand_path("#{path}/cache"))
+      end
+    end
+
+    it "should be an array of strings or pathnames" do
+      subject.caches.each do |cache|
+        [String, Pathname].should include(cache.class)
+      end
+    end
+  end
+end

data/spec/install/deprecated_spec.rb

@@ -5,8 +5,7 @@ describe "bundle install with deprecated features" do
     in_app_root
   end
 
-  %w( only except disable_system_gems disable_rubygems
-      clear_sources bundle_path bin_path ).each do |deprecated|
+  %w().each do |deprecated|
 
     it "reports that #{deprecated} is deprecated" do
       gemfile <<-G
@@ -21,7 +20,7 @@ describe "bundle install with deprecated features" do
   end
 
 
-  %w( require_as vendored_at only except ).each do |deprecated|
+  %w().each do |deprecated|
 
     it "reports that :#{deprecated} is deprecated" do
       gemfile <<-G

data/spec/install/gems/dependency_api_spec.rb

@@ -0,0 +1,358 @@
+require "spec_helper"
+
+describe "gemcutter's dependency API" do
+  let(:source_uri) { "http://localgemserver.test" }
+
+  it "should use the API" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rack"
+    G
+
+    bundle :install, :artifice => "endpoint"
+    out.should include("Fetching gem metadata from #{source_uri}")
+    should_be_installed "rack 1.0.0"
+  end
+
+  it "should handle nested dependencies" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rails"
+    G
+
+    bundle :install, :artifice => "endpoint"
+    out.should include("Fetching gem metadata from #{source_uri}/...")
+    should_be_installed(
+      "rails 2.3.2",
+      "actionpack 2.3.2",
+      "activerecord 2.3.2",
+      "actionmailer 2.3.2",
+      "activeresource 2.3.2",
+      "activesupport 2.3.2")
+  end
+
+  it "should handle multiple gem dependencies on the same gem" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "net-sftp"
+    G
+
+    bundle :install, :artifice => "endpoint"
+    should_be_installed "net-sftp 1.1.1"
+  end
+
+  it "should use the endpoint when using --deployment" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rack"
+    G
+    bundle :install, :artifice => "endpoint"
+
+    bundle "install --deployment", :artifice => "endpoint"
+    out.should include("Fetching gem metadata from #{source_uri}")
+    should_be_installed "rack 1.0.0"
+  end
+
+  it "handles git dependencies that are in rubygems" do
+    build_git "foo" do |s|
+      s.executables = "foobar"
+      s.add_dependency "rails", "2.3.2"
+    end
+
+    gemfile <<-G
+      source "#{source_uri}"
+      git "file:///#{lib_path('foo-1.0')}" do
+        gem 'foo'
+      end
+    G
+
+    bundle :install, :artifice => "endpoint"
+
+    should_be_installed("rails 2.3.2")
+  end
+
+  it "handles git dependencies that are in rubygems using --deployment" do
+    build_git "foo" do |s|
+      s.executables = "foobar"
+      s.add_dependency "rails", "2.3.2"
+    end
+
+    gemfile <<-G
+      source "#{source_uri}"
+      gem 'foo', :git => "file:///#{lib_path('foo-1.0')}"
+    G
+
+    bundle :install, :artifice => "endpoint"
+
+    bundle "install --deployment", :artifice => "endpoint"
+
+    should_be_installed("rails 2.3.2")
+  end
+
+  it "falls back when the API errors out" do
+    simulate_platform mswin
+
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rcov"
+    G
+
+    bundle :install, :fakeweb => "windows"
+    out.should include("\nFetching full source index from #{source_uri}")
+    should_be_installed "rcov 1.0.0"
+  end
+
+  it "falls back when hitting the Gemcutter Dependency Limit" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "activesupport"
+      gem "actionpack"
+      gem "actionmailer"
+      gem "activeresource"
+      gem "thin"
+      gem "rack"
+      gem "rails"
+    G
+    bundle :install, :artifice => "endpoint_fallback"
+    out.should include("\nFetching full source index from #{source_uri}")
+
+    should_be_installed(
+      "activesupport 2.3.2",
+      "actionpack 2.3.2",
+      "actionmailer 2.3.2",
+      "activeresource 2.3.2",
+      "activesupport 2.3.2",
+      "thin 1.0.0",
+      "rack 1.0.0",
+      "rails 2.3.2")
+  end
+
+  it "falls back when Gemcutter API doesn't return proper Marshal format" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rack"
+    G
+
+    bundle :install, :artifice => "endpoint_marshal_fail"
+    out.should include("\nFetching full source index from #{source_uri}")
+    should_be_installed "rack 1.0.0"
+  end
+
+  it "timeouts when Bundler::Fetcher redirects too much" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rack"
+    G
+
+    bundle :install, :artifice => "endpoint_redirect"
+    out.should match(/Too many redirects/)
+  end
+
+  it "should use the modern index when the --full-index" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rack"
+    G
+
+    bundle "install --full-index", :artifice => "endpoint"
+    out.should include("Fetching source index from #{source_uri}")
+    should_be_installed "rack 1.0.0"
+  end
+
+  it "fetches again when more dependencies are found in subsequent sources" do
+    build_repo2 do
+      build_gem "back_deps" do |s|
+        s.add_dependency "foo"
+      end
+      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+    end
+
+    gemfile <<-G
+      source "#{source_uri}"
+      source "#{source_uri}/extra"
+      gem "back_deps"
+    G
+
+    bundle :install, :artifice => "endpoint_extra"
+    should_be_installed "back_deps 1.0"
+  end
+
+  it "prints API output properly with back deps" do
+    build_repo2 do
+      build_gem "back_deps" do |s|
+        s.add_dependency "foo"
+      end
+      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+    end
+
+    gemfile <<-G
+      source "#{source_uri}"
+      source "#{source_uri}/extra"
+      gem "back_deps"
+    G
+
+    bundle :install, :artifice => "endpoint_extra"
+
+    output = <<OUTPUT
+Fetching gem metadata from http://localgemserver.test/..
+Fetching gem metadata from http://localgemserver.test/extra/.
+OUTPUT
+    out.should include(output)
+  end
+
+  it "does not fetch every specs if the index of gems is large when doing back deps" do
+    build_repo2 do
+      build_gem "back_deps" do |s|
+        s.add_dependency "foo"
+      end
+      build_gem "missing"
+      # need to hit the limit
+      1.upto(Bundler::Source::Rubygems::FORCE_MODERN_INDEX_LIMIT) do |i|
+        build_gem "gem#{i}"
+      end
+
+      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+    end
+
+    gemfile <<-G
+      source "#{source_uri}"
+      source "#{source_uri}/extra"
+      gem "back_deps"
+    G
+
+    bundle :install, :artifice => "endpoint_extra_missing"
+    should_be_installed "back_deps 1.0"
+  end
+
+  it "uses the endpoint if all sources support it" do
+    gemfile <<-G
+      source "#{source_uri}"
+
+      gem 'foo'
+    G
+
+    bundle :install, :artifice => "endpoint_api_missing"
+    should_be_installed "foo 1.0"
+  end
+
+  it "fetches again when more dependencies are found in subsequent sources using --deployment" do
+    build_repo2 do
+      build_gem "back_deps" do |s|
+        s.add_dependency "foo"
+      end
+      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+    end
+
+    gemfile <<-G
+      source "#{source_uri}"
+      source "#{source_uri}/extra"
+      gem "back_deps"
+    G
+
+    bundle :install, :artifice => "endpoint_extra"
+
+    bundle "install --deployment", :artifice => "endpoint_extra"
+    should_be_installed "back_deps 1.0"
+  end
+
+  it "does not refetch if the only unmet dependency is bundler" do
+    gemfile <<-G
+      source "#{source_uri}"
+
+      gem "bundler_dep"
+    G
+
+    bundle :install, :artifice => "endpoint"
+    out.should include("Fetching gem metadata from #{source_uri}")
+  end
+
+  it "should install when EndpointSpecification with a bin dir owned by root", :sudo => true do
+    sudo "mkdir -p #{system_gem_path("bin")}"
+    sudo "chown -R root #{system_gem_path("bin")}"
+
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rails"
+    G
+    bundle :install, :artifice => "endpoint"
+    should_be_installed "rails 2.3.2"
+  end
+
+  it "installs the binstubs" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rack"
+    G
+
+    bundle "install --binstubs", :artifice => "endpoint"
+
+    gembin "rackup"
+    out.should == "1.0.0"
+  end
+
+  it "installs the bins when using --path and uses autoclean" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rack"
+    G
+
+    bundle "install --path vendor/bundle", :artifice => "endpoint"
+
+    vendored_gems("bin/rackup").should exist
+  end
+
+  it "installs the bins when using --path and uses bundle clean" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rack"
+    G
+
+    bundle "install --path vendor/bundle --no-clean", :artifice => "endpoint"
+
+    vendored_gems("bin/rackup").should exist
+  end
+
+  context "when using basic authentication" do
+    let(:user)     { "user" }
+    let(:password) { "pass" }
+    let(:basic_auth_source_uri) do
+      uri          = URI.parse(source_uri)
+      uri.user     = user
+      uri.password = password
+
+      uri
+    end
+
+    it "passes basic authentication details and strips out creds" do
+      gemfile <<-G
+        source "#{basic_auth_source_uri}"
+        gem "rack"
+      G
+
+      bundle :install, :artifice => "endpoint_basic_authentication"
+      out.should_not include("#{user}:#{password}")
+      should_be_installed "rack 1.0.0"
+    end
+
+    it "strips http basic authentication creds for modern index" do
+      gemfile <<-G
+        source "#{basic_auth_source_uri}"
+        gem "rack"
+      G
+
+      bundle :install, :artifice => "endopint_marshal_fail_basic_authentication"
+      out.should_not include("#{user}:#{password}")
+      should_be_installed "rack 1.0.0"
+    end
+
+    it "strips http basic auth creds when it can't reach the server" do
+      gemfile <<-G
+        source "#{basic_auth_source_uri}"
+        gem "rack"
+      G
+
+      bundle :install, :artifice => "endpoint_500"
+      out.should_not include("#{user}:#{password}")
+    end
+  end
+end

data/spec/install/gems/flex_spec.rb

@@ -193,7 +193,7 @@ describe "bundle flex_install" do
 
     it "suggests bundle update when the Gemfile requires different versions than the lock" do
       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 "rack":
           In snapshot (Gemfile.lock):
             rack (0.9.1)

data/spec/install/gems/groups_spec.rb

@@ -21,16 +21,23 @@ describe "bundle install with gem sources" do
       it "installs gems in a group block into that group" do
         should_be_installed "activesupport 2.3.5"
 
-        run("require 'activesupport'; puts ACTIVESUPPORT",
-          :default, :expect_err => true)
-        @err.should =~ /no such file to load -- activesupport/
+        load_error_run <<-R, 'activesupport', :default
+          require 'activesupport'
+          puts ACTIVESUPPORT
+        R
+
+        err.should == "ZOMG LOAD ERROR"
       end
 
       it "installs gems with inline :groups into those groups" do
         should_be_installed "thin 1.0"
 
-        run("require 'thin'; puts THIN", :default, :expect_err => true)
-        @err.should =~ /no such file to load -- thin/
+        load_error_run <<-R, 'thin', :default
+          require 'thin'
+          puts THIN
+        R
+
+        err.should == "ZOMG LOAD ERROR"
       end
 
       it "sets up everything if Bundler.setup is used with no groups" do
@@ -45,11 +52,13 @@ describe "bundle install with gem sources" do
       end
 
       it "removes old groups when new groups are set up" do
-        run <<-RUBY, :emo, :expect_err => true
+        load_error_run <<-RUBY, 'thin', :emo
           Bundler.setup(:default)
-          require 'thin'; puts THIN
+          require 'thin'
+          puts THIN
         RUBY
-        @err.should =~ /no such file to load -- thin/i
+
+        err.should == "ZOMG LOAD ERROR"
       end
 
       it "sets up old groups when they have previously been removed" do

data/spec/install/gems/platform_spec.rb

@@ -190,3 +190,19 @@ describe "bundle install with platform conditionals" do
   end
 
 end
+
+describe "when a gem has an architecture in its platform" do
+  it "still installs correctly" do
+    simulate_platform mswin
+
+    gemfile <<-G
+      # Try to install gem with nil arch
+      source "http://localgemserver.test/"
+      gem "rcov"
+    G
+
+    bundle :install, :fakeweb => "windows"
+    should_be_installed "rcov 1.0.0"
+  end
+end
+