molinillo 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59b5cd0ec4345cc73a54775616b40161fb2af5a4
-  data.tar.gz: d38ad81fd35dcb0cc20a05005f5945c51c22b041
+  metadata.gz: aac1d186cbe00eb9659705c4c35c8cfc3b6f4e84
+  data.tar.gz: 3ea34b9aa3e68233ee0744442f136eeec3972e08
 SHA512:
-  metadata.gz: 7ef9ce46b630677f9ad68fe2861be96bce9a90e66e12e065f75387ed01cf50c6200e8bb79128abec09a4a56f5fd11ab5f47d1e7eb3754549c6f2fd7cd3c4ca3e
-  data.tar.gz: 731564965a432a6b80a74ccc312936e43c1b3ad11f8be2f322eee01e8ce3d831c91979139b079436b20bd072d52640420356c9a6db095f4582d5a514bd25485d
+  metadata.gz: 250f701b7bf421d1e964fe6051f15652f4a2ab4611763b070732b51eef770739ef892c7df461845c859c85e4b4c2e10595caa0eabf3082c9d6c7f84541c856dc
+  data.tar.gz: 84858314e130d50eabf2fabe9da871003d8c75633e55cb35713968c8ac2fdfab8a8a21b1957e6ae89c53df80bb006e5a1039a685fa8f35ec9d80b8dd63b4aa75

data/README.md

@@ -28,7 +28,7 @@ $ gem install molinillo
 
 ## Usage
 
-Look at the test suite for example usage. Better documentation and examples are
+See the [ARCHITECTURE](ARCHITECTURE.md) file for an overview and look at the test suite for example usage. Better documentation and examples are
 forthcoming.
 
 ## Contributing

data/lib/molinillo/gem_metadata.rb

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

data/lib/molinillo/resolution.rb

@@ -229,7 +229,7 @@ module Molinillo
       #   `requirement`.
       def find_state_for(requirement)
         return nil unless requirement
-        states.find { |i| requirement == i.requirement }
+        states.reverse_each.find { |i| requirement == i.requirement && i.is_a?(DependencyState) }
       end
 
       # @return [Boolean] whether or not the given state has any possibilities
@@ -320,12 +320,24 @@ module Molinillo
           new_requirements = requirements.dup
           push_state_for_requirements(new_requirements)
         else
+          return if attempt_to_swap_possibility
           create_conflict
           debug(depth) { "Unsatisfied by existing spec (#{existing_node.payload})" }
           unwind_for_conflict
         end
       end
 
+      # Attempts to swp the current {#possibility} with the already-activated
+      # spec with the given name
+      # @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.
+            all? { |r| requirement_satisfied_by?(r, swapped, possibility) }
+        attempt_to_activate_new_spec
+      end
+
       # Attempts to activate the current {#possibility} (given that it hasn't
       # already been activated)
       # @return [void]
@@ -383,7 +395,7 @@ module Molinillo
       # @param [Array] new_requirements
       # @return [void]
       def push_state_for_requirements(new_requirements)
-        new_requirements = sort_dependencies(new_requirements, activated, conflicts)
+        new_requirements = sort_dependencies(new_requirements.uniq, activated, conflicts)
         new_requirement = new_requirements.shift
         states.push DependencyState.new(
           new_requirement ? name_for(new_requirement) : '',

data/spec/resolver_integration_specs/index_from_rubygems.rb

@@ -0,0 +1,76 @@
+#!/usr/bin/env ruby
+
+require 'json'
+require 'open-uri'
+require 'set'
+
+GEMS = %w(rails capybara bundler).freeze
+
+VERSION_PATTERN = /\A
+  [0-9]+\.[0-9]+\.[0-9]+           (?# Number component)
+  ([-][0-9a-z-]+(\.[0-9a-z-]+)*)?  (?# Pre-release component)
+  ([+][0-9a-z-]+(\.[0-9a-z-]+)*)?  (?# Build component)
+    \Z/xi
+
+def coerce_to_semver(version)
+  return version if version.sub(/^(\S+\s+)/, '') =~ VERSION_PATTERN
+  return "#{Regexp.last_match[1]}#{Regexp.last_match[2]}" if version =~ /^(\S+\s+)? (\d+\.\d+\.\d+) (?: \.\d+)*$/ix
+
+  parts = version.split(/[\.-]/, 4)
+  4.times do |i|
+    if parts[i] =~ /-?([a-zA-Z])/
+      parts << '0' until parts.size >= 3
+      parts[i].sub!(/-?([a-zA-Z]+)/, '')
+      parts[i] = '0' if parts[i].empty?
+      parts[3] = Regexp.last_match[1] + parts[i..-1].join('')
+    end
+  end
+  semver = parts[0..2].join('.')
+  semver.sub!(/([a-zA-Z])/, '-\1')
+  semver += '-' + parts[-1] if parts.size > 3
+  semver
+end
+
+def coerce_dependencies_to_semver(deps)
+  dependencies = {}
+  deps.each do |name, req|
+    dependencies[name] = req.split(',').map { |r| coerce_to_semver(r) }.join(',')
+  end
+  dependencies
+end
+
+gems = Set.new(GEMS)
+downloaded_gems = Set.new
+specs = []
+
+loop do
+  size = gems.size
+  (gems ^ downloaded_gems).each_slice(200) do |g|
+    specs += JSON.load open("http://bundler.rubygems.org/api/v1/dependencies.json?gems=#{g.join(',')}")
+  end
+  downloaded_gems.merge(gems)
+
+  gems.merge(specs.flat_map { |s| s['dependencies'].map(&:first) })
+
+  break if gems.size == size
+end
+
+specs.reject! { |s| s['platform'] != 'ruby' }
+specs.uniq! { |s| [s['name'], s['number']] }
+specs.sort_by! { |s| s['name'].downcase }
+specs = specs.group_by { |s| s['name'] }.values.map do |spec|
+  [spec.first['name'], spec.flat_map do |s|
+    {
+      'name' => s['name'],
+      'version' => coerce_to_semver(s['number']),
+      'dependencies' => coerce_dependencies_to_semver(Hash[s['dependencies']])
+    }
+  end.uniq { |s| s['version'] }.sort_by { |s| Gem::Version.new(s['version']) }
+  ]
+end
+
+specs = Hash[specs]
+
+json = JSON.pretty_generate(specs)
+
+File.open('index/rubygems.json', 'w') { |f| f.write json }

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2015-02-21 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,13 @@ 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_integration_specs/index_from_rubygems.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,22 +74,23 @@ 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.4.5
 signing_key: 
 specification_version: 4
 summary: Provides support for dependency resolution
 test_files:
 - spec/dependency_graph_spec.rb
+- spec/resolver_integration_specs/index_from_rubygems.rb
 - spec/resolver_spec.rb
 - spec/spec_helper/index.rb
 - spec/spec_helper/specification.rb