solve 0.3.1 → 0.4.0.rc1

data/.travis.yml

@@ -1,5 +1,6 @@
 script: "bundle exec thor spec"
 language: ruby
+bundler_args: --without development
 rvm:
   - 1.9.2
   - 1.9.3

data/Gemfile

@@ -1,3 +1,46 @@
 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
+
+  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
+
+  elsif RbConfig::CONFIG['target_os'] =~ /linux/i
+    gem 'libnotify',  '~> 0.7.1', require: false
+    gem 'rb-inotify', 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
+
+group :test do
+  gem 'thor', '>= 0.16.0'
+  gem 'rake', '>= 0.9.2.2'
+
+  gem 'spork'
+  gem 'rspec'
+end

data/README.md

@@ -3,7 +3,7 @@
 [![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)
 
-A Ruby constraint solver
+A Ruby versioning constraint solver implementing [Semantic Versioning 2.0.0-rc.1](http://semver.org).
 
 ## Installation
 
@@ -21,7 +21,7 @@ Add an artifact to the graph
 
 Now add another artifact that has a dependency
 
-    graph.artifacts("mysql", "1.2.4").depends("openssl", "~> 1.0.0")
+    graph.artifacts("mysql", "1.2.4-alpha.1").depends("openssl", "~> 1.0.0")
 
 Dependencies can be chained, too
 
@@ -40,5 +40,8 @@ And now solve the graph with some demands
 ## Authors
 
 Author:: Jamie Winsor (<jamie@vialstudios.com>)
+Author:: Andrew Garson (<andrew.garson@gmail.com>)
 
-Copyright 2012 Jamie Winsor
+## Contributors
+
+[Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg))

data/lib/solve/constraint.rb

@@ -1,5 +1,6 @@
 module Solve
   # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Thibaud Guillaume-Gentil <thibaud@thibaud.me>
   class Constraint
     class << self
       # Split a constraint string into an Array of two elements. The first
@@ -81,32 +82,42 @@ module Solve
       #
       # @return [Boolean]
       def compare_aprox(constraint, target_version)
-        unless constraint.patch.nil?
-          target_version.patch >= constraint.patch &&
-            target_version.minor == constraint.minor &&
-            target_version.major == constraint.major
+        min = constraint.version
+        if constraint.patch == nil
+          max = Version.new([min.major + 1, 0, 0, 0])
+        elsif constraint.build
+          identifiers = constraint.version.identifiers(:build)
+          replace = identifiers.last.to_i.to_s == identifiers.last.to_s ? "-" : nil
+          max = Version.new([min.major, min.minor, min.patch, min.pre_release, identifiers.fill(replace, -1).join('.')])
+        elsif constraint.pre_release
+          identifiers = constraint.version.identifiers(:pre_release)
+          replace = identifiers.last.to_i.to_s == identifiers.last.to_s ? "-" : nil
+          max = Version.new([min.major, min.minor, min.patch, identifiers.fill(replace, -1).join('.')])
         else
-          target_version.minor >= constraint.minor &&
-            target_version.major == constraint.major
+          max = Version.new([min.major, min.minor + 1, 0, 0])
         end
+        min <= target_version && target_version < max
       end
     end
 
     OPERATORS = {
-      "=" => method(:compare_equal),
-      ">" => method(:compare_gt),
-      "<" => method(:compare_lt),
+      "~>" => method(:compare_aprox),
       ">=" => method(:compare_gte),
       "<=" => method(:compare_lte),
-      "~>" => method(:compare_aprox)
+      "=" => method(:compare_equal),
+      "~" => method(:compare_aprox),
+      ">" => method(:compare_gt),
+      "<" => method(:compare_lt)
     }.freeze
 
-    REGEXP = /^(#{OPERATORS.keys.join('|')}) (.+)$/
+    REGEXP = /^(#{OPERATORS.keys.join('|')})\s?(.+)$/
 
     attr_reader :operator
     attr_reader :major
     attr_reader :minor
     attr_reader :patch
+    attr_reader :pre_release
+    attr_reader :build
 
     # @param [#to_s] constraint
     def initialize(constraint = ">= 0.0.0")
@@ -115,7 +126,7 @@ module Solve
         raise Errors::InvalidConstraintFormat.new(constraint)
       end
 
-      @major, @minor, @patch = Version.split(ver_str)
+      @major, @minor, @patch, @pre_release, @build = Version.split(ver_str)
       @compare_fun = OPERATORS.fetch(self.operator)
     end
 
@@ -124,7 +135,15 @@ module Solve
     #
     # @return [Solve::Version]
     def version
-      @version ||= Version.new([self.major, self.minor, self.patch])
+      @version ||= Version.new(
+        [
+          self.major,
+          self.minor,
+          self.patch,
+          self.pre_release,
+          self.build
+        ]
+      )
     end
 
     # Returns true or false if the given version would be satisfied by
@@ -145,12 +164,16 @@ module Solve
     def ==(other)
       other.is_a?(self.class) &&
         self.operator == other.operator &&
-        self.version == other.version 
+        self.version == other.version
     end
     alias_method :eql?, :==
 
     def to_s
-      "#{operator} #{major}.#{minor}.#{patch}"
+      str = operator
+      str += " #{major}.#{minor}.#{patch}"
+      str += "-#{pre_release}" if pre_release
+      str += "+#{build}" if build
+      str
     end
   end
 end

data/lib/solve/gem_version.rb

@@ -1,3 +1,3 @@
 module Solve
-  VERSION = "0.3.1"
+  VERSION = "0.4.0.rc1"
 end

data/lib/solve/version.rb

@@ -1,5 +1,6 @@
 module Solve
   # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Thibaud Guillaume-Gentil <thibaud@thibaud.me>
   class Version
     class << self
       # @param [#to_s] version_string
@@ -8,11 +9,15 @@ module Solve
       #
       # @return [Array]
       def split(version_string)
-        major, minor, patch = case version_string.to_s
+        case version_string.to_s
+        when /^(\d+)\.(\d+)\.(\d+)(-([0-9a-z\-\.]+))?(\+([0-9a-z\-\.]+))?$/i
+          [ $1.to_i, $2.to_i, $3.to_i, $5, $7 ]
         when /^(\d+)\.(\d+)\.(\d+)$/
           [ $1.to_i, $2.to_i, $3.to_i ]
         when /^(\d+)\.(\d+)$/
           [ $1.to_i, $2.to_i, nil ]
+        when /^(\d+)$/
+          [ $1.to_i, nil, nil ]
         else
           raise Errors::InvalidVersionFormat.new(version_string)
         end
@@ -24,30 +29,32 @@ module Solve
     attr_reader :major
     attr_reader :minor
     attr_reader :patch
+    attr_reader :pre_release
+    attr_reader :build
 
     # @overload initialize(version_array)
     #   @param [Array] version_array
     #
     #   @example
-    #     Version.new([1, 2, 3]) => #<Version: @major=1, @minor=2, @patch=3>
+    #     Version.new([1, 2, 3, 'rc.1', 'build.1']) => #<Version: @major=1, @minor=2, @patch=3, @pre_release='rc.1', @build='build.1'>
     #
     # @overload initialize(version_string)
     #   @param [#to_s] version_string
     #
     #   @example
-    #     Version.new("1.2.3") => #<Version: @major=1, @minor=2, @patch=3>
+    #     Version.new("1.2.3-rc.1+build.1") => #<Version: @major=1, @minor=2, @patch=3, @pre_release='rc.1', @build='build.1'>
     #
     # @overload initialize(version)
     #   @param [Solve::Version] version
     #
     #   @example
-    #     Version.new(Version.new("1.2.3")) => #<Version: @major=1, @minor=2, @patch=3>
+    #     Version.new(Version.new("1.2.3-rc.1+build.1")) => #<Version: @major=1, @minor=2, @pre_release='rc.1', @build='build.1'>
     #
     def initialize(*args)
       if args.first.is_a?(Array)
-        @major, @minor, @patch = args.first
+        @major, @minor, @patch, @pre_release, @build = args.first
       else
-        @major, @minor, @patch = self.class.split(args.first.to_s)
+        @major, @minor, @patch, @pre_release, @build = self.class.split(args.first.to_s)
       end
 
       @major ||= 0
@@ -59,10 +66,48 @@ module Solve
     #
     # @return [Integer]
     def <=>(other)
-      [:major, :minor, :patch].each do |method|
-        ans = (self.send(method) <=> other.send(method))
+      [:major, :minor, :patch].each do |release|
+        ans = self.send(release) <=> other.send(release)
         return ans if ans != 0
       end
+      ans = pre_release_and_build_presence_score <=> other.pre_release_and_build_presence_score
+      return ans if ans != 0
+      ans = identifiers_comparaison(other, :pre_release)
+      return ans if ans != 0
+      if build && other.build
+        return identifiers_comparaison(other, :build)
+      else
+        return build.to_s <=> other.build.to_s
+      end
+      0
+    end
+
+    # @return [Array]
+    def identifiers(release)
+      send(release).to_s.split('.').map do |str|
+        str.to_i.to_s == str ? str.to_i : str
+      end
+    end
+
+    # @return [Integer]
+    def pre_release_and_build_presence_score
+      pre_release ? 0 : (build.nil? ? 1 : 2)
+    end
+
+    # @param [Solve::Version] other
+    #
+    # @return [Integer]
+    def identifiers_comparaison(other, release)
+      [identifiers(release).length, other.identifiers(release).length].max.times do |i|
+        if identifiers(release)[i].class == other.identifiers(release)[i].class
+          ans = identifiers(release)[i] <=> other.identifiers(release)[i]
+          return ans if ans != 0
+        elsif identifiers(release)[i] && other.identifiers(release)[i]
+          return identifiers(release)[i].class.to_s <=> other.identifiers(release)[i].class.to_s
+        elsif identifiers(release)[i] || other.identifiers(release)[i]
+          return other.identifiers(release)[i].class.to_s <=> identifiers(release)[i].class.to_s
+        end
+      end
       0
     end
 
@@ -78,7 +123,10 @@ module Solve
     end
 
     def to_s
-      "#{major}.#{minor}.#{patch}"
+      str = "#{major}.#{minor}.#{patch}"
+      str += "-#{pre_release}" if pre_release
+      str += "+#{build}" if build
+      str
     end
   end
 end

data/solve.gemspec

@@ -2,12 +2,12 @@
 require File.expand_path('../lib/solve/gem_version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.authors               = ["Jamie Winsor", "Andrew Garson"]
-  s.email                 = ["jamie@vialstudios.com", "andrew.garson@gmail.com"]
-  s.description           = %q{A Ruby constraint solver}
-  s.summary               = s.description
+  s.authors               = ["Jamie Winsor", "Andrew Garson", "Thibaud Guillaume-Gentil"]
+  s.email                 = ["jamie@vialstudios.com", "andrew.garson@gmail.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/reset/solve"
-  
+
   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/})
@@ -17,18 +17,4 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.9.1"
 
   s.add_dependency 'json'
-
-  s.add_development_dependency 'thor', '>= 0.16.0'
-  s.add_development_dependency 'rake', '>= 0.9.2.2'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'fuubar'
-  s.add_development_dependency 'spork'
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'redcarpet'
-  s.add_development_dependency 'guard'
-  s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'guard-spork'
-  s.add_development_dependency 'guard-yard'
-  s.add_development_dependency 'coolline'
 end

data/spec/unit/solve/constraint_spec.rb

@@ -1,5 +1,11 @@
 require 'spec_helper'
 
+RSpec::Matchers.define :satisfies do |*args|
+  match do |constraint|
+    constraint.satisfies?(*args).should be_true
+  end
+end
+
 describe Solve::Constraint do
   let(:valid_string) { ">= 0.0.0" }
   let(:invalid_string) { "x23u7089213.*" }
@@ -16,6 +22,10 @@ describe Solve::Constraint do
         subject.new(valid_string).operator.should eql(">=")
       end
 
+      it "assigns the parsed operator to the operator attribute with no separation between operator and version" do
+        subject.new(">=0.0.0").operator.should eql(">=")
+      end
+
       it "assigns the parsed version string as an instance of Version to the version attribute" do
         result = subject.new(valid_string)
 
@@ -73,133 +83,176 @@ describe Solve::Constraint do
     end
   end
 
-  describe "#satisfies?" do
+  describe "#satisfies?", :focus do
     subject { Solve::Constraint.new("= 1.0.0") }
 
-    it "accepts a String for version" do
-      subject.satisfies?("1.0.0").should be_true
-    end
+    it { should satisfies("1.0.0") }
 
     it "accepts a Version for version" do
-      subject.satisfies?(Solve::Version.new("1.0.0")).should be_true
+      should satisfies(Solve::Version.new("1.0.0"))
     end
 
     context "strictly greater than (>)" do
-      subject { Solve::Constraint.new("> 1.0.0") }
-
-      it "returns true if the given version would satisfy the constraint" do
-        subject.satisfies?("2.0.0").should be_true
-      end
+      subject { Solve::Constraint.new("> 1.0.0-alpha") }
 
-      it "returns false if the given version would not satisfy the constraint" do
-        subject.satisfies?("1.0.0").should be_false
-      end
+      it { should satisfies("2.0.0") }
+      it { should satisfies("1.0.0") }
+      it { should_not satisfies("1.0.0-alpha") }
     end
 
     context "strictly less than (<)" do
-      subject { Solve::Constraint.new("< 1.0.0") }
-
-      it "returns true if the given version would satisfy the constraint" do
-        subject.satisfies?("0.1.0").should be_true
-      end
+      subject { Solve::Constraint.new("< 1.0.0+build.20") }
 
-      it "returns false if the given version would not satisfy the constraint" do
-        subject.satisfies?("1.0.0").should be_false
-      end
+      it { should satisfies("0.1.0") }
+      it { should satisfies("1.0.0") }
+      it { should_not satisfies("1.0.0+build.21") }
     end
 
     context "strictly equal to (=)" do
       subject { Solve::Constraint.new("= 1.0.0") }
 
-      it "returns true if the given version would satisfy the constraint" do
-        subject.satisfies?("1.0.0").should be_true
-      end
-
-      it "returns false if the given version would not satisfy the constraint" do
-        subject.satisfies?("1.0.1").should be_false
-      end
+      it { should_not satisfies("0.9.9+build") }
+      it { should satisfies("1.0.0") }
+      it { should_not satisfies("1.0.1") }
+      it { should_not satisfies("1.0.0-alpha") }
     end
 
     context "greater than or equal to (>=)" do
       subject { Solve::Constraint.new(">= 1.0.0") }
 
-      it "returns true if the given version is greater than the version constraint" do
-        subject.satisfies?("2.0.0").should be_true
-      end
-
-      it "returns true if the given version is equal to the version constraint" do
-        subject.satisfies?("1.0.0").should be_true
-      end
-
-      it "returns false if the given version is less than the version constraint" do
-        subject.satisfies?("0.9.0").should be_false
-      end
+      it { should_not satisfies("0.9.9+build") }
+      it { should_not satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0") }
+      it { should satisfies("1.0.1") }
+      it { should satisfies("2.0.0") }
     end
 
     context "greater than or equal to (<=)" do
       subject { Solve::Constraint.new("<= 1.0.0") }
 
-      it "returns true if the given version is less than the version constraint" do
-        subject.satisfies?("0.9.0").should be_true
-      end
-
-      it "returns true if the given version is equal to the version constraint" do
-        subject.satisfies?("1.0.0").should be_true
-      end
-
-      it "returns false if the given version is less than the version constraint" do
-        subject.satisfies?("1.0.1").should be_false
-      end
+      it { should satisfies("0.9.9+build") }
+      it { should satisfies("1.0.0-alpha") }
+      it { should satisfies("1.0.0") }
+      it { should_not satisfies("1.0.0+build") }
+      it { should_not satisfies("1.0.1") }
+      it { should_not satisfies("2.0.0") }
     end
 
-    context "aproximately (~>)" do
-      subject { Solve::Constraint.new("~> 1.0.0") }
-
-      it "returns true if the given version is equal to the version constraint" do
-        subject.satisfies?("1.0.0").should be_true
-      end
-
-      context "when the last value in the constraint is for patch" do
-        subject { Solve::Constraint.new("~> 1.0.1") }
-
-        it "returns true if the patch level is greater than the constraint's" do
-          subject.satisfies?("1.0.2").should be_true
+    %w[~> ~].each do |operator|
+      describe "aproximately (#{operator})" do
+        context "when the last value in the constraint is for minor" do
+          subject { Solve::Constraint.new("#{operator} 1.2") }
+
+          it { should_not satisfies("1.1.0") }
+          it { should_not satisfies("1.2.0-alpha") }
+          it { should satisfies("1.2.0") }
+          it { should satisfies("1.2.3") }
+          it { should satisfies("1.2.3+build") }
+          it { should_not satisfies("2.0.0-0") }
+          it { should_not satisfies("2.0.0") }
         end
 
-        it "returns true if the patch level is equal to the constraint's" do
-          subject.satisfies?("1.0.1").should be_true
-        end
+        context "when the last value in the constraint is for minor" do
+          subject { Solve::Constraint.new("#{operator} 1.2.3") }
 
-        it "returns false if the patch level is less than the constraint's" do
-          subject.satisfies?("1.0.0").should be_false
+          it { should_not satisfies("1.1.0") }
+          it { should_not satisfies("1.2.3-alpha") }
+          it { should_not satisfies("1.2.2") }
+          it { should satisfies("1.2.3") }
+          it { should satisfies("1.2.5+build") }
+          it { should_not satisfies("1.3.0-0") }
+          it { should_not satisfies("1.3.0") }
         end
 
-        it "returns false if the given version is less than the constraint's" do
-          subject.satisfies?("0.9.0").should be_false
+        context "when the last value in the constraint is for pre_release with a last numeric identifier" do
+          subject { Solve::Constraint.new("#{operator} 1.2.3-4") }
+
+          it { should_not satisfies("1.2.3") }
+          it { should satisfies("1.2.3-4") }
+          it { should satisfies("1.2.3-10") }
+          it { should satisfies("1.2.3-10.5+build.33") }
+          it { should_not satisfies("1.2.3--") }
+          it { should_not satisfies("1.2.3-alpha") }
+          it { should_not satisfies("1.2.3") }
+          it { should_not satisfies("1.2.4") }
+          it { should_not satisfies("1.3.0") }
         end
-      end
-
-      context "when the last value in the constraint is for minor" do
-        subject { Solve::Constraint.new("~> 1.1") }
 
-        it "returns true if the minor level is greater than the constraint's" do
-          subject.satisfies?("1.2").should be_true
+        context "when the last value in the constraint is for pre_release with a last non-numeric identifier" do
+          subject { Solve::Constraint.new("#{operator} 1.2.3-alpha") }
+
+          it { should_not satisfies("1.2.3-4") }
+          it { should_not satisfies("1.2.3--") }
+          it { should satisfies("1.2.3-alpha") }
+          it { should satisfies("1.2.3-alpha.0") }
+          it { should satisfies("1.2.3-beta") }
+          it { should satisfies("1.2.3-omega") }
+          it { should satisfies("1.2.3-omega.4") }
+          it { should_not satisfies("1.2.3") }
+          it { should_not satisfies("1.3.0") }
         end
 
-        it "returns true if the minor level is equal to the constraint's" do
-          subject.satisfies?("1.1").should be_true
+        context "when the last value in the constraint is for build with a last numeric identifier and a pre-release" do
+          subject { Solve::Constraint.new("#{operator} 1.2.3-alpha+5") }
+
+          it { should_not satisfies("1.2.3-alpha") }
+          it { should_not satisfies("1.2.3-alpha.4") }
+          it { should_not satisfies("1.2.3-alpha.4+4") }
+          it { should satisfies("1.2.3-alpha+5") }
+          it { should satisfies("1.2.3-alpha+5.5") }
+          it { should satisfies("1.2.3-alpha+10") }
+          it { should_not satisfies("1.2.3-alpha+-") }
+          it { should_not satisfies("1.2.3-alpha+build") }
+          it { should_not satisfies("1.2.3-beta") }
+          it { should_not satisfies("1.2.3") }
+          it { should_not satisfies("1.3.0") }
         end
 
-        it "returns true if a patch level is set but the minor level is equal to or greater than the constraint's" do
-          subject.satisfies?("1.2.8").should be_true
+        context "when the last value in the constraint is for build with a last non-numeric identifier and a pre-release" do
+          subject { Solve::Constraint.new("#{operator} 1.2.3-alpha+build") }
+
+          it { should_not satisfies("1.2.3-alpha") }
+          it { should_not satisfies("1.2.3-alpha.4") }
+          it { should_not satisfies("1.2.3-alpha.4+4") }
+          it { should satisfies("1.2.3-alpha+build") }
+          it { should satisfies("1.2.3-alpha+build.5") }
+          it { should satisfies("1.2.3-alpha+preview") }
+          it { should satisfies("1.2.3-alpha+zzz") }
+          it { should_not satisfies("1.2.3-alphb") }
+          it { should_not satisfies("1.2.3-beta") }
+          it { should_not satisfies("1.2.3") }
+          it { should_not satisfies("1.3.0") }
         end
 
-        it "returns false if the patch level is less than the constraint's" do
-          subject.satisfies?("1.0.1").should be_false
+        context "when the last value in the constraint is for build with a last numeric identifier" do
+          subject { Solve::Constraint.new("#{operator} 1.2.3+5") }
+
+          it { should_not satisfies("1.2.3") }
+          it { should_not satisfies("1.2.3-alpha") }
+          it { should_not satisfies("1.2.3+4") }
+          it { should satisfies("1.2.3+5") }
+          it { should satisfies("1.2.3+99") }
+          it { should_not satisfies("1.2.3+5.build") }
+          it { should_not satisfies("1.2.3+-") }
+          it { should_not satisfies("1.2.3+build") }
+          it { should_not satisfies("1.2.4") }
+          it { should_not satisfies("1.3.0") }
         end
 
-        it "returns false if the major level is greater than the constraint's" do
-          subject.satisfies?("2.0.0").should be_false
+        context "when the last value in the constraint is for build with a last non-numeric identifier" do
+          subject { Solve::Constraint.new("#{operator} 1.2.3+build") }
+
+          it { should_not satisfies("1.2.3-alpha") }
+          it { should_not satisfies("1.2.3") }
+          it { should_not satisfies("1.2.3+5") }
+          it { should satisfies("1.2.3+build") }
+          it { should satisfies("1.2.3+build.5") }
+          it { should satisfies("1.2.3+preview") }
+          it { should satisfies("1.2.3+zzz") }
+          it { should_not satisfies("1.2.4-0") }
+          it { should_not satisfies("1.2.4") }
+          it { should_not satisfies("1.2.5") }
+          it { should_not satisfies("1.3.0") }
         end
       end
     end

data/spec/unit/solve/version_spec.rb

@@ -5,6 +5,54 @@ describe Solve::Version do
     subject { Solve::Version }
 
     describe "::new" do
+      context "a string containing a major, minor and patch separated by periods a pre-release and a build" do
+        before(:each) { @version = subject.new("1.2.3-rc.1+build.1") }
+
+        it "assigns a major value" do
+          @version.major.should eql(1)
+        end
+
+        it "assigns a minor value" do
+          @version.minor.should eql(2)
+        end
+
+        it "assigns a patch value" do
+          @version.patch.should eql(3)
+        end
+
+        it "assigns a pre_release value" do
+          @version.pre_release.should eql('rc.1')
+        end
+
+        it "assigns a build value" do
+          @version.build.should eql('build.1')
+        end
+      end
+
+      context "a string containing a major, minor and patch separated by periods and a build" do
+        before(:each) { @version = subject.new("1.2.3+pre-build.11.e0f985a") }
+
+        it "assigns a major value" do
+          @version.major.should eql(1)
+        end
+
+        it "assigns a minor value" do
+          @version.minor.should eql(2)
+        end
+
+        it "assigns a patch value" do
+          @version.patch.should eql(3)
+        end
+
+        it "doesn't assigns a pre_release value" do
+          @version.pre_release.should be_nil
+        end
+
+        it "assigns a build value" do
+          @version.build.should eql('pre-build.11.e0f985a')
+        end
+      end
+
       context "a string containing a major, minor, and patch separated by periods" do
         before(:each) { @version = subject.new("1.2.3") }
 
@@ -19,6 +67,62 @@ describe Solve::Version do
         it "assigns a patch value" do
           @version.patch.should eql(3)
         end
+
+        it "doesn't assigns a pre_release value" do
+          @version.pre_release.should be_nil
+        end
+
+        it "doesn't assigns a build value" do
+          @version.build.should be_nil
+        end
+      end
+
+      context "a five element array" do
+        before(:each) { @version = subject.new([1,2,3,nil,'build.1']) }
+
+        it "assigns a major value" do
+          @version.major.should eql(1)
+        end
+
+        it "assigns a minor value" do
+          @version.minor.should eql(2)
+        end
+
+        it "assigns a patch value" do
+          @version.patch.should eql(3)
+        end
+
+        it "doesn't assigns a pre_release value" do
+          @version.pre_release.should be_nil
+        end
+
+        it "assigns a build value" do
+          @version.build.should eql('build.1')
+        end
+      end
+
+      context "a four element array" do
+        before(:each) { @version = subject.new([1,2,3,'alpha.1']) }
+
+        it "assigns a major value" do
+          @version.major.should eql(1)
+        end
+
+        it "assigns a minor value" do
+          @version.minor.should eql(2)
+        end
+
+        it "assigns a patch value" do
+          @version.patch.should eql(3)
+        end
+
+        it "assigns a pre_release value" do
+          @version.pre_release.should eql('alpha.1')
+        end
+
+        it "doesn't assigns a build value" do
+          @version.build.should be_nil
+        end
       end
 
       context "a three element array" do
@@ -35,6 +139,14 @@ describe Solve::Version do
         it "assigns a patch value" do
           @version.patch.should eql(3)
         end
+
+        it "doesn't assigns a pre_release value" do
+          @version.pre_release.should be_nil
+        end
+
+        it "doesn't assigns a build value" do
+          @version.build.should be_nil
+        end
       end
 
       context "a two element array" do
@@ -51,6 +163,14 @@ describe Solve::Version do
         it "sets the patch value to 0 (zero)" do
           @version.patch.should eql(0)
         end
+
+        it "doesn't assigns a pre_release value" do
+          @version.pre_release.should be_nil
+        end
+
+        it "doesn't assigns a build value" do
+          @version.build.should be_nil
+        end
       end
 
       context "a one element array" do
@@ -66,7 +186,15 @@ describe Solve::Version do
 
         it "sets the patch value to 0 (zero)" do
           @version.patch.should eql(0)
-        end        
+        end
+
+        it "doesn't assigns a pre_release value" do
+          @version.pre_release.should be_nil
+        end
+
+        it "doesn't assigns a build value" do
+          @version.build.should be_nil
+        end
       end
 
       context "an empty array" do
@@ -83,16 +211,38 @@ describe Solve::Version do
         it "sets the patch value to 0 (zero)" do
           @version.patch.should eql(0)
         end
+
+        it "doesn't assigns a pre_release value" do
+          @version.pre_release.should be_nil
+        end
+
+        it "doesn't assigns a build value" do
+          @version.build.should be_nil
+        end
       end
     end
 
     describe "::split" do
-      it "returns an array containing 3 elements" do
-        subject.split("1.2.0").should have(3).items
+      it "returns an array containing 5 elements" do
+        subject.split("1.2.0-alpha.1").should have(5).items
+      end
+
+      context "given a string only containing a major, minor and patch version" do
+        it "returns an array containing 4 elements" do
+          subject.split("1.2.3").should have(5).items
+        end
+
+        it "returns nil as fourth element" do
+          subject.split("1.2.3")[3].should be_nil
+        end
+
+        it "returns nil as fifth element" do
+          subject.split("1.2.3")[4].should be_nil
+        end
       end
 
       context "given a string only containing a major and minor version" do
-        it "returns an array containing 3 elements" do
+        it "returns an array containing 4 elements" do
           subject.split("1.2").should have(3).items
         end
 
@@ -102,20 +252,62 @@ describe Solve::Version do
       end
 
       context "given a string with only a major version" do
-        it "raises an InvalidVersionFormat error" do
-          lambda {
-            subject.split("1")
-          }.should raise_error(Solve::Errors::InvalidVersionFormat)
+        it "returns an array containing 3 elements" do
+          subject.split("1").should have(3).items
+        end
+
+        it "returns nil as the second element" do
+          subject.split("1")[2].should be_nil
+        end
+
+        it "returns nil as the third element" do
+          subject.split("1")[2].should be_nil
         end
       end
+
+    context "given a string with an invalid version"
+      it "raises an InvalidVersionFormat error" do
+        lambda {
+          subject.split("hello")
+        }.should raise_error(Solve::Errors::InvalidVersionFormat)
+      end
     end
   end
 
-  subject { Solve::Version.new("1.0.0") }
-
   describe "#to_s" do
-    it "returns a string containing the major.minor.patch" do
-      subject.to_s.should eql("1.0.0")
+    subject { Solve::Version.new("1.0.0-rc.1+build.1") }
+
+    it "returns a string containing the major.minor.patch-pre_release+build" do
+      subject.to_s.should eql("1.0.0-rc.1+build.1")
     end
   end
+
+  describe "#<=>" do
+    it "compares versions" do
+      versions_list = %w[
+        1.0.0-0
+        1.0.0-alpha
+        1.0.0-alpha.1
+        1.0.0-beta.2
+        1.0.0-beta.11
+        1.0.0-rc.1
+        1.0.0-rc.1+build.1
+        1.0.0
+        1.0.0+0.3.7
+        1.0.0+build
+        1.0.0+build.2.b8f12d7
+        1.0.0+build.11.e0f985a
+      ]
+      versions = versions_list.map { |version| Solve::Version.new(version) }
+
+      100.times do
+        shuffled_versions = versions.shuffle
+        while shuffled_versions == versions
+          shuffled_versions = shuffled_versions.shuffle
+        end
+        shuffled_versions.sort.map(&:to_s).should == versions_list
+      end
+    end
+  end
+
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: solve
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.4.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Jamie Winsor
 - Andrew Garson
+- Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-29 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -28,218 +29,11 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.2.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.2.2
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: spork
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-spork
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coolline
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: A Ruby constraint solver
+description: A Ruby version constraint solver
 email:
 - jamie@vialstudios.com
 - andrew.garson@gmail.com
+- thibaud@thibaud.me
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -294,18 +88,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -267791564304481347
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A Ruby constraint solver
+summary: A Ruby version constraint solver implementing Semantic Versioning 2.0.0-rc.1
 test_files:
 - spec/acceptance/solutions_spec.rb
 - spec/spec_helper.rb