molinillo 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 135680d0c4a7de58ac3e44505fa78ba73921c167a67f0772f5017ba6acb4c211
-  data.tar.gz: 41d3c7dde1f4925aa33cb534864a0d7d49c7372969db393f8e0c02410c9bd5a4
+  metadata.gz: da3743b5073c8c2e1f9188f3ac2178be94174d80b4450effc94af78b9a06eaba
+  data.tar.gz: a0684796c7423561761e311a3fdfd16195ead3bacda4abd9741bb6419c8199c6
 SHA512:
-  metadata.gz: 7a81b3d5f68f54505f2ca431c302396a7e9d3d708e2ab51d4b9fd8c0eb8de7adce18de8e54738c3d49d3b4c4f2f5d03a791647369fb1fbd200537aac579b7fff
-  data.tar.gz: 3b2401002e64b4425d19f28f19b95d26ffa250eaa3dfc1ce1b2e7cdb8617aa799336bf8deee1f9e0c1f02f240b51133715d9500ca204319c693acd751c2ff91b
+  metadata.gz: 59876ee8b9694c9e8e3e4c2b352a0a927c0fa3c496a1c2218d9d9df9d7592a0315915eb356b062f9b108341805d71349a5234c33fbb144dc1b2e493edc92f655
+  data.tar.gz: 062b07e84a80b99608c58681ce4bd2c23b12e0047ce90f0553f586449b5812e86b8df5f59d4ff7869660c6c0fc58bcf069db7c127c4c0773a186746bf12672cd

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Molinillo Changelog
 
+## 0.6.6 (2018-08-07)
+
+##### Enhancements
+
+* Improve performance of `Vertex#path_to?`.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Allow customization of string used to say that a version conflict has occurred
+  for a particular name by passing in the `:incompatible_version_message_for_conflict` 
+  key when constructing a version conflict message with trees.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+##### Bug Fixes
+
+* None.  
+
+
 ## 0.6.5 (2018-03-22)
 
 ##### Enhancements

data/lib/molinillo/dependency_graph/vertex.rb

@@ -130,11 +130,21 @@ module Molinillo
       # dependency graph?
       # @return true iff there is a path following edges within this {#graph}
       def path_to?(other)
-        equal?(other) || successors.any? { |v| v.path_to?(other) }
+        _path_to?(other)
       end
 
       alias descendent? path_to?
 
+      # @param [Vertex] other the vertex to check if there's a path to
+      # @param [Set<Vertex>] visited the vertices of {#graph} that have been visited
+      # @return [Boolean] whether there is a path to `other` from `self`
+      def _path_to?(other, visited = Set.new)
+        return false unless visited.add?(self)
+        return true if equal?(other)
+        successors.any? { |v| v._path_to?(other, visited) }
+      end
+      protected :_path_to?
+
       # Is there a path from `other` to `self` following edges in the
       # dependency graph?
       # @return true iff there is a path following edges within this {#graph}

data/lib/molinillo/errors.rb

@@ -18,7 +18,7 @@ module Molinillo
     # @param [Array<Object>] required_by @see {#required_by}
     def initialize(dependency, required_by = [])
       @dependency = dependency
-      @required_by = required_by
+      @required_by = required_by.uniq
       super()
     end
 
@@ -101,9 +101,14 @@ module Molinillo
       printable_requirement = opts.delete(:printable_requirement) { proc { |req| req.to_s } }
       additional_message_for_conflict = opts.delete(:additional_message_for_conflict) { proc {} }
       version_for_spec = opts.delete(:version_for_spec) { proc(&:to_s) }
+      incompatible_version_message_for_conflict = opts.delete(:incompatible_version_message_for_conflict) do
+        proc do |name, _conflict|
+          %(#{solver_name} could not find compatible versions for #{possibility_type} "#{name}":)
+        end
+      end
 
       conflicts.sort.reduce(''.dup) do |o, (name, conflict)|
-        o << %(\n#{solver_name} could not find compatible versions for #{possibility_type} "#{name}":\n)
+        o << "\n" << incompatible_version_message_for_conflict.call(name, conflict) << "\n"
         if conflict.locked_requirement
           o << %(  In snapshot (#{name_for_locking_dependency_source}):\n)
           o << %(    #{printable_requirement.call(conflict.locked_requirement)}\n)

data/lib/molinillo/gem_metadata.rb

@@ -2,5 +2,5 @@
 
 module Molinillo
   # The version of Molinillo.
-  VERSION = '0.6.5'.freeze
+  VERSION = '0.6.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Provides support for dependency resolution