[DRE-commits] [ruby-solve] 01/07: Imported Upstream version 3.0.0
Hleb Valoshka
tsfgnu-guest at moszumanska.debian.org
Fri Aug 5 15:45:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
tsfgnu-guest pushed a commit to branch master
in repository ruby-solve.
commit 45972692f29c596106cffbcea44c9cfd629c7411
Author: Hleb Valoshka <375gnu at gmail.com>
Date: Fri Aug 5 18:33:21 2016 +0300
Imported Upstream version 3.0.0
---
.travis.yml | 16 ++---
README.md | 54 +++++++++-----
lib/solve/ruby_solver.rb | 9 +++
lib/solve/version.rb | 2 +-
metadata.yml | 181 -----------------------------------------------
solve.gemspec | 4 +-
6 files changed, 54 insertions(+), 212 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 30f53bf..175c6a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
+sudo: true
language: ruby
-
-rvm:
- - 2.1
+cache: bundler
before_install:
- sudo apt-get update
@@ -19,11 +18,10 @@ branches:
matrix:
include:
- - rvm: 1.9.3
- - rvm: 2.0.0
- - rvm: jruby-19mode
- - rvm: 2.1
- gemfile: NoGecode.gemfile
- script: "bundle exec thor nogecode_spec"
+ - rvm: 2.1.9
+ - rvm: 2.2.5
+ - rvm: 2.3.1
+ allow_failures:
+ - rvm: 2.3.1
diff --git a/README.md b/README.md
index b0295e2..6543385 100644
--- a/README.md
+++ b/README.md
@@ -1,43 +1,52 @@
# Solve
-[][gem]
-[][travis]
-[gem]: https://rubygems.org/gems/solve
-[travis]: http://travis-ci.org/berkshelf/solve
+[][gem] [][travis]
A Ruby versioning constraint solver implementing [Semantic Versioning 2.0.0](http://semver.org).
## Installation
- $ gem install solve
+```
+$ gem install solve
+```
## Usage
Create a new graph
- graph = Solve::Graph.new
+```
+graph = Solve::Graph.new
+```
Add an artifact to the graph
- graph.artifact("nginx", "1.0.0")
+```
+graph.artifact("nginx", "1.0.0")
+```
Now add another artifact that has a dependency
- graph.artifact("mysql", "1.2.4-alpha.1").depends("openssl", "~> 1.0.0")
+```
+graph.artifact("mysql", "1.2.4-alpha.1").depends("openssl", "~> 1.0.0")
+```
Dependencies can be chained, too
- graph.artifact("ntp", "1.0.0").depends("build-essential").depends("yum")
+```
+graph.artifact("ntp", "1.0.0").depends("build-essential").depends("yum")
+```
And now solve the graph with some demands
- 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']])
+```
- Solve.it!(graph, [['nginx', '>= 0.100.0']], sorted: true)
+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)
+```
### Selecting A Resolver
@@ -52,18 +61,25 @@ You can set the resolver by calling `Solver.engine=` with the symbol `:ruby` or
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:
- $ gem install dep_selector
+```
+$ 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.
- $ export SOLVE_TIMEOUT=60
+```
+$ 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 at vialstudios.com>)
-* [Andrew Garson](andrewGarson) (<agarson at riotgames.com>)
-* [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg))
+- [Jamie Winsor](https://github.com/reset) ([jamie at vialstudios.com](mailto:jamie at vialstudios.com))
+- [Andrew Garson](andrewGarson) ([agarson at riotgames.com](mailto:agarson at 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
diff --git a/lib/solve/ruby_solver.rb b/lib/solve/ruby_solver.rb
index 4bf244e..08a1182 100644
--- a/lib/solve/ruby_solver.rb
+++ b/lib/solve/ruby_solver.rb
@@ -180,6 +180,15 @@ module Solve
'Lockfile'
end
+ # Returns whether this dependency, which has no possible matching
+ # specifications, can safely be ignored.
+ #
+ # @param [Object] dependency
+ # @return [Boolean] whether this dependency can safely be skipped.
+ def allow_missing?(dependency)
+ false
+ end
+
private
def resolve_with_error_wrapping
diff --git a/lib/solve/version.rb b/lib/solve/version.rb
index 433376c..8d23fcd 100644
--- a/lib/solve/version.rb
+++ b/lib/solve/version.rb
@@ -1,3 +1,3 @@
module Solve
- VERSION = "2.0.2"
+ VERSION = "3.0.0"
end
diff --git a/metadata.yml b/metadata.yml
deleted file mode 100644
index e8cf833..0000000
--- a/metadata.yml
+++ /dev/null
@@ -1,181 +0,0 @@
---- !ruby/object:Gem::Specification
-name: solve
-version: !ruby/object:Gem::Version
- version: 2.0.2
-platform: ruby
-authors:
-- Jamie Winsor
-- Andrew Garson
-- Thibaud Guillaume-Gentil
-autorequire:
-bindir: bin
-cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
- name: semverse
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: '1.1'
- type: :runtime
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: '1.1'
-- !ruby/object:Gem::Dependency
- name: molinillo
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: 0.2.3
- type: :runtime
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: 0.2.3
-- !ruby/object:Gem::Dependency
- name: thor
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: 0.16.0
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: 0.16.0
-- !ruby/object:Gem::Dependency
- name: rake
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: 0.9.2.2
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: 0.9.2.2
-- !ruby/object:Gem::Dependency
- name: spork
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
-- !ruby/object:Gem::Dependency
- name: rspec
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: '3.0'
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: '3.0'
-description: A Ruby version constraint solver
-email:
-- jamie at vialstudios.com
-- agarson at riotgames.com
-- thibaud at thibaud.me
-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
-- lib/solve/demand.rb
-- lib/solve/dependency.rb
-- lib/solve/errors.rb
-- lib/solve/gecode_solver.rb
-- lib/solve/graph.rb
-- 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
-metadata: {}
-post_install_message:
-rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: 1.9.1
-required_rubygems_version: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
-requirements: []
-rubyforge_project:
-rubygems_version: 2.5.0
-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
diff --git a/solve.gemspec b/solve.gemspec
index 56d5a82..6c71e1a 100644
--- a/solve.gemspec
+++ b/solve.gemspec
@@ -14,10 +14,10 @@ Gem::Specification.new do |s|
s.name = "solve"
s.require_paths = ["lib"]
s.version = Solve::VERSION
- s.required_ruby_version = ">= 1.9.1"
+ s.required_ruby_version = ">= 2.1.0"
s.add_dependency "semverse", "~> 1.1"
- s.add_dependency "molinillo", "~> 0.2.3"
+ s.add_dependency "molinillo", "~> 0.4.2"
s.add_development_dependency 'thor', '>= 0.16.0'
s.add_development_dependency 'rake', '>= 0.9.2.2'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-solve.git
More information about the Pkg-ruby-extras-commits
mailing list