bundler 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7fccfcec378505ae78a308e9f840497a8a6593f
-  data.tar.gz: 36f474d0d2bd87d1d4883e7b452dc3b9f44a8e84
+  metadata.gz: bea44bed0acb6398c570a3ff7e7aa290b3e52a50
+  data.tar.gz: 121da52822f43b573e430a7df36670ee33dd3c9b
 SHA512:
-  metadata.gz: 7052ec5a2415965569c0a85a1c403b40b37eaa642fc3bb512cd80690505661dc1cf658bfd24100d1146faa28c904e94074e5be64783845b1be139248d449981f
-  data.tar.gz: 6cfc213cafa8e3c381dd52c04b20a6eec60dc6471c4d197694893834ce5cad1d97fec10c723432a352b2393c24d3e29387bfbab2864338c3c62339742c589375
+  metadata.gz: c2eac51c09a25749f854980cede45a0054c10b635384938fcf30e546bc28c4f79aaf8bbe79462b09211905289f22dbbbc4aa128af7fbb851b143dea04272ed75
+  data.tar.gz: bba562fb670cecb13c93baed2f98c35be0c1949a5f8fc1503c59c0b9e964354e27c82cf7453aa570ca41332c3f3138b95584152b21738d00ca9a665c2c6db96d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.6.6 (2014-08-23)
+
+Bugfixes:
+
+  - restore Gemfile credentials to Gemfile.lock (@indirect)
+
 ## 1.6.5 (2014-07-23)
 
 Bugfixes:

data/lib/bundler/source/rubygems.rb

@@ -186,7 +186,7 @@ module Bundler
       end
 
       def suppress_configured_credentials(remote)
-        remote_nouser = remote.tap { |uri| uri.user = uri.password = nil }.to_s
+        remote_nouser = remote.dup.tap { |uri| uri.user = uri.password = nil }.to_s
         if remote.userinfo && remote.userinfo == Bundler.settings[remote_nouser]
           remote_nouser
         else

data/lib/bundler/version.rb

@@ -2,5 +2,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.6.5" unless defined?(::Bundler::VERSION)
+  VERSION = "1.6.6" unless defined?(::Bundler::VERSION)
 end

data/spec/lock/lockfile_spec.rb

@@ -75,6 +75,7 @@ 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
@@ -82,6 +83,7 @@ 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)
@@ -144,7 +146,7 @@ describe "the lockfile format" do
     G
   end
 
-  it "does not assplode when a platform specific dependency is present and the Gemfile has not been resolved on that platform" do
+  it "does not asplode 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
@@ -285,6 +287,45 @@ 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}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
@@ -373,7 +373,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies