bundler 1.4.0.rc.1 → 1.5.0.rc.1

data/spec/install/prereleases_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe "bundle install" do
+
+  describe "when prerelease gems are available" do
+    it "finds prereleases" do
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "not_released"
+      G
+      should_be_installed "not_released 1.0.pre"
+    end
+
+    it "uses regular releases if available" do
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "has_prerelease"
+      G
+      should_be_installed "has_prerelease 1.0"
+    end
+
+    it "uses prereleases if requested" do
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "has_prerelease", "1.1.pre"
+      G
+      should_be_installed "has_prerelease 1.1.pre"
+    end
+  end
+
+  describe "when prerelease gems are not available" do
+    it "still works" do
+      build_repo3
+      install_gemfile <<-G
+        source "file://#{gem_repo3}"
+        gem "rack"
+      G
+
+      should_be_installed "rack 1.0"
+    end
+  end
+
+end

data/spec/other/bundle_ruby_spec.rb

@@ -116,7 +116,7 @@ describe "bundle_ruby" do
     it "returns the ruby version" do
       gemfile <<-G
         source "file://#{gem_repo1}"
-        ruby "1.9.3", :patchlevel => 429, :engine => 'ruby', :engine_version => '1.9.3'
+        ruby "1.9.3", :patchlevel => '429', :engine => 'ruby', :engine_version => '1.9.3'
 
         gem "foo"
       G
@@ -129,7 +129,7 @@ describe "bundle_ruby" do
     it "handles an engine" do
       gemfile <<-G
         source "file://#{gem_repo1}"
-        ruby "1.9.3", :patchlevel => 392, :engine => 'jruby', :engine_version => '1.7.4'
+        ruby "1.9.3", :patchlevel => '392', :engine => 'jruby', :engine_version => '1.7.4'
 
         gem "foo"
       G

data/spec/other/ext_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Gem::Specification#match_platform" do
   it "does not match platforms other than the gem platform" do
     darwin = gem "lol", "1.0", "platform_specific-1.0-x86-darwin-10"
-    expect(darwin.match_platform(pl('java'))).to be_false
+    expect(darwin.match_platform(pl('java'))).to be false
   end
 end
 

data/spec/other/platform_spec.rb

@@ -198,11 +198,12 @@ G
 
   let(:ruby_version_correct) { "ruby \"#{RUBY_VERSION}\", :engine => \"#{local_ruby_engine}\", :engine_version => \"#{local_engine_version}\"" }
   let(:ruby_version_correct_engineless) { "ruby \"#{RUBY_VERSION}\"" }
-  let(:ruby_version_correct_patchlevel) { "#{ruby_version_correct}, :patchlevel => #{RUBY_PATCHLEVEL}" }
+  let(:ruby_version_correct_patchlevel) { "#{ruby_version_correct}, :patchlevel => '#{RUBY_PATCHLEVEL}'" }
   let(:ruby_version_incorrect) { "ruby \"#{not_local_ruby_version}\", :engine => \"#{local_ruby_engine}\", :engine_version => \"#{not_local_ruby_version}\"" }
   let(:engine_incorrect) { "ruby \"#{RUBY_VERSION}\", :engine => \"#{not_local_tag}\", :engine_version => \"#{RUBY_VERSION}\"" }
   let(:engine_version_incorrect) { "ruby \"#{RUBY_VERSION}\", :engine => \"#{local_ruby_engine}\", :engine_version => \"#{not_local_engine_version}\"" }
-  let(:patchlevel_incorrect) { "#{ruby_version_correct}, :patchlevel => #{not_local_patchlevel}" }
+  let(:patchlevel_incorrect) { "#{ruby_version_correct}, :patchlevel => '#{not_local_patchlevel}'" }
+  let(:patchlevel_fixnum) { "#{ruby_version_correct}, :patchlevel => #{RUBY_PATCHLEVEL}1" }
 
   def should_be_ruby_version_incorrect(opts = {:exitstatus => true})
     expect(exitstatus).to eq(18) if opts[:exitstatus]
@@ -225,6 +226,12 @@ G
     expect(out).to be_include("Your Ruby patchlevel is #{RUBY_PATCHLEVEL}, but your Gemfile specified #{not_local_patchlevel}")
   end
 
+  def should_be_patchlevel_fixnum(opts = {:exitstatus => true})
+    expect(exitstatus).to eq(18) if opts[:exitstatus]
+
+    expect(out).to be_include("The Ruby patchlevel in your Gemfile must be a string")
+  end
+
   context "bundle install" do
     it "installs fine when the ruby version matches" do
       install_gemfile <<-G
@@ -1254,5 +1261,25 @@ G
         should_be_patchlevel_incorrect
       end
     end
+
+    it "fails when the patchlevel is a fixnum" do
+      simulate_ruby_engine "jruby" do
+        update_repo2 do
+          build_gem "activesupport", "3.0"
+          update_git "foo", :path => lib_path("foo")
+        end
+
+        gemfile <<-G
+          source "file://#{gem_repo2}"
+          gem "activesupport", "2.3.5"
+          gem "foo", :git => "#{lib_path('foo')}"
+
+          #{patchlevel_fixnum}
+        G
+
+        bundle "outdated", :exitstatus => true
+        should_be_patchlevel_fixnum
+      end
+    end
   end
 end

data/spec/realworld/parallel_install_spec.rb

@@ -8,7 +8,8 @@ describe "installing dependencies parallely", :realworld => true do
       gem 'faker', '~> 1.1.2'
     G
 
-    bundle :install, :jobs => 4
+    bundle :install, :jobs => 4, :env => {"DEBUG" => "1"}
+    (0..3).each {|i| expect(out).to include("#{i}: ") }
 
     bundle "show activesupport"
     expect(out).to match(/activesupport/)

data/spec/realworld/parallel_update_spec.rb

@@ -0,0 +1,31 @@
+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

data/spec/runtime/platform_spec.rb

@@ -75,10 +75,10 @@ describe "Bundler.setup with multi platform stuff" do
         nokogiri
     G
 
-    system_gems "nokogiri-1.4.2", "platform_specific-1.0-x86-darwin-100"
-
     simulate_platform "x86-darwin-100"
 
+    system_gems "nokogiri-1.4.2", "platform_specific-1.0-x86-darwin-100"
+
     gemfile <<-G
       source "file://#{gem_repo1}"
       gem "nokogiri"

data/spec/spec_helper.rb

@@ -28,7 +28,7 @@ $show_err = true
 
 Spec::Rubygems.setup
 FileUtils.rm_rf(Spec::Path.gem_repo1)
-ENV['RUBYOPT'] = "#{ENV['RUBYOPT']} -r#{Spec::Path.root}/spec/support/rubygems_hax/platform.rb"
+ENV['RUBYOPT'] = "#{ENV['RUBYOPT']} -r#{Spec::Path.root}/spec/support/hax.rb"
 ENV['BUNDLE_SPEC_RUN'] = "true"
 
 # Don't wrap output in tests
@@ -88,7 +88,7 @@ RSpec.configure do |config|
     in_app_root
   end
 
-  config.after :each do
+  config.after :each do |example|
     puts @out if example.exception
 
     Dir.chdir(original_wd)

metadata

@@ -1,56 +1,72 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bundler
-version: !ruby/object:Gem::Version
-  version: 1.4.0.rc.1
+version: !ruby/object:Gem::Version 
+  hash: -3177594936
+  prerelease: 6
+  segments: 
+  - 1
+  - 5
+  - 0
+  - rc
+  - 1
+  version: 1.5.0.rc.1
 platform: ruby
-authors:
-- André Arko
+authors: 
+- "Andr\xC3\xA9 Arko"
 - Terence Lee
 - Carl Lerche
 - Yehuda Katz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-11-10 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: ronn
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.3
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
+        - 3
         version: 0.7.3
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
-description: Bundler manages an application's dependencies through its entire life,
-  across many machines, systematically and repeatably
-email:
+      - !ruby/object:Gem::Version 
+        hash: -1680146190
+        segments: 
+        - 2
+        - 99
+        - 0
+        - beta
+        - 1
+        version: 2.99.0.beta1
+  type: :development
+  version_requirements: *id002
+description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
+email: 
 - andre@arko.net
-executables:
+executables: 
 - bundle
 - bundler
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -211,17 +227,25 @@ files:
 - spec/commands/exec_spec.rb
 - spec/commands/help_spec.rb
 - spec/commands/init_spec.rb
+- spec/commands/inject_spec.rb
 - spec/commands/licenses_spec.rb
 - spec/commands/newgem_spec.rb
 - spec/commands/open_spec.rb
 - spec/commands/outdated_spec.rb
 - spec/commands/show_spec.rb
+- spec/install/binstubs_spec.rb
+- spec/install/bundler_spec.rb
 - spec/install/deploy_spec.rb
+- spec/install/gemfile/gemspec_spec.rb
+- spec/install/gemfile/git_spec.rb
+- spec/install/gemfile/path_spec.rb
+- spec/install/gemfile_spec.rb
 - spec/install/gems/c_ext_spec.rb
 - spec/install/gems/dependency_api_spec.rb
 - spec/install/gems/env_spec.rb
 - spec/install/gems/flex_spec.rb
 - spec/install/gems/groups_spec.rb
+- spec/install/gems/mirror_spec.rb
 - spec/install/gems/packed_spec.rb
 - spec/install/gems/platform_spec.rb
 - spec/install/gems/post_install_spec.rb
@@ -230,14 +254,12 @@ files:
 - spec/install/gems/standalone_spec.rb
 - spec/install/gems/sudo_spec.rb
 - spec/install/gems/win32_spec.rb
-- spec/install/gemspec_spec.rb
-- spec/install/git_spec.rb
-- spec/install/invalid_spec.rb
+- spec/install/gemspecs_spec.rb
 - spec/install/path_spec.rb
 - spec/install/post_bundle_message_spec.rb
+- spec/install/prereleases_spec.rb
 - spec/install/security_policy_spec.rb
 - spec/install/upgrade_spec.rb
-- spec/integration/inject.rb
 - spec/lock/git_spec.rb
 - spec/lock/lockfile_spec.rb
 - spec/other/bundle_ruby_spec.rb
@@ -248,6 +270,7 @@ files:
 - spec/realworld/dependency_api_spec.rb
 - spec/realworld/edgecases_spec.rb
 - spec/realworld/parallel_install_spec.rb
+- spec/realworld/parallel_update_spec.rb
 - spec/resolver/basic_spec.rb
 - spec/resolver/platform_spec.rb
 - spec/runtime/executable_spec.rb
@@ -272,6 +295,7 @@ files:
 - spec/support/builders.rb
 - spec/support/fakeweb/rack-1.0.0.marshal
 - spec/support/fakeweb/windows.rb
+- spec/support/hax.rb
 - spec/support/helpers.rb
 - spec/support/indexes.rb
 - spec/support/matchers.rb
@@ -279,53 +303,65 @@ files:
 - spec/support/platforms.rb
 - spec/support/ruby_ext.rb
 - spec/support/rubygems_ext.rb
-- spec/support/rubygems_hax/platform.rb
 - spec/support/streams.rb
 - spec/support/sudo.rb
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
-- lib/bundler/man/bundle
-- lib/bundler/man/bundle-config
-- lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle-exec
-- lib/bundler/man/bundle-exec.txt
+- lib/bundler/man/bundle
 - lib/bundler/man/bundle-install
-- lib/bundler/man/bundle-install.txt
-- lib/bundler/man/bundle-package
-- lib/bundler/man/bundle-package.txt
+- lib/bundler/man/gemfile.5
 - lib/bundler/man/bundle-platform
-- lib/bundler/man/bundle-platform.txt
+- lib/bundler/man/bundle-package
 - lib/bundler/man/bundle-update
+- lib/bundler/man/bundle-exec.txt
+- lib/bundler/man/gemfile.5.txt
 - lib/bundler/man/bundle-update.txt
+- lib/bundler/man/bundle-config
+- lib/bundler/man/bundle-platform.txt
+- lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle.txt
-- lib/bundler/man/gemfile.5
-- lib/bundler/man/gemfile.5.txt
+- lib/bundler/man/bundle-package.txt
+- lib/bundler/man/bundle-install.txt
 homepage: http://bundler.io
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: The best way to manage your application's dependencies
-test_files:
+test_files: 
 - spec/bundler/bundler_spec.rb
 - spec/bundler/cli_rspec.rb
 - spec/bundler/definition_spec.rb
@@ -348,17 +384,25 @@ test_files:
 - spec/commands/exec_spec.rb
 - spec/commands/help_spec.rb
 - spec/commands/init_spec.rb
+- spec/commands/inject_spec.rb
 - spec/commands/licenses_spec.rb
 - spec/commands/newgem_spec.rb
 - spec/commands/open_spec.rb
 - spec/commands/outdated_spec.rb
 - spec/commands/show_spec.rb
+- spec/install/binstubs_spec.rb
+- spec/install/bundler_spec.rb
 - spec/install/deploy_spec.rb
+- spec/install/gemfile/gemspec_spec.rb
+- spec/install/gemfile/git_spec.rb
+- spec/install/gemfile/path_spec.rb
+- spec/install/gemfile_spec.rb
 - spec/install/gems/c_ext_spec.rb
 - spec/install/gems/dependency_api_spec.rb
 - spec/install/gems/env_spec.rb
 - spec/install/gems/flex_spec.rb
 - spec/install/gems/groups_spec.rb
+- spec/install/gems/mirror_spec.rb
 - spec/install/gems/packed_spec.rb
 - spec/install/gems/platform_spec.rb
 - spec/install/gems/post_install_spec.rb
@@ -367,14 +411,12 @@ test_files:
 - spec/install/gems/standalone_spec.rb
 - spec/install/gems/sudo_spec.rb
 - spec/install/gems/win32_spec.rb
-- spec/install/gemspec_spec.rb
-- spec/install/git_spec.rb
-- spec/install/invalid_spec.rb
+- spec/install/gemspecs_spec.rb
 - spec/install/path_spec.rb
 - spec/install/post_bundle_message_spec.rb
+- spec/install/prereleases_spec.rb
 - spec/install/security_policy_spec.rb
 - spec/install/upgrade_spec.rb
-- spec/integration/inject.rb
 - spec/lock/git_spec.rb
 - spec/lock/lockfile_spec.rb
 - spec/other/bundle_ruby_spec.rb
@@ -385,6 +427,7 @@ test_files:
 - spec/realworld/dependency_api_spec.rb
 - spec/realworld/edgecases_spec.rb
 - spec/realworld/parallel_install_spec.rb
+- spec/realworld/parallel_update_spec.rb
 - spec/resolver/basic_spec.rb
 - spec/resolver/platform_spec.rb
 - spec/runtime/executable_spec.rb
@@ -409,6 +452,7 @@ test_files:
 - spec/support/builders.rb
 - spec/support/fakeweb/rack-1.0.0.marshal
 - spec/support/fakeweb/windows.rb
+- spec/support/hax.rb
 - spec/support/helpers.rb
 - spec/support/indexes.rb
 - spec/support/matchers.rb
@@ -416,7 +460,6 @@ test_files:
 - spec/support/platforms.rb
 - spec/support/ruby_ext.rb
 - spec/support/rubygems_ext.rb
-- spec/support/rubygems_hax/platform.rb
 - spec/support/streams.rb
 - spec/support/sudo.rb
 - spec/update/gems_spec.rb