rake_roll 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbe2dac908a11530fc05ae8d78ee4a0ffcba7b00
-  data.tar.gz: 9fd1bc7c3c680169418b6471974d8b6f69f16aca
+  metadata.gz: 345479e1a6c3cc305ce62dc49a65ab1c9b2b0736
+  data.tar.gz: 91aeed46d743af5e272ac20f8c52470e2286a66f
 SHA512:
-  metadata.gz: e867f8accd49a6a8332c636167f7e03cd87967e585ca7c4a8096c4828651750028fac44a5c789b3c0f51ecaf89b2c46bc43b3fbd13e09c7c0622a02476209995
-  data.tar.gz: f637475f0cdcb81217b9ca0ab4744f5bfa4b23a6d6130626e93090e52f7ecad61325a5d6deb543cb5fb8d6e5d45f9d59b6406c8da01fff69b965ea1271fc4311
+  metadata.gz: 34e62b98b966c67013689987482561f48e00b9d947d880c8f4e6b752dba2bb3e1a6a47c61eb4f966e4cde92d472ce5fb48511fc68d1ffab709284d3b52ed6997
+  data.tar.gz: 4a2b2bb0eae95807355d0d165628e11987a5c21f765181e0a485b37c83d48f14064379dbe86ca470405a92a8017cd590d790a261adf2203f94d06b107bf24492

data/VERSION

@@ -1 +1 @@
-0.4.0
+1.0.0

data/lib/rake_roll/roller.rb

@@ -39,7 +39,12 @@ module RakeRoll
 
     def print_run_for_real_text(type)
       log_to_s
-      puts "=> rake roll:#{type} PUSH=true (to run for real)"
+      puts "To run for real:"
+      if type == "bump"
+        puts "$> BUMP=#{new_version} PUSH=true rake roll:#{type}"
+      else
+        puts "$> PUSH=true rake roll:#{type}"
+      end
       puts "----------------------"
     end
 

data/lib/rake_roll/tasks/roll.rake

@@ -5,11 +5,12 @@ task :roll => :environment do
   version = RakeRoll::Versioning.new(roller.current_version)
   puts "rake roll options are:"
   puts "----------------------"
-  puts "rake roll:bump            #{roller.current_version} => #{version.bump}"
   puts "rake roll:pre             #{roller.current_version} => #{version.pre}"
+  puts "rake roll:revision        #{roller.current_version} => #{version.revision}"
   puts "rake roll:minor           #{roller.current_version} => #{version.minor}"
   puts "rake roll:major           #{roller.current_version} => #{version.major}"
-  puts "rake roll:test            #{roller.current_version} => #{version.test} witout tagging"
+  puts "rake roll:next            Writes latest commits to changelog without tagging or updating version"
+  puts "rake roll:bump            Pass bumped version in eg: BUMP=#{version.revision}"
   puts "----------------------"
   puts "Above will do a dry run, Run with PUSH=true to run for real"
   puts "----------------------"
@@ -20,13 +21,13 @@ end
 desc "bump the version, update the tag and changelog"
 namespace :roll do
 
-  desc "#{RakeRoll::Roller.new.current_version} => #{RakeRoll::Versioning.new(RakeRoll::Roller.new.current_version).bump}"
-  task :bump => :environment do
+  desc "#{RakeRoll::Roller.new.current_version} => #{RakeRoll::Versioning.new(RakeRoll::Roller.new.current_version).revision}"
+  task :revision => :environment do
     roller = RakeRoll::Roller.new
     version = RakeRoll::Versioning.new(roller.current_version)
     if version.current_version
-      roller.new_version = version.bump
-      do_your_thing(roller, version, "bump")
+      roller.new_version = version.revision
+      do_your_thing(roller, version, "revision")
     else
       puts "ERROR: Invalid Version Number #{roller.current_version}"
     end
@@ -68,26 +69,41 @@ namespace :roll do
     end
   end
 
-  desc "#{RakeRoll::Roller.new.current_version} => #{RakeRoll::Versioning.new(RakeRoll::Roller.new.current_version).test}"
-  task :test => :environment do
+  desc "#{RakeRoll::Roller.new.current_version} => Writes latest commits to changelog without tagging"
+  task :next => :environment do
     roller = RakeRoll::Roller.new
     version = RakeRoll::Versioning.new(roller.current_version)
     if version.current_version
-      roller.new_version = version.test
-      do_your_thing(roller, version, "test")
+      roller.new_version = version.next
+      do_your_thing(roller, version, "next")
     else
       puts "ERROR: Invalid Version Number #{roller.current_version}"
     end
   end
 
+  desc "#{RakeRoll::Roller.new.current_version} => Pass bumped version in eg: BUMP=1.2.3"
+  task :bump => :environment do
+    roller = RakeRoll::Roller.new
+    version = RakeRoll::Versioning.new(roller.current_version)
+    if new_version = ENV["BUMP"]
+      if version.current_version
+        roller.new_version = new_version
+        do_your_thing(roller, version, "bump")
+      else
+        puts "ERROR: Invalid Version Number #{roller.current_version}"
+      end
+    else
+      puts "You must supply a version number i.e. BUMP=#{version.revision} rake roll:bump"
+    end
+  end
 
 end
 
 def do_your_thing(roller, version, type)
-    roller.print_versions
-    if ENV["PUSH"]
-      roller.push
-    else
-      roller.print_run_for_real_text(type)
-    end
+  roller.print_versions
+  if ENV["PUSH"]
+    roller.push
+  else
+    roller.print_run_for_real_text(type)
+  end
 end

data/lib/rake_roll/versioning.rb

@@ -8,15 +8,6 @@ module RakeRoll
       @current_version = validate_current_version(current_version)
     end
 
-    def bump
-      if nums = current_version.dup
-        last_number = nums[-1].scan(/\d+/).first.to_i
-        last_number = last_number + 1
-        nums[-1] = last_number
-        nums.join(".")
-      end
-    end
-
     def pre
       if nums = current_version.dup
         pre_letter = nums[-1].scan(/\D/).first
@@ -30,6 +21,15 @@ module RakeRoll
       end
     end
 
+    def revision
+      if nums = current_version.dup
+        last_number = nums[-1].scan(/\d+/).first.to_i
+        last_number = last_number + 1
+        nums[-1] = last_number
+        nums.join(".")
+      end
+    end
+
     def minor
       if nums = current_version.dup
         minor_number = nums[1].scan(/\d+/).first.to_i
@@ -52,7 +52,7 @@ module RakeRoll
       end
     end
 
-    def test
+    def next
       'NEXT'
     end
 

data/rake_roll.gemspec

@@ -6,7 +6,7 @@ require 'rake_roll/version'
 Gem::Specification.new do |spec|
   spec.name          = "rake_roll"
   spec.version       = RakeRoll::VERSION
-  spec.authors       = ["Stuart Hanscombe"]
+  spec.authors       = ["Stuart Hanscombe", "Jose Fuentes"]
   spec.email         = ["hanscs1969@yahoo.co.uk"]
   spec.summary       = "RakeRoll: Git version tagger and changelog creator"
   spec.description   = "RakeRoll: Roll out your release versions with ease, RakeRoll will version and tag a release then create an updated changelog of the git commits (picking only those starting with a *)"

data/spec/lib/rake_roll/roller_spec.rb

@@ -12,7 +12,7 @@ describe RakeRoll::Roller do
     expect(roller.new_version).to eq(RakeRoll::VERSION)
     roller.new_version = "3.0.0"
     expect(roller.new_version).to eq("3.0.0")
-  end 
+  end
 
   it "Should Roll out the changes" do
     #TODO Mock all those system calls

data/spec/lib/rake_roll/versioning_spec.rb

@@ -3,14 +3,14 @@ describe RakeRoll::Versioning do
 
   it "should validate the version" do
     expect(RakeRoll::Versioning.new("1").current_version).to eq(false)
-  end 
+  end
 
   context "Dealing with 3 levels" do
 
     let(:version) { RakeRoll::Versioning.new("1.0.0") }
 
-    it "#bump should => 1.0.0 to 1.0.1" do
-      expect(version.bump).to eq("1.0.1")
+    it "#revision should => 1.0.0 to 1.0.1" do
+      expect(version.revision).to eq("1.0.1")
     end
 
     it "#pre should => 1.0.0 to 1.0.0a" do
@@ -31,8 +31,8 @@ describe RakeRoll::Versioning do
 
     let(:version) { RakeRoll::Versioning.new("1.0") }
 
-    it "#bump should => 1.0 to 1.1" do
-      expect(version.bump).to eq("1.1")
+    it "#revision should => 1.0 to 1.1" do
+      expect(version.revision).to eq("1.1")
     end
 
     it "#pre should => 1.0 to 1.0a" do
@@ -51,8 +51,8 @@ describe RakeRoll::Versioning do
 
   context "Other versioning cases" do
 
-    it "#bump should => 1.0a to 1.1" do
-      expect(RakeRoll::Versioning.new("1.0a").bump).to eq("1.1")
+    it "#revision should => 1.0a to 1.1" do
+      expect(RakeRoll::Versioning.new("1.0a").revision).to eq("1.1")
     end
 
     it "#major should => 1.5a to 2.0" do
@@ -67,8 +67,8 @@ describe RakeRoll::Versioning do
       expect(RakeRoll::Versioning.new("1.5a").pre).to eq("1.5b")
     end
 
-    it "#bump should => 1.0.0a to 1.0.1" do
-      expect(RakeRoll::Versioning.new("1.0.0a").bump).to eq("1.0.1")
+    it "#revision should => 1.0.0a to 1.0.1" do
+      expect(RakeRoll::Versioning.new("1.0.0a").revision).to eq("1.0.1")
     end
 
     it "#major should => 1.5.5a to 2.0.0" do
@@ -83,12 +83,12 @@ describe RakeRoll::Versioning 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")
+    it "#revision should => 1.10 to 1.11" do
+      expect(RakeRoll::Versioning.new("1.10").revision).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")
+    it "#revision should => 1.1.10 to 1.1.11" do
+      expect(RakeRoll::Versioning.new("1.1.10").revision).to eq("1.1.11")
     end
 
     it "#minor should => 1.10.1 to 1.11.11" do

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rake_roll
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Stuart Hanscombe
+- Jose Fuentes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler