solve 0.4.1 → 0.4.2

data/.rbenv-version

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

data/lib/solve.rb

@@ -21,12 +21,12 @@ module Solve
     #
     # @param [Solve::Graph] graph
     # @param [Array<Solve::Demand>, Array<String, String>] demands
-    # @param [#say, nil] ui
+    # @param [#say, nil] ui (nil)
     #
     # @raise [NoSolutionError]
     #
     # @return [Hash]
-    def it!(graph, demands, ui=nil)
+    def it!(graph, demands, ui = nil)
       Solver.new(graph, demands, ui).resolve
     end
   end

data/lib/solve/constraint.rb

@@ -119,8 +119,12 @@ module Solve
     attr_reader :pre_release
     attr_reader :build
 
-    # @param [#to_s] constraint
-    def initialize(constraint = ">= 0.0.0")
+    # @param [#to_s] constraint (">= 0.0.0")
+    def initialize(constraint = nil)
+      if constraint.nil? || constraint.empty?
+        constraint = ">= 0.0.0"
+      end
+
       @operator, ver_str = self.class.split(constraint)
       if @operator.nil? || ver_str.nil?
         raise Errors::InvalidConstraintFormat.new(constraint)

data/lib/solve/gem_version.rb

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

data/lib/solve/version.rb

@@ -12,12 +12,12 @@ module Solve
         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+)$/
+        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+)\.(\d+)?$/
+          [ $1.to_i, $2.to_i, 0 ]
         when /^(\d+)$/
-          [ $1.to_i, nil, nil ]
+          [ $1.to_i, 0, 0 ]
         else
           raise Errors::InvalidVersionFormat.new(version_string)
         end

data/spec/unit/solve/constraint_spec.rb

@@ -33,6 +33,14 @@ describe Solve::Constraint do
         result.version.to_s.should eql("0.0.0")
       end
 
+      it "sets a default of '>= 0.0.0' if given a nil value" do
+        subject.new(nil).to_s.should eql(">= 0.0.0")
+      end
+
+      it "sets a default of '>= 0.0.0' if given a blank string" do
+        subject.new('').to_s.should eql(">= 0.0.0")
+      end
+
       context "given a string that does not match the Constraint REGEXP" do
         it "raises an InvalidConstraintFormat error" do
           lambda {

data/spec/unit/solve/version_spec.rb

@@ -246,8 +246,12 @@ describe Solve::Version do
           subject.split("1.2").should have(3).items
         end
 
-        it "returns nil as the third element" do
-          subject.split("1.2")[2].should be_nil
+        it "returns 0 as the third element" do
+          subject.split("1.2")[2].should eql(0)
+        end
+
+        it "converts the third element to 0 if it's nil or blank" do
+          subject.split("1.2.")[2].should eql(0)
         end
       end
 
@@ -256,12 +260,16 @@ describe Solve::Version do
           subject.split("1").should have(3).items
         end
 
-        it "returns nil as the second element" do
-          subject.split("1")[2].should be_nil
+        it "returns 0 as the second element" do
+          subject.split("1")[2].should eql(0)
+        end
+
+        it "returns 0 as the third element" do
+          subject.split("1")[2].should eql(0)
         end
 
-        it "returns nil as the third element" do
-          subject.split("1")[2].should be_nil
+        it "converts the second element to 0 if it's nil or blank" do
+          subject.split("1.")[1].should eql(0)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solve
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -94,10 +94,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3991493875393418852
+      hash: 3780464592715279943
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Ruby version constraint solver implementing Semantic Versioning 2.0.0-rc.1