molinillo 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f58da410ac680b6b1dcb44c90cff7ee899e05e2d
-  data.tar.gz: dfa4c21e605ee3fd74bcec2ea167fb0e1c1a1ae4
+  metadata.gz: 5ca54c31b0225c0a70bd08056c807459893d8b05
+  data.tar.gz: d044395b17ede295d35e8663bbeba8c5f0ab91c5
 SHA512:
-  metadata.gz: bdfa7ee068ed2f379406f047d4f6ed72935c29046ff314b772dceee1568fbe9bce54a7a2a7524adec384760c483f5b1f800467726574871267e55df56321ed3d
-  data.tar.gz: e6070563c8b8020cf71c23e518522423769fe2248790bc7b5e88e90dd66eb321a6e6a01176a5957fd912b1052abb171a4f83a208cbdde59db926ae091ab45ecd
+  metadata.gz: cbb0cc34b7ec121f29199e73115e1e1b6231662325c36852ca552c894e031e533adc996c56642a61e60f6410234006dcc42de20068c15bc8c49cd15629c3abdc
+  data.tar.gz: 30e5ffb3e3bd50da99a14cccdf3d3eecc34c8c5887f3c1503913e97c4f311303cd0d0e982ccfd6e1853173ba0b3a5b28216b84e00fb3e008937283c619a834b9

data/lib/molinillo/gem_metadata.rb

@@ -1,3 +1,3 @@
 module Molinillo
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/molinillo/modules/ui.rb

@@ -53,11 +53,12 @@ module Molinillo
     end
 
     # Whether or not debug messages should be printed.
-    # By default, whether or not the `CP_RESOLVER` environment variable is set.
+    # By default, whether or not the `MOLINILLO_DEBUG` environment variable is
+    # set.
     #
     # @return [Boolean]
     def debug?
-      @debug_mode ||= ENV['CP_RESOLVER']
+      @debug_mode ||= ENV['MOLINILLO_DEBUG']
     end
   end
 end

data/lib/molinillo/resolution.rb

@@ -55,7 +55,7 @@ module Molinillo
           break unless state.requirements.any? || state.requirement
           indicate_progress
           if state.respond_to?(:pop_possibility_state) # DependencyState
-            debug(depth) { "creating possibility state (#{possibilities.count} remaining)" }
+            debug(depth) { "Creating possibility state (#{possibilities.count} remaining)" }
             state.pop_possibility_state.tap { |s| states.push(s) if s }
           end
           process_topmost_state
@@ -75,7 +75,7 @@ module Molinillo
 
         states.push(initial_state)
 
-        debug { "starting resolution (#{@started_at})" }
+        debug { "Starting resolution (#{@started_at})" }
         resolver_ui.before_resolution
       end
 
@@ -84,11 +84,11 @@ module Molinillo
       def end_resolution
         resolver_ui.after_resolution
         debug do
-          "finished resolution (#{@iteration_counter} steps) " \
-          "(took #{(ended_at = Time.now) - @started_at} seconds) (#{ended_at})"
+          "Finished resolution (#{@iteration_counter} steps) " \
+          "(Took #{(ended_at = Time.now) - @started_at} seconds) (#{ended_at})"
         end
-        debug { 'unactivated: ' + Hash[activated.vertices.reject { |_n, v| v.payload }].keys.join(', ') }
-        debug { 'activated: ' + Hash[activated.vertices.select { |_n, v| v.payload }].keys.join(', ') }
+        debug { 'Unactivated: ' + Hash[activated.vertices.reject { |_n, v| v.payload }].keys.join(', ') } if state
+        debug { 'Activated: ' + Hash[activated.vertices.select { |_n, v| v.payload }].keys.join(', ') } if state
       end
 
       require 'molinillo/state'
@@ -115,9 +115,11 @@ module Molinillo
           begin
             specification_provider.send(instance_method, *args, &block)
           rescue NoSuchDependencyError => error
-            vertex = activated.vertex_named(name_for error.dependency)
-            error.required_by += vertex.incoming_edges.map { |e| e.origin.name }
-            error.required_by << name_for_explicit_dependency_source unless vertex.explicit_requirements.empty?
+            if state
+              vertex = activated.vertex_named(name_for error.dependency)
+              error.required_by += vertex.incoming_edges.map { |e| e.origin.name }
+              error.required_by << name_for_explicit_dependency_source unless vertex.explicit_requirements.empty?
+            end
             raise
           end
         end
@@ -225,7 +227,7 @@ module Molinillo
       # Attempts to activate the current {#possibility}
       # @return [void]
       def attempt_to_activate
-        debug(depth) { 'attempting to activate ' + possibility.to_s }
+        debug(depth) { 'Attempting to activate ' + possibility.to_s }
         existing_node = activated.vertex_named(name)
         if existing_node && existing_node.payload
           attempt_to_activate_existing_spec(existing_node)
@@ -283,7 +285,7 @@ module Molinillo
       # @return [void]
       def activate_spec
         conflicts.delete(name)
-        debug(depth) { 'activated ' + name + ' at ' + possibility.to_s }
+        debug(depth) { 'Activated ' + name + ' at ' + possibility.to_s }
         vertex = activated.vertex_named(name)
         vertex.payload = possibility
         require_nested_dependencies_for(possibility)
@@ -295,7 +297,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.map(&:to_s).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)

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-11-06 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,6 +45,9 @@ 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
@@ -53,15 +56,12 @@ 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.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provides support for dependency resolution
@@ -95,4 +95,3 @@ test_files:
 - spec/spec_helper/ui.rb
 - spec/spec_helper.rb
 - spec/state_spec.rb
-has_rdoc: