bundler 1.5.3 → 1.6.0.pre.1

data/spec/other/ssl_cert_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'bundler/ssl_certs/certificate_manager'
+
+describe "SSL Certificates", :if => (ENV['RGV'] == "master") do
+  it "are up to date with Rubygems" do
+    rubygems = File.expand_path("../../../tmp/rubygems", __FILE__)
+    manager = Bundler::SSLCerts::CertificateManager.new(rubygems)
+    expect(manager).to be_up_to_date
+  end
+end

data/spec/realworld/edgecases_spec.rb

@@ -32,7 +32,7 @@ describe "real world edgecases", :realworld => true do
       gem 'activerecord', '~> 3.0'
       gem 'builder', '~> 2.1.2'
     G
-    expect(out).to include("activemodel (3.0.5)")
+    expect(out).to include("activemodel 3.0.5")
   end
 
   # https://github.com/bundler/bundler/issues/1500

data/spec/resolver/basic_spec.rb

@@ -24,6 +24,35 @@ describe "Resolving" do
     should_resolve_as %w(activemodel-3.2.11 builder-3.0.4 grape-0.2.6 my_app-1.0.0)
   end
 
+  it "resolves a complex conflicting index" do
+    @index = a_complex_conflict_index
+    dep "my_app"
+    should_resolve_as %w(a-1.4.0 b-0.3.5 c-3.2 d-0.9.8 my_app-1.1.0)
+  end
+
+  it "resolves a index with conflict on child" do
+    @index = index_with_conflict_on_child
+    dep "chef_app"
+    should_resolve_as %w(berkshelf-2.0.7 chef-10.26 chef_app-1.0.0 json-1.7.7)
+  end
+
+  it "resolves a index with root level conflict on child" do
+    @index = a_index_with_root_conflict_on_child
+    dep "i18n", "~> 0.4"
+    dep "activesupport", "~> 3.0"
+    dep "activerecord", "~> 3.0"
+    dep "builder", "~> 2.1.2"
+    should_resolve_as %w(activesupport-3.0.5 i18n-0.4.2 builder-2.1.2 activerecord-3.0.5 activemodel-3.0.5)
+  end
+
+  it "raises an exception if a child dependency is not resolved" do
+    @index = a_unresovable_child_index
+    dep "chef_app_error"
+    expect {
+      resolve
+    }.to raise_error(Bundler::VersionConflict)
+  end
+
   it "should throw error in case of circular dependencies" do
     @index = a_circular_index
     dep "circular_app"

data/spec/support/builders.rb

@@ -627,54 +627,53 @@ module Spec
 
     TEST_CERT=<<CERT
 -----BEGIN CERTIFICATE-----
-MIIDMjCCAhqgAwIBAgIBATANBgkqhkiG9w0BAQUFADAnMQwwCgYDVQQDDAN5b3Ux
-FzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMB4XDTE0MDIwNTE0MTEwNloXDTE1MDIw
-NTE0MTEwNlowJzEMMAoGA1UEAwwDeW91MRcwFQYKCZImiZPyLGQBGRYHZXhhbXBs
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANlvFdpN43c4DMS9Jo06
-m0a7k3bQ3HWQ1yrYhZMi77F1F73NpBknYHIzDktQpGn6hs/4QFJT4m4zNEBF47UL
-jHU5nTK5rjkS3niGYUjvh3ZEzVeo9zHUlD/UwflDo4ALl3TSo2KY/KdPS/UTdLXL
-ajkQvaVJtEDgBPE3DPhlj5whp+Ik3mDHej7qpV6F502leAwYaFyOtlEG/ZGNG+nZ
-L0clH0j77HpP42AylHDi+vakEM3xcjo9BeWQ6Vkboic93c9RTt6CWBWxMQP7Nol1
-MOebz9XOSQclxpxWteXNfPRtMdAhmRl76SMI8ywzThNPpa4EH/yz34ftebVOgKyM
-nd0CAwEAAaNpMGcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFA7D
-n9qo0np23qi3aOYuAAPn/5IdMBYGA1UdEQQPMA2BC3lvdUBleGFtcGxlMBYGA1Ud
-EgQPMA2BC3lvdUBleGFtcGxlMA0GCSqGSIb3DQEBBQUAA4IBAQB5N+71KiNX3k0Y
-FWizUHUYOqo+fEk3aBoFbOFcx+M5TXPiA91pH8mgyyD9tVzqiYgCGk7g/UrOv5Ec
-NHjYqsFecNPayj8u2Po07pp2Nbc9aqt9uxoRSENZ72Dzrk3YDStgji7Sk/LZW5Kn
-4JFTeRof+B7/ZijLZWBEnMfSHSIPaQu0Ig6c19OEhiiuhGOn4WUhGFYCadciKgnj
-PtaUcxKuvXMwRPG3NZqeGZivTlrhAmmf7iPV/E334qzMytvAV8zycZFj2J5hvyLk
-432zLezmbFGc0uLIUjXDu9bM5WYGy1BOTuzuApyuCs9S1greqz17f8f01J87DX3X
-wJsshs4b
+MIIDLDCCAhSgAwIBAgIBADANBgkqhkiG9w0BAQUFADA8MRAwDgYDVQQDDAdleGFt
+cGxlMRMwEQYKCZImiZPyLGQBGRYDZm9vMRMwEQYKCZImiZPyLGQBGRYDY29tMB4X
+DTEzMDIwNDIxMTYzNVoXDTE0MDIwNDIxMTYzNVowPDEQMA4GA1UEAwwHZXhhbXBs
+ZTETMBEGCgmSJomT8ixkARkWA2ZvbzETMBEGCgmSJomT8ixkARkWA2NvbTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANVgibTKM0ux14SXQU9M2Ec2mTHG
+hoPJl/3Qq+p4wEalT87/Ascc2BaT6hXWWfAJ4oxReZnPfVop+fXZZDgtVC0JijPC
+v+5JHs5KLEG1N+wzaVI7238yv4N62t48XD585bPp1meiVh9wE2kdax1bIJBwcRhd
+gzR5kFfr2+O7u/g1nO/LN6aAWlKBXqntUmG0wEoWAibWDqpv4AIJhSGrzAqw648F
+5TWiOEvKyrwohAt7IWbmiS8Cr3qT+GSq6tR9Hi6IC8vFW0gBvd1pSX25oUjdNApX
+lzf6zkqBTzek9R7FN6TiymbJfCqaMz55rNAGZDDX0DOqJIvRTR6I2MQSfJsCAwEA
+AaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4EFgQULUiq0A8j8lc03KGvxV4a0tuBqfUw
+CwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IBAQBMqoR/F94kK2ou9Yff+DMp
+b/hXEnl8lXzW0euUiTQcVRX6HO2AqGTqdZemUmm1uetGiozsuA1nbPInZQTL/zQq
+oNbg60JxlKWStxF3zsZdKVDNXsXWg4WlzvF6qd4AjDCO//e/BHHe44r+vASqglYO
+zTrTWYgjtDmPOLDvZTHhZ3kBV0Q0pGCBi7f0VYpqjEHSeyRfqJH1LT8yYC3vuYzZ
+PPIub1CZNnaS4jvtSKZsEzaijftwI7ddt/S9Yt7BahUrfHCMrA/Nt3XSDu0BcgaF
+cxrVBbDO8ELUvTY1yFcMYE1gzTIPCYE9TWXgm7A9HcD/7XLXkUL6nuvG3wwpBPTa
 -----END CERTIFICATE-----
 CERT
 
     TEST_PKEY=<<PKEY
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
 PKEY
   end

data/spec/support/indexes.rb

@@ -2,7 +2,7 @@ module Spec
   module Indexes
     def dep(name, reqs = nil)
       @deps ||= []
-      @deps << Bundler::Dependency.new(name, :version => reqs)
+      @deps << Bundler::Dependency.new(name, reqs)
     end
 
     def platform(*args)
@@ -131,6 +131,133 @@ module Spec
       end
     end
 
+    def a_complex_conflict_index
+      build_index do
+        gem("a", %w(1.0.2 1.1.4 1.2.0 1.4.0)) do
+          dep "d", ">= 0"
+        end
+
+        gem("d", %w(1.3.0 1.4.1)) do
+          dep "x", ">= 0"
+        end
+
+        gem "d", "0.9.8"
+
+        gem("b", '0.3.4') do
+          dep "a", ">= 1.5.0"
+        end
+
+        gem("b", '0.3.5') do
+          dep "a", ">= 1.2"
+        end
+
+        gem("b", '0.3.3') do
+          dep "a", "> 1.0"
+        end
+
+        versions '3.2 3.3' do |version|
+          gem("c", version) do
+            dep "a", "~> 1.0"
+          end
+        end
+
+        gem("my_app", '1.3.0') do
+          dep "c", ">= 4.0"
+          dep "b", ">= 0"
+        end
+
+        gem("my_app", '1.2.0') do
+          dep "c", "~> 3.3.0"
+          dep "b", "0.3.4"
+        end
+
+        gem("my_app", '1.1.0') do
+          dep "c", "~> 3.2.0"
+          dep "b", "0.3.5"
+        end
+      end
+    end
+
+    def index_with_conflict_on_child
+      build_index do
+        gem "json", %w(1.6.5 1.7.7 1.8.0)
+
+        gem("chef", '10.26') do
+          dep "json", [">= 1.4.4", "<= 1.7.7"]
+        end
+
+        gem("berkshelf", "2.0.7") do
+          dep "json", ">= 1.7.7"
+        end
+
+        gem("chef_app", '1.0.0') do
+          dep "berkshelf", "~> 2.0"
+          dep "chef", "~> 10.26"
+        end
+      end
+    end
+
+    def a_unresovable_child_index
+      build_index do
+        gem "json", %w(1.8.0)
+
+        gem("chef", '10.26') do
+          dep "json", [">= 1.4.4", "<= 1.7.7"]
+        end
+
+        gem("berkshelf", "2.0.7") do
+          dep "json", ">= 1.7.7"
+        end
+
+        gem("chef_app_error", '1.0.0') do
+          dep "berkshelf", "~> 2.0"
+          dep "chef", "~> 10.26"
+        end
+      end
+    end
+
+    def a_index_with_root_conflict_on_child
+      build_index do
+        gem "builder", %w(2.1.2 3.0.1 3.1.3)
+        gem "i18n", %w(0.4.1 0.4.2)
+
+        gem "activesupport", %w(3.0.0 3.0.1 3.0.5 3.1.7)
+
+        gem("activemodel", '3.0.5') do
+          dep "activesupport", "= 3.0.5"
+          dep "builder", "~> 2.1.2"
+          dep 'i18n', '~> 0.4'
+        end
+
+        gem("activemodel", '3.0.0') do
+          dep "activesupport", "= 3.0.0"
+          dep "builder", "~> 2.1.2"
+          dep 'i18n', '~> 0.4.1'
+        end
+
+        gem("activemodel", '3.1.3') do
+          dep "activesupport", "= 3.1.3"
+          dep "builder", "~> 2.1.2"
+          dep 'i18n', '~> 0.5'
+        end
+
+        gem("activerecord", '3.0.0') do
+          dep "activesupport", "= 3.0.0"
+          dep "activemodel", "= 3.0.0"
+        end
+
+        gem("activerecord", '3.0.5') do
+          dep "activesupport", "= 3.0.5"
+          dep "activemodel", "= 3.0.5"
+        end
+
+        gem("activerecord", '3.0.9') do
+          dep "activesupport", "= 3.1.5"
+          dep "activemodel", "= 3.1.5"
+        end
+      end
+    end
+
     def a_circular_index
       build_index do
         gem "rack", "1.0.1"
@@ -148,5 +275,6 @@ module Spec
         end
       end
     end
+
   end
 end

data/spec/support/permissions.rb

@@ -8,3 +8,4 @@ module Spec
     end
   end
 end
+

data/spec/update/gems_spec.rb

@@ -83,6 +83,22 @@ describe "bundle update" do
       expect(out).not_to match(/Fetching source index/)
     end
   end
+
+  describe "with --group option" do
+    it "should update only specifed group gems" do
+      install_gemfile <<-G
+        source "file://#{gem_repo2}"
+        gem "activesupport", :group => :development
+        gem "rack"
+      G
+      update_repo2 do
+        build_gem "activesupport", "3.0"
+      end
+      bundle "update --group development"
+      should_be_installed "activesupport 3.0"
+      should_not_be_installed "rack 1.2"
+    end
+  end
 end
 
 describe "bundle update in more complicated situations" do
@@ -151,3 +167,24 @@ describe "bundle update when a gem depends on a newer version of bundler" do
     expect(out).to match(/perhaps you need to update bundler/i)
   end
 end
+
+describe "bundle update" do
+  it "shows the previous version of the gem when updated from rubygems source" do
+    build_repo2
+
+    install_gemfile <<-G
+      source "file://#{gem_repo2}"
+      gem "activesupport"
+    G
+
+    bundle "update"
+    expect(out).to include("Using activesupport 2.3.5")
+
+    update_repo2 do
+      build_gem "activesupport", "3.0"
+    end
+
+    bundle "update"
+    expect(out).to include("Installing activesupport 3.0 (was 2.3.5)")
+  end
+end

data/spec/update/git_spec.rb

@@ -32,7 +32,7 @@ describe "bundle update" do
       G
 
       bundle "update rails"
-      expect(out).to include("Using activesupport (3.0) from #{lib_path('rails')} (at master)")
+      expect(out).to include("Using activesupport 3.0 from #{lib_path('rails')} (at master)")
       should_be_installed "rails 3.0", "activesupport 3.0"
     end
 
@@ -209,5 +209,28 @@ describe "bundle update" do
       expect(out).to include("Your bundle is updated!")
     end
 
+    it "shows the previous version of the gem" do
+      build_git "rails", "3.0", :path => lib_path("rails")
+
+      install_gemfile <<-G
+        gem "rails", :git => "#{lib_path('rails')}"
+      G
+
+      lockfile <<-G
+        GIT
+          remote: #{lib_path("rails")}
+          specs:
+            rails (2.3.2)
+
+        PLATFORMS
+          #{generic(Gem::Platform.local)}
+
+        DEPENDENCIES
+          rails!
+      G
+
+      bundle "update"
+      expect(out).to include("Using rails 3.0 (was 2.3.2) from #{lib_path('rails')} (at master)")
+    end
   end
 end

data/spec/update/source_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "bundle update" do
+describe "bundle update --source" do
   describe "git sources" do
     before :each do
       build_repo2
@@ -46,5 +46,18 @@ describe "bundle update" do
       bundle "update --source foo"
       should_be_installed "rack 1.0"
     end
+
+    it "shows the previous version of the gem when updated from path source" do
+      build_lib "activesupport", "2.3.5", :path => lib_path("rails/activesupport")
+
+      install_gemfile <<-G
+      gem "activesupport", :path => "#{lib_path('rails/activesupport')}"
+      G
+
+      build_lib "activesupport", "3.0", :path => lib_path("rails/activesupport")
+
+      bundle "update --source activesupport"
+      expect(out).to include("Using activesupport 3.0 (was 2.3.5) from source at #{lib_path('rails/activesupport')}")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0.pre.1
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ronn
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 2.99.0.beta1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 2.99.0.beta1
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
 email:
@@ -107,7 +107,6 @@ files:
 - lib/bundler/rubygems_ext.rb
 - lib/bundler/rubygems_integration.rb
 - lib/bundler/runtime.rb
-- lib/bundler/safe_catch.rb
 - lib/bundler/settings.rb
 - lib/bundler/setup.rb
 - lib/bundler/shared_helpers.rb
@@ -124,6 +123,7 @@ files:
 - lib/bundler/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
 - lib/bundler/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
 - lib/bundler/ssl_certs/GeoTrustGlobalCA.pem
+- lib/bundler/ssl_certs/certificate_manager.rb
 - lib/bundler/templates/Executable
 - lib/bundler/templates/Executable.standalone
 - lib/bundler/templates/Gemfile
@@ -143,6 +143,9 @@ files:
 - lib/bundler/templates/newgem/test/minitest_helper.rb.tt
 - lib/bundler/templates/newgem/test/test_newgem.rb.tt
 - lib/bundler/ui.rb
+- lib/bundler/ui/rg_proxy.rb
+- lib/bundler/ui/shell.rb
+- lib/bundler/ui/silent.rb
 - lib/bundler/vendor/.document
 - lib/bundler/vendor/net/http/faster.rb
 - lib/bundler/vendor/net/http/persistent.rb
@@ -200,7 +203,7 @@ files:
 - spec/bundler/gem_helper_spec.rb
 - spec/bundler/psyched_yaml_spec.rb
 - spec/bundler/retry_spec.rb
-- spec/bundler/safe_catch_spec.rb
+- spec/bundler/settings_spec.rb
 - spec/bundler/source_spec.rb
 - spec/cache/gems_spec.rb
 - spec/cache/git_spec.rb
@@ -219,6 +222,7 @@ files:
 - spec/commands/newgem_spec.rb
 - spec/commands/open_spec.rb
 - spec/commands/outdated_spec.rb
+- spec/commands/package_spec.rb
 - spec/commands/show_spec.rb
 - spec/install/binstubs_spec.rb
 - spec/install/bundler_spec.rb
@@ -233,7 +237,6 @@ files:
 - 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
 - spec/install/gems/resolving_spec.rb
@@ -253,6 +256,7 @@ files:
 - spec/other/cli_dispatch_spec.rb
 - spec/other/ext_spec.rb
 - spec/other/platform_spec.rb
+- spec/other/ssl_cert_spec.rb
 - spec/quality_spec.rb
 - spec/realworld/dependency_api_spec.rb
 - spec/realworld/edgecases_spec.rb
@@ -345,7 +349,7 @@ test_files:
 - spec/bundler/gem_helper_spec.rb
 - spec/bundler/psyched_yaml_spec.rb
 - spec/bundler/retry_spec.rb
-- spec/bundler/safe_catch_spec.rb
+- spec/bundler/settings_spec.rb
 - spec/bundler/source_spec.rb
 - spec/cache/gems_spec.rb
 - spec/cache/git_spec.rb
@@ -364,6 +368,7 @@ test_files:
 - spec/commands/newgem_spec.rb
 - spec/commands/open_spec.rb
 - spec/commands/outdated_spec.rb
+- spec/commands/package_spec.rb
 - spec/commands/show_spec.rb
 - spec/install/binstubs_spec.rb
 - spec/install/bundler_spec.rb
@@ -378,7 +383,6 @@ test_files:
 - 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
 - spec/install/gems/resolving_spec.rb
@@ -398,6 +402,7 @@ test_files:
 - spec/other/cli_dispatch_spec.rb
 - spec/other/ext_spec.rb
 - spec/other/platform_spec.rb
+- spec/other/ssl_cert_spec.rb
 - spec/quality_spec.rb
 - spec/realworld/dependency_api_spec.rb
 - spec/realworld/edgecases_spec.rb