bundler 1.3.5 → 1.3.6

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/lib/bundler/ui.rb

@@ -20,6 +20,10 @@ module Bundler
     def confirm(message, newline = nil)
     end
 
+    def quiet?
+      false
+    end
+
     def debug?
       false
     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.5" unless defined?(::Bundler::VERSION)
+  VERSION = "1.3.6" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-exec.ronn

@@ -58,17 +58,35 @@ It also modifies Rubygems:
 
 ### Shelling out
 
-When shelling out (using the `system` or backticks methods,
-for example), Bundler's environment changes will propagate 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:
+Any Ruby code that opens a subshell (like `system`, backticks, or `%x{}`) will
+automatically use the current Bundler environment. If you need to shell out to
+a Ruby command that is not part of your current bundle, use the
+`with_clean_env` method with a block. Any subshells created inside the block
+will be given the environment present before Bundler was activated. For
+example, Homebrew commands run Ruby, but don't work inside a bundle:
 
     Bundler.with_clean_env do
       `brew install wget`
     end
 
+Using `with_clean_env` is also necessary if you are shelling out to a different
+bundle. Any Bundler commands run in a subshell will inherit the current
+Gemfile, so commands that need to run in the context of a different bundle also
+need to use `with_clean_env`.
+
+    Bundler.with_clean_env do
+      Dir.chdir "/other/bundler/project" do
+        `bundle exec ./script`
+      end
+    end
+
+Bundler provides convenience helpers that wrap `system` and `exec`, and they
+can be used like this:
+
+    Bundler.clean_system('brew install wget')
+    Bundler.clean_exec('brew install wget')
+
+
 ## RUBYGEMS PLUGINS
 
 At present, the Rubygems plugin system requires all files

data/man/bundle-install.ronn

@@ -321,7 +321,7 @@ evaluates the gems currently being used to satisfy its requirements:
     also used to satisfy a dependency in `activemerchant`,
     which is not being updated
   * `rack ~> 1.1.0`:
-    not currently being used to satify another dependency
+    not currently being used to satisfy another dependency
 
 Because you did not explicitly ask to update `activemerchant`,
 you would not expect it to suddenly stop working after updating

data/man/bundle.ronn

@@ -44,7 +44,7 @@ We divide `bundle` subcommands into primary commands and utilities.
   Specify and read configuration options for bundler
 
 * `bundle help(1)`:
-  Displays this help page
+  Displays detailed help for each subcommand
 
 ## UTILITIES
 

data/man/gemfile.5.ronn

@@ -196,8 +196,7 @@ 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. 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.
+command.
 
 If a git repository does not have a `.gemspec`, bundler will attempt to
 create one, but it will not contain any dependencies, executables, or

data/spec/bundler/cli_rspec.rb

@@ -1,9 +1,14 @@
 require 'spec_helper'
 
 
-describe 'bundle executable' do
-  it 'returns non-zero exit status when passed unrecognized options' do
+describe "bundle executable" do
+  it "returns non-zero exit status when passed unrecognized options" do
     bundle '--invalid_argument', :exitstatus => true
     expect(exitstatus).to_not be_zero
   end
+
+  it "returns non-zero exit status when passed unrecognized task" do
+    bundle 'unrecognized-tast', :exitstatus => true
+    expect(exitstatus).to_not be_zero
+  end
 end

data/spec/bundler/dsl_spec.rb

@@ -6,7 +6,7 @@ describe Bundler::Dsl do
     Bundler::Source::Rubygems.stub(:new){ @rubygems }
   end
 
-  describe '#_normalize_options' do
+  describe "#_normalize_options" do
     it "converts :github to :git" do
       subject.gem("sparks", :github => "indirect/sparks")
       github_uri = "git://github.com/indirect/sparks.git"
@@ -32,8 +32,8 @@ describe Bundler::Dsl do
     end
   end
 
-  describe '#method_missing' do
-    it 'raises an error for unknown DSL methods' do
+  describe "#method_missing" do
+    it "raises an error for unknown DSL methods" do
       Bundler.should_receive(:read_file).with("Gemfile").and_return("unknown")
       error_msg = "Undefined local variable or method `unknown'" \
         " for Gemfile\\s+from Gemfile:1"
@@ -51,7 +51,7 @@ describe Bundler::Dsl do
   end
 
   describe "syntax errors" do
-    it "raise a Bundler::GemfileError" do
+    it "will raise a Bundler::GemfileError" do
       gemfile "gem 'foo', :path => /unquoted/string/syntax/error"
       expect { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }.
         to raise_error(Bundler::GemfileError)

data/spec/bundler/gem_helper_spec.rb

@@ -62,7 +62,7 @@ describe "Bundler::GemHelper tasks" do
       expect(Bundler.ui).to be_a(Bundler::UI::Shell)
     end
 
-    describe 'install_tasks' do
+    describe "install_tasks" do
       before(:each) do
         @saved, Rake.application = Rake.application, Rake::Application.new
       end
@@ -92,7 +92,7 @@ describe "Bundler::GemHelper tasks" do
       end
     end
 
-    describe 'build' do
+    describe "build" do
       it "builds" do
         mock_build_message
         @helper.build_gem
@@ -106,7 +106,7 @@ describe "Bundler::GemHelper tasks" do
       end
     end
 
-    describe 'install' do
+    describe "install" do
       it "installs" do
         mock_build_message
         mock_confirm_message "test (0.0.1) installed."
@@ -127,7 +127,7 @@ describe "Bundler::GemHelper tasks" do
       end
     end
 
-    describe 'release' do
+    describe "release" do
       it "shouldn't push if there are unstaged files" do
         expect { @helper.release_gem }.to raise_error(/files that need to be committed/)
       end
@@ -137,7 +137,7 @@ describe "Bundler::GemHelper tasks" do
         expect { @helper.release_gem }.to raise_error(/files that need to be committed/)
       end
 
-      it 'raises an appropriate error if there is no git remote' 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) {
@@ -193,7 +193,6 @@ describe "Bundler::GemHelper tasks" do
         }
         @helper.release_gem
       end
-
     end
   end
 end

data/spec/install/gems/dependency_api_spec.rb

@@ -162,6 +162,40 @@ 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}"

data/spec/install/gems/post_install_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe 'bundle install with gem sources' do
-  describe 'when gems include post install messages' do
+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}"
@@ -20,7 +20,7 @@ describe 'bundle install with gem sources' do
     end
   end
 
-  describe 'when gems do not include post install messages' do
+  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}"

data/spec/install/gems/simple_case_spec.rb

@@ -337,6 +337,22 @@ 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

data/spec/install/gems/win32_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "bundle install with win32-generated lockfile" do
-  it 'should read lockfile' do
+  it "should read lockfile" do
     File.open(bundled_app('Gemfile.lock'), 'wb') do |f|
       f << "GEM\r\n"
       f << "  remote: file:#{gem_repo1}/\r\n"

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`.split("\n")')
+        foospec = s.to_ruby.gsub(/s\.files.*/, 's.files = `git ls-files -z`.split("\x0")')
         s.write "foo.gemspec", foospec
       end
 

data/spec/install/security_policy_spec.rb

@@ -14,37 +14,37 @@ describe "policies with unsigned gems" do
     G
   end
 
-  it "works after you try to deploy without a lock" do
+  it "will work after you try to deploy without a lock" do
     bundle "install --deployment"
     bundle :install, :exitstatus => true
     expect(exitstatus).to eq(0)
     should_be_installed "rack 1.0", "signed_gem 1.0"
   end
 
-  it "fails when given invalid security policy" do
+  it "will fail when given invalid security policy" do
     bundle "install --trust-policy=InvalidPolicyName"
     expect(out).to include("Rubygems doesn't know about trust policy")
   end
 
-  it "fails with High Security setting due to presence of unsigned gem" do
+  it "will fail with High Security setting due to presence of unsigned gem" do
     bundle "install --trust-policy=HighSecurity"
     expect(out).to include("security policy didn't allow")
   end
 
   # This spec will fail on Rubygems 2 rc1 due to a bug in policy.rb. the bug is fixed in rc3.
-  it "fails with Medium Security setting due to presence of unsigned gem", :unless => ENV['RGV'] == "v2.0.0.rc.1" do
+  it "will fail with Medium Security setting due to presence of unsigned gem", :unless => ENV['RGV'] == "v2.0.0.rc.1" do
     bundle "install --trust-policy=MediumSecurity"
     expect(out).to include("security policy didn't allow")
   end
 
-  it "succeeds with no policy" do
+  it "will succeed with no policy" do
     bundle "install", :exitstatus => true
     expect(exitstatus).to eq(0)
   end
 
 end
 
-describe "policies with signed gems, no CA" do
+describe "policies with signed gems and no CA" do
   before do
     build_security_repo
     gemfile <<-G
@@ -53,26 +53,25 @@ describe "policies with signed gems, no CA" do
     G
   end
 
-  it "fails with High Security setting, gem is self-signed" do
+  it "will fail with High Security setting, gem is self-signed" do
     bundle "install --trust-policy=HighSecurity"
     expect(out).to include("security policy didn't allow")
   end
 
-  it "fails with Medium Security setting, gem is self-signed" do
+  it "will fail with Medium Security setting, gem is self-signed" do
     bundle "install --trust-policy=MediumSecurity"
     expect(out).to include("security policy didn't allow")
   end
 
-  it "succeeds with Low Security setting, low security accepts self signed gem" do
+  it "will succeed with Low Security setting, low security accepts self signed gem" do
     bundle "install --trust-policy=LowSecurity", :exitstatus => true
     expect(exitstatus).to eq(0)
     should_be_installed "signed_gem 1.0"
   end
 
-  it "succeeds with no policy" do
+  it "will succeed with no policy" do
     bundle "install", :exitstatus => true
     expect(exitstatus).to eq(0)
     should_be_installed "signed_gem 1.0"
   end
-
 end

data/spec/integration/inject.rb

@@ -21,7 +21,7 @@ describe "bundle inject" do
       bundle "install"
     end
 
-    it "adds the injected gems to the gemfile" do
+    it "adds the injected gems to the Gemfile" do
       expect(bundled_app("Gemfile").read).not_to match(/rack-obama/)
       bundle "inject 'rack-obama' '> 0'"
       expect(bundled_app("Gemfile").read).to match(/rack-obama/)

data/spec/lock/git_spec.rb

@@ -31,5 +31,4 @@ describe "bundle lock with git gems" do
     RUBY
     expect(out).to eq(bundle("show foo"))
   end
-
 end

data/spec/lock/lockfile_spec.rb

@@ -292,7 +292,7 @@ describe "the lockfile format" do
     G
   end
 
-  it "order dependencies of dependencies in alphabetical order" do
+  it "orders dependencies' dependencies in alphabetical order" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
 
@@ -328,7 +328,7 @@ describe "the lockfile format" do
     G
   end
 
-  it "orders dependencies according to version" do
+  it "orders dependencies by version" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
       gem 'double_deps'
@@ -472,6 +472,30 @@ describe "the lockfile format" do
     G
   end
 
+  it "stores relative paths when the path is provided for gemspec" do
+    build_lib("foo", :path => tmp.join("foo"))
+
+    install_gemfile <<-G
+      gemspec :path => "../foo"
+    G
+
+    lockfile_should_be <<-G
+      PATH
+        remote: ../foo
+        specs:
+          foo (1.0)
+
+      GEM
+        specs:
+
+      PLATFORMS
+        #{generic(Gem::Platform.local)}
+
+      DEPENDENCIES
+        foo!
+    G
+  end
+
   it "keeps existing platforms in the lockfile" do
     lockfile <<-G
       GEM
@@ -638,7 +662,7 @@ describe "the lockfile format" do
   end
 
 
-  it "raises if two different versions are used" do
+  it "raises if two different sources are used" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
       gem "rack"
@@ -676,7 +700,7 @@ describe "the lockfile format" do
   # * multiple copies of the same GIT section appeared in the lockfile
   # * when this happened, those sections got multiple copies of gems
   #   in those sections.
-  it "fix corrupted lockfiles" do
+  it "fixes corrupted lockfiles" do
     build_git "omg", :path => lib_path('omg')
     revision = revision_for(lib_path('omg'))
 
@@ -740,7 +764,7 @@ describe "the lockfile format" do
     L
   end
 
-  describe "line endings" do
+  describe "a line ending" do
     def set_lockfile_mtime_to_known_value
       time = Time.local(2000, 1, 1, 0, 0, 0)
       File.utime(time, time, bundled_app('Gemfile.lock'))