bundler 1.14.5 → 1.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2100f5dffe1a1a753faca372bf1c5f3838715580c2acb0aa9513e938100575cc
-  data.tar.gz: c564d74033eefd53cdda1a9e5c8992e5090ac67c251c9c691ed2c51d692a0b6e
+  metadata.gz: 9de4004fd8e8958b8da52205f67cdbcc036ac1473a853c6864fc6d7164fd778c
+  data.tar.gz: 241a3dfbcbe6bd91cb27698ce07e2ad5b9a8dbe31fc63c6e1e6e0fe14b0a4671
 SHA512:
-  metadata.gz: af14db114e66673f77255884adc891aa7c390d9f07ad8502c938b355b228e082f7a2babd0f29fc19bf2579a7fac2e2e6eeb8fca5a8867f147c556189410c3c90
-  data.tar.gz: b58357e2fefceb182a35d350246633c840d78206ff7151cbc1d6149a11ebef17f01b599ae4d940b39921cfa49d19b9a6da8060f65fa330bb256b1abea7aeccf2
+  metadata.gz: 86c4e9d38389953287c939bfccd8eb9744928693f73dc67409d8ca24124ff07dc86eaa7aae3affcdc08fa3dde497a34b826a0b9478a5390225047d89377a7ee6
+  data.tar.gz: 4294b2ceb5a51da94dfe2d70efa248dfae19aec85f5084d7c15f58432f352f0c313796163ae2a015f80de5e7e2d7b464732ec9e5b5f74e401acc1308062931e7

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.14.6 (2017-03-03)
+
+Bugfixes:
+
+  - avoid undefined constant `Bundler::Plugin::API::Source` exception (#5409, @segiddins)
+  - avoid incorrect warnings about needing to enable `specific_platform` (@segiddins)
+  - fail gracefully when the compact index does not send an ETag (#5463, @olleolleolle)
+  - ensure `bundle outdated --local` shows all outdated gems (#5430, @denniss)
+  - fix a case where ruby version requirements could lead to incorrect resolver conflicts (#5425, @segiddins)
+
 ## 1.14.5 (2017-02-22)
 
 Bugfixes:

data/lib/bundler/cli/outdated.rb

@@ -49,8 +49,7 @@ module Bundler
         %w(filter-major filter-minor filter-patch)
 
       definition_resolution = proc do
-        return definition.resolve_with_cache! if options[:local]
-        definition.resolve_remotely!
+        options[:local] ? definition.resolve_with_cache! : definition.resolve_remotely!
       end
 
       if options[:parseable]

data/lib/bundler/compact_index_client/updater.rb

@@ -53,7 +53,7 @@ module Bundler
             local_temp_path.open(mode) {|f| f << content }
           end
 
-          response_etag = response["ETag"].gsub(%r{\AW/}, "")
+          response_etag = (response["ETag"] || "").gsub(%r{\AW/}, "")
           if etag_for(local_temp_path) == response_etag
             SharedHelpers.filesystem_access(local_path) do
               FileUtils.mv(local_temp_path, local_path)

data/lib/bundler/friendly_errors.rb

@@ -92,7 +92,7 @@ module Bundler
           #{e.backtrace && e.backtrace.join("\n          ").chomp}
         ```
 
-        #{Bundler::Env.new.report(:print_gemfile => false, :print_gemspecs => false)}
+        #{Bundler::Env.new.report}
         --- TEMPLATE END ----------------------------------------------------------------
 
       EOS

data/lib/bundler/lazy_specification.rb

@@ -73,7 +73,7 @@ module Bundler
         source.gemspec.tap {|s| s.source = source }
       else
         search = source.specs.search(search_object).last
-        if search && search.platform != platform && !search.runtime_dependencies.-(dependencies.reject {|d| d.type == :development }).empty?
+        if search && Gem::Platform.new(search.platform) != Gem::Platform.new(platform) && !search.runtime_dependencies.-(dependencies.reject {|d| d.type == :development }).empty?
           Bundler.ui.warn "Unable to use the platform-specific (#{search.platform}) version of #{name} (#{version}) " \
             "because it has different dependencies from the #{platform} version. " \
             "To use the platform-specific version of the gem, run `bundle config specific_platform true` and install again."

data/lib/bundler/plugin/api/source.rb

@@ -287,6 +287,12 @@ module Bundler
         def root
           Bundler.root
         end
+
+        # @private
+        # Returns true
+        def bundler_plugin_api_source?
+          true
+        end
       end
     end
   end

data/lib/bundler/rubygems_ext.rb

@@ -42,7 +42,11 @@ module Gem
     attr_writer :full_gem_path unless instance_methods.include?(:full_gem_path=)
 
     def full_gem_path
-      if source.respond_to?(:path) || source.is_a?(Bundler::Plugin::API::Source)
+      # this cannot check source.is_a?(Bundler::Plugin::API::Source)
+      # because that _could_ trip the autoload, and if there are unresolved
+      # gems at that time, this method could be called inside another require,
+      # thus raising with that constant being undefined. Better to check a method
+      if source.respond_to?(:path) || (source.respond_to?(:bundler_plugin_api_source?) && source.bundler_plugin_api_source?)
         Pathname.new(loaded_from).dirname.expand_path(source.root).to_s.untaint
       else
         rg_full_gem_path

data/lib/bundler/rubygems_gem_installer.rb

@@ -43,7 +43,7 @@ module Bundler
 
           If you wish to continue installing the downloaded gem, and are certain it does not pose a \
           security issue despite the mismatching checksum, do the following:
-          1. run `bundle config disable.checksum_validation true` to turn off checksum verification
+          1. run `bundle config disable_checksum_validation true` to turn off checksum verification
           2. run `bundle install`
 
           (More info: The expected SHA256 checksum was #{checksum.inspect}, but the \

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

@@ -132,7 +132,8 @@ module Bundler::Molinillo
       vertices.each do |name, vertex|
         other_vertex = other.vertex_named(name)
         return false unless other_vertex
-        return false unless other_vertex.successors.map(&:name).to_set == vertex.successors.map(&:name).to_set
+        return false unless vertex.payload == other_vertex.payload
+        return false unless other_vertex.successors.to_set == vertex.successors.to_set
       end
     end
 

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

@@ -10,7 +10,7 @@ module Bundler::Molinillo
       # @return [Object] the payload the vertex holds
       attr_accessor :payload
 
-      # @return [Arrary<Object>] the explicit requirements that required
+      # @return [Array<Object>] the explicit requirements that required
       #   this vertex
       attr_reader :explicit_requirements
 

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.5.6'.freeze
+  VERSION = '0.5.7'.freeze
 end

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

@@ -52,7 +52,7 @@ module Bundler::Molinillo
         @base = base
         @states = []
         @iteration_counter = 0
-        @parent_of = {}
+        @parents_of = Hash.new { |h, k| h[k] = [] }
       end
 
       # Resolves the {#original_requested} dependencies into a full dependency
@@ -105,7 +105,7 @@ module Bundler::Molinillo
 
         handle_missing_or_push_dependency_state(initial_state)
 
-        debug { "Starting resolution (#{@started_at})" }
+        debug { "Starting resolution (#{@started_at})\nUser-requested dependencies: #{original_requested}" }
         resolver_ui.before_resolution
       end
 
@@ -178,14 +178,14 @@ module Bundler::Molinillo
       # Unwinds the states stack because a conflict has been encountered
       # @return [void]
       def unwind_for_conflict
-        debug(depth) { "Unwinding for conflict: #{requirement}" }
+        debug(depth) { "Unwinding for conflict: #{requirement} to #{state_index_for_unwind / 2}" }
         conflicts.tap do |c|
           sliced_states = states.slice!((state_index_for_unwind + 1)..-1)
           raise VersionConflict.new(c) unless state
           activated.rewind_to(sliced_states.first || :initial_state) if sliced_states
           state.conflicts = c
           index = states.size - 1
-          @parent_of.reject! { |_, i| i >= index }
+          @parents_of.each { |_, a| a.reject! { |i| i >= index } }
         end
       end
 
@@ -214,7 +214,7 @@ module Bundler::Molinillo
       #   to the list of requirements.
       def parent_of(requirement)
         return unless requirement
-        return unless index = @parent_of[requirement]
+        return unless index = @parents_of[requirement].last
         return unless parent_state = @states[index]
         parent_state.requirement
       end
@@ -361,18 +361,20 @@ module Bundler::Molinillo
         deps = dependencies_for(payload).group_by(&method(:name_for))
         vertex.outgoing_edges.each do |outgoing_edge|
           requirement = outgoing_edge.requirement
-          parent_index = @parent_of[requirement]
+          parent_index = @parents_of[requirement].last
           succ = outgoing_edge.destination
           matching_deps = Array(deps[succ.name])
           dep_matched = matching_deps.include?(requirement)
 
-          # only reset the parent index when it was originally required by the
+          # only push the current index when it was originally required by the
           # same named spec
-          @parent_of[requirement] = states.size - 1 if parent_index && states[parent_index].name == name
+          if parent_index && states[parent_index].name == name
+            @parents_of[requirement].push(states.size - 1)
+          end
 
           if matching_deps.empty? && !succ.root? && succ.predecessors.to_a == [vertex]
             debug(depth) { "Removing orphaned spec #{succ.name} after swapping #{name}" }
-            succ.requirements.each { |r| @parent_of.delete(r) }
+            succ.requirements.each { |r| @parents_of.delete(r) }
 
             removed_names = activated.detach_vertex_named(succ.name).map(&:name)
             requirements.delete_if do |r|
@@ -381,9 +383,10 @@ module Bundler::Molinillo
               removed_names.include?(name_for(r))
             end
           elsif !dep_matched
+            debug(depth) { "Removing orphaned dependency #{requirement} after swapping #{name}" }
             # also reset if we're removing the edge, but only if its parent has
             # already been fixed up
-            @parent_of[requirement] = states.size - 1 if @parent_of[requirement].nil?
+            @parents_of[requirement].push(states.size - 1) if @parents_of[requirement].empty?
 
             activated.delete_edge(outgoing_edge)
             requirements.delete(requirement)
@@ -406,13 +409,18 @@ module Bundler::Molinillo
       # @return [Boolean] whether the current spec is satisfied as a new
       # possibility.
       def new_spec_satisfied?
+        unless requirement_satisfied_by?(requirement, activated, possibility)
+          debug(depth) { 'Unsatisfied by requested spec' }
+          return false
+        end
+
         locked_requirement = locked_requirement_named(name)
-        requested_spec_satisfied = requirement_satisfied_by?(requirement, activated, possibility)
+
         locked_spec_satisfied = !locked_requirement ||
           requirement_satisfied_by?(locked_requirement, activated, possibility)
-        debug(depth) { 'Unsatisfied by requested spec' } unless requested_spec_satisfied
         debug(depth) { 'Unsatisfied by locked spec' } unless locked_spec_satisfied
-        requested_spec_satisfied && locked_spec_satisfied
+
+        locked_spec_satisfied
       end
 
       # @param [String] requirement_name the spec name to search for
@@ -428,7 +436,7 @@ module Bundler::Molinillo
       # @return [void]
       def activate_spec
         conflicts.delete(name)
-        debug(depth) { 'Activated ' + name + ' at ' + possibility.to_s }
+        debug(depth) { "Activated #{name} at #{possibility}" }
         activated.set_payload(name, possibility)
         require_nested_dependencies_for(possibility)
       end
@@ -443,7 +451,8 @@ module Bundler::Molinillo
         nested_dependencies.each do |d|
           activated.add_child_vertex(name_for(d), nil, [name_for(activated_spec)], d)
           parent_index = states.size - 1
-          @parent_of[d] ||= parent_index
+          parents = @parents_of[d]
+          parents << parent_index if parents.empty?
         end
 
         push_state_for_requirements(requirements + nested_dependencies, !nested_dependencies.empty?)

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.14.5
+  version: 1.14.6
 platform: ruby
 authors:
 - André Arko
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek