solve 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04ed0566c24a6be5c32e5a6b13911cf7c1ae20ef
-  data.tar.gz: 5fb06b3e2def2cf8f6355d48662aecd95db5c724
+  metadata.gz: 2479b663bdd02ece7185186812184b09d492f83a
+  data.tar.gz: 827ae48a741ad73b497fc1cba7cc569dba27df92
 SHA512:
-  metadata.gz: 063768523d3fd67a04eb80910b9e27d7e3f9b2c54df07a05e7da7faa1dd3e124e3338aa782a2db967a6111d91e43f361bc82ba9441c9733f57e7f9b6c0775c12
-  data.tar.gz: c5f7696eaf9c2d3f76951b39e05d81b29af0f4e4a8852c34d2c114f2e2398b2a982b938feaa892ba269a10d7d8acf76b5e3976a6dc1a58e279c8d416304e4793
+  metadata.gz: 5bd7ce5fb6ac7f1fd6abcfbb14bcccb0de57d8aaa13e59485538352e8c38a6442a04e750c6ebc4cdfd91be8bc6b1a8ddb74f92a07c9619cd828713eafae0ba9f
+  data.tar.gz: 68563e6af71ecab95483b3b1a9e9a8629e46ff731ca5a6e806733d1d57e2c6b1c4cf165a6e73d082d645625a45b8701dfa0262d8f17d4e33db1474a7c9ca7c2f

data/.travis.yml

@@ -1,17 +1,29 @@
+language: ruby
+
+rvm:
+  - 2.1
+
 before_install:
   - sudo apt-get update
   - sudo apt-get install libgecode-dev
+  - gem install bundler --no-ri --no-rdoc
+
 script: "bundle exec thor spec"
-language: ruby
 env: USE_SYSTEM_GECODE=1
 bundler_args: --without dev
 
+# prevent PR branches from running travis twice
+branches:
+  only:
+    - master
+
 matrix:
   include:
     - rvm: 1.9.3
     - rvm: 2.0.0
-    - rvm: 2.1.0
     - rvm: jruby-19mode
     - rvm: 2.1
       gemfile: NoGecode.gemfile
       script: "bundle exec thor nogecode_spec"
+
+

data/lib/solve/constraint.rb

@@ -195,11 +195,11 @@ module Solve
     # Returns true or false if the given version would be satisfied by
     # the version constraint.
     #
-    # @param [Version, #to_s] target
+    # @param [Semverse::Version, #to_s] target
     #
     # @return [Boolean]
     def satisfies?(target)
-      target = Version.coerce(target)
+      target = Semverse::Version.coerce(target)
 
       return false if !version.zero? && greedy_match?(target)
 

data/lib/solve/ruby_solver.rb

@@ -44,6 +44,7 @@ module Solve
       @demands_array = demands
       @timeout_ms    = self.class.timeout
 
+      @ui = options[:ui] # could be nil, but that's okay
       @dependency_source = options[:dependency_source] || 'user-specified dependency'
 
       @molinillo_graph = Molinillo::DependencyGraph.new
@@ -69,6 +70,8 @@ module Solve
     #   and the demands have a solution, but the solution contains a cyclic
     #   dependency
     def resolve(options = {})
+      @ui = options[:ui] if options[:ui]
+
       solved_graph = resolve_with_error_wrapping
 
       solution =  solved_graph.map(&:payload)
@@ -103,12 +106,18 @@ module Solve
     # Callback required by Molinillo, called when the solve starts
     # @return nil
     def before_resolution
-      nil
+      @ui.say('Starting dependency resolution') if @ui
     end
 
     # Callback required by Molinillo, called when the solve is complete.
     # @return nil
     def after_resolution
+      @ui.say('Finished dependency resolution') if @ui
+    end
+
+    # Callback required by Molinillo, called when resolving every progress_rate
+    # @return nil
+    def indicate_progress
       nil
     end
 
@@ -117,7 +126,7 @@ module Solve
     def debug(current_resolver_depth)
       # debug info will be returned if you call yield here, but it seems to be
       # broken in current Molinillo
-      nil
+      @ui.say(yield) if @ui
     end
 
     # Callback required by Molinillo

data/lib/solve/version.rb

@@ -1,3 +1,3 @@
 module Solve
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solve
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Jamie Winsor
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semverse
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: A Ruby version constraint solver implementing Semantic Versioning 2.0.0-rc.1
@@ -179,4 +179,3 @@ test_files:
 - spec/unit/solve/ruby_solver_spec.rb
 - spec/unit/solve/solver/serializer_spec.rb
 - spec/unit/solve_spec.rb
-has_rdoc: