solve 0.4.2 → 0.4.3

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p392

data/LICENSE

@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright [yyyy] [name of copyright owner]
+Copyright 2012-2013 Riot Games
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -39,9 +39,6 @@ And now solve the graph with some demands
 
 ## Authors
 
-Author:: Jamie Winsor (<jamie@vialstudios.com>)
-Author:: Andrew Garson (<andrew.garson@gmail.com>)
-
-## Contributors
-
-[Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg))
+* [Jamie Winsor](https://github.com/reset) (<reset@riotgames.com>)
+* [Andrew Garson](andrewGarson) (<agarson@riotgames.com>)
+* [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg))

data/lib/solve.rb

@@ -2,7 +2,7 @@ require 'forwardable'
 require 'json'
 require 'solve/errors'
 
-# @author Jamie Winsor <jamie@vialstudios.com>
+# @author Jamie Winsor <reset@riotgames.com>
 module Solve
   autoload :Version, 'solve/version'
   autoload :Artifact, 'solve/artifact'

data/lib/solve/artifact.rb

@@ -1,5 +1,5 @@
 module Solve
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class Artifact
     include Comparable
 

data/lib/solve/constraint.rb

@@ -1,5 +1,5 @@
 module Solve
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   # @author Thibaud Guillaume-Gentil <thibaud@thibaud.me>
   class Constraint
     class << self
@@ -12,7 +12,7 @@ module Solve
       # If the given string does not contain a valid version string then
       # nil will be returned.
       #
-      # @param [#to_s] string
+      # @param [#to_s] constraint
       #
       # @example splitting a string with a constraint operator and valid version string
       #   Constraint.split(">= 1.0.0") => [ ">=", "1.0.0" ]
@@ -24,17 +24,32 @@ module Solve
       #   Constraint.split("hello") => nil
       #
       # @return [Array, nil]
-      def split(string)
-        if string =~ /^[0-9]/
-          op = "="
-          ver = string
+      def split(constraint)
+        if constraint =~ /^[0-9]/
+          operator = "="
+          version  = constraint
         else
-          _, op, ver = REGEXP.match(string).to_a
+          _, operator, version = REGEXP.match(constraint).to_a
         end
 
-        return nil unless op || ver
+        if operator.nil?
+          raise Errors::InvalidConstraintFormat.new(constraint)
+        end
+
+        split_version = case version.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, nil, nil ]
+        when /^(\d+)\.(\d+)?$/
+          [ $1.to_i, $2.to_i, nil, nil, nil ]
+        when /^(\d+)$/
+          [ $1.to_i, nil, nil, nil, nil ]
+        else
+          raise Errors::InvalidConstraintFormat.new(constraint)
+        end
 
-        [ op, ver ]
+        [ operator, split_version ].flatten
       end
 
       # @param [Solve::Constraint] constraint
@@ -83,18 +98,18 @@ module Solve
       # @return [Boolean]
       def compare_aprox(constraint, target_version)
         min = constraint.version
-        if constraint.patch == nil
-          max = Version.new([min.major + 1, 0, 0, 0])
+        max = if constraint.patch.nil?
+          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('.')])
+          replace     = identifiers.last.to_i.to_s == identifiers.last.to_s ? "-" : nil
+          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('.')])
+          replace     = identifiers.last.to_i.to_s == identifiers.last.to_s ? "-" : nil
+          Version.new([min.major, min.minor, min.patch, identifiers.fill(replace, -1).join('.')])
         else
-          max = Version.new([min.major, min.minor + 1, 0, 0])
+          Version.new([min.major, min.minor + 1, 0, 0])
         end
         min <= target_version && target_version < max
       end
@@ -125,12 +140,7 @@ module Solve
         constraint = ">= 0.0.0"
       end
 
-      @operator, ver_str = self.class.split(constraint)
-      if @operator.nil? || ver_str.nil?
-        raise Errors::InvalidConstraintFormat.new(constraint)
-      end
-
-      @major, @minor, @patch, @pre_release, @build = Version.split(ver_str)
+      @operator, @major, @minor, @patch, @pre_release, @build = self.class.split(constraint)
       @compare_fun = OPERATORS.fetch(self.operator)
     end
 
@@ -159,6 +169,10 @@ 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
+
       @compare_fun.call(self, target_version)
     end
 

data/lib/solve/demand.rb

@@ -1,5 +1,5 @@
 module Solve
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class Demand
     # A reference to the solver this demand belongs to
     #

data/lib/solve/dependency.rb

@@ -1,5 +1,5 @@
 module Solve
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class Dependency
     # A reference to the artifact this dependency belongs to
     #

data/lib/solve/errors.rb

@@ -1,5 +1,5 @@
 module Solve
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   module Errors
     class SolveError < StandardError
       alias_method :mesage, :to_s

data/lib/solve/gem_version.rb

@@ -1,3 +1,3 @@
 module Solve
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/solve/graph.rb

@@ -1,5 +1,5 @@
 module Solve
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   class Graph
     class << self
       # Create a key for a graph from an instance of an Artifact or Dependency

data/lib/solve/solver.rb

@@ -1,5 +1,6 @@
 module Solve
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
+  # @author Andrew Garson <agarson@riotgames.com>
   class Solver
     autoload :VariableTable, 'solve/solver/variable_table'
     autoload :VariableRow, 'solve/solver/variable_row'
@@ -101,7 +102,7 @@ module Solve
           trace("\t#{constraint}")
         end
         trace("Possible values are #{possible_values_for_unbound}")
-        
+
         while possible_value = possible_values_for_unbound.shift
           possible_artifact = graph.get_artifact(unbound_variable.artifact, possible_value.version)
           possible_dependencies = possible_artifact.dependencies

data/lib/solve/solver/constraint_row.rb

@@ -1,7 +1,7 @@
 module Solve
   class Solver
-    # @author Andrew Garson <andrew.garson@gmail.com>
-    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @author Andrew Garson <agarson@riotgames.com>
+    # @author Jamie Winsor <reset@riotgames.com>
     class ConstraintRow
       extend Forwardable
 

data/lib/solve/solver/constraint_table.rb

@@ -1,7 +1,7 @@
 module Solve
   class Solver
-    # @author Andrew Garson <andrew.garson@gmail.com>
-    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @author Andrew Garson <agarson@riotgames.com>
+    # @author Jamie Winsor <reset@riotgames.com>
     class ConstraintTable
       attr_reader :rows
 

data/lib/solve/solver/variable_row.rb

@@ -1,7 +1,7 @@
 module Solve
   class Solver
-    # @author Andrew Garson <andrew.garson@gmail.com>
-    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @author Andrew Garson <agarson@riotgames.com>
+    # @author Jamie Winsor <reset@riotgames.com>
     class VariableRow
       attr_reader :artifact
       attr_reader :value

data/lib/solve/solver/variable_table.rb

@@ -1,7 +1,7 @@
 module Solve
   class Solver
-    # @author Andrew Garson <andrew.garson@gmail.com>
-    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @author Andrew Garson <agarson@riotgames.com>
+    # @author Jamie Winsor <reset@riotgames.com>
     class VariableTable
       attr_reader :rows
 

data/lib/solve/version.rb

@@ -1,5 +1,5 @@
 module Solve
-  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @author Jamie Winsor <reset@riotgames.com>
   # @author Thibaud Guillaume-Gentil <thibaud@thibaud.me>
   class Version
     class << self
@@ -57,9 +57,11 @@ module Solve
         @major, @minor, @patch, @pre_release, @build = self.class.split(args.first.to_s)
       end
 
-      @major ||= 0
-      @minor ||= 0
-      @patch ||= 0
+      @major       ||= 0
+      @minor       ||= 0
+      @patch       ||= 0
+      @pre_release ||= nil
+      @build       ||= nil
     end
 
     # @param [Solve::Version] other
@@ -89,6 +91,10 @@ module Solve
       end
     end
 
+    def pre_release?
+      !!pre_release
+    end
+
     # @return [Integer]
     def pre_release_and_build_presence_score
       pre_release ? 0 : (build.nil? ? 1 : 2)

data/solve.gemspec

@@ -3,10 +3,10 @@ require File.expand_path('../lib/solve/gem_version', __FILE__)
 
 Gem::Specification.new do |s|
   s.authors               = ["Jamie Winsor", "Andrew Garson", "Thibaud Guillaume-Gentil"]
-  s.email                 = ["jamie@vialstudios.com", "andrew.garson@gmail.com", "thibaud@thibaud.me"]
+  s.email                 = ["reset@riotgames.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/reset/solve"
+  s.homepage              = "https://github.com/RiotGames/solve"
   s.license               = "Apache 2.0"
 
   s.files                 = `git ls-files`.split($\)

data/spec/unit/solve/constraint_spec.rb

@@ -49,49 +49,205 @@ describe Solve::Constraint do
         end
       end
 
-      context "given a nil value" do
-        it "raises an InvalidConstraintFormat error" do
-          lambda {
-            subject.new(nil)
-          }.should raise_error(Solve::Errors::InvalidConstraintFormat)
+      context "given a constraint that does not include a minor version" do
+        it "has a nil value for minor" do
+          subject.new(">= 1").minor.should be_nil
         end
       end
 
-      context "given a string containing only a major and minor version" do
+      context "given a constraint that does not include a patch version" do
         it "has a nil value for patch" do
           subject.new("~> 1.2").patch.should be_nil
         end
       end
+
+      context "given a constraint that does not include a build version" do
+        it "has a nil value for build" do
+          subject.new(">= 1.2.3-alpha").build.should be_nil
+        end
+      end
+
+      context "given a constraint that does not include a pre release version" do
+        it "has a nil value for pre release" do
+          subject.new(">= 1.2.3+build").pre_release.should be_nil
+        end
+      end
     end
 
     describe "::split" do
-      it "returns an array containing two items" do
-        subject.split(valid_string).should have(2).items
+      let(:constraint_string) { nil }
+
+      subject { described_class.split(constraint_string) }
+
+      context "given a constraint containing the elements (operator, major, minor, patch, pre_release, build)" do
+        let(:constraint_string) { ">= 1.2.3-alpha+build" }
+
+        it "returns an array with the constraint operator at index 0" do
+          subject[0].should eql(">=")
+        end
+
+        it "returns an array with the major version in index 1" do
+          subject[1].should eql(1)
+        end
+
+        it "returns an array with the minor version at index 2" do
+          subject[2].should eql(2)
+        end
+
+        it "returns an array with the patch version at index 3" do
+          subject[3].should eql(3)
+        end
+
+        it "returns an array with the pre release version at index 4" do
+          subject[4].should eql("alpha")
+        end
+
+        it "returns an array with the build version at index 5" do
+          subject[5].should eql("build")
+        end
+      end
+
+      context "given a constraint containing the elements (operator, major, minor, patch, pre_release)" do
+        let(:constraint_string) { ">= 1.2.3-alpha" }
+
+        it "returns an array with the constraint operator at index 0" do
+          subject[0].should eql(">=")
+        end
+
+        it "returns an array with the major version in index 1" do
+          subject[1].should eql(1)
+        end
+
+        it "returns an array with the minor version at index 2" do
+          subject[2].should eql(2)
+        end
+
+        it "returns an array with the patch version at index 3" do
+          subject[3].should eql(3)
+        end
+
+        it "returns an array with the pre release version at index 4" do
+          subject[4].should eql("alpha")
+        end
+
+        it "returns an array with a nil value at index 5" do
+          subject[5].should be_nil
+        end
+      end
+
+      context "given a constraint containing the elements (operator, major, minor, patch)" do
+        let(:constraint_string) { ">= 1.2.3" }
+
+        it "returns an array with the constraint operator at index 0" do
+          subject[0].should eql(">=")
+        end
+
+        it "returns an array with the major version in index 1" do
+          subject[1].should eql(1)
+        end
+
+        it "returns an array with the minor version at index 2" do
+          subject[2].should eql(2)
+        end
+
+        it "returns an array with the patch version at index 3" do
+          subject[3].should eql(3)
+        end
+
+        it "returns an array with a nil value at index 4" do
+          subject[4].should be_nil
+        end
+
+        it "returns an array with a nil value at index 5" do
+          subject[5].should be_nil
+        end
       end
 
-      it "returns the operator at index 0" do
-        subject.split(valid_string)[0].should eql(">=")
+      context "given a constraint containing the elements (operator, major, minor)" do
+        let(:constraint_string) { ">= 1.2" }
+
+        it "returns an array with the constraint operator at index 0" do
+          subject[0].should eql(">=")
+        end
+
+        it "returns an array with the major version in index 1" do
+          subject[1].should eql(1)
+        end
+
+        it "returns an array with the minor version at index 2" do
+          subject[2].should eql(2)
+        end
+
+        it "returns an array with a nil value at index 3" do
+          subject[3].should be_nil
+        end
+
+        it "returns an array with a nil value at index 4" do
+          subject[4].should be_nil
+        end
+
+        it "returns an array with a nil value at index 5" do
+          subject[5].should be_nil
+        end
+      end
+
+      context "given a constraint containing the elements (operator, major)" do
+        let(:constraint_string) { ">= 1" }
+
+        it "returns an array with the constraint operator at index 0" do
+          subject[0].should eql(">=")
+        end
+
+        it "returns an array with the major version in index 1" do
+          subject[1].should eql(1)
+        end
+
+        it "returns an array with a nil value at index 2" do
+          subject[2].should be_nil
+        end
+
+        it "returns an array with a nil value at index 3" do
+          subject[3].should be_nil
+        end
+
+        it "returns an array with a nil value at index 4" do
+          subject[4].should be_nil
+        end
+
+        it "returns an array with a nil value at index 5" do
+          subject[5].should be_nil
+        end
       end
 
-      it "returns the version string at index 1" do
-        subject.split(valid_string)[1].should eql("0.0.0")
+      context "given a constraint which is missing an operator" do
+        let(:constraint_string) { "1.2.3" }
+
+        it "returns an equality operator at index 0" do
+          subject[0].should eql("=")
+        end
       end
 
       context "given a string that does not match the Constraint REGEXP" do
-        it "returns nil" do
-          subject.split(invalid_string).should be_nil
+        let(:constraint_string) { "x23u7089213.*" }
+
+        it "raises an InvalidConstraintFormat error" do
+          expect {
+            subject.split(invalid_string)
+          }.to raise_error(Solve::Errors::InvalidConstraintFormat)
         end
       end
 
       context "given a string that does not contain an operator" do
+        let(:constraint_string) { "1.2.3" }
+
         it "returns a constraint constraint with a default operator (=)" do
-          subject.split("1.0.0")[0].should eql("=")
+          subject[0].should eql("=")
         end
       end
     end
   end
 
-  describe "#satisfies?", :focus do
+  describe "#satisfies?" do
     subject { Solve::Constraint.new("= 1.0.0") }
 
     it { should satisfies("1.0.0") }
@@ -100,6 +256,22 @@ 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") }
+
+      it "is satisfied by pre-release versions" do
+        should satisfies("1.2.3-beta")
+      end
+    end
+
+    context "when the constraint does not contain a pre-release value" do
+      subject { Solve::Constraint.new(">= 1.2.3") }
+
+      it "is not satisfied by pre-release versions" do
+        should_not satisfies("1.2.3-beta")
+      end
+    end
+
     context "strictly greater than (>)" do
       subject { Solve::Constraint.new("> 1.0.0-alpha") }
 
@@ -139,7 +311,7 @@ describe Solve::Constraint do
       subject { Solve::Constraint.new("<= 1.0.0") }
 
       it { should satisfies("0.9.9+build") }
-      it { should satisfies("1.0.0-alpha") }
+      it { should_not 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") }
@@ -156,16 +328,18 @@ describe Solve::Constraint do
           it { should satisfies("1.2.0") }
           it { should satisfies("1.2.3") }
           it { should satisfies("1.2.3+build") }
+          it { should satisfies("1.3") }
+          it { should satisfies("1.3.0") }
           it { should_not satisfies("2.0.0-0") }
           it { should_not satisfies("2.0.0") }
         end
 
-        context "when the last value in the constraint is for minor" do
-          subject { Solve::Constraint.new("#{operator} 1.2.3") }
+        context "when the last value in the constraint is for patch" do
+          subject { Solve::Constraint.new("#{operator} 1.2.0") }
 
           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.2") }
           it { should satisfies("1.2.3") }
           it { should satisfies("1.2.5+build") }
           it { should_not satisfies("1.3.0-0") }

data/spec/unit/solve/version_spec.rb

@@ -282,6 +282,18 @@ describe Solve::Version do
     end
   end
 
+  describe "#pre_release?" do
+    context "when a pre-release value is set" do
+      subject { described_class.new("1.2.3-alpha").pre_release? }
+      it { should be_true }
+    end
+
+    context "when no pre-release value is set" do
+      subject { described_class.new("1.2.3").pre_release? }
+      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.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -31,15 +31,15 @@ dependencies:
         version: '0'
 description: A Ruby version constraint solver
 email:
-- jamie@vialstudios.com
-- andrew.garson@gmail.com
+- reset@riotgames.com
+- agarson@riotgames.com
 - thibaud@thibaud.me
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rbenv-version
+- .ruby-version
 - .travis.yml
 - Gemfile
 - Guardfile
@@ -73,7 +73,7 @@ files:
 - spec/unit/solve/solver_spec.rb
 - spec/unit/solve/version_spec.rb
 - spec/unit/solve_spec.rb
-homepage: https://github.com/reset/solve
+homepage: https://github.com/RiotGames/solve
 licenses:
 - Apache 2.0
 post_install_message: 
@@ -94,10 +94,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3780464592715279943
+      hash: -856939986988863331
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Ruby version constraint solver implementing Semantic Versioning 2.0.0-rc.1

data/.rbenv-version

@@ -1,2 +0,0 @@
-1.9.3-p327
-