solve 0.5.0 → 0.6.0

data/Gemfile

@@ -3,37 +3,24 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'pry'
   gem 'fuubar'
   gem 'yard'
   gem 'redcarpet'
-  gem 'guard'
   gem 'guard-rspec'
   gem 'guard-spork'
   gem 'guard-yard'
-
-  platform :ruby_19 do
-    gem 'coolline'
-  end
+  gem 'coolline'
 
   require 'rbconfig'
 
   if RbConfig::CONFIG['target_os'] =~ /darwin/i
-    gem 'growl', require: false
-    gem 'rb-fsevent', require: false
-
-    if `uname`.strip == 'Darwin' && `sw_vers -productVersion`.strip >= '10.8'
-      gem 'terminal-notifier-guard', '~> 1.5.3', require: false
-    end rescue Errno::ENOENT
+    gem 'ruby_gntp', require: false
 
   elsif RbConfig::CONFIG['target_os'] =~ /linux/i
-    gem 'libnotify',  '~> 0.8.0', require: false
-    gem 'rb-inotify', require: false
+    gem 'libnotify', require: false
 
   elsif RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
     gem 'win32console', require: false
-    gem 'rb-notifu', '>= 0.0.4', require: false
-    gem 'wdm', require: false
   end
 end
 

data/README.md

@@ -1,10 +1,9 @@
 # Solve
 [![Gem Version](https://badge.fury.io/rb/solve.png)](http://badge.fury.io/rb/solve)
-[![Build Status](https://secure.travis-ci.org/reset/solve.png?branch=master)](http://travis-ci.org/reset/solve)
-[![Dependency Status](https://gemnasium.com/reset/solve.png?travis)](https://gemnasium.com/reset/solve)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/reset/solve)
+[![Build Status](https://secure.travis-ci.org/RiotGames/solve.png?branch=master)](http://travis-ci.org/RiotGames/solve)
+[![Dependency Status](https://gemnasium.com/RiotGames/solve.png?travis)](https://gemnasium.com/RiotGames/solve)
 
-A Ruby versioning constraint solver implementing [Semantic Versioning 2.0.0-rc.1](http://semver.org).
+A Ruby versioning constraint solver implementing [Semantic Versioning 2.0.0](http://semver.org).
 
 ## Installation
 

data/lib/solve/constraint.rb

@@ -189,9 +189,7 @@ module Solve
     def satisfies?(target_version)
       target_version = Version.new(target_version.to_s)
 
-      if target_version.pre_release? && !version.pre_release?
-        return false
-      end
+      return false if !version.zero? && greedy_match?(target_version)
 
       compare(target_version)
     end
@@ -217,6 +215,16 @@ module Solve
 
     private
 
+      # Returns true if the given version is a pre-release and if the constraint
+      # does not include a pre-release and if the operator isn't < or <=.
+      # This avoids greedy matches, e.g. 2.0.0.alpha won't satisfy >= 1.0.0.
+      #
+      # @param [Solve::Version] target_version
+      #
+      def greedy_match?(target_version)
+        operator_type !~ /less/ && target_version.pre_release? && !version.pre_release?
+      end
+
       # @param [Solve::Version] target
       #
       # @return [Boolean]

data/lib/solve/demand.rb

@@ -20,7 +20,7 @@ module Solve
     # @param [Solve::Constraint, #to_s] constraint
     def initialize(solver, name, constraint = ">= 0.0.0")
       @solver = solver
-      @name = name
+      @name   = name
       @constraint = if constraint.is_a?(Solve::Constraint)
         constraint
       else
@@ -33,7 +33,7 @@ module Solve
     # @return [Solve::Demand, nil]
     def delete
       unless solver.nil?
-        result = solver.remove_demand(self)
+        result  = solver.remove_demand(self)
         @solver = nil
         result
       end

data/lib/solve/gem_version.rb

@@ -1,3 +1,3 @@
 module Solve
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/solve/graph.rb

@@ -157,11 +157,11 @@ module Solve
     end
     alias_method :eql?, :==
 
-      private
+    private
 
-        # @return [Array<Solve::Artifact>]
-        def artifact_collection
-          @artifacts.collect { |name, artifact| artifact }
-        end
+      # @return [Array<Solve::Artifact>]
+      def artifact_collection
+        @artifacts.collect { |name, artifact| artifact }
+      end
   end
 end

data/lib/solve/version.rb

@@ -93,6 +93,10 @@ module Solve
       !!pre_release
     end
 
+    def zero?
+      [major, minor, patch].all? { |n| n == 0 }
+    end
+
     # @return [Integer]
     def pre_release_and_build_presence_score
       pre_release ? 0 : (build.nil? ? 1 : 2)

data/spec/unit/solve/constraint_spec.rb

@@ -272,36 +272,130 @@ describe Solve::Constraint do
       should satisfies(Solve::Version.new("1.0.0"))
     end
 
-    context "when the constraint contains a pre-release value" do
-      subject { Solve::Constraint.new(">= 1.2.3-alpha") }
+    context "strictly greater than (>) pre-release constraint" do
+      subject { Solve::Constraint.new("> 1.0.0-alpha") }
 
-      it "is satisfied by pre-release versions" do
-        should satisfies("1.2.3-beta")
-      end
+      it { should_not satisfies("0.9.9+build") }
+      it { should_not satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0-alpha.2") }
+      it { should satisfies("1.0.0") }
+      it { should satisfies("1.0.0+build") }
+      it { should satisfies("1.0.1-beta") }
+      it { should satisfies("1.0.1") }
+      it { should satisfies("1.0.1+build.2") }
+      it { should satisfies("2.0.0") }
     end
 
-    context "when the constraint does not contain a pre-release value" do
-      subject { Solve::Constraint.new(">= 1.2.3") }
+    context "strictly greater than (>)" do
+      subject { Solve::Constraint.new("> 1.0.0") }
 
-      it "is not satisfied by pre-release versions" do
-        should_not satisfies("1.2.3-beta")
-      end
+      it { should_not satisfies("0.9.9+build") }
+      it { should_not satisfies("1.0.0-alpha") }
+      it { should_not satisfies("1.0.0-alpha.2") }
+      it { should_not satisfies("1.0.0") }
+      it { should satisfies("1.0.0+build") }
+      it { should_not satisfies("1.0.1-beta") }
+      it { should satisfies("1.0.1") }
+      it { should satisfies("1.0.1+build.2") }
+      it { should satisfies("2.0.0") }
     end
 
-    context "strictly greater than (>)" do
-      subject { Solve::Constraint.new("> 1.0.0-alpha") }
+    context "strictly greater than (>) build constraint" do
+      subject { Solve::Constraint.new("> 1.0.0+build") }
 
+      it { should_not satisfies("0.9.9+build") }
+      it { should_not satisfies("1.0.0-alpha") }
+      it { should_not satisfies("1.0.0-alpha.2") }
+      it { should_not satisfies("1.0.0") }
+      it { should_not satisfies("1.0.0+build") }
+      it { should_not satisfies("1.0.1-beta") }
+      it { should satisfies("1.0.1") }
+      it { should satisfies("1.0.1+build.2") }
       it { should satisfies("2.0.0") }
+    end
+
+    context "greater than or equal to (>) zero pre-release constraint" do
+      subject { Solve::Constraint.new("> 0.0.0-alpha") }
+
+      it { should satisfies("0.9.9+build") }
+      it { should satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0-alpha.2") }
       it { should satisfies("1.0.0") }
-      it { should_not satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0+build") }
+      it { should satisfies("1.0.1-beta") }
+      it { should satisfies("1.0.1") }
+      it { should satisfies("1.0.1+build.2") }
+      it { should satisfies("2.0.0") }
+    end
+
+    context "greater than or equal to (>) zero constraint" do
+      subject { Solve::Constraint.new("> 0.0.0") }
+
+      it { should satisfies("0.9.9+build") }
+      it { should satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0-alpha.2") }
+      it { should satisfies("1.0.0") }
+      it { should satisfies("1.0.0+build") }
+      it { should satisfies("1.0.1-beta") }
+      it { should satisfies("1.0.1") }
+      it { should satisfies("1.0.1+build.2") }
+      it { should satisfies("2.0.0") }
+    end
+
+    context "greater than or equal to (>) zero build constraint" do
+      subject { Solve::Constraint.new("> 0.0.0+build") }
+
+      it { should satisfies("0.9.9+build") }
+      it { should satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0-alpha.2") }
+      it { should satisfies("1.0.0") }
+      it { should satisfies("1.0.0+build") }
+      it { should satisfies("1.0.1-beta") }
+      it { should satisfies("1.0.1") }
+      it { should satisfies("1.0.1+build.2") }
+      it { should satisfies("2.0.0") }
+    end
+
+    context "strictly less than (<) pre-release constraint" do
+      subject { Solve::Constraint.new("< 1.0.0-alpha.3") }
+
+      it { should satisfies("0.9.9+build") }
+      it { should satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0-alpha.2") }
+      it { should_not satisfies("1.0.0") }
+      it { should_not satisfies("1.0.0+build") }
+      it { should_not satisfies("1.0.1-beta") }
+      it { should_not satisfies("1.0.1") }
+      it { should_not satisfies("1.0.1+build.2") }
+      it { should_not satisfies("2.0.0") }
     end
 
     context "strictly less than (<)" do
+      subject { Solve::Constraint.new("< 1.0.0") }
+
+      it { should satisfies("0.9.9+build") }
+      it { should satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0-alpha.2") }
+      it { should_not satisfies("1.0.0") }
+      it { should_not satisfies("1.0.0+build") }
+      it { should_not satisfies("1.0.1-beta") }
+      it { should_not satisfies("1.0.1") }
+      it { should_not satisfies("1.0.1+build.2") }
+      it { should_not satisfies("2.0.0") }
+    end
+
+    context "strictly less than (<) build constraint" do
       subject { Solve::Constraint.new("< 1.0.0+build.20") }
 
-      it { should satisfies("0.1.0") }
+      it { should satisfies("0.9.9+build") }
+      it { should satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0-alpha.2") }
       it { should satisfies("1.0.0") }
-      it { should_not satisfies("1.0.0+build.21") }
+      it { should satisfies("1.0.0+build") }
+      it { should_not satisfies("1.0.1-beta") }
+      it { should_not satisfies("1.0.1") }
+      it { should_not satisfies("1.0.1+build.2") }
+      it { should_not satisfies("2.0.0") }
     end
 
     context "strictly equal to (=)" do
@@ -313,24 +407,129 @@ describe Solve::Constraint do
       it { should_not satisfies("1.0.0-alpha") }
     end
 
+    context "greater than or equal to (>=) pre-release constraint" do
+      subject { Solve::Constraint.new(">= 1.0.0-alpha") }
+
+      it { should_not satisfies("0.9.9+build") }
+      it { should satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0-alpha.2") }
+      it { should satisfies("1.0.0") }
+      it { should satisfies("1.0.0+build") }
+      it { should satisfies("1.0.1-beta") }
+      it { should satisfies("1.0.1") }
+      it { should satisfies("1.0.1+build.2") }
+      it { should satisfies("2.0.0") }
+    end
+
     context "greater than or equal to (>=)" do
       subject { Solve::Constraint.new(">= 1.0.0") }
 
       it { should_not satisfies("0.9.9+build") }
       it { should_not satisfies("1.0.0-alpha") }
+      it { should_not satisfies("1.0.0-alpha.2") }
       it { should satisfies("1.0.0") }
+      it { should satisfies("1.0.0+build") }
+      it { should_not satisfies("1.0.1-beta") }
       it { should satisfies("1.0.1") }
+      it { should satisfies("1.0.1+build.2") }
       it { should satisfies("2.0.0") }
     end
 
-    context "greater than or equal to (<=)" do
+    context "greater than or equal to (>=) build constraint" do
+      subject { Solve::Constraint.new(">= 1.0.0+build") }
+
+      it { should_not satisfies("0.9.9+build") }
+      it { should_not satisfies("1.0.0-alpha") }
+      it { should_not satisfies("1.0.0-alpha.2") }
+      it { should_not satisfies("1.0.0") }
+      it { should satisfies("1.0.0+build") }
+      it { should_not satisfies("1.0.1-beta") }
+      it { should satisfies("1.0.1") }
+      it { should satisfies("1.0.1+build.2") }
+      it { should satisfies("2.0.0") }
+    end
+
+    context "greater than or equal to (>=) zero pre-release constraint" do
+      subject { Solve::Constraint.new(">= 0.0.0-alpha") }
+
+      it { should satisfies("0.9.9+build") }
+      it { should satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0-alpha.2") }
+      it { should satisfies("1.0.0") }
+      it { should satisfies("1.0.0+build") }
+      it { should satisfies("1.0.1-beta") }
+      it { should satisfies("1.0.1") }
+      it { should satisfies("1.0.1+build.2") }
+      it { should satisfies("2.0.0") }
+    end
+
+    context "greater than or equal to (>=) zero constraint" do
+      subject { Solve::Constraint.new(">= 0.0.0") }
+
+      it { should satisfies("0.9.9+build") }
+      it { should satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0-alpha.2") }
+      it { should satisfies("1.0.0") }
+      it { should satisfies("1.0.0+build") }
+      it { should satisfies("1.0.1-beta") }
+      it { should satisfies("1.0.1") }
+      it { should satisfies("1.0.1+build.2") }
+      it { should satisfies("2.0.0") }
+    end
+
+    context "greater than or equal to (>=) zero build constraint" do
+      subject { Solve::Constraint.new(">= 0.0.0+build") }
+
+      it { should satisfies("0.9.9+build") }
+      it { should satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0-alpha.2") }
+      it { should satisfies("1.0.0") }
+      it { should satisfies("1.0.0+build") }
+      it { should satisfies("1.0.1-beta") }
+      it { should satisfies("1.0.1") }
+      it { should satisfies("1.0.1+build.2") }
+      it { should satisfies("2.0.0") }
+    end
+
+    context "lower than or equal to (<=) pre-release constraint" do
       subject { Solve::Constraint.new("<= 1.0.0") }
 
       it { should satisfies("0.9.9+build") }
-      it { should_not satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0-alpha.2") }
       it { should satisfies("1.0.0") }
       it { should_not satisfies("1.0.0+build") }
+      it { should_not satisfies("1.0.1-beta") }
+      it { should_not satisfies("1.0.1") }
+      it { should_not satisfies("1.0.1+build.2") }
+      it { should_not satisfies("2.0.0") }
+    end
+
+    context "lower than or equal to (<=)" do
+      subject { Solve::Constraint.new("<= 1.0.0-alpha") }
+
+      it { should satisfies("0.9.9+build") }
+      it { should satisfies("1.0.0-alpha") }
+      it { should_not satisfies("1.0.0-alpha.2") }
+      it { should_not satisfies("1.0.0") }
+      it { should_not satisfies("1.0.0+build") }
+      it { should_not satisfies("1.0.1-beta") }
+      it { should_not satisfies("1.0.1") }
+      it { should_not satisfies("1.0.1+build.2") }
+      it { should_not satisfies("2.0.0") }
+    end
+
+    context "lower than or equal to (<=) build constraint" do
+      subject { Solve::Constraint.new("<= 1.0.0+build") }
+
+      it { should satisfies("0.9.9+build") }
+      it { should satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0-alpha.2") }
+      it { should satisfies("1.0.0") }
+      it { should satisfies("1.0.0+build") }
+      it { should_not satisfies("1.0.1-beta") }
       it { should_not satisfies("1.0.1") }
+      it { should_not satisfies("1.0.1+build.2") }
       it { should_not satisfies("2.0.0") }
     end
 

data/spec/unit/solve/version_spec.rb

@@ -294,6 +294,28 @@ describe Solve::Version do
     end
   end
 
+  describe "#zero?" do
+    context "major, minor and patch are equal to 0" do
+      subject { described_class.new("0.0.0").zero? }
+      it { should be_true }
+    end
+
+    context "major is not equal to 0" do
+      subject { described_class.new("1.0.0").zero? }
+      it { should be_false }
+    end
+
+    context "minor is not equal to 0" do
+      subject { described_class.new("0.1.0").zero? }
+      it { should be_false }
+    end
+
+    context "patch is not equal to 0" do
+      subject { described_class.new("0.0.1").zero? }
+      it { should be_false }
+    end
+  end
+
   describe "#to_s" do
     subject { Solve::Version.new("1.0.0-rc.1+build.1") }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solve
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby version constraint solver
 email:
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2797902556656574855
+      hash: 682127496261768650
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23