molinillo 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07ba133d4a53675053e7dcd0951237049e522ea8
-  data.tar.gz: 21ef570c95d650318652b77f24a68b46fa60b3db
+  metadata.gz: 201374a6119011f4e8aad27f0c594fd27a210707
+  data.tar.gz: d2ae554dca78b440d312ead38410706198eb2a2c
 SHA512:
-  metadata.gz: cb2eb17979338fb368d96effa38d25aa7fc3a19e97e3c41dc4c4e36290260d00d43fe1b206481122d1b4e708963bbb43eb7833c868566e1ff4364840671b1797
-  data.tar.gz: 2541587694311be9e41ee3f7778e996fcb01b5d5ad10b25d5a5db7cc00fbad5164b26f5b63ed4ec12534f19dcd3d18fa2ca6212c85ca7719d21094f27a139d4d
+  metadata.gz: 53c5b13bda9d0865e3d0b2d836325db2548757d9e145798401cbd59737e6378c30d46378c65a683742e0db8aa903629d002a839bacad78320ccf5dfd2e81f541
+  data.tar.gz: bfc7c83391e307a8dbb03321c356cb300c75ad3e27c1ddda1ee207467dabe1089a8671f6c95f35de6b2a9cb4d4e5fe0d41a7bb68724254e38d3cbbc4defae685

data/lib/molinillo/dependency_graph.rb

@@ -182,6 +182,13 @@ module Molinillo
       add_edge_no_circular(origin, destination, requirement)
     end
 
+    # Deletes an {Edge} from the dependency graph
+    # @param [Edge] edge
+    # @return [Void]
+    def delete_edge(edge)
+      log.delete_edge(self, edge.origin.name, edge.destination.name, edge.requirement)
+    end
+
     # Sets the payload of the vertex with the given name
     # @param [String] name the name of the vertex
     # @param [Object] payload the payload

data/lib/molinillo/dependency_graph/action.rb

@@ -7,7 +7,7 @@ module Molinillo
       # rubocop:disable Lint/UnusedMethodArgument
 
       # @return [Symbol] The name of the action.
-      def self.name
+      def self.action_name
         raise 'Abstract'
       end
 

data/lib/molinillo/dependency_graph/add_edge_no_circular.rb

@@ -7,8 +7,8 @@ module Molinillo
     class AddEdgeNoCircular < Action
       # @!group Action
 
-      # (see Action.name)
-      def self.name
+      # (see Action.action_name)
+      def self.action_name
         :add_vertex
       end
 

data/lib/molinillo/dependency_graph/add_vertex.rb

@@ -7,8 +7,8 @@ module Molinillo
     class AddVertex < Action # :nodoc:
       # @!group Action
 
-      # (see Action.name)
-      def self.name
+      # (see Action.action_name)
+      def self.action_name
         :add_vertex
       end
 

data/lib/molinillo/dependency_graph/delete_edge.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+require 'molinillo/dependency_graph/action'
+module Molinillo
+  class DependencyGraph
+    # @!visibility private
+    # (see DependencyGraph#delete_edge)
+    class DeleteEdge < Action
+      # @!group Action
+
+      # (see Action.action_name)
+      def self.action_name
+        :delete_edge
+      end
+
+      # (see Action#up)
+      def up(graph)
+        edge = make_edge(graph)
+        edge.origin.outgoing_edges.delete(edge)
+        edge.destination.incoming_edges.delete(edge)
+      end
+
+      # (see Action#down)
+      def down(graph)
+        edge = make_edge(graph)
+        edge.origin.outgoing_edges << edge
+        edge.destination.incoming_edges << edge
+        edge
+      end
+
+      # @!group DeleteEdge
+
+      # @return [String] the name of the origin of the edge
+      attr_reader :origin_name
+
+      # @return [String] the name of the destination of the edge
+      attr_reader :destination_name
+
+      # @return [Object] the requirement that the edge represents
+      attr_reader :requirement
+
+      # @param  [DependencyGraph] graph the graph to find vertices from
+      # @return [Edge] The edge this action adds
+      def make_edge(graph)
+        Edge.new(
+          graph.vertex_named(origin_name),
+          graph.vertex_named(destination_name),
+          requirement
+        )
+      end
+
+      # Initialize an action to add an edge to a dependency graph
+      # @param [String] origin_name the name of the origin of the edge
+      # @param [String] destination_name the name of the destination of the edge
+      # @param [Object] requirement the requirement that the edge represents
+      def initialize(origin_name, destination_name, requirement)
+        @origin_name = origin_name
+        @destination_name = destination_name
+        @requirement = requirement
+      end
+    end
+  end
+end

data/lib/molinillo/dependency_graph/detach_vertex_named.rb

@@ -8,7 +8,7 @@ module Molinillo
       # @!group Action
 
       # (see Action#name)
-      def self.name
+      def self.action_name
         :add_vertex
       end
 

data/lib/molinillo/dependency_graph/log.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require 'molinillo/dependency_graph/add_edge_no_circular'
 require 'molinillo/dependency_graph/add_vertex'
+require 'molinillo/dependency_graph/delete_edge'
 require 'molinillo/dependency_graph/detach_vertex_named'
 require 'molinillo/dependency_graph/set_payload'
 require 'molinillo/dependency_graph/tag'
@@ -40,6 +41,16 @@ module Molinillo
         push_action(graph, AddEdgeNoCircular.new(origin, destination, requirement))
       end
 
+      # {include:DependencyGraph#delete_edge}
+      # @param [Graph] graph the graph to perform the action on
+      # @param [String] origin_name
+      # @param [String] destination_name
+      # @param [Object] requirement
+      # @return (see DependencyGraph#delete_edge)
+      def delete_edge(graph, origin_name, destination_name, requirement)
+        push_action(graph, DeleteEdge.new(origin_name, destination_name, requirement))
+      end
+
       # @macro action
       def set_payload(graph, name, payload)
         push_action(graph, SetPayload.new(name, payload))
@@ -92,7 +103,7 @@ module Molinillo
         loop do
           action = pop!(graph)
           raise "No tag #{tag.inspect} found" unless action
-          break if action.class.name == :tag && action.tag == tag
+          break if action.class.action_name == :tag && action.tag == tag
         end
       end
 

data/lib/molinillo/dependency_graph/set_payload.rb

@@ -7,8 +7,8 @@ module Molinillo
     class SetPayload < Action # :nodoc:
       # @!group Action
 
-      # (see Action.name)
-      def self.name
+      # (see Action.action_name)
+      def self.action_name
         :set_payload
       end
 

data/lib/molinillo/dependency_graph/tag.rb

@@ -7,8 +7,8 @@ module Molinillo
     class Tag < Action
       # @!group Action
 
-      # (see Action.name)
-      def self.name
+      # (see Action.action_name)
+      def self.action_name
         :tag
       end
 

data/lib/molinillo/gem_metadata.rb

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

data/lib/molinillo/resolution.rb

@@ -373,9 +373,9 @@ module Molinillo
               (requirement_name == succ.name) || all_successor_names.include?(requirement_name)
             end
           elsif !matching_deps.include?(outgoing_edge.requirement)
-            outgoing_edge.requirement = matching_deps.first
+            activated.delete_edge(outgoing_edge)
+            requirements.delete(outgoing_edge.requirement)
           end
-          matching_deps.delete(outgoing_edge.requirement)
         end
       end
 

data/spec/resolver_spec.rb

@@ -242,6 +242,47 @@ module Molinillo
         expect(resolved.map(&:payload).map(&:to_s).sort).to eq(expected.sort)
       end
 
+      it 'can resolve when swapping changes transitive dependencies' do
+        index = TestIndex.new('restkit')
+        def index.sort_dependencies(dependencies, activated, conflicts)
+          dependencies.sort_by do |d|
+            [
+              activated.vertex_named(d.name).payload ? 0 : 1,
+              dependency_pre_release?(d) ? 0 : 1,
+              conflicts[d.name] ? 0 : 1,
+              search_for(d).count,
+            ]
+          end
+        end
+
+        def index.requirement_satisfied_by?(requirement, activated, spec)
+          existing_vertices = activated.vertices.values.select do |v|
+            v.name.split('/').first == requirement.name.split('/').first
+          end
+          existing = existing_vertices.map(&:payload).compact.first
+          if existing
+            existing.version == spec.version && requirement.satisfied_by?(spec.version)
+          else
+            requirement.satisfied_by? spec.version
+          end
+        end
+
+        @resolver = described_class.new(index, TestUI.new)
+        demands = [
+          VersionKit::Dependency.new('RestKit', '~> 0.23.0'),
+          VersionKit::Dependency.new('RestKit', '<= 0.23.2'),
+        ]
+
+        resolved = @resolver.resolve(demands, DependencyGraph.new)
+
+        expected = [
+          'RestKit (0.23.2)',
+          'RestKit/Core (0.23.2)',
+        ]
+
+        expect(resolved.map(&:payload).map(&:to_s)).to match_array(expected)
+      end
+
       # Regression test. See: https://github.com/CocoaPods/Molinillo/pull/38
       it 'can resolve when swapping children with successors' do
         swap_child_with_successors_index = Class.new(TestIndex) do

data/spec/spec_helper/index.rb

@@ -32,6 +32,7 @@ module Molinillo
             dependency.satisfied_by?(spec.version)
         end
       end
+      @search_for[dependency].dup
     end
 
     def name_for(dependency)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,6 +54,7 @@ files:
 - lib/molinillo/dependency_graph/action.rb
 - lib/molinillo/dependency_graph/add_edge_no_circular.rb
 - lib/molinillo/dependency_graph/add_vertex.rb
+- lib/molinillo/dependency_graph/delete_edge.rb
 - lib/molinillo/dependency_graph/detach_vertex_named.rb
 - lib/molinillo/dependency_graph/log.rb
 - lib/molinillo/dependency_graph/set_payload.rb