molinillo 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c0e6948c750e17cfaf091e5cd1f94ac58e4bffe
-  data.tar.gz: 64427be3edf97f492aef46c7c6eb69f1e262e25e
+  metadata.gz: 59b5cd0ec4345cc73a54775616b40161fb2af5a4
+  data.tar.gz: d38ad81fd35dcb0cc20a05005f5945c51c22b041
 SHA512:
-  metadata.gz: 2e11fb6bebe0f6797d7c855cfe92aef39054a7d82cccb9e6b78b080bb69bdb9455aa4e8b13fc613a4acd3c430fb3a6faf96ae5d63663404f377a95bbc417136e
-  data.tar.gz: e4d395af07f86d361e5fa47c13e098f3ee77f4f878311a93c9a64bcbc87d1775837233f2096ccc84196a2b13c68586852097ad1e866e9814e09212a8d82c5dda
+  metadata.gz: 7ef9ce46b630677f9ad68fe2861be96bce9a90e66e12e065f75387ed01cf50c6200e8bb79128abec09a4a56f5fd11ab5f47d1e7eb3754549c6f2fd7cd3c4ca3e
+  data.tar.gz: 731564965a432a6b80a74ccc312936e43c1b3ad11f8be2f322eee01e8ce3d831c91979139b079436b20bd072d52640420356c9a6db095f4582d5a514bd25485d

data/lib/molinillo/dependency_graph.rb

@@ -1,14 +1,36 @@
 require 'set'
+require 'tsort'
 
 module Molinillo
   # A directed acyclic graph that is tuned to hold named dependencies
   class DependencyGraph
     include Enumerable
 
+    # Enumerates through the vertices of the graph.
+    # @return [Array<Vertex>] The graph's vertices.
     def each
       vertices.values.each { |v| yield v }
     end
 
+    include TSort
+
+    alias_method :tsort_each_node, :each
+
+    def tsort_each_child(vertex, &block)
+      vertex.successors.each(&block)
+    end
+
+    # Topologically sorts the given vertices.
+    # @param [Enumerable<Vertex>] vertices the vertices to be sorted, which must
+    #   all belong to the same graph.
+    # @return [Array<Vertex>] The sorted vertices.
+    def self.tsort(vertices)
+      TSort.tsort(
+        lambda { |b| vertices.each(&b) },
+        lambda { |v, &b| (v.successors & vertices).each(&b) }
+      )
+    end
+
     # A directed edge of a {DependencyGraph}
     # @attr [Vertex] origin The origin of the directed edge
     # @attr [Vertex] destination The destination of the directed edge
@@ -162,7 +184,7 @@ module Molinillo
       # @return [Array<Object>] all of the requirements that required
       #   this vertex
       def requirements
-        incoming_edges.flat_map(&:requirements) + explicit_requirements
+        incoming_edges.map(&:requirements).flatten + explicit_requirements
       end
 
       # @return [Array<Edge>] the edges of {#graph} that have `self` as their

data/lib/molinillo/gem_metadata.rb

@@ -1,3 +1,3 @@
 module Molinillo
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/lib/molinillo/modules/ui.rb

@@ -40,7 +40,6 @@ module Molinillo
     end
 
     # Conveys debug information to the user.
-    # By default, prints to `STDERR` instead of {#output}.
     #
     # @param [Integer] depth the current depth of the resolution process.
     # @return [void]
@@ -48,7 +47,7 @@ module Molinillo
       if debug?
         debug_info = yield
         debug_info = debug_info.inspect unless debug_info.is_a?(String)
-        STDERR.puts debug_info.split("\n").map { |s| '  ' * depth + s }
+        output.puts debug_info.split("\n").map { |s| '  ' * depth + s }
       end
     end
 

data/lib/molinillo/resolution.rb

@@ -9,11 +9,16 @@ module Molinillo
       #   the {#possibility}
       # @attr [Object] possibility the spec that was unable to be activated due
       #   to a conflict
+      # @attr [Object] locked_requirement the relevant locking requirement.
+      # @attr [Array<Array<Object>>] requirement_trees the different requirement
+      #   trees that led to every requirement for the conflicting name.
       Conflict = Struct.new(
         :requirement,
         :requirements,
         :existing,
-        :possibility
+        :possibility,
+        :locked_requirement,
+        :requirement_trees
       )
 
       # @return [SpecificationProvider] the provider that knows about
@@ -176,8 +181,7 @@ module Molinillo
       def unwind_for_conflict
         debug(depth) { "Unwinding for conflict: #{requirement}" }
         conflicts.tap do |c|
-          states.slice!(state_index_for_unwind..-1)
-          states.pop if state
+          states.slice!((state_index_for_unwind + 1)..-1)
           raise VersionConflict.new(c) unless state
           state.conflicts = c
         end
@@ -186,22 +190,58 @@ module Molinillo
       # @return [Integer] The index to which the resolution should unwind in the
       #   case of conflict.
       def state_index_for_unwind
