bundler 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37c6c8be382fbcd2bff8886e6a5e490997d540a7
-  data.tar.gz: 2a12c500ea09fbe5c994e6b93b3226e329597d48
+  metadata.gz: 255979ae6f36fa64f98d2b107eddf7f1be2399d3
+  data.tar.gz: 0ef6bf64f268ec9d6cb84fa7f90e70dd67188f77
 SHA512:
-  metadata.gz: bca04ffbb8f955a1f06713fd863baff98f91d11e52058e151e3f01155bf7c23cde1b43e00b0940ba0cb10889d0445a2ca736d39f498782ad9387211bcb943f96
-  data.tar.gz: 40a3c9193608ff8a40623b6ec722dccd2cc7f2ba739eaca6f022411dd191ed312abc7ed81e278f75495cf96858e5c1756b9b52e7d14aba733d6e08d632c1a683
+  metadata.gz: 0bd4bf2ba3b85fbabf842ff5708fc084742871501df7605e6283132bba8df8ec6dcb8ba92e7c870dd9ca8c9beba9de5869709ac19ceac28a1cf69ebb1677f39b
+  data.tar.gz: 2e7462d45fd546e05bfff85934c3b96ebae507e0f4a5b43f68c989ce7dc914d47cfd6b558e96b2215d8d99e10fbd9194b32a3d307e278da2089f30c21b5a6b6f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.7.2 (2014-08-23)
+
+Bugfixes:
+
+  - Revert gem source sorting in lock files (@indirect)
+
 ## 1.7.1 (2014-08-20)
 
 Bugfixes:

data/lib/bundler/installer.rb

@@ -118,6 +118,9 @@ module Bundler
       end
 
       post_install_message
+    rescue Errno::ENOSPC
+      raise Bundler::InstallError, "Your disk is out of space. Free some " \
+        "space to be able to install your bundle."
     rescue Exception => e
       # if install hook failed or gem signature is bad, just die
       raise e if e.is_a?(Bundler::InstallHookError) || e.is_a?(Bundler::SecurityError)

data/lib/bundler/source/path.rb

@@ -103,7 +103,7 @@ module Bundler
         name
       end
 
-      private
+    private
 
       def expand(somepath)
         somepath.expand_path(Bundler.root)

data/lib/bundler/source/rubygems.rb

@@ -344,6 +344,7 @@ module Bundler
       def remotes_equal?(other_remotes)
         remotes.map(&method(:suppress_configured_credentials)) == other_remotes.map(&method(:suppress_configured_credentials))
       end
+
     end
   end
 end

data/lib/bundler/source_list.rb

@@ -37,7 +37,8 @@ module Bundler
     end
 
     def lock_sources
-      (path_sources + git_sources) << combine_rubygems_sources
+      lock_sources = (path_sources + git_sources).sort_by(&:to_s)
+      lock_sources << combine_rubygems_sources
     end
 
     def replace_sources!(replacement_sources)

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.7.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.7.2" unless defined?(::Bundler::VERSION)
 end

data/spec/bundler/source_list_spec.rb

@@ -291,12 +291,12 @@ describe Bundler::SourceList do
       source_list.add_git_source('uri' => 'git://first-git.org/path.git')
 
       expect(source_list.lock_sources).to eq [
-        Bundler::Source::Path.new('path' => '/first/path/to/gem'),
-        Bundler::Source::Path.new('path' => '/second/path/to/gem'),
-        Bundler::Source::Path.new('path' => '/third/path/to/gem'),
         Bundler::Source::Git.new('uri' => 'git://first-git.org/path.git'),
         Bundler::Source::Git.new('uri' => 'git://second-git.org/path.git'),
         Bundler::Source::Git.new('uri' => 'git://third-git.org/path.git'),
+        Bundler::Source::Path.new('path' => '/first/path/to/gem'),
+        Bundler::Source::Path.new('path' => '/second/path/to/gem'),
+        Bundler::Source::Path.new('path' => '/third/path/to/gem'),
         Bundler::Source::Rubygems.new('remotes' => [
           'https://first-rubygems.org',
           'https://second-rubygems.org',

data/spec/lock/lockfile_spec.rb

@@ -144,7 +144,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 +285,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.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-23 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount