Merge tag 'v1.13.4'aa-merge-1-13-4

Version 1.13.4

8 files changed, 36 insertions, 18 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 714b3082b0..5499bc828e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 1.13.4 (2016-10-11)
+
+Bugfixes:
+
+ - stop printing warning when compact index versions file is rewritten (#5064, @indirect)
+ - fix `parent directory is world writable but not sticky` error on install (#5043, @indirect)
+ - fix for `uninitialized constant Bundler::Plugin::API::Source` error (#5010, @hsbt, @aycabta)
+ - make `update` options for major, minor, and patch updates consistent (#4934, @chrismo)
+
 ## 1.13.3 (2016-10-10)
 
 Bugfixes:
diff --git a/lib/bundler/deployment.rb b/lib/bundler/deployment.rb
index a62fa232fb..94f2fac620 100644
--- a/lib/bundler/deployment.rb
+++ b/lib/bundler/deployment.rb
@@ -15,7 +15,7 @@ module Bundler
       else
         context_name = "vlad"
         role_default = "[:app]"
-        error_type = ::Vlad::CommandFailedError
+        error_type = ::Rake::CommandFailedError
       end
 
       roles = context.fetch(:bundle_roles, false)
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 159148372e..823045b3f8 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -7,5 +7,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.13.3" unless defined?(::Bundler::VERSION)
+  VERSION = "1.13.4" unless defined?(::Bundler::VERSION)
 end
diff --git a/spec/realworld/dependency_api_spec.rb b/spec/realworld/dependency_api_spec.rb
index 9823cf8c76..ea02adfe4b 100644
--- a/spec/realworld/dependency_api_spec.rb
+++ b/spec/realworld/dependency_api_spec.rb
@@ -26,6 +26,7 @@ describe "gemcutter's dependency API", :realworld => true do
     end
 
     after do
+      Artifice.deactivate
       @t.kill
       @t.join
     end
diff --git a/spec/realworld/edgecases_spec.rb b/spec/realworld/edgecases_spec.rb
index 06e588044c..81fe3d77b0 100644
--- a/spec/realworld/edgecases_spec.rb
+++ b/spec/realworld/edgecases_spec.rb
@@ -2,6 +2,20 @@
 require "spec_helper"
 
 describe "real world edgecases", :realworld => true, :sometimes => true do
+  def rubygems_version(name, requirement)
+    require "bundler/source/rubygems/remote"
+    require "bundler/fetcher"
+    source = Bundler::Source::Rubygems::Remote.new(URI("https://rubygems.org"))
+    fetcher = Bundler::Fetcher.new(source)
+    index = fetcher.specs([name], nil)
+    rubygem = index.search(Gem::Dependency.new(name, requirement)).last
+    if rubygem.nil?
+      raise "Could not find #{name} (#{requirement}) on rubygems.org!\n" \
+        "Found specs:\n#{index.send(:specs).inspect}"
+    end
+    "#{name} (#{rubygem.version})"
+  end
+
   # there is no rbx-relative-require gem that will install on 1.9
   it "ignores extra gems with bad platforms", :ruby => "~> 1.8.7" do
     gemfile <<-G
@@ -15,7 +29,7 @@ describe "real world edgecases", :realworld => true, :sometimes => true do
 
   # https://github.com/bundler/bundler/issues/1202
   it "bundle cache works with rubygems 1.3.7 and pre gems",
-    :ruby => "~> 1.8.7", "https://rubygems.org" => "~> 1.3.7" do
+    :ruby => "~> 1.8.7", :rubygems => "~> 1.3.7" do
     install_gemfile <<-G
       source "https://rubygems.org"
       gem "rack",          "1.3.0.beta2"
@@ -32,8 +46,8 @@ describe "real world edgecases", :realworld => true, :sometimes => true do
       source "https://rubygems.org"
 
       gem 'i18n', '~> 0.6.0'
-      gem 'activesupport', '~> 3.0'
-      gem 'activerecord', '~> 3.0'
+      gem 'activesupport', '~> 3.0.5'
+      gem 'activerecord', '~> 3.0.5'
       gem 'builder', '~> 2.1.2'
     G
     bundle :lock
@@ -49,15 +63,7 @@ describe "real world edgecases", :realworld => true, :sometimes => true do
       gem 'rack-cache', '1.2.0' # last version that works on Ruby 1.9
     G
     bundle! :lock
-    rails_version = ruby(<<-R)
-      require 'rubygems'
-      require 'bundler'
-      fetcher = Bundler::Fetcher.new(Bundler::Source::Rubygems::Remote.new(URI('https://rubygems.org')))
-      index = fetcher.specs(%w(rails), nil)
-      rails = index.search(Gem::Dependency.new("rails", "~> 3.0")).last
-      puts rails.version
-    R
-    expect(lockfile).to include("rails (#{rails_version})")
+    expect(lockfile).to include(rubygems_version("rails", "~> 3.0"))
     expect(lockfile).to include("capybara (2.2.1)")
   end
 
@@ -84,8 +90,8 @@ describe "real world edgecases", :realworld => true, :sometimes => true do
       gem "builder", "~> 2.1.2"
     G
     bundle :lock
-    expect(lockfile).to include("i18n (0.6.11)")
-    expect(lockfile).to include("activesupport (3.0.5)")
+    expect(lockfile).to include(rubygems_version("i18n", "~> 0.6.0"))
+    expect(lockfile).to include(rubygems_version("activesupport", "~> 3.0"))
   end
 
   # https://github.com/bundler/bundler/issues/1500
diff --git a/spec/realworld/gemfile_source_header_spec.rb b/spec/realworld/gemfile_source_header_spec.rb
index 1c39fe97bb..95935f76f7 100644
--- a/spec/realworld/gemfile_source_header_spec.rb
+++ b/spec/realworld/gemfile_source_header_spec.rb
@@ -12,6 +12,7 @@ describe "fetching dependencies with a mirrored source", :realworld => true, :ru
   end
 
   after do
+    Artifice.deactivate
     @t.kill
     @t.join
   end
diff --git a/spec/realworld/mirror_probe_spec.rb b/spec/realworld/mirror_probe_spec.rb
index bb2be7f232..0fb93b8ab1 100644
--- a/spec/realworld/mirror_probe_spec.rb
+++ b/spec/realworld/mirror_probe_spec.rb
@@ -15,6 +15,7 @@ describe "fetching dependencies with a not available mirror", :realworld => true
   end
 
   after do
+    Artifice.deactivate
     @server_thread.kill
     @server_thread.join
   end
diff --git a/spec/runtime/with_clean_env_spec.rb b/spec/runtime/with_clean_env_spec.rb
index 752754be39..294233a581 100644
--- a/spec/runtime/with_clean_env_spec.rb
+++ b/spec/runtime/with_clean_env_spec.rb
@@ -116,14 +116,14 @@ describe "Bundler.with_env helpers" do
     end
   end
 
-  describe "Bundler.clean_system" do
+  describe "Bundler.clean_system", :ruby => ">= 1.9" do
     it "runs system inside with_clean_env" do
       Bundler.clean_system(%(echo 'if [ "$BUNDLE_PATH" = "" ]; then exit 42; else exit 1; fi' | /bin/sh))
       expect($?.exitstatus).to eq(42)
     end
   end
 
-  describe "Bundler.clean_exec" do
+  describe "Bundler.clean_exec", :ruby => ">= 1.9" do
     it "runs exec inside with_clean_env" do
       pid = Kernel.fork do
         Bundler.clean_exec(%(echo 'if [ "$BUNDLE_PATH" = "" ]; then exit 42; else exit 1; fi' | /bin/sh))