rake_roll 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 293c0ecc0fbd7214eecc2109ae2154935265fe37
-  data.tar.gz: 4710b2e781c343490c15e0ac8da4032799b4ad83
+  metadata.gz: 7ff175f270349cfb4e39bca2c0f050f21dcb0238
+  data.tar.gz: d4cebefaf4f2b4a361487bcd2fc5eef6d33f6b43
 SHA512:
-  metadata.gz: bda6a79d4729c89a7ed438001a196916bebb627ad4a3534d98712ca938893ab9578e7833ef3d9eee7bf5e6c17dad027dfa63e3cb99790e05de8ff1f2549bbef3
-  data.tar.gz: c509a36586eff0c460f42d7fc32de80bb8d5a965b92581943928631f4546f7c33934bcec1692259e6e2cfcf0aa18a52152b7f8ca2fce69227034465c79a92021
+  metadata.gz: f1546eda90ea94958f5d548e8c94225a91df3a92f9d0670785392bf618615173e17e64350bdaf76df4f7a962f75490e1f1c2e8389998e6ef274bc90ea0821a2c
+  data.tar.gz: 558c71ca6e5a01ee71dff45f7673ca46f34a6c2c799864fa7ae5a13babb5af79ce0fc6fe3cca84c7eca52a96d8233117c1f03d803b914ba4486c4ffb8267294d

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/rake_roll/tasks/roll.rake

@@ -22,7 +22,7 @@ namespace :roll do
   task :bump => :environment do
     roller = RakeRoll::Roller.new
     version = RakeRoll::Versioning.new(roller.current_version)
-    if version
+    if version.current_version
       roller.new_version = version.bump
       do_your_thing(roller, version, "bump")
     else
@@ -34,7 +34,7 @@ namespace :roll do
   task :major => :environment do
     roller = RakeRoll::Roller.new
     version = RakeRoll::Versioning.new(roller.current_version)
-    if version
+    if version.current_version
       roller.new_version = version.major
       do_your_thing(roller, version, "major")
     else
@@ -46,7 +46,7 @@ namespace :roll do
   task :minor => :environment do
     roller = RakeRoll::Roller.new
     version = RakeRoll::Versioning.new(roller.current_version)
-    if version
+    if version.current_version
       roller.new_version = version.minor
       do_your_thing(roller, version, "minor")
     else
@@ -58,7 +58,7 @@ namespace :roll do
   task :pre => :environment do
     roller = RakeRoll::Roller.new
     version = RakeRoll::Versioning.new(roller.current_version)
-    if version
+    if version.current_version
       roller.new_version = version.pre
       do_your_thing(roller, version, "pre")
     else

data/lib/rake_roll/versioning.rb

@@ -10,7 +10,7 @@ module RakeRoll
 
     def bump
       if nums = current_version.dup
-        last_number = nums[-1].scan(/\d/).first.to_i
+        last_number = nums[-1].scan(/\d+/).first.to_i
         last_number = last_number + 1
         nums[-1] = last_number
         nums.join(".")
@@ -32,7 +32,7 @@ module RakeRoll
 
     def minor
       if nums = current_version.dup
-        minor_number = nums[1].scan(/\d/).first.to_i
+        minor_number = nums[1].scan(/\d+/).first.to_i
         minor_number = minor_number + 1
         nums[1] = minor_number.to_s
         nums.last.gsub!(/\D/, "")
@@ -43,7 +43,7 @@ module RakeRoll
 
     def major
       if nums = current_version.dup
-        major_number = nums[0].scan(/\d/).first.to_i
+        major_number = nums[0].scan(/\d+/).first.to_i
         major_number = major_number + 1
         nums[0] = major_number
         nums[-1] = "0"

data/spec/lib/rake_roll/versioning_spec.rb

@@ -82,7 +82,27 @@ describe RakeRoll::Versioning do
     it "#pre should => 1.5.5a to 1.5.5b" do
       expect(RakeRoll::Versioning.new("1.5.5a").pre).to eq("1.5.5b")
     end
-    
+
+    it "#bump should => 1.10 to 1.11" do
+      expect(RakeRoll::Versioning.new("1.10").bump).to eq("1.11")
+    end
+
+    it "#bump should => 1.1.10 to 1.1.11" do
+      expect(RakeRoll::Versioning.new("1.1.10").bump).to eq("1.1.11")
+    end
+
+    it "#minor should => 1.10.1 to 1.11.11" do
+      expect(RakeRoll::Versioning.new("1.10.1").minor).to eq("1.11.0")
+    end
+
+    it "#major should => 10.1.0 to 11.0.0" do
+      expect(RakeRoll::Versioning.new("10.1.0").major).to eq("11.0.0")
+    end
+
+    it "#major should => 10.1 to 11.0" do
+      expect(RakeRoll::Versioning.new("10.1").major).to eq("11.0")
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_roll
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Stuart Hanscombe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler