bundler 1.5.1 → 1.5.2

data/spec/realworld/parallel_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe "parallel", :realworld => true do
+  it "installs", :ruby => "1.8" do
+    gemfile <<-G
+      source "https://rubygems.org"
+      gem 'activesupport', '~> 3.2.13'
+      gem 'faker', '~> 1.1.2'
+    G
+
+    bundle :install, :jobs => 4, :env => {"DEBUG" => "1"}
+    expect(out).to match(/[1-3]: /)
+
+    bundle "show activesupport"
+    expect(out).to match(/activesupport/)
+
+    bundle "show faker"
+    expect(out).to match(/faker/)
+
+    bundle "config jobs"
+    expect(out).to match(/: "4"/)
+  end
+
+  it "installs even with circular dependency", :ruby => "1.9" do
+    gemfile <<-G
+      source 'https://rubygems.org'
+      gem 'activesupport', '~> 3.2.13'
+      gem 'mongoid_auto_increment', "0.1.1"
+    G
+
+    bundle :install, :jobs => 4, :env => {"DEBUG" => "1"}
+    expect(out).to match(/[1-3]: /)
+
+    bundle "show activesupport"
+    expect(out).to match(/activesupport/)
+
+    bundle "show mongoid_auto_increment"
+    expect(out).to match(%r{gems/mongoid_auto_increment})
+
+    bundle "config jobs"
+    expect(out).to match(/: "4"/)
+  end
+
+  it "updates" do
+    install_gemfile <<-G
+      source "https://rubygems.org"
+      gem 'activesupport', '3.2.12'
+      gem 'faker', '~> 1.1.2'
+    G
+
+    gemfile <<-G
+      source "https://rubygems.org"
+      gem 'activesupport', '~> 3.2.12'
+      gem 'faker', '~> 1.1.2'
+    G
+
+    bundle :update, :jobs => 4, :env => {"DEBUG" => "1"}
+     expect(out).to match(/[1-3]: /)
+
+    bundle "show activesupport"
+    expect(out).to match(/activesupport-3\.2\.1[3-9]/)
+
+    bundle "show faker"
+    expect(out).to match(/faker/)
+
+    bundle "config jobs"
+    expect(out).to match(/: "4"/)
+  end
+end

data/spec/runtime/setup_spec.rb

@@ -631,7 +631,7 @@ describe "Bundler.setup" do
     expect(out).to eq("yay")
   end
 
-  it "ignores Gem.refresh" do
+  it "stubs out Gem.refresh so it does not reveal system gems" do
     system_gems "rack-1.0.0"
 
     install_gemfile <<-G
@@ -640,11 +640,12 @@ describe "Bundler.setup" do
     G
 
     run <<-R
+      puts Bundler.rubygems.find_name("rack").inspect
       Gem.refresh
       puts Bundler.rubygems.find_name("rack").inspect
     R
 
-    expect(out).to eq("[]")
+    expect(out).to eq("[]\n[]")
   end
 
   describe "when a vendored gem specification uses the :path option" do

data/spec/spec_helper.rb

@@ -43,6 +43,7 @@ RSpec.configure do |config|
   config.include Spec::Rubygems
   config.include Spec::Platforms
   config.include Spec::Sudo
+  config.include Spec::Permissions
 
   if Spec::Sudo.test_sudo?
     config.filter_run :sudo => true

data/spec/support/artifice/endpoint_host_redirect.rb

@@ -0,0 +1,15 @@
+require File.expand_path("../endpoint", __FILE__)
+
+Artifice.deactivate
+
+class EndpointHostRedirect < Endpoint
+  get "/fetch/actual/gem/:id", :host_name => 'localgemserver.test' do
+    redirect "http://bundler.localgemserver.test#{request.path_info}"
+  end
+
+  get "/api/v1/dependencies" do
+    status 404
+  end
+end
+
+Artifice.activate_with(EndpointHostRedirect)

data/spec/support/permissions.rb

@@ -0,0 +1,11 @@
+module Spec
+  module Permissions
+    def with_umask(new_umask)
+      old_umask = File.umask(new_umask)
+      yield if block_given?
+    ensure
+      File.umask(old_umask)
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ronn
@@ -168,6 +168,9 @@ files:
 - lib/bundler/vendor/thor/error.rb
 - lib/bundler/vendor/thor/group.rb
 - lib/bundler/vendor/thor/invocation.rb
+- lib/bundler/vendor/thor/line_editor.rb
+- lib/bundler/vendor/thor/line_editor/basic.rb
+- lib/bundler/vendor/thor/line_editor/readline.rb
 - lib/bundler/vendor/thor/parser.rb
 - lib/bundler/vendor/thor/parser/argument.rb
 - lib/bundler/vendor/thor/parser/arguments.rb
@@ -258,8 +261,7 @@ files:
 - spec/quality_spec.rb
 - spec/realworld/dependency_api_spec.rb
 - spec/realworld/edgecases_spec.rb
-- spec/realworld/parallel_install_spec.rb
-- spec/realworld/parallel_update_spec.rb
+- spec/realworld/parallel_spec.rb
 - spec/resolver/basic_spec.rb
 - spec/resolver/platform_spec.rb
 - spec/runtime/executable_spec.rb
@@ -278,6 +280,7 @@ files:
 - spec/support/artifice/endpoint_extra.rb
 - spec/support/artifice/endpoint_extra_missing.rb
 - spec/support/artifice/endpoint_fallback.rb
+- spec/support/artifice/endpoint_host_redirect.rb
 - spec/support/artifice/endpoint_marshal_fail.rb
 - spec/support/artifice/endpoint_redirect.rb
 - spec/support/artifice/endpoint_timeout.rb
@@ -289,6 +292,7 @@ files:
 - spec/support/indexes.rb
 - spec/support/matchers.rb
 - spec/support/path.rb
+- spec/support/permissions.rb
 - spec/support/platforms.rb
 - spec/support/ruby_ext.rb
 - spec/support/rubygems_ext.rb
@@ -403,8 +407,7 @@ test_files:
 - spec/quality_spec.rb
 - spec/realworld/dependency_api_spec.rb
 - spec/realworld/edgecases_spec.rb
-- spec/realworld/parallel_install_spec.rb
-- spec/realworld/parallel_update_spec.rb
+- spec/realworld/parallel_spec.rb
 - spec/resolver/basic_spec.rb
 - spec/resolver/platform_spec.rb
 - spec/runtime/executable_spec.rb
@@ -423,6 +426,7 @@ test_files:
 - spec/support/artifice/endpoint_extra.rb
 - spec/support/artifice/endpoint_extra_missing.rb
 - spec/support/artifice/endpoint_fallback.rb
+- spec/support/artifice/endpoint_host_redirect.rb
 - spec/support/artifice/endpoint_marshal_fail.rb
 - spec/support/artifice/endpoint_redirect.rb
 - spec/support/artifice/endpoint_timeout.rb
@@ -434,6 +438,7 @@ test_files:
 - spec/support/indexes.rb
 - spec/support/matchers.rb
 - spec/support/path.rb
+- spec/support/permissions.rb
 - spec/support/platforms.rb
 - spec/support/ruby_ext.rb
 - spec/support/rubygems_ext.rb

data/spec/realworld/parallel_install_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe "installing dependencies parallely", :realworld => true do
-  it "installs gems parallely" do
-    gemfile <<-G
-      source "https://rubygems.org"
-      gem 'activesupport', '~> 3.2.13'
-      gem 'faker', '~> 1.1.2'
-    G
-
-    bundle :install, :jobs => 4, :env => {"DEBUG" => "1"}
-    (0..3).each {|i| expect(out).to include("#{i}: ") }
-
-    bundle "show activesupport"
-    expect(out).to match(/activesupport/)
-
-    bundle "show faker"
-    expect(out).to match(/faker/)
-
-    bundle "config jobs"
-    expect(out).to match(/: "4"/)
-  end
-end

data/spec/realworld/parallel_update_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe "updating dependencies parallely", :realworld => true do
-  before :each do
-    install_gemfile <<-G
-      source "https://rubygems.org"
-      gem 'activesupport', '~> 3.2.12'
-      gem 'faker', '~> 1.1.2'
-    G
-  end
-
-  it "installs gems parallely" do
-    gemfile <<-G
-      source "https://rubygems.org"
-      gem 'activesupport', '3.2.13'
-      gem 'faker', '~> 1.1.2'
-    G
-
-    bundle :update, :jobs => 4, :env => {"DEBUG" => "1"}
-    (0..3).each {|i| expect(out).to include("#{i}: ") }
-
-    bundle "show activesupport"
-    expect(out).to match(/activesupport-3\.2\.13/)
-
-    bundle "show faker"
-    expect(out).to match(/faker/)
-
-    bundle "config jobs"
-    expect(out).to match(/: "4"/)
-  end
-end