solve 0.4.4 → 0.5.0

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p392
+1.9.3-p429

data/README.md

@@ -1,4 +1,5 @@
 # Solve
+[![Gem Version](https://badge.fury.io/rb/solve.png)](http://badge.fury.io/rb/solve)
 [![Build Status](https://secure.travis-ci.org/reset/solve.png?branch=master)](http://travis-ci.org/reset/solve)
 [![Dependency Status](https://gemnasium.com/reset/solve.png?travis)](https://gemnasium.com/reset/solve)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/reset/solve)

data/lib/solve.rb

@@ -1,16 +1,13 @@
-require 'forwardable'
-require 'json'
-require 'solve/errors'
-
-# @author Jamie Winsor <reset@riotgames.com>
 module Solve
-  autoload :Version, 'solve/version'
-  autoload :Artifact, 'solve/artifact'
-  autoload :Constraint, 'solve/constraint'
-  autoload :Dependency, 'solve/dependency'
-  autoload :Graph, 'solve/graph'
-  autoload :Demand, 'solve/demand'
-  autoload :Solver, 'solve/solver'
+  require_relative 'solve/artifact'
+  require_relative 'solve/constraint'
+  require_relative 'solve/demand'
+  require_relative 'solve/dependency'
+  require_relative 'solve/gem_version'
+  require_relative 'solve/errors'
+  require_relative 'solve/graph'
+  require_relative 'solve/solver'
+  require_relative 'solve/version'
 
   class << self
     # A quick solve. Given the "world" as we know it (the graph) and a list of

data/lib/solve/artifact.rb

@@ -1,5 +1,4 @@
 module Solve
-  # @author Jamie Winsor <reset@riotgames.com>
   class Artifact
     include Comparable
 

data/lib/solve/constraint.rb

@@ -1,6 +1,4 @@
 module Solve
-  # @author Jamie Winsor <reset@riotgames.com>
-  # @author Thibaud Guillaume-Gentil <thibaud@thibaud.me>
   class Constraint
     class << self
       # Split a constraint string into an Array of two elements. The first

data/lib/solve/demand.rb

@@ -1,5 +1,4 @@
 module Solve
-  # @author Jamie Winsor <reset@riotgames.com>
   class Demand
     # A reference to the solver this demand belongs to
     #

data/lib/solve/dependency.rb

@@ -1,5 +1,4 @@
 module Solve
-  # @author Jamie Winsor <reset@riotgames.com>
   class Dependency
     # A reference to the artifact this dependency belongs to
     #

data/lib/solve/errors.rb

@@ -1,5 +1,4 @@
 module Solve
-  # @author Jamie Winsor <reset@riotgames.com>
   module Errors
     class SolveError < StandardError
       alias_method :mesage, :to_s

data/lib/solve/gem_version.rb

@@ -1,3 +1,3 @@
 module Solve
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

data/lib/solve/graph.rb

@@ -1,5 +1,4 @@
 module Solve
-  # @author Jamie Winsor <reset@riotgames.com>
   class Graph
     class << self
       # Create a key for a graph from an instance of an Artifact or Dependency

data/lib/solve/solver.rb

@@ -1,13 +1,11 @@
+require_relative 'solver/variable_table'
+require_relative 'solver/variable_row'
+require_relative 'solver/constraint_table'
+require_relative 'solver/constraint_row'
+require_relative 'solver/serializer'
+
 module Solve
-  # @author Jamie Winsor <reset@riotgames.com>
-  # @author Andrew Garson <agarson@riotgames.com>
   class Solver
-    autoload :VariableTable, 'solve/solver/variable_table'
-    autoload :VariableRow, 'solve/solver/variable_row'
-    autoload :ConstraintTable, 'solve/solver/constraint_table'
-    autoload :ConstraintRow, 'solve/solver/constraint_row'
-    autoload :Serializer, 'solve/solver/serializer'
-
     class << self
       # Create a key to identify a demand on a Solver.
       #
@@ -74,7 +72,7 @@ module Solve
     # @param [Solve::Graph] graph
     # @param [Array<String>, Array<Array<String, String>>] demands
     # @param [#say] ui
-    def initialize(graph, demands = Array.new, ui=nil) 
+    def initialize(graph, demands = Array.new, ui=nil)
       @graph = graph
       @demands = Hash.new
       @ui = ui.respond_to?(:say) ? ui : nil
@@ -109,7 +107,7 @@ module Solve
           all_ok = possible_dependencies.all? { |dependency| can_add_new_constraint?(dependency) }
           if all_ok
             trace("Attempting to use #{possible_artifact}")
-            add_dependencies(possible_dependencies, possible_artifact) 
+            add_dependencies(possible_dependencies, possible_artifact)
             unbound_variable.bind(possible_value)
             break
           end
@@ -117,7 +115,7 @@ module Solve
 
         unless unbound_variable.bound?
           trace("Could not find an acceptable value for #{unbound_variable.artifact}")
-          backtrack(unbound_variable) 
+          backtrack(unbound_variable)
         end
       end
 
@@ -284,7 +282,7 @@ module Solve
           trace("Removed constraint #{removed_constraint.name} #{removed_constraint.constraint}")
         end
         previous_variable.unbind
-        variable_table.all_after(previous_variable.artifact).each do |variable| 
+        variable_table.all_after(previous_variable.artifact).each do |variable|
           new_possibles = reset_possible_values_for(variable)
         end
       end

data/lib/solve/solver/constraint_row.rb

@@ -1,7 +1,7 @@
+require 'forwardable'
+
 module Solve
   class Solver
-    # @author Andrew Garson <agarson@riotgames.com>
-    # @author Jamie Winsor <reset@riotgames.com>
     class ConstraintRow
       extend Forwardable
 

data/lib/solve/solver/constraint_table.rb

@@ -1,7 +1,5 @@
 module Solve
   class Solver
-    # @author Andrew Garson <agarson@riotgames.com>
-    # @author Jamie Winsor <reset@riotgames.com>
     class ConstraintTable
       attr_reader :rows
 

data/lib/solve/solver/serializer.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Solve
   class Solver
     class Serializer
@@ -46,7 +48,7 @@ module Solve
             list << format_dependency(dependency)
           end
 
-          { 
+          {
             "name" => artifact.name,
             "version" => artifact.version.to_s,
             "dependencies" => dependencies
@@ -54,21 +56,21 @@ module Solve
         end
 
         def format_dependency(dependency)
-          { 
-            "name" => dependency.name, 
+          {
+            "name" => dependency.name,
             "constraint" => dependency.constraint.to_s
           }
         end
 
         def format_demands(demands)
-          demands_list = demands.inject([]) do |list, demand| 
-            list << format_demand(demand) 
+          demands_list = demands.inject([]) do |list, demand|
+            list << format_demand(demand)
           end
           { "demands" => demands_list }
         end
 
         def format_demand(demand)
-          { 
+          {
             "name" => demand.name,
             "constraint" => demand.constraint.to_s
           }

data/lib/solve/solver/variable_row.rb

@@ -1,7 +1,5 @@
 module Solve
   class Solver
-    # @author Andrew Garson <agarson@riotgames.com>
-    # @author Jamie Winsor <reset@riotgames.com>
     class VariableRow
       attr_reader :artifact
       attr_reader :value

data/lib/solve/solver/variable_table.rb

@@ -1,7 +1,5 @@
 module Solve
   class Solver
-    # @author Andrew Garson <agarson@riotgames.com>
-    # @author Jamie Winsor <reset@riotgames.com>
     class VariableTable
       attr_reader :rows
 

data/lib/solve/version.rb

@@ -1,6 +1,4 @@
 module Solve
-  # @author Jamie Winsor <reset@riotgames.com>
-  # @author Thibaud Guillaume-Gentil <thibaud@thibaud.me>
   class Version
     class << self
       # @param [#to_s] version_string

data/solve.gemspec

@@ -16,6 +16,4 @@ Gem::Specification.new do |s|
   s.require_paths         = ["lib"]
   s.version               = Solve::VERSION
   s.required_ruby_version = ">= 1.9.1"
-
-  s.add_dependency 'json'
 end

data/spec/acceptance/solutions_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Solutions" do
-  
+
   it "chooses the correct artifact for the demands" do
     graph = Solve::Graph.new
     graph.artifacts("mysql", "2.0.0")
@@ -18,13 +18,13 @@ describe "Solutions" do
     graph.artifacts("mysql", "2.0.0")
     graph.artifacts("mysql", "1.2.0")
     graph.artifacts("nginx", "1.0.0").depends("mysql", ">= 1.2.0")
-    
+
     result = Solve.it!(graph, [['nginx', '= 1.0.0'], ['mysql']])
 
     result.should eql("nginx" => "1.0.0", "mysql" => "2.0.0")
   end
 
-  it "raises NoSolutionError when a solution cannot be found" do    
+  it "raises NoSolutionError when a solution cannot be found" do
     graph = Solve::Graph.new
     graph.artifacts("mysql", "1.2.0")
 
@@ -76,7 +76,7 @@ describe "Solutions" do
 
     result = Solve.it!(graph, [["A", "1.0.0"]])
 
-    result.should eql("A" => "1.0.0", 
+    result.should eql("A" => "1.0.0",
                       "B" => "1.0.0",
                       "C" => "1.0.0")
   end
@@ -90,7 +90,7 @@ describe "Solutions" do
 
     result = Solve.it!(graph, [["A", "1.0.0"]])
 
-    result.should eql("A" => "1.0.0", 
+    result.should eql("A" => "1.0.0",
                       "B" => "1.0.0",
                       "C" => "1.0.0")
   end
@@ -141,7 +141,7 @@ describe "Solutions" do
     graph.artifacts("D", "1.0.0").depends("A", "< 0.0.0")
 
     # Add a solution to the graph that should be reached only after
-    #   all of the others have been tried 
+    #   all of the others have been tried
     #   it must be circular to ensure that no other branch can find it
     graph.artifacts("A", "0.0.0").depends("B", "0.0.0")
     graph.artifacts("B", "0.0.0").depends("C", "0.0.0")
@@ -151,7 +151,7 @@ describe "Solutions" do
     demands = [["A"]]
 
     result = Solve.it!(graph, demands)
-    
+
     result.should eql({ "A" => "0.0.0",
                         "B" => "0.0.0",
                         "C" => "0.0.0",

data/spec/spec_helper.rb

@@ -4,9 +4,9 @@ require 'spork'
 
 Spork.prefork do
   require 'rspec'
-  
+
   APP_ROOT = File.expand_path('../../', __FILE__)
-  
+
   Dir[File.join(APP_ROOT, "spec/support/**/*.rb")].each {|f| require f}
 
   RSpec.configure do |config|

data/spec/unit/solve/demand_spec.rb

@@ -80,7 +80,7 @@ describe Solve::Demand do
 
       subject.should_not eql(other)
     end
-    
+
     it "returns false when other is a Solve::Demand with the same constraint but a different name" do
       other = Solve::Demand.new(solver, "chicken", constraint)
 

data/spec/unit/solve/solver/serializer_spec.rb

@@ -18,7 +18,7 @@ describe Solve::Solver::Serializer do
 
     solver.graph.should eql(deserialized.graph)
     solver.demands.should eql(deserialized.demands)
-    
+
     result = solver.resolve
     deserialized_result = deserialized.resolve
     result.should eql(deserialized_result)

data/spec/unit/solve_spec.rb

@@ -10,7 +10,7 @@ describe Solve do
       end
     end
 
-    describe "#it!" do      
+    describe "#it!" do
       it "raises NoSolutionError if a solution does not exist" do
         pending
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solve
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,24 +11,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2013-06-13 00:00:00.000000000 Z
+dependencies: []
 description: A Ruby version constraint solver
 email:
 - reset@riotgames.com
@@ -94,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3360162225470919551
+      hash: 2797902556656574855
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23