molinillo 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63ad00d58586b91b92f5960997bc8654c20fc5b2
-  data.tar.gz: b9db062ba89b4a8981e94307882b1ee41c799cfb
+  metadata.gz: 69f2c3781273e6f2e5c06758ed06c441691a9bcc
+  data.tar.gz: e43917b29522495a4108ad810a8ddc6879585fc1
 SHA512:
-  metadata.gz: 94bfb948e6ed3ac1be08b8a0cd51a26863f00fcb3793a8d21279a5ac741c3569bf7caa1bc6ff978fc933c7b8c8d27a8e5192f9b6c662546f51bf086dc1ba67f0
-  data.tar.gz: 4cb1385a6b9d1bad57fb7df365cb84cd6bf880fc8156e762695997c0e847c69b6c3b36c9b97f87845d495d310b859ab745e46c1fdc54c71a12e6582dca4a74fc
+  metadata.gz: 534b055dd96c322231c79e6624687764ad99bf67c8c15f0293320d695465b8041e7086f27bdff79b3378a568a5998b0ec2242a31043b52e1ee6f736839b0ebf8
+  data.tar.gz: f9c29fb00c70d2638086404f91baa6d0fc9b0c837aa28bd0819fa6dfd44f6466d33941241438cb45b88f066ec97025cf79f611c5f6999b61fd56cd714eae215c

data/lib/molinillo/gem_metadata.rb

@@ -1,3 +1,3 @@
 module Molinillo
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/lib/molinillo/modules/specification_provider.rb

@@ -86,5 +86,14 @@ module Molinillo
         ]
       end
     end
+
+    # Returns whether this dependency, which has no possible matching
+    # specifications, can safely be ignored.
+    #
+    # @param [Object] dependency
+    # @return [Boolean] whether this dependency can safely be skipped.
+    def allow_missing?(dependency)
+      false
+    end
   end
 end

data/lib/molinillo/resolution.rb

@@ -93,7 +93,7 @@ module Molinillo
       def start_resolution
         @started_at = Time.now
 
-        states.push(initial_state)
+        handle_missing_or_push_dependency_state(initial_state)
 
         debug { "Starting resolution (#{@started_at})" }
         resolver_ui.before_resolution
@@ -116,7 +116,8 @@ module Molinillo
 
       ResolutionState.new.members.each do |member|
         define_method member do |*args, &block|
-          state.send(member, *args, &block)
+          current_state = state || ResolutionState.empty
+          current_state.send(member, *args, &block)
         end
       end
 
@@ -397,19 +398,33 @@ module Molinillo
       # requirements
       # @param [Array] new_requirements
       # @return [void]
-      def push_state_for_requirements(new_requirements)
-        new_requirements = sort_dependencies(new_requirements.uniq, activated, conflicts)
+      def push_state_for_requirements(new_requirements, new_activated = activated.dup)
+        new_requirements = sort_dependencies(new_requirements.uniq, new_activated, conflicts)
         new_requirement = new_requirements.shift
-        states.push DependencyState.new(
-          new_requirement ? name_for(new_requirement) : '',
-          new_requirements,
-          activated.dup,
-          new_requirement,
-          new_requirement ? search_for(new_requirement) : [],
-          depth,
-          conflicts.dup
+        new_name = new_requirement ? name_for(new_requirement) : ''
+        possibilities = new_requirement ? search_for(new_requirement) : []
+        handle_missing_or_push_dependency_state DependencyState.new(
+          new_name, new_requirements, new_activated,
+          new_requirement, possibilities, depth, conflicts.dup
         )
       end
+
+      # Pushes a new {DependencyState}.
+      # If the {#specification_provider} says to
+      # {SpecificationProvider#allow_missing?} that particular requirement, and
+      # there are no possibilities for that requirement, then `state` is not
+      # pushed, and the node in {#activated} is removed, and we continue
+      # resolving the remaining requirements.
+      # @param [DependencyState] state
+      # @return [void]
+      def handle_missing_or_push_dependency_state(state)
+        if state.requirement && state.possibilities.empty? && allow_missing?(state.requirement)
+          state.activated.detach_vertex_named(state.name)
+          push_state_for_requirements(state.requirements, state.activated)
+        else
+          states.push state
+        end
+      end
     end
   end
 end

data/lib/molinillo/state.rb

@@ -17,6 +17,14 @@ module Molinillo
     :conflicts
   )
 
+  class ResolutionState
+    # Returns an empty resolution state
+    # @return [ResolutionState] an empty state
+    def self.empty
+      new(nil, [], DependencyGraph.new, nil, nil, 0, Set.new)
+    end
+  end
+
   # A state that encapsulates a set of {#requirements} with an {Array} of
   # possibilities
   class DependencyState < ResolutionState

data/spec/resolver_spec.rb

@@ -106,6 +106,24 @@ module Molinillo
           @resolver.resolve([VersionKit::Dependency.new('missing', '3.0')], DependencyGraph.new)
         end.message.should.match /required by `user-specified dependency`/
       end
+
+      it 'can handle when allow_missing? returns true for the only requirement' do
+        dep = VersionKit::Dependency.new('missing', '3.0')
+        @resolver.specification_provider.stubs(:allow_missing?).with(dep).returns(true)
+        @resolver.resolve([dep], DependencyGraph.new).to_a.should == []
+      end
+
+      it 'can handle when allow_missing? returns true for a nested requirement' do
+        index = TestIndex.new('awesome')
+        dep = VersionKit::Dependency.new('actionpack', '1.2.3')
+        @resolver.specification_provider.stubs(:allow_missing?).
+          with { |d| d.name == 'activesupport' }.returns(true)
+        @resolver.specification_provider.stubs(:search_for).
+          with { |d| d.name == 'activesupport' }.returns([])
+        @resolver.specification_provider.stubs(:search_for).
+          with { |d| d.name == 'actionpack' }.returns(index.search_for(dep))
+        @resolver.resolve([dep], DependencyGraph.new).map(&:payload).map(&:to_s).should == ['actionpack (1.2.3)']
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Provides support for dependency resolution