bundler 1.6.9 → 1.7.0

data/spec/lock/lockfile_spec.rb

@@ -75,7 +75,6 @@ describe "the lockfile format" do
 
     install_gemfile(<<-G, :artifice => "endpoint_strict_basic_authentication", :quiet => true)
       source "http://localgemserver.test/"
-      source "http://user:pass@othergemserver.test/"
 
       gem "rack-obama", ">= 1.0"
     G
@@ -83,7 +82,6 @@ describe "the lockfile format" do
     lockfile_should_be <<-G
       GEM
         remote: http://localgemserver.test/
-        remote: http://user:pass@othergemserver.test/
         specs:
           rack (1.0.0)
           rack-obama (1.0)
@@ -146,7 +144,7 @@ describe "the lockfile format" do
     G
   end
 
-  it "does not asplode when a platform specific dependency is present and the Gemfile has not been resolved on that platform" do
+  it "does not assplode when a platform specific dependency is present and the Gemfile has not been resolved on that platform" do
     build_lib "omg", :path => lib_path('omg')
 
     gemfile <<-G
@@ -287,45 +285,6 @@ describe "the lockfile format" do
     G
   end
 
-  it "sorts serialized sources by type" do
-    build_lib "foo"
-    bar = build_git "bar"
-
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack"
-      gem "foo", :path => "#{lib_path("foo-1.0")}"
-      gem "bar", :git => "#{lib_path("bar-1.0")}"
-    G
-
-    lockfile_should_be <<-G
-      GIT
-        remote: #{lib_path("bar-1.0")}
-        revision: #{bar.ref_for('master')}
-        specs:
-          bar (1.0)
-
-      PATH
-        remote: #{lib_path("foo-1.0")}
-        specs:
-          foo (1.0)
-
-      GEM
-        remote: file:#{gem_repo1}/
-        specs:
-          rack (1.0.0)
-
-      PLATFORMS
-        #{generic(Gem::Platform.local)}
-
-      DEPENDENCIES
-        bar!
-        foo!
-        rack
-    G
-  end
-
   it "lists gems alphabetically" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"

data/spec/other/ssl_cert_spec.rb

@@ -1,23 +1,10 @@
 require 'spec_helper'
 require 'bundler/ssl_certs/certificate_manager'
 
-describe "SSL Certificates", :rubygems_master do
+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
-
-  hosts = %w(
-    d2chzxaqi4y7f8.cloudfront.net
-    rubygems.org
-    s3.amazonaws.com
-    staging.rubygems.org
-  )
-
-  hosts.each do |host|
-    it "can securely connect to #{host}", :realworld do
-      Bundler::SSLCerts::CertificateManager.new.connect_to(host)
-    end
-  end
 end

data/spec/quality_spec.rb

@@ -46,7 +46,7 @@ describe "The library itself" do
       actual.empty?
     end
 
-    failure_message do |actual|
+    failure_message_for_should do |actual|
       actual.join("\n")
     end
   end

data/spec/realworld/parallel_spec.rb

@@ -58,7 +58,7 @@ describe "parallel", :realworld => true do
      expect(out).to match(/[1-3]: /)
 
     bundle "show activesupport"
-    expect(out).to match(/activesupport-3\.2\.\d+/)
+    expect(out).to match(/activesupport-3\.2\.1[3-9]/)
 
     bundle "show faker"
     expect(out).to match(/faker/)

data/spec/spec_helper.rb

@@ -76,12 +76,6 @@ RSpec.configure do |config|
     config.filter_run_excluding :rubygems => "2.2"
   end
 
-  if ENV['RGV'] == "master"
-    config.filter_run :rubygems_master => true
-  else
-    config.filter_run_excluding :rubygems_master => true
-  end
-
   config.filter_run :focused => true unless ENV['CI']
   config.run_all_when_everything_filtered = true
   config.alias_example_to :fit, :focused => true

data/spec/update/git_spec.rb

@@ -233,4 +233,51 @@ describe "bundle update" do
       expect(out).to include("Using rails 3.0 (was 2.3.2) from #{lib_path('rails')} (at master)")
     end
   end
+
+  describe "with --source flag" do
+    before :each do
+      build_repo2
+      @git = build_git "foo", :path => lib_path("foo") do |s|
+        s.executables = "foobar"
+      end
+
+      install_gemfile <<-G
+        source "file://#{gem_repo2}"
+        git "#{lib_path('foo')}" do
+          gem 'foo'
+        end
+        gem 'rack'
+      G
+    end
+
+    it "updates the source" do
+      update_git "foo", :path => @git.path
+
+      bundle "update --source foo"
+
+      in_app_root do
+        run <<-RUBY
+          require 'foo'
+          puts "WIN" if defined?(FOO_PREV_REF)
+        RUBY
+
+        expect(out).to eq("WIN")
+      end
+    end
+
+    it "unlocks gems that were originally pulled in by the source" do
+      update_git "foo", "2.0", :path => @git.path
+
+      bundle "update --source foo"
+      should_be_installed "foo 2.0"
+    end
+
+    it "leaves all other gems frozen" do
+      update_repo2
+      update_git "foo", :path => @git.path
+
+      bundle "update --source foo"
+      should_be_installed "rack 1.0"
+    end
+  end
 end

data/spec/update/path_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+describe "path sources" do
+  describe "bundle update --source" do
+    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.6.9
+  version: 1.7.0
 platform: ruby
 authors:
 - André Arko
@@ -11,22 +11,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mustache
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.99.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.99.6
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
@@ -180,10 +166,9 @@ files:
 - lib/bundler/source/path.rb
 - lib/bundler/source/path/installer.rb
 - lib/bundler/source/rubygems.rb
+- lib/bundler/source_list.rb
 - lib/bundler/spec_set.rb
 - lib/bundler/ssl_certs/.document
-- lib/bundler/ssl_certs/AddTrustExternalCARoot-2048.pem
-- lib/bundler/ssl_certs/AddTrustExternalCARoot.pem
 - lib/bundler/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
 - lib/bundler/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
 - lib/bundler/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
@@ -272,7 +257,8 @@ files:
 - spec/bundler/psyched_yaml_spec.rb
 - spec/bundler/retry_spec.rb
 - spec/bundler/settings_spec.rb
-- spec/bundler/source_spec.rb
+- spec/bundler/source/rubygems_spec.rb
+- spec/bundler/source_list_spec.rb
 - spec/cache/gems_spec.rb
 - spec/cache/git_spec.rb
 - spec/cache/path_spec.rb
@@ -309,6 +295,7 @@ files:
 - spec/install/gems/post_install_spec.rb
 - spec/install/gems/resolving_spec.rb
 - spec/install/gems/simple_case_spec.rb
+- spec/install/gems/sources_spec.rb
 - spec/install/gems/standalone_spec.rb
 - spec/install/gems/sudo_spec.rb
 - spec/install/gems/win32_spec.rb
@@ -368,7 +355,7 @@ files:
 - spec/support/sudo.rb
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
-- spec/update/source_spec.rb
+- spec/update/path_spec.rb
 homepage: http://bundler.io
 licenses:
 - MIT
@@ -403,7 +390,8 @@ test_files:
 - spec/bundler/psyched_yaml_spec.rb
 - spec/bundler/retry_spec.rb
 - spec/bundler/settings_spec.rb
-- spec/bundler/source_spec.rb
+- spec/bundler/source/rubygems_spec.rb
+- spec/bundler/source_list_spec.rb
 - spec/cache/gems_spec.rb
 - spec/cache/git_spec.rb
 - spec/cache/path_spec.rb
@@ -440,6 +428,7 @@ test_files:
 - spec/install/gems/post_install_spec.rb
 - spec/install/gems/resolving_spec.rb
 - spec/install/gems/simple_case_spec.rb
+- spec/install/gems/sources_spec.rb
 - spec/install/gems/standalone_spec.rb
 - spec/install/gems/sudo_spec.rb
 - spec/install/gems/win32_spec.rb
@@ -499,4 +488,4 @@ test_files:
 - spec/support/sudo.rb
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
-- spec/update/source_spec.rb
+- spec/update/path_spec.rb

data/lib/bundler/ssl_certs/AddTrustExternalCARoot-2048.pem

@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
-IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
-MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
-bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
-H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
-uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
-mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
-a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
-E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
-WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
-VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
-Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
-cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
-IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
-AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
-YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
-Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
-c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
-mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----

data/lib/bundler/ssl_certs/AddTrustExternalCARoot.pem

@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFdDCCBFygAwIBAgIQJ2buVutJ846r13Ci/ITeIjANBgkqhkiG9w0BAQwFADBv
-MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk
-ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF
-eHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFow
-gYUxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSswKQYD
-VQQDEyJDT01PRE8gUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAkehUktIKVrGsDSTdxc9EZ3SZKzejfSNw
-AHG8U9/E+ioSj0t/EFa9n3Byt2F/yUsPF6c947AEYe7/EZfH9IY+Cvo+XPmT5jR6
-2RRr55yzhaCCenavcZDX7P0N+pxs+t+wgvQUfvm+xKYvT3+Zf7X8Z0NyvQwA1onr
-ayzT7Y+YHBSrfuXjbvzYqOSSJNpDa2K4Vf3qwbxstovzDo2a5JtsaZn4eEgwRdWt
-4Q08RWD8MpZRJ7xnw8outmvqRsfHIKCxH2XeSAi6pE6p8oNGN4Tr6MyBSENnTnIq
-m1y9TBsoilwie7SrmNnu4FGDwwlGTm0+mfqVF9p8M1dBPI1R7Qu2XK8sYxrfV8g/
-vOldxJuvRZnio1oktLqpVj3Pb6r/SVi+8Kj/9Lit6Tf7urj0Czr56ENCHonYhMsT
-8dm74YlguIwoVqwUHZwK53Hrzw7dPamWoUi9PPevtQ0iTMARgexWO/bTouJbt7IE
-IlKVgJNp6I5MZfGRAy1wdALqi2cVKWlSArvX31BqVUa/oKMoYX9w0MOiqiwhqkfO
-KJwGRXa/ghgntNWutMtQ5mv0TIZxMOmm3xaG4Nj/QN370EKIf6MzOi5cHkERgWPO
-GHFrK+ymircxXDpqR+DDeVnWIBqv8mqYqnK8V0rSS527EPywTEHl7R09XiidnMy/
-s1Hap0flhFMCAwEAAaOB9DCB8TAfBgNVHSMEGDAWgBStvZh6NLQm9/rEJlTvA73g
-JMtUGjAdBgNVHQ4EFgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQD
-AgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAGBgRVHSAAMEQGA1UdHwQ9
-MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9BZGRUcnVzdEV4dGVy
-bmFsQ0FSb290LmNybDA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6
-Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEMBQADggEBAGS/g/FfmoXQ
-zbihKVcN6Fr30ek+8nYEbvFScLsePP9NDXRqzIGCJdPDoCpdTPW6i6FtxFQJdcfj
-Jw5dhHk3QBN39bSsHNA7qxcS1u80GH4r6XnTq1dFDK8o+tDb5VCViLvfhVdpfZLY
-Uspzgb8c8+a4bmYRBbMelC1/kZWSWfFMzqORcUx8Rww7Cxn2obFshj5cqsQugsv5
-B5a6SE2Q8pTIqXOi6wZ7I53eovNNVZ96YUWYGGjHXkBrI/V5eu+MtWuLt29G9Hvx
-PUsE2JOAWVrgQSQdso8VYFhH2+9uRv0V9dlfmrPb2LjkQLPNlzmuhbsdjrzch5vR
-pu/xO28QOG8=
------END CERTIFICATE-----

data/spec/update/source_spec.rb

@@ -1,63 +0,0 @@
-require "spec_helper"
-
-describe "bundle update --source" do
-  describe "git sources" do
-    before :each do
-      build_repo2
-      @git = build_git "foo", :path => lib_path("foo") do |s|
-        s.executables = "foobar"
-      end
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        git "#{lib_path('foo')}" do
-          gem 'foo'
-        end
-        gem 'rack'
-      G
-    end
-
-    it "updates the source" do
-      update_git "foo", :path => @git.path
-
-      bundle "update --source foo"
-
-      in_app_root do
-        run <<-RUBY
-          require 'foo'
-          puts "WIN" if defined?(FOO_PREV_REF)
-        RUBY
-
-        expect(out).to eq("WIN")
-      end
-    end
-
-    it "unlocks gems that were originally pulled in by the source" do
-      update_git "foo", "2.0", :path => @git.path
-
-      bundle "update --source foo"
-      should_be_installed "foo 2.0"
-    end
-
-    it "leaves all other gems frozen" do
-      update_repo2
-      update_git "foo", :path => @git.path
-
-      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