-        index = states.rindex do |state|
-          return nil unless vertex = state.activated.vertex_named(name)
-          state.is_a?(DependencyState) &&
-            (
-              !vertex.payload ||
-              (!state.requirements.include?(requirement) && state.requirement != requirement)
-            )
+        current_requirement = requirement
+        existing_requirement = requirement_for_existing_name(name)
+        until current_requirement.nil?
+          current_state = find_state_for(current_requirement)
+          return states.index(current_state) if state_any?(current_state)
+          current_requirement = parent_of(current_requirement)
         end
-        index + 2
+
+        until existing_requirement.nil?
+          existing_state = find_state_for(existing_requirement)
+          return states.index(existing_state) if state_any?(existing_state)
+          existing_requirement = parent_of(existing_requirement)
+        end
+        -1
+      end
+
+      # @return [Object] the requirement that led to `requirement` being added
+      #   to the list of requirements.
+      def parent_of(requirement)
+        return nil unless requirement
+        seen = false
+        state = states.reverse_each.find do |s|
+          seen ||= s.requirement == requirement
+          seen && s.requirement != requirement && !s.requirements.include?(requirement)
+        end
+        state && state.requirement
+      end
+
+      # @return [Object] the requirement that led to a version of a possibility
+      #   with the given name being activated.
+      def requirement_for_existing_name(name)
+        return nil unless activated.vertex_named(name).payload
+        states.reverse_each.find { |s| !s.activated.vertex_named(name).payload }.requirement
+      end
+
+      # @return [ResolutionState] the state whose `requirement` is the given
+      #   `requirement`.
+      def find_state_for(requirement)
+        return nil unless requirement
+        states.find { |i| requirement == i.requirement }
+      end
+
+      # @return [Boolean] whether or not the given state has any possibilities
+      #   left.
+      def state_any?(state)
+        state && state.possibilities.any?
       end
 
       # @return [Conflict] a {Conflict} that reflects the failure to activate
       #   the {#possibility} in conjunction with the current {#state}
       def create_conflict
         vertex = activated.vertex_named(name)
-        existing = vertex.payload
         requirements = {
           name_for_explicit_dependency_source => vertex.explicit_requirements,
           name_for_locking_dependency_source => Array(locked_requirement_named(name)),
@@ -210,11 +250,30 @@ module Molinillo
         conflicts[name] = Conflict.new(
           requirement,
           Hash[requirements.select { |_, r| !r.empty? }],
-          existing,
-          possibility
+          vertex.payload,
+          possibility,
+          locked_requirement_named(name),
+          requirement_trees
         )
       end
 
+      # @return [Array<Array<Object>>] The different requirement
+      #   trees that led to every requirement for the current spec.
+      def requirement_trees
+        activated.vertex_named(name).requirements.map { |r| requirement_tree_for(r) }
+      end
+
+      # @return [Array<Object>] the list of requirements that led to
+      #   `requirement` being required.
+      def requirement_tree_for(requirement)
+        tree = []
+        while requirement
+          tree.unshift(requirement)
+          requirement = parent_of(requirement)
+        end
+        tree
+      end
+
       # Indicates progress roughly once every second
       # @return [void]
       def indicate_progress

data/spec/spec_helper/index.rb

@@ -7,7 +7,7 @@ module Molinillo
       File.open(FIXTURE_INDEX_DIR + (fixture_name + '.json'), 'r') do |fixture|
         self.specs = JSON.load(fixture).reduce(Hash.new([])) do |specs_by_name, (name, versions)|
           specs_by_name.tap do |specs|
-            specs[name] = versions.map { |s| TestSpecification.new s }.sort { |x, y| x.version <=> y.version }
+            specs[name] = versions.map { |s| TestSpecification.new s }.sort_by(&:version)
           end
         end
       end
@@ -24,8 +24,9 @@ module Molinillo
 
     def search_for(dependency)
       pre_release = dependency_pre_release?(dependency)
-      specs[dependency.name].reject do |spec|
-        pre_release ? false : spec.version.pre_release?
+      specs[dependency.name].select do |spec|
+        (pre_release ? true : !spec.version.pre_release?) &&
+          dependency.satisfied_by?(spec.version)
       end
     end
 
@@ -43,7 +44,7 @@ module Molinillo
           activated.vertex_named(d.name).payload ? 0 : 1,
           dependency_pre_release?(d) ? 0 : 1,
           conflicts[d.name] ? 0 : 1,
-          specs[d.name].count,
+          activated.vertex_named(d.name).payload ? 0 : search_for(d).count,
         ]
       end
     end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -45,9 +45,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
-- lib/molinillo.rb
 - lib/molinillo/dependency_graph.rb
 - lib/molinillo/errors.rb
 - lib/molinillo/gem_metadata.rb
@@ -56,12 +53,15 @@ files:
 - lib/molinillo/resolution.rb
 - lib/molinillo/resolver.rb
 - lib/molinillo/state.rb
+- lib/molinillo.rb
+- README.md
+- LICENSE
 - spec/dependency_graph_spec.rb
 - spec/resolver_spec.rb
-- spec/spec_helper.rb
 - spec/spec_helper/index.rb
 - spec/spec_helper/specification.rb
 - spec/spec_helper/ui.rb
+- spec/spec_helper.rb
 - spec/state_spec.rb
 homepage: https://github.com/CocoaPods/Molinillo
 licenses:
@@ -73,17 +73,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Provides support for dependency resolution