solve 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2c8bf1750e6652a793210aa4fd698f949c5fef1
-  data.tar.gz: 25cc4de765ed2cb8b48fa069db70c2edbccd4c1b
+  metadata.gz: 0e6a58fa44e65b31c0702901da1b090dca04b59a
+  data.tar.gz: 12508f512d12eabaaf12f2d672267256d02da0fa
 SHA512:
-  metadata.gz: d3a7ed9ea96b5299f016b02c7d70531df7880bae9fcf9b3ae50fa19ee301c600a556a9c22a5602e35f452ea6ba2f06261b59e0071432b4e7ee8e90156ef9d0f9
-  data.tar.gz: ac60d6f13a033e406cc2943fb5683fdb487196dea3398035b4f65ac67e7971e9a937c66461f81064d894d3dd57569106f8a19f3b6b866e2ec01acfa7cfce264b
+  metadata.gz: 4758cf9a12c21aab78f46cfdf6f5e3fadedca7a4317036fea6243b192a51c28b85369d89b0d3f0358535eb5dc2cbb9345f28682137ab80353486f0f445c2348a
+  data.tar.gz: 49cf75e3e9f95b168bdc7911229567543093b3efff4c7030ce43f5dab0af2882c4f5a43802de46f7e3adbfa133042a4003e5ee531741a194fdd6e1962053e2b6

data/README.md

@@ -38,6 +38,14 @@ NOTE: This will raise Solve::Errors::UnsortableSolutionError if the solution con
 
     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.
+
+    $ export SOLVE_TIMEOUT=30
+
+This will set the timeout to 30 seconds instead of 10 seconds.
+
 ## Authors
 
 * [Jamie Winsor](https://github.com/reset) (<jamie@vialstudios.com>)

data/lib/solve.rb

@@ -4,7 +4,7 @@ module Solve
   require_relative 'solve/artifact'
   require_relative 'solve/demand'
   require_relative 'solve/dependency'
-  require_relative 'solve/gem_version'
+  require_relative 'solve/version'
   require_relative 'solve/errors'
   require_relative 'solve/graph'
   require_relative 'solve/solver'
@@ -22,8 +22,6 @@ module Solve
     # @param [Solve::Graph] graph
     # @param [Array<Solve::Demand>, Array<String, String>] demands
     #
-    # @option options [#say] :ui (nil)
-    #   a ui object for output
     # @option options [Boolean] :sorted (false)
     #   should the output be a sorted list rather than a Hash
     #
@@ -31,7 +29,7 @@ module Solve
     #
     # @return [Hash]
     def it!(graph, demands, options = {})
-      Solver.new(graph, demands, options[:ui]).resolve(options)
+      Solver.new(graph, demands).resolve(options)
     end
   end
 end

data/lib/solve/solver.rb

@@ -4,6 +4,17 @@ require_relative 'solver/serializer'
 
 module Solve
   class Solver
+    class << self
+      # The timeout (in seconds) to use when resolving graphs. Default is 10. This can be
+      # configured by setting the SOLVE_TIMEOUT environment variable.
+      #
+      # @return [Integer]
+      def timeout
+        seconds = 10 unless seconds = ENV["SOLVE_TIMEOUT"]
+        seconds.to_i * 1_000
+      end
+    end
+
     # Graph object with references to all known artifacts and dependency
     # constraints.
     #
@@ -22,12 +33,11 @@ module Solve
     #   Solver.new(graph, demands)
     # @param [Solve::Graph] graph
     # @param [Array<String>, Array<Array<String, String>>] demands
-    # @param [#say] ui
-    def initialize(graph, demands, ui = nil)
-      @ds_graph = DepSelector::DependencyGraph.new
-      @graph = graph
+    def initialize(graph, demands)
+      @ds_graph      = DepSelector::DependencyGraph.new
+      @graph         = graph
       @demands_array = demands
-      @timeout_ms = 1_000
+      @timeout_ms    = self.class.timeout
     end
 
     # The problem demands given as Demand model objects

data/lib/solve/version.rb

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

data/solve.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/solve/gem_version', __FILE__)
+require File.expand_path('../lib/solve/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.authors               = ["Jamie Winsor", "Andrew Garson", "Thibaud Guillaume-Gentil"]

data/spec/unit/solve/solver_spec.rb

@@ -1,6 +1,24 @@
 require 'spec_helper'
 
 describe Solve::Solver do
+  describe "ClassMethods" do
+    describe "::timeout" do
+      subject { described_class.timeout }
+
+      it "returns 10,000 by default" do
+        expect(subject).to eql(10_000)
+      end
+
+      context "when the SOLVE_TIMEOUT env variable is set" do
+        before { ENV.stub(:[]).with("SOLVE_TIMEOUT") { "30" } }
+
+        it "returns the value multiplied by a thousand" do
+          expect(subject).to eql(30_000)
+        end
+      end
+    end
+  end
+
   let(:graph) { double(Solve::Graph) }
   let(:demands) { [["mysql"], ["nginx"]] }
   subject(:solver) { described_class.new(graph, demands) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solve
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semverse
@@ -62,10 +62,10 @@ files:
 - lib/solve/demand.rb
 - lib/solve/dependency.rb
 - lib/solve/errors.rb
-- lib/solve/gem_version.rb
 - lib/solve/graph.rb
 - lib/solve/solver.rb
 - lib/solve/solver/serializer.rb
+- lib/solve/version.rb
 - solve.gemspec
 - spec/acceptance/benchmark.rb
 - spec/acceptance/large_graph_no_solution.rb

data/lib/solve/gem_version.rb

@@ -1,3 +0,0 @@
-module Solve
-  VERSION = "1.1.0"
-end