bundler 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35f0cb52a9b882c8c637ef77113a1489a51dfaab
-  data.tar.gz: 6360632fce92559605a10156b5461b983ea9a019
+  metadata.gz: b30d7f68ab57d609b0945f483f536cafac8d4757
+  data.tar.gz: 7a7c04740ead7985a85d89061738f7a654c95c06
 SHA512:
-  metadata.gz: d6740f61b4c432e18499bb873d6b37f2faac68f3aedc610a29c8f0e020813d72de618ebe1e0e4f6c63e4cf4e39e0afdc7eb425b4a0c881490bf66e3a12acc3a5
-  data.tar.gz: 1b6c857370935620790be2a7c6594d9cca98b1048eb2a35c886897848166343f29575b21f46a86f7ee95a37c983bc823c69621dadf2265887ce9ae39c80b2fcb
+  metadata.gz: 8a04ea9994afc79eaa115ca259758e15fba0da19228f4210646c2451e0c3b11b0e39278fda7aa56f1c1202993b248a3b16227ceff5ab7d72ecaf4c31be2ccd73
+  data.tar.gz: f26a87583ff7b6cf97bb260874117d47cb9636a3051a59d1cb88e4551cae9bdb7ebc745f2e5aa07ec57a1ea96a698d82b2a9b4853947ca392f55b9cc4773162a

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.12.1 (2016-04-30)
+
+Bugfixes:
+  - automatically fallback when the new index has a checksum mismatch instead of erroring (@segiddins)
+  - fix computation of new index file local checksums on Windows (#4472, @mwrock)
+  - properly handle certain resolver backtracking cases without erroring (@segiddins, #4484)
+  - ensure the `$LOAD_PATH` contains specs' load paths in the correct order (@segiddins, #4482)
+
 ## 1.12.0 (2016-04-28)
 
 This space intentionally left blank.

data/lib/bundler/fetcher/compact_index.rb

@@ -61,6 +61,9 @@ module Bundler
       def available?
         # Read info file checksums out of /versions, so we can know if gems are up to date
         fetch_uri.scheme != "file" && compact_index_client.update_and_parse_checksums!
+      rescue CompactIndexClient::Updater::MisMatchedChecksumError => e
+        Bundler.ui.warn(e.message)
+        nil
       end
       compact_index_request :available?
 

data/lib/bundler/runtime.rb

@@ -17,7 +17,7 @@ module Bundler
       Bundler.rubygems.replace_entrypoints(specs)
 
       # Activate the specs
-      specs.each do |spec|
+      load_paths = specs.map do |spec|
         unless spec.loaded_from
           raise GemNotFound, "#{spec.full_name} is missing. Run `bundle` to get it."
         end
@@ -36,18 +36,16 @@ module Bundler
         end
 
         Bundler.rubygems.mark_loaded(spec)
-        load_paths = spec.load_paths.reject {|path| $LOAD_PATH.include?(path) }
-
-        # See Gem::Specification#add_self_to_load_path (since RubyGems 1.8)
-        insert_index = Bundler.rubygems.load_path_insert_index
+        spec.load_paths.reject {|path| $LOAD_PATH.include?(path) }
+      end.reverse.flatten
 
-        if insert_index
-          # Gem directories must come after -I and ENV['RUBYLIB']
-          $LOAD_PATH.insert(insert_index, *load_paths)
-        else
-          # We are probably testing in core, -I and RUBYLIB don't apply
-          $LOAD_PATH.unshift(*load_paths)
-        end
+      # See Gem::Specification#add_self_to_load_path (since RubyGems 1.8)
+      if insert_index = Bundler.rubygems.load_path_insert_index
+        # Gem directories must come after -I and ENV['RUBYLIB']
+        $LOAD_PATH.insert(insert_index, *load_paths)
+      else
+        # We are probably testing in core, -I and RUBYLIB don't apply
+        $LOAD_PATH.unshift(*load_paths)
       end
 
       setup_manpath

data/lib/bundler/vendor/compact_index_client/lib/compact_index_client.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "pathname"
 require "set"
 

data/lib/bundler/vendor/compact_index_client/lib/compact_index_client/cache.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Bundler::CompactIndexClient
   class Cache
     attr_reader :directory

data/lib/bundler/vendor/compact_index_client/lib/compact_index_client/updater.rb

@@ -1,9 +1,21 @@
+# frozen_string_literal: true
 require "stringio"
 require "zlib"
 
 class Bundler::CompactIndexClient
   class Updater
-    class MisMatchedChecksumError < Error; end
+    class MisMatchedChecksumError < Error
+      def initialize(path, server_checksum, local_checksum)
+        @path = path
+        @server_checksum = server_checksum
+        @local_checksum = local_checksum
+      end
+
+      def message
+        "The checksum of /#{@path} does not match the checksum provided by the server! Something is wrong " \
+          "(local checksum is #{@local_checksum.inspect}, was expecting #{@server_checksum.inspect})."
+      end
+    end
 
     def initialize(fetcher)
       @fetcher = fetcher
@@ -31,25 +43,28 @@ class Bundler::CompactIndexClient
       mode = response.is_a?(Net::HTTPPartialContent) ? "a" : "w"
       local_path.open(mode) {|f| f << content }
 
-      return if etag_for(local_path) == response["ETag"]
+      response_etag = response["ETag"]
+      return if etag_for(local_path) == response_etag
 
       if retrying.nil?
         local_path.delete
         update(local_path, remote_path, :retrying)
       else
-        raise MisMatchedChecksumError, "Checksum of /#{remote_path} " \
-          "does not match the checksum provided by server! Something is wrong."
+        raise MisMatchedChecksumError.new(remote_path, response_etag, etag_for(local_path))
       end
     end
 
     def etag_for(path)
       sum = checksum_for_file(path)
-      sum ? '"' << sum << '"' : nil
+      sum ? %("#{sum}") : nil
     end
 
     def checksum_for_file(path)
       return nil unless path.file?
-      Digest::MD5.file(path).hexdigest
+      # This must use IO.read instead of Digest.file().hexdigest
+      # because we need to preserve \n line endings on windows when calculating
+      # the checksum
+      Digest::MD5.hexdigest(IO.read(path))
     end
   end
 end

data/lib/bundler/vendor/compact_index_client/lib/compact_index_client/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Bundler::CompactIndexClient
-  VERSION = "0.1.0"
+  VERSION = "0.1.0".freeze
 end

data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb

@@ -16,7 +16,7 @@ module Bundler::Molinillo
     include TSort
 
     # @visibility private
-    alias_method :tsort_each_node, :each
+    alias tsort_each_node each
 
     # @visibility private
     def tsort_each_child(vertex, &block)
@@ -184,7 +184,7 @@ module Bundler::Molinillo
 
       # @return [Boolean] whether the vertex is considered a root vertex
       attr_accessor :root
-      alias_method :root?, :root
+      alias root? root
 
       # Initializes a vertex with the given name and payload.
       # @param [String] name see {#name}
@@ -262,7 +262,7 @@ module Bundler::Molinillo
           payload == other.payload
       end
 
-      alias_method :eql?, :==
+      alias eql? ==
 
       # @return [Fixnum] a hash for the vertex based upon its {#name}
       def hash
@@ -276,7 +276,7 @@ module Bundler::Molinillo
         equal?(other) || successors.any? { |v| v.path_to?(other) }
       end
 
-      alias_method :descendent?, :path_to?
+      alias descendent? path_to?
 
       # Is there a path from `other` to `self` following edges in the
       # dependency graph?
@@ -285,7 +285,7 @@ module Bundler::Molinillo
         other.path_to?(self)
       end
 
-      alias_method :is_reachable_from?, :ancestor?
+      alias is_reachable_from? ancestor?
     end
   end
 end

data/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb

@@ -26,7 +26,7 @@ module Bundler::Molinillo
     def message
       sources = required_by.map { |r| "`#{r}`" }.join(' and ')
       message = "Unable to find a specification for `#{dependency}`"
-      message << " depended upon by #{sources}" unless sources.empty?
+      message += " depended upon by #{sources}" unless sources.empty?
       message
     end
   end

data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Bundler::Molinillo
   # The version of Bundler::Molinillo.
-  VERSION = '0.4.3'.freeze
+  VERSION = '0.4.5'.freeze
 end

data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb

@@ -131,7 +131,7 @@ module Bundler::Molinillo
             specification_provider.send(instance_method, *args, &block)
           rescue NoSuchDependencyError => error
             if state
-              vertex = activated.vertex_named(name_for error.dependency)
+              vertex = activated.vertex_named(name_for(error.dependency))
               error.required_by += vertex.incoming_edges.map { |e| e.origin.name }
               error.required_by << name_for_explicit_dependency_source unless vertex.explicit_requirements.empty?
             end
@@ -345,7 +345,7 @@ module Bundler::Molinillo
         vertex = swapped.vertex_named(name)
         vertex.payload = possibility
         return unless vertex.requirements.
-            all? { |r| requirement_satisfied_by?(r, swapped, possibility) }
+                      all? { |r| requirement_satisfied_by?(r, swapped, possibility) }
         return unless new_spec_satisfied?
         actual_vertex = activated.vertex_named(name)
         actual_vertex.payload = possibility
@@ -363,7 +363,13 @@ module Bundler::Molinillo
           if !dep_names.include?(succ.name) && !succ.root? && succ.predecessors.to_a == [vertex]
             debug(depth) { "Removing orphaned spec #{succ.name} after swapping #{name}" }
             activated.detach_vertex_named(succ.name)
-            requirements.delete_if { |r| name_for(r) == succ.name }
+
+            all_successor_names = succ.recursive_successors.map(&:name)
+
+            requirements.delete_if do |requirement|
+              requirement_name = name_for(requirement)
+              (requirement_name == succ.name) || all_successor_names.include?(requirement_name)
+            end
           end
         end
       end
@@ -420,14 +426,14 @@ module Bundler::Molinillo
         debug(depth) { "Requiring nested dependencies (#{nested_dependencies.join(', ')})" }
         nested_dependencies.each { |d| activated.add_child_vertex(name_for(d), nil, [name_for(activated_spec)], d) }
 
-        push_state_for_requirements(requirements + nested_dependencies, nested_dependencies.size > 0)
+        push_state_for_requirements(requirements + nested_dependencies, !nested_dependencies.empty?)
       end
 
       # Pushes a new {DependencyState} that encapsulates both existing and new
       # requirements
       # @param [Array] new_requirements
       # @return [void]
-      def push_state_for_requirements(new_requirements, requires_sort = true, new_activated = activated.dup)
+      def push_state_for_requirements(new_requirements, requires_sort = true, new_activated = activated)
         new_requirements = sort_dependencies(new_requirements.uniq, new_activated, conflicts) if requires_sort
         new_requirement = new_requirements.shift
         new_name = new_requirement ? name_for(new_requirement) : ''

data/lib/bundler/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek
@@ -353,8 +353,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []
+has_rdoc: