bundler 1.3.6 → 1.4.0.pre.1

data/lib/bundler/vendor/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.16.0"
+  VERSION = "0.18.1"
 end

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.3.6" unless defined?(::Bundler::VERSION)
+  VERSION = "1.4.0.pre.1" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-install.ronn

@@ -10,6 +10,7 @@ bundle-install(1) -- Install the dependencies specified in your Gemfile
                  [--binstubs[=DIRECTORY]]
                  [--standalone[=GROUP1[ GROUP2...]]]
                  [--trust-policy=POLICY]
+                 [--jobs=SIZE]
                  [--no-cache]
                  [--quiet]
 
@@ -59,7 +60,7 @@ update process below under [CONSERVATIVE UPDATING][].
   Do not attempt to connect to `rubygems.org`, instead using just
   the gems already present in Rubygems' cache or in `vendor/cache`.
   Note that if a more appropriate platform-specific gem exists on
-  `rubygems.org`, it will not be found.
+  `rubygems.org`, it will not be found. This option implies `--no-cache`.
 
 * `--deployment`:
   Switches bundler's defaults into [deployment mode][DEPLOYMENT MODE].
@@ -88,6 +89,9 @@ update process below under [CONSERVATIVE UPDATING][].
   HighSecurity, MediumSecurity, LowSecurity, or NoSecurity. For more detail,
   see the Rubygems signing documentation, linked below in [SEE ALSO][].
 
+* `--jobs=[<size>]`:
+  Install gems parallely by starting <size> number of parallel workers.
+
 * `--no-cache`:
   Do not update the cache in `vendor/cache` with the newly bundled gems. This
   does not remove any existing cached gems, only stops the newly bundled gems

data/man/gemfile.5.ronn

@@ -74,16 +74,19 @@ Each _gem_ `MAY` have one or more version specifiers.
 ### REQUIRE AS (: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
+`Bundler.require`. You may pass an array with multiple files or `true` if file
+you want `required` has same name as _gem_ or `false` to
 prevent any file from being autorequired.
 
     gem "redis", :require => ["redis/connection/hiredis", "redis"]
     gem "webmock", :require => false
+    gem "debugger", :require => true
 
 The argument defaults to the name of the gem. For example, these are identical:
 
     gem "nokogiri"
     gem "nokogiri", :require => "nokogiri"
+    gem "nokogiri", :require => true
 
 ### GROUPS (:group or :groups)
 
@@ -196,7 +199,8 @@ as they would for a normal gem.
 A git repository `SHOULD` have at least one file, at the root of the
 directory containing the gem, with the extension `.gemspec`. This file
 `MUST` contain a valid gem specification, as expected by the `gem build`
-command.
+command. It `MUST NOT` have any dependencies, other than on the files in
+the git repository itself and any built-in functionality of Ruby or Rubygems.
 
 If a git repository does not have a `.gemspec`, bundler will attempt to
 create one, but it will not contain any dependencies, executables, or
@@ -257,6 +261,10 @@ Are both equivalent to
 
     gem "rails", :git => "git://github.com/rails/rails.git"
 
+In addition, if you wish to choose a specific branch:
+
+    gem "rails", :github => "rails/rails", :branch => "branch_name"
+
 ### PATH (:path)
 
 You can specify that a gem is located in a particular location

data/spec/bundler/dsl_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe Bundler::Dsl do
   before do
-    @rubygems = mock("rubygems")
+    @rubygems = double("rubygems")
     Bundler::Source::Rubygems.stub(:new){ @rubygems }
   end
 
   describe "#_normalize_options" do
     it "converts :github to :git" do
       subject.gem("sparks", :github => "indirect/sparks")
-      github_uri = "git://github.com/indirect/sparks.git"
+      github_uri = "https://github.com/indirect/sparks.git"
       expect(subject.dependencies.first.source.uri).to eq(github_uri)
     end
 
@@ -27,7 +27,7 @@ describe Bundler::Dsl do
 
     it "converts 'rails' to 'rails/rails'" do
       subject.gem("rails", :github => "rails")
-      github_uri = "git://github.com/rails/rails.git"
+      github_uri = "https://github.com/rails/rails.git"
       expect(subject.dependencies.first.source.uri).to eq(github_uri)
     end
   end

data/spec/bundler/gem_helper_spec.rb

@@ -128,6 +128,14 @@ describe "Bundler::GemHelper tasks" do
     end
 
     describe "release" do
+      before do
+        Dir.chdir(@app) do
+          `git init`
+          `git config user.email "you@example.com"`
+          `git config user.name "name"`
+        end
+      end
+
       it "shouldn't push if there are unstaged files" do
         expect { @helper.release_gem }.to raise_error(/files that need to be committed/)
       end
@@ -140,15 +148,8 @@ describe "Bundler::GemHelper tasks" do
       it "raises an appropriate error if there is no git remote" do
         Bundler.ui.stub(:confirm => nil, :error => nil) # silence messages
 
-        Dir.chdir(gem_repo1) {
-          `git init --bare`
-        }
-        Dir.chdir(@app) {
-          `git init`
-          `git config user.email "you@example.com"`
-          `git config user.name "name"`
-          `git commit -a -m "initial commit"`
-        }
+        Dir.chdir(gem_repo1) { `git init --bare` }
+        Dir.chdir(@app) { `git commit -a -m "initial commit"` }
 
         expect { @helper.release_gem }.to raise_error
       end
@@ -160,18 +161,13 @@ describe "Bundler::GemHelper tasks" do
 
         @helper.should_receive(:rubygem_push).with(bundled_app('test/pkg/test-0.0.1.gem').to_s)
 
-        Dir.chdir(gem_repo1) {
-          `git init --bare`
-        }
-        Dir.chdir(@app) {
-          `git init`
-          `git config user.email "you@example.com"`
-          `git config user.name "name"`
+        Dir.chdir(gem_repo1) { `git init --bare` }
+        Dir.chdir(@app) do
           `git remote add origin file://#{gem_repo1}`
           `git commit -a -m "initial commit"`
           sys_exec("git push origin master", true)
           `git commit -a -m "another commit"`
-        }
+        end
         @helper.release_gem
       end
 
@@ -193,6 +189,7 @@ describe "Bundler::GemHelper tasks" do
         }
         @helper.release_gem
       end
+
     end
   end
 end

data/spec/bundler/safe_catch_spec.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'bundler'
+require "bundler/safe_catch"
+require "bundler/current_ruby"
+
+class RecursiveTmpResolver
+  include Bundler::SafeCatch
+end
+
+describe Bundler::SafeCatch do
+  let(:resolver) { RecursiveTmpResolver.new() }
+
+  it "should use safe_catch on jruby" do
+    if Bundler.current_ruby.jruby?
+      Bundler::SafeCatch::Internal.should_receive(:catch).and_call_original
+      Bundler::SafeCatch::Internal.should_receive(:throw).and_call_original
+
+      retval = resolver.safe_catch(:resolve) do
+        resolver.safe_throw(:resolve, "good bye world")
+      end
+      expect(retval).to eq("good bye world")
+    end
+  end
+
+  it "should use regular catch/throw on MRI" do
+    if Bundler.current_ruby.mri?
+      Bundler::SafeCatch::Internal.should_not_receive(:catch)
+      Bundler::SafeCatch::Internal.should_not_receive(:throw)
+
+      retval = resolver.safe_catch(:resolve) do
+        resolver.safe_throw(:resolve, "good bye world")
+      end
+      expect(retval).to eq("good bye world")
+    end
+  end
+end

data/spec/install/gems/dependency_api_spec.rb

@@ -162,40 +162,6 @@ describe "gemcutter's dependency API" do
     should_be_installed "rack 1.0.0"
   end
 
-  it "handles host redirects" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    bundle :install, :artifice => "endpoint_host_redirect"
-    should_be_installed "rack 1.0.0"
-  end
-
-  it "handles host redirects without Net::HTTP::Persistent" do
-    gemfile <<-G
-      source "#{source_uri}"
-      gem "rack"
-    G
-
-    FileUtils.mkdir_p lib_path
-    File.open(lib_path("disable_net_http_persistent.rb"), "w") do |h|
-      h.write <<-H
-        module Kernel
-          alias require_without_disabled_net_http require
-          def require(*args)
-            raise LoadError, 'simulated' if args.first == 'openssl' && !caller.grep(/vendored_persistent/).empty?
-            require_without_disabled_net_http(*args)
-          end
-        end
-      H
-    end
-
-    bundle :install, :artifice => "endpoint_host_redirect", :requires => [lib_path("disable_net_http_persistent.rb")]
-    expect(out).to_not match(/Too many redirects/)
-    should_be_installed "rack 1.0.0"
-  end
-
   it "timeouts when Bundler::Fetcher redirects too much" do
     gemfile <<-G
       source "#{source_uri}"
@@ -334,7 +300,7 @@ describe "gemcutter's dependency API" do
     expect(out).to include("Fetching gem metadata from #{source_uri}")
   end
 
-  fit "should install when EndpointSpecification with a bin dir owned by root", :sudo => true do
+  it "should install when EndpointSpecification has a bin dir owned by root", :sudo => true do
     sudo "mkdir -p #{system_gem_path("bin")}"
     sudo "chown -R root #{system_gem_path("bin")}"
 
@@ -343,7 +309,6 @@ describe "gemcutter's dependency API" do
       gem "rails"
     G
     bundle :install, :artifice => "endpoint"
-    puts out, err
     should_be_installed "rails 2.3.2"
   end
 

data/spec/install/gems/packed_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "bundle install with gem sources" do
   describe "when cached and locked" do
-    it "does not hit the remote at all" do
+    it "does not hit the remote at all if --local is passed" do
       build_repo2
       install_gemfile <<-G
         source "file://#{gem_repo2}"
@@ -14,10 +14,11 @@ describe "bundle install with gem sources" do
       FileUtils.rm_rf gem_repo2
 
       bundle "install --local"
+      expect(out).not_to include("Updating files in vendor/cache")
       should_be_installed "rack 1.0.0"
     end
 
-    it "does not hit the remote at all" do
+    it "does not hit the remote at all if --deployment is passed" do
       build_repo2
       install_gemfile <<-G
         source "file://#{gem_repo2}"
@@ -29,6 +30,7 @@ describe "bundle install with gem sources" do
       FileUtils.rm_rf gem_repo2
 
       bundle "install --deployment"
+      expect(out).not_to include("Updating files in vendor/cache")
       should_be_installed "rack 1.0.0"
     end
 

data/spec/install/gems/resolving_spec.rb

@@ -67,6 +67,43 @@ describe "bundle install with gem sources" do
 
         should_be_installed "net_a 1.0", "net_b 1.0", "net_c 1.0", "net_d 1.0", "net_e 1.0"
       end
+
+      context "with ENV['DEBUG_RESOLVER'] set" do
+        before do
+          ENV['DEBUG_RESOLVER'] = '1'
+        end
+        it "produces debug output" do
+          expect(capture(:stdout) do
+            install_gemfile <<-G
+              source "file://#{gem_repo1}"
+              gem "net_c"
+              gem "net_e"
+            G
+          end).to include "==== Iterating ===="
+        end
+        after do
+          ENV['DEBUG_RESOLVER'] = nil
+        end
+      end
+
+      context "with ENV['DEBUG_RESOLVER_TREE'] set" do
+        before do
+          ENV['DEBUG_RESOLVER_TREE'] = '1'
+        end
+        it "produces debug output" do
+          expect(capture(:stdout) do
+            install_gemfile <<-G
+              source "file://#{gem_repo1}"
+              gem "net_c"
+              gem "net_e"
+            G
+          end).to include " net_b (>= 0) ruby"
+        end
+        after do
+          ENV['DEBUG_RESOLVER_TREE'] = nil
+        end
+      end
+
     end
 
     describe "when some gems require a different version of ruby" do

data/spec/install/gems/simple_case_spec.rb

@@ -337,22 +337,6 @@ describe "bundle install with gem sources" do
       G
       expect(exitstatus).to eq(0)
     end
-
-    it "reinstalls the gem if the gem dir is missing but the specification file exists" do
-      gemfile(<<-G)
-        source "file://#{gem_repo1}"
-
-        gem 'foo'
-      G
-
-      bundle "install --path vendor/bundle"
-
-      FileUtils.rm_rf(vendored_gems('gems/foo-1.0'))
-
-      bundle "install"
-
-      expect(vendored_gems('gems/foo-1.0')).to exist
-    end
   end
 
   describe "when Bundler root contains regex chars" do
@@ -830,4 +814,22 @@ describe "bundle install with gem sources" do
     end
   end
 
+  it "should use gemspecs in the system cache when available" do
+    gemfile <<-G
+      source "http://localtestserver.gem"
+      gem 'rack'
+    G
+
+    FileUtils.mkdir_p "#{tmp}/gems/system/specifications"
+    File.open("#{tmp}/gems/system/specifications/rack-1.0.0.gemspec", 'w+') do |f|
+      spec = Gem::Specification.new do |s|
+        s.name = 'rack'
+        s.version = '1.0.0'
+        s.add_runtime_dependency 'activesupport', '2.3.2'
+      end
+      f.write spec.to_ruby
+    end
+    bundle :install, :artifice => 'endpoint_marshal_fail' # force gemspec load
+    should_be_installed "activesupport 2.3.2"
+  end
 end

data/spec/install/git_spec.rb

@@ -34,7 +34,7 @@ describe "bundle install with git sources" do
       git = update_git "foo" do |s|
         s.executables = ["foobar"] # we added this the first time, so keep it now
         s.files = ["bin/foobar"] # updating git nukes the files list
-        foospec = s.to_ruby.gsub(/s\.files.*/, 's.files = `git ls-files -z`.split("\x0")')
+        foospec = s.to_ruby.gsub(/s\.files.*/, 's.files = `git ls-files`.split("\n")')
         s.write "foo.gemspec", foospec
       end
 

data/spec/other/binstubs_spec.rb

@@ -26,6 +26,30 @@ describe "bundle binstubs <gem>" do
       expect(bundled_app("bin/rails")).to exist
     end
 
+    it "does install multiple binstubs" do
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack"
+        gem "rails"
+      G
+
+      bundle "binstubs rails rack"
+
+      expect(bundled_app("bin/rackup")).to exist
+      expect(bundled_app("bin/rails")).to exist
+    end
+
+    it "displays an error when used without any gem" do
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack"
+      G
+
+      bundle "binstubs", :exitstatus => true
+      expect(exitstatus).to eq(1)
+      expect(out).to eq("`bundle binstubs` needs at least one gem to run.")
+    end
+
     it "does not bundle the bundler binary" do
       install_gemfile <<-G
         source "file://#{gem_repo1}"
@@ -66,19 +90,6 @@ describe "bundle binstubs <gem>" do
 
       expect(bundled_app("bin/foo")).to exist
     end
-
-    it "sets correct permissions for binstubs" do
-      with_umask(0002) do
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rack"
-        G
-
-        bundle "binstubs rack"
-        binary = bundled_app("bin/rackup")
-        expect(File.stat(binary).mode.to_s(8)).to eq("100775")
-      end
-    end
   end
 
   context "--path" do

data/spec/other/exec_spec.rb

@@ -39,6 +39,12 @@ describe "bundle exec" do
     expect(out).to eq("exec")
   end
 
+  it "works when exec'ing to ruby" do
+    install_gemfile 'gem "rack"'
+    bundle "exec ruby -e 'puts %{hi}'"
+    expect(out).to eq("hi")
+  end
+
   it "accepts --verbose" do
     install_gemfile 'gem "rack"'
     bundle "exec --verbose echo foobar"
@@ -108,13 +114,13 @@ describe "bundle exec" do
     should_not_be_installed "rack_middleware 1.0"
   end
 
-  it "should not duplicate already exec'ed RUBYOPT or PATH" do
+  it "does not duplicate already exec'ed RUBYOPT" do
     install_gemfile <<-G
       gem "rack"
     G
 
     rubyopt = ENV['RUBYOPT']
-    rubyopt = "-I#{bundler_path} -rbundler/setup #{rubyopt}"
+    rubyopt = "-rbundler/setup #{rubyopt}"
 
     bundle "exec 'echo $RUBYOPT'"
     expect(out).to have_rubyopts(rubyopt)
@@ -123,6 +129,22 @@ describe "bundle exec" do
     expect(out).to have_rubyopts(rubyopt)
   end
 
+  it "does not duplicate already exec'ed RUBYLIB" do
+    install_gemfile <<-G
+      gem "rack"
+    G
+
+    rubylib = ENV['RUBYLIB']
+    rubylib = "#{rubylib}".split(File::PATH_SEPARATOR).unshift "#{bundler_path}"
+    rubylib = rubylib.uniq.join(File::PATH_SEPARATOR)
+
+    bundle "exec 'echo $RUBYLIB'"
+    expect(out).to eq(rubylib)
+
+    bundle "exec 'echo $RUBYLIB'", :env => {"RUBYLIB" => rubylib}
+    expect(out).to eq(rubylib)
+  end
+
   it "errors nicely when the argument doesn't exist" do
     install_gemfile <<-G
       gem "rack"