molinillo 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27a5127f777d4d2241afc7f5c7835805688f3735
-  data.tar.gz: 59355f73e74c7ecb33ffae6d07eebb865efa2126
+  metadata.gz: bf1021f8076e5f81d17109e67bdd2b8bc0af0ae5
+  data.tar.gz: 610060ef298653c630392db49fb9904b6de1fb16
 SHA512:
-  metadata.gz: e6a5abe9e0e3b9a15e7dc26d03a77e9710cddcc58c53b3a572e93925711d52481e422dc9e8436a0629e1170bde42dabe9181831465d915e884bfbe5f807f4043
-  data.tar.gz: 56c23925d436aa33cb9ac8998abf464b4bb72e6c6b3b6404916ae76632e7ec347e1a9975993a21ca7d69dd85c3215a52641c688a2e14bc0452de218086230971
+  metadata.gz: 6a37000600b685b1ced6443cfab3bd9531cd3375ac47fa6eaf30c9fe60f67895be8277909cca92e0a45131bd281870adaba1d026ca418c6e1b8aea4d8f84ea21
+  data.tar.gz: 2e131077cdd99f9d3a9464080b077c5456c2913e9d3c4b1fb27f8516ab80e1c409525d4ded8d6b99192992bc246c4ae7a0bade39fbad979734ce6942026e1f6e

data/lib/molinillo.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'molinillo/gem_metadata'
 require 'molinillo/errors'
 require 'molinillo/resolver'

data/lib/molinillo/dependency_graph.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'set'
 require 'tsort'
 

data/lib/molinillo/errors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Molinillo
   # An error that occurred during the resolution process
   class ResolverError < StandardError; end

data/lib/molinillo/gem_metadata.rb

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

data/lib/molinillo/modules/specification_provider.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Molinillo
   # Provides information about specifcations and dependencies to the resolver,
   # allowing the {Resolver} class to remain generic while still providing power

data/lib/molinillo/modules/ui.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Molinillo
   # Conveys information about the resolution process to a user.
   module UI

data/lib/molinillo/resolution.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Molinillo
   class Resolver
     # A specific resolution from a given {Resolver}
@@ -362,6 +363,7 @@ module Molinillo
           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)
+            requirements.delete_if { |r| name_for(r) == succ.name }
           end
         end
       end

data/lib/molinillo/resolver.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'molinillo/dependency_graph'
 
 module Molinillo

data/lib/molinillo/state.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Molinillo
   # A state that a {Resolution} can be in
   # @attr [String] name the name of the current requirement

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 mail).freeze
+GEMS = %w(rails capybara bundler github-linguist).freeze
 
 VERSION_PATTERN = /\A
   [0-9]+\.[0-9]+\.[0-9]+           (?# Number component)
@@ -33,7 +33,7 @@ end
 
 def coerce_dependencies_to_semver(deps)
   dependencies = {}
-  deps.each do |name, req|
+  deps.sort_by(&:first).each do |name, req|
     dependencies[name] = req.split(',').map { |r| coerce_to_semver(r) }.join(',')
   end
   dependencies
@@ -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(s['dependencies'].sort_by(&:first))
+      'dependencies' => coerce_dependencies_to_semver(s['dependencies'])
     }
   end.uniq { |s| s['version'] }.sort_by { |s| Gem::Version.new(s['version']) }
   ]
@@ -71,6 +71,6 @@ end
 
 specs = Hash[specs]
 
-json = JSON.pretty_generate(specs)
+json = JSON.generate(specs)
 
-File.open('index/rubygems.json', 'w') { |f| f.write json }
+File.open("index/rubygems-#{Date.today}.json", 'w') { |f| f.write json }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: molinillo
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-30 00:00:00.000000000 Z
+date: 2016-02-18 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.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Provides support for dependency resolution