solve 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: af5099b9f2b7ff996d32e8082de7f3f8085bf5aa
-  data.tar.gz: 8b6541e4ce764b2c1db8ade3c8b1ba5a19060c47
+SHA256:
+  metadata.gz: 2716c3058f3990b8bfa27bb8961e0204a086ea8e9353eec03e39ba84e0877613
+  data.tar.gz: c9bb41f43375181e4431d215b613dcddf5d2ea2043217ffb5ff87e2505d78881
 SHA512:
-  metadata.gz: 21fc447438917b86a09f5741b0b325ba030d4f654b1831806bb987c68bbc22975c83725fa1e5845f22cd1b35a7ecbcc8dbf56d6f44ec3c09ec97113199c7263d
-  data.tar.gz: b8862c18f07f3fea2c0033f54848a073ab387edc1b9f489439ee2b088ff78cdb36cf7f97d98cdb66396771f6990d4ee44004a7047c081f33f17291d25b5c2a67
+  metadata.gz: 911f81ecfcd431abcac7bdc7a307ad4acba9c77e328e3aac6ed594ecd2535a4947ddbf1fe37a4a7c7f0b1e6f3a33ca4dbc3219d5874c5ba5ad841658b96c3788
+  data.tar.gz: d50980103fd7b23e03964a3b0b5d639f5f4cce4673d9a4e44894d1e09c702be155041cb85d47e70464df1d3686f0c09aff3e000e50447d4b47a9132a6cafdcdd

data/lib/solve/constraint.rb

@@ -185,7 +185,7 @@ module Solve
 
     # @return [Symbol]
     def operator_type
-      unless type = OPERATOR_TYPES.fetch(operator)
+      unless ( type = OPERATOR_TYPES.fetch(operator) )
         raise "unknown operator type: #{operator}"
       end
 

data/lib/solve/gecode_solver.rb

@@ -10,7 +10,7 @@ module Solve
       #
       # @return [Integer]
       def timeout
-        seconds = 30 unless seconds = ENV["SOLVE_TIMEOUT"]
+        seconds = 30 unless ( seconds = ENV["SOLVE_TIMEOUT"] )
         seconds.to_i * 1_000
       end
 

data/lib/solve/ruby_solver.rb

@@ -11,7 +11,7 @@ module Solve
       #
       # @return [Integer]
       def timeout
-        seconds = 30 unless seconds = ENV["SOLVE_TIMEOUT"]
+        seconds = 30 unless ( seconds = ENV["SOLVE_TIMEOUT"] )
         seconds.to_i * 1_000
       end
 

data/lib/solve/version.rb

@@ -1,3 +1,3 @@
 module Solve
-  VERSION = "4.0.0"
+  VERSION = "4.0.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solve
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semverse
@@ -111,15 +111,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
-- Guardfile
 - LICENSE
-- NoGecode.gemfile
-- README.md
-- Rakefile
-- Thorfile
 - lib/solve.rb
 - lib/solve/artifact.rb
 - lib/solve/constraint.rb
@@ -131,24 +123,9 @@ files:
 - lib/solve/ruby_solver.rb
 - lib/solve/solver/serializer.rb
 - lib/solve/version.rb
-- solve.gemspec
-- spec/acceptance/benchmark.rb
-- spec/acceptance/large_graph_no_solution.rb
-- spec/acceptance/opscode_ci_graph.rb
-- spec/acceptance/ruby_solver_solutions_spec.rb
-- spec/acceptance/solutions_spec.rb
-- spec/spec_helper.rb
-- spec/unit/solve/artifact_spec.rb
-- spec/unit/solve/demand_spec.rb
-- spec/unit/solve/dependency_spec.rb
-- spec/unit/solve/gecode_solver_spec.rb
-- spec/unit/solve/graph_spec.rb
-- spec/unit/solve/ruby_solver_spec.rb
-- spec/unit/solve/solver/serializer_spec.rb
-- spec/unit/solve_spec.rb
 homepage: https://github.com/berkshelf/solve
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -166,22 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A Ruby version constraint solver implementing Semantic Versioning 2.0.0-rc.1
-test_files:
-- spec/acceptance/benchmark.rb
-- spec/acceptance/large_graph_no_solution.rb
-- spec/acceptance/opscode_ci_graph.rb
-- spec/acceptance/ruby_solver_solutions_spec.rb
-- spec/acceptance/solutions_spec.rb
-- spec/spec_helper.rb
-- spec/unit/solve/artifact_spec.rb
-- spec/unit/solve/demand_spec.rb
-- spec/unit/solve/dependency_spec.rb
-- spec/unit/solve/gecode_solver_spec.rb
-- spec/unit/solve/graph_spec.rb
-- spec/unit/solve/ruby_solver_spec.rb
-- spec/unit/solve/solver/serializer_spec.rb
-- spec/unit/solve_spec.rb
+test_files: []

data/.gitignore

@@ -1,20 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-NoGecode.gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.ruby-version
-.rspec

data/.travis.yml

@@ -1,25 +0,0 @@
-language: ruby
-cache:
-  - apt
-  - bundler
-
-before_install:
-  - sudo apt-get update
-  - gem install bundler --no-ri --no-rdoc
-
-install:  travis_wait bundle install --without guard --jobs 7 --retry=3
-script: "bundle exec thor spec"
-# prevent PR branches from running travis twice
-branches:
-  only:
-    - master
-
-matrix:
-  include:
-    - rvm: 2.3.3
-    - rvm: 2.4.1
-    - rvm: ruby-head
-    - rvm: 2.4.1
-      env:
-        CHEFSTYLE: 1
-      script: bundle exec rake style

data/Gemfile

@@ -1,36 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-group :gecode do
-  gem "dep_selector", "~> 1.0"
-end
-
-# If this group is named "development", then `bundle install --without
-# development` automagically excludes development dependencies that are listed
-# in the gemspec, which will skip installing rspec and then we can't run tests.
-group :development do
-  gem "fuubar"
-  gem "yard"
-  gem "redcarpet"
-  gem "chefstyle", git: "https://github.com/chef/chefstyle"
-end
-
-group :guard do
-  gem "guard-rspec"
-  gem "guard-spork"
-  gem "guard-yard"
-  gem "coolline"
-
-  require "rbconfig"
-
-  if RbConfig::CONFIG["target_os"] =~ /darwin/i
-    gem "ruby_gntp", require: false
-
-  elsif RbConfig::CONFIG["target_os"] =~ /linux/i
-    gem "libnotify", require: false
-
-  elsif RbConfig::CONFIG["target_os"] =~ /mswin|mingw/i
-    gem "win32console", require: false
-  end
-end

data/Guardfile

@@ -1,17 +0,0 @@
-guard "spork", rspec_port: 8991 do
-  watch("Gemfile")
-  watch("spec/spec_helper.rb") { :rspec }
-end
-
-guard "yard", port: 8809, stdout: "/dev/null", stderr: "/dev/null" do
-  watch(%r{app/.+\.rb})
-  watch(%r{lib/.+\.rb})
-  watch(%r{ext/.+\.c})
-end
-
-guard "rspec", cli: "--color --drb --drb-port 8991 --format Fuubar", all_on_start: false, all_after_pass: false, notification: false do
-  watch(%r{^spec/acceptance/.+_spec\.rb$})
-  watch(%r{^spec/unit/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})          { |m| "spec/unit/#{m[1]}_spec.rb" }
-  watch("spec/spec_helper.rb")       { "spec" }
-end

data/NoGecode.gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-

data/README.md

@@ -1,85 +0,0 @@
-# Solve
-
-[![Gem Version](http://img.shields.io/gem/v/solve.svg)][gem] [![Build Status](http://img.shields.io/travis/berkshelf/solve.svg)][travis]
-
-A Ruby versioning constraint solver implementing [Semantic Versioning 2.0.0](http://semver.org).
-
-## Installation
-
-```shell
-$ gem install solve
-```
-
-## Usage
-
-Create a new graph
-
-```ruby
-graph = Solve::Graph.new
-```
-
-Add an artifact to the graph
-
-```ruby
-graph.artifact("nginx", "1.0.0")
-```
-
-Now add another artifact that has a dependency
-
-```ruby
-graph.artifact("mysql", "1.2.4-alpha.1").depends("openssl", "~> 1.0.0")
-```
-
-Dependencies can be chained, too
-
-```ruby
-graph.artifact("ntp", "1.0.0").depends("build-essential").depends("yum")
-```
-
-And now solve the graph with some demands
-
-```ruby
-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)
-
-```ruby
-Solve.it!(graph, [['nginx', '>= 0.100.0']], sorted: true)
-```
-
-### Selecting A Resolver
-
-Solve supports two different resolvers. A pure Ruby solver implemented using [Molinillo](https://github.com/CocoaPods/Molinillo) and the same dependency resolver the Chef Server uses, [dep-selector](https://github.com/chef/dep-selector), which is a Ruby C extension for [Gecode](https://github.com/ampl/gecode).
-
-You can set the resolver by calling `Solver.engine=` with the symbol `:ruby` or `:gecode`.
-
-```ruby
-Solver.engine = :ruby
-Solver.engine = :gecode
-```
-
-The Ruby solver is installed and enabled by default. If you'd like to use the Gecode solver you can do so by installing the dep-selector gem or adding it to your Gemfile:
-
-```shell
-$ gem install dep_selector
-```
-
-### Increasing the solver's timeout
-
-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.
-
-```shell
-$ export SOLVE_TIMEOUT=60
-```
-
-This will set the timeout to 60 seconds instead of the default 30 seconds.
-
-## Authors
-
-- [Jamie Winsor](https://github.com/reset) ([jamie@vialstudios.com](mailto:jamie@vialstudios.com))
-- [Andrew Garson](andrewGarson) ([agarson@riotgames.com](mailto:agarson@riotgames.com))
-- [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg))
-
-[gem]: https://rubygems.org/gems/solve
-[travis]: http://travis-ci.org/berkshelf/solve

data/Rakefile

@@ -1,11 +0,0 @@
-require "bundler/gem_tasks"
-
-begin
-  require "chefstyle"
-  require "rubocop/rake_task"
-  RuboCop::RakeTask.new(:style) do |task|
-    task.options += ["--display-cop-names", "--no-color"]
-  end
-rescue LoadError
-  puts "chefstyle/rubocop is not available.  gem install chefstyle to do style checking."
-end

data/Thorfile

@@ -1,36 +0,0 @@
-# encoding: utf-8
-$:.push File.expand_path("../lib", __FILE__)
-
-require "bundler"
-require "bundler/setup"
-require "thor/rake_compat"
-
-class Default < Thor
-  include Thor::RakeCompat
-  Bundler::GemHelper.install_tasks
-
-  desc "build", "Build Solve-#{Solve::VERSION}.gem into the pkg directory"
-  def build
-    Rake::Task["build"].invoke
-  end
-
-  desc "install", "Build and install Solve-#{Solve::VERSION}.gem into system gems"
-  def install
-    Rake::Task["install"].invoke
-  end
-
-  desc "release", "Create tag v#{Solve::VERSION} and build and push Solve-#{Solve::VERSION}.gem to Rubygems"
-  def release
-    Rake::Task["release"].invoke
-  end
-
-  desc "spec", "Run RSpec code examples"
-  def spec
-    exec "rspec --color --format=documentation spec"
-  end
-
-  desc "spec", "Run RSpec code examples"
-  def nogecode_spec
-    exec "rspec -t '~gecode' --color --format=documentation spec"
-  end
-end

data/solve.gemspec

@@ -1,26 +0,0 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path("../lib/solve/version", __FILE__)
-
-Gem::Specification.new do |s|
-  s.authors               = ["Jamie Winsor", "Andrew Garson", "Thibaud Guillaume-Gentil"]
-  s.email                 = ["jamie@vialstudios.com", "agarson@riotgames.com", "thibaud@thibaud.me"]
-  s.description           = %q{A Ruby version constraint solver}
-  s.summary               = %q{A Ruby version constraint solver implementing Semantic Versioning 2.0.0-rc.1}
-  s.homepage              = "https://github.com/berkshelf/solve"
-  s.license               = "Apache 2.0"
-  s.files                 = `git ls-files`.split($\)
-  s.executables           = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
-  s.test_files            = s.files.grep(%r{^spec/})
-  s.name                  = "solve"
-  s.require_paths         = ["lib"]
-  s.version               = Solve::VERSION
-  s.required_ruby_version = ">= 2.1.0"
-
-  s.add_dependency "semverse",     ">= 1.1", "< 3.0"
-  s.add_dependency "molinillo",    "~> 0.6"
-
-  s.add_development_dependency "thor"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "spork"
-  s.add_development_dependency "rspec"
-end

data/spec/acceptance/benchmark.rb

@@ -1,59 +0,0 @@
-require "benchmark"
-require "solve"
-require "solve/gecode_solver"
-require File.expand_path("../large_graph_no_solution", __FILE__)
-require File.expand_path("../opscode_ci_graph", __FILE__)
-
-PROBLEM = OpscodeCiGraph
-#PROBLEM = LargeGraphNoSolution
-N = 100
-
-def demands
-  PROBLEM::DEMANDS
-end
-
-def artifacts
-  PROBLEM::ARTIFACTS
-end
-
-require "pp"
-
-def create_graph
-  graph = Solve::Graph.new
-  artifacts.each do |name, all_artifact_versions|
-    all_artifact_versions.each do |artifact|
-      graph.artifact(name, artifact[:version])
-      artifact[:dependencies].each do |dep|
-        dep_name, dep_constraint = dep
-        graph.artifact(name, artifact[:version])
-          .depends(dep_name, dep_constraint)
-      end
-    end
-  end
-
-  graph
-end
-
-STATIC_GRAPH = create_graph
-
-def solve_gecode
-  Solve::GecodeSolver.new(STATIC_GRAPH, demands).resolve({})
-rescue Solve::Errors::NoSolutionError => e
-  # Uncomment to look at the error messages. Probably only useful if N == 1
-  #puts e
-  e
-end
-
-def solve_ruby
-  Solve::RubySolver.new(STATIC_GRAPH, demands).resolve({})
-rescue Solve::Errors::NoSolutionError => e
-  # Uncomment to look at the error messages. Probably only useful if N == 1
-  #puts e
-  e
-end
-
-Benchmark.bm(12) do |x|
-  x.report("Create graph")   { N.times { create_graph } }
-  x.report("Solve Gecode") { N.times { solve_gecode } }
-  x.report("Solve Ruby") { N.times { solve_ruby } }
-end