molinillo 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ea85c0037f78e6763d19bf7d8144c33eccb1a28
-  data.tar.gz: da1f09939f213f0e93bc644a8ba021000c79db9e
+  metadata.gz: 27a5127f777d4d2241afc7f5c7835805688f3735
+  data.tar.gz: 59355f73e74c7ecb33ffae6d07eebb865efa2126
 SHA512:
-  metadata.gz: a84d8bde06c58dcf77fe69d9128c964a35077226a8cb5b9f9af6d4aa78592426491b35e62371565d2654f035302a7797deda05584c778e6d58e4575291bc5c5e
-  data.tar.gz: 40f4b4b9282474acee27715541f6d2f3c5153b1e333c1ed84f42d04aa09f8aeb4e024f6010abae83d958c41baa7c596002a2457c69ec008573efccac9824cf93
+  metadata.gz: e6a5abe9e0e3b9a15e7dc26d03a77e9710cddcc58c53b3a572e93925711d52481e422dc9e8436a0629e1170bde42dabe9181831465d915e884bfbe5f807f4043
+  data.tar.gz: 56c23925d436aa33cb9ac8998abf464b4bb72e6c6b3b6404916ae76632e7ec347e1a9975993a21ca7d69dd85c3215a52641c688a2e14bc0452de218086230971

data/lib/molinillo/dependency_graph.rb

@@ -126,6 +126,10 @@ module Molinillo
         v.incoming_edges.delete(e)
         detach_vertex_named(v.name) unless v.root? || v.predecessors.any?
       end
+      vertex.incoming_edges.each do |e|
+        v = e.origin
+        v.outgoing_edges.delete(e)
+      end
     end
 
     # @param [String] name

data/lib/molinillo/gem_metadata.rb

@@ -1,4 +1,4 @@
 module Molinillo
   # The version of Molinillo.
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

data/lib/molinillo/modules/ui.rb

@@ -57,7 +57,8 @@ module Molinillo
     #
     # @return [Boolean]
     def debug?
-      @debug_mode ||= ENV['MOLINILLO_DEBUG']
+      return @debug_mode if defined?(@debug_mode)
+      @debug_mode = ENV['MOLINILLO_DEBUG']
     end
   end
 end

data/lib/molinillo/resolution.rb

@@ -341,26 +341,36 @@ module Molinillo
       # @return [Boolean] Whether the possibility was swapped into {#activated}
       def attempt_to_swap_possibility
         swapped = activated.dup
-        swapped.vertex_named(name).payload = possibility
-        return unless swapped.vertex_named(name).requirements.
+        vertex = swapped.vertex_named(name)
+        vertex.payload = possibility
+        return unless vertex.requirements.
             all? { |r| requirement_satisfied_by?(r, swapped, possibility) }
-        attempt_to_activate_new_spec
+        return unless new_spec_satisfied?
+        actual_vertex = activated.vertex_named(name)
+        actual_vertex.payload = possibility
+        fixup_swapped_children(actual_vertex)
+        activate_spec
+      end
+
+      # Ensures there are no orphaned successors to the given {vertex}.
+      # @param [DependencyGraph::Vertex] vertex the vertex to fix up.
+      # @return [void]
+      def fixup_swapped_children(vertex)
+        payload = vertex.payload
+        dep_names = dependencies_for(payload).map(&method(:name_for))
+        vertex.successors.each do |succ|
+          if !dep_names.include?(succ.name) && !succ.root? && succ.predecessors.to_a == [vertex]
+            debug(depth) { "Removing orphaned spec #{succ.name} after swapping #{name}" }
+            activated.detach_vertex_named(succ.name)
+          end
+        end
       end
 
       # Attempts to activate the current {#possibility} (given that it hasn't
       # already been activated)
       # @return [void]
       def attempt_to_activate_new_spec
-        satisfied = begin
-          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
-        end
-        if satisfied
+        if new_spec_satisfied?
           activate_spec
         else
           create_conflict
@@ -368,6 +378,18 @@ module Molinillo
         end
       end
 
+      # @return [Boolean] whether the current spec is satisfied as a new
+      # possibility.
+      def new_spec_satisfied?
+        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
+      end
+
       # @param [String] requirement_name the spec name to search for
       # @return [Object] the locked spec named `requirement_name`, if one
       #   is found on {#base}
@@ -393,7 +415,7 @@ module Molinillo
       # @return [void]
       def require_nested_dependencies_for(activated_spec)
         nested_dependencies = dependencies_for(activated_spec)
-        debug(depth) { "Requiring nested dependencies (#{nested_dependencies.map(&:to_s).join(', ')})" }
+        debug(depth) { "Requiring nested dependencies (#{nested_dependencies.join(', ')})" }
         nested_dependencies.each { |d| activated.add_child_vertex(name_for(d), nil, [name_for(activated_spec)], d) }
 
         push_state_for_requirements(requirements + nested_dependencies, nested_dependencies.size > 0)

data/spec/dependency_graph_spec.rb

@@ -59,6 +59,15 @@ module Molinillo
         expect(child.predecessors).to eq([root2])
         expect(@graph.vertices.count).to eq(2)
       end
+
+      it 'detaches a vertex with predecessors' do
+        parent = @graph.add_vertex('parent', 'parent', true)
+        child = @graph.add_child_vertex('child', 'child', %w(parent), 'child')
+        @graph.detach_vertex_named(child.name)
+        expect(@graph.vertex_named(child.name)).to be_nil
+        expect(@graph.vertices).to eq(parent.name => parent)
+        expect(parent.outgoing_edges).to be_empty
+      end
     end
   end
 end

data/spec/resolver_integration_specs/index_from_rubygems.rb

@@ -4,7 +4,7 @@ require 'json'
 require 'open-uri'
 require 'set'
 
-GEMS = %w(rails capybara bundler).freeze
+GEMS = %w(rails capybara bundler mail).freeze
 
 VERSION_PATTERN = /\A
   [0-9]+\.[0-9]+\.[0-9]+           (?# Number component)
@@ -63,7 +63,7 @@ specs = specs.group_by { |s| s['name'] }.values.map do |spec|
     {
       'name' => s['name'],
       'version' => coerce_to_semver(s['number']),
-      'dependencies' => coerce_dependencies_to_semver(Hash[s['dependencies']])
+      'dependencies' => coerce_dependencies_to_semver(s['dependencies'].sort_by(&:first))
     }
   end.uniq { |s| s['version'] }.sort_by { |s| Gem::Version.new(s['version']) }
   ]

data/spec/resolver_spec.rb

@@ -77,9 +77,9 @@ module Molinillo
             result = resolve.call
 
             pretty_dependencies = lambda do |dg|
-              dg.vertices.values.map { |v| "#{v.payload.name} (#{v.payload.version})" }.sort
+              dg.vertices.values.map { |v| "#{v.name} (#{v.payload && v.payload.version})" }
             end
-            expect(pretty_dependencies.call(result)).to eq(pretty_dependencies.call(test_case.result))
+            expect(pretty_dependencies.call(result)).to contain_exactly(*pretty_dependencies.call(test_case.result))
 
             expect(result).to eq(test_case.result)
           end

data/spec/spec_helper.rb

@@ -29,3 +29,8 @@ $LOAD_PATH.unshift((ROOT + 'spec').to_s)
 
 require 'version_kit'
 require 'molinillo'
+
+RSpec.configure do |config|
+  # Enable flags like --only-failures and --next-failure
+  config.example_status_persistence_file_path = '.rspec_status'
+end

data/spec/spec_helper/specification.rb

@@ -18,5 +18,9 @@ module Molinillo
     def to_s
       "#{name} (#{version})"
     end
+
+    def inspect
+      "#<#{self.class} name=#{name} version=#{version} dependencies=[#{dependencies.join(', ')}]>"
+    end
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-30 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: 
@@ -74,12 +74,12 @@ 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: []