solve 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e6a58fa44e65b31c0702901da1b090dca04b59a
-  data.tar.gz: 12508f512d12eabaaf12f2d672267256d02da0fa
+  metadata.gz: f8183623942ab701e9117e2912fd2fb4fefdfc19
+  data.tar.gz: a001a2bb59751962e18719575d3b59ff3192a753
 SHA512:
-  metadata.gz: 4758cf9a12c21aab78f46cfdf6f5e3fadedca7a4317036fea6243b192a51c28b85369d89b0d3f0358535eb5dc2cbb9345f28682137ab80353486f0f445c2348a
-  data.tar.gz: 49cf75e3e9f95b168bdc7911229567543093b3efff4c7030ce43f5dab0af2882c4f5a43802de46f7e3adbfa133042a4003e5ee531741a194fdd6e1962053e2b6
+  metadata.gz: 548d9980b3b6e1f32922abcc0da8fd5146cf02f220453d6633a57a30eb982a18198fb7f4e21f7cab995c208a61a55af4417dc7b7161f36d6e48a7c1c0fe2e8ee
+  data.tar.gz: b0009f814da7354eea4a7c0fc90b378fd477cc14ab6207c94b6782c1fe48b4ce349ba84831d36a4886dcfb233026edc4c2fe435eba04e5a63b555ba10a0f2bcd

data/README.md

@@ -15,7 +15,7 @@ A Ruby versioning constraint solver implementing [Semantic Versioning 2.0.0](htt
 
 Create a new graph
 
-    graph = Graph.new
+    graph = Solve::Graph.new
 
 Add an artifact to the graph
 
@@ -31,20 +31,20 @@ Dependencies can be chained, too
 
 And now solve the graph with some demands
 
-    Solve.it!(graph, ['nginx', '>= 0.100.0'])
+    Solve.it!(graph, [['nginx', '>= 0.100.0']])
 
 Or, if you want a topologically sorted solution
 NOTE: This will raise Solve::Errors::UnsortableSolutionError if the solution contains a cycle (which can happen with ruby packages)
 
-    Solve.it!(graph, ['nginx', '>= 0.100.0'], sorted: true)
+    Solve.it!(graph, [['nginx', '>= 0.100.0']], sorted: true)
 
 ### Increasing the solver's timeout
 
-By default the solver will wait 10 seconds before giving up on finding a solution. Under certain conditions a graph may be too complicated to solve within the alotted time. To increase the timeout you can set the "SOLVE_TIMEOUT" environment variable to the amount of seconds desired.
+By default the solver will wait 30 seconds before giving up on finding a solution. Under certain conditions a graph may be too complicated to solve within the alotted time. To increase the timeout you can set the "SOLVE_TIMEOUT" environment variable to the amount of seconds desired.
 
-    $ export SOLVE_TIMEOUT=30
+    $ export SOLVE_TIMEOUT=60
 
-This will set the timeout to 30 seconds instead of 10 seconds.
+This will set the timeout to 60 seconds instead of the default 30 seconds.
 
 ## Authors
 

data/lib/solve/errors.rb

@@ -43,7 +43,8 @@ module Solve
         s << "#{@message}\n"
         s << "Missing artifacts: #{missing_artifacts.join(',')}\n" unless missing_artifacts.empty?
         unless constraints_excluding_all_artifacts.empty?
-          s << "Constraints that match no available version: #{constraints_excluding_all_artifacts.join(',')}\n"
+	  pretty = constraints_excluding_all_artifacts.map { |constraint| "(#{constraint[0]} #{constraint[1]})" }.join(',')
+          s << "Constraints that match no available version: #{pretty}\n"
         end
         s << "Demand that cannot be met: #{unsatisfiable_demand}\n" if unsatisfiable_demand
         unless artifacts_with_no_satisfactory_version.empty?

data/lib/solve/solver.rb

@@ -10,7 +10,7 @@ module Solve
       #
       # @return [Integer]
       def timeout
-        seconds = 10 unless seconds = ENV["SOLVE_TIMEOUT"]
+        seconds = 30 unless seconds = ENV["SOLVE_TIMEOUT"]
         seconds.to_i * 1_000
       end
     end
@@ -146,7 +146,7 @@ module Solve
         end
 
         constrained_to_no_versions = e.constrained_to_no_versions.inject([]) do |list, constraint|
-          list << constraint.to_s
+          list << [constraint.package.name, constraint.constraint.to_s]
         end
 
         raise Solve::Errors::NoSolutionError.new(

data/lib/solve/version.rb

@@ -1,3 +1,3 @@
 module Solve
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solve
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semverse