rake_roll 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09ef35c3d40587b26e5bdfbff1e5fa8e137c83cf
-  data.tar.gz: 31482e4674fd576b4b0a8921ec0dc17c5bd1a975
+  metadata.gz: 293c0ecc0fbd7214eecc2109ae2154935265fe37
+  data.tar.gz: 4710b2e781c343490c15e0ac8da4032799b4ad83
 SHA512:
-  metadata.gz: 48a993b6193748b25a0b0a5d21efe18f48a84d528d0d6e576362a3c40c4aec7d539afa45990bb999b2cf44432ea0aa85c99a1601e152ba6bc7f60517cffed00a
-  data.tar.gz: 96cbc682bbd4bc26c883bcafac62e66767f44bf5d29154831c4a43aaa7de33dfd24576d10721e4c1a4dac412a3444918b830e9c1f296b5205af209e6315d899c
+  metadata.gz: bda6a79d4729c89a7ed438001a196916bebb627ad4a3534d98712ca938893ab9578e7833ef3d9eee7bf5e6c17dad027dfa63e3cb99790e05de8ff1f2549bbef3
+  data.tar.gz: c509a36586eff0c460f42d7fc32de80bb8d5a965b92581943928631f4546f7c33934bcec1692259e6e2cfcf0aa18a52152b7f8ca2fce69227034465c79a92021

data/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem "pry"
+gem "rspec"

data/README.md

@@ -20,11 +20,11 @@ Or install it yourself as:
 
   rake roll
 
-  rake roll                        # shows version and all options
-  rake roll:pre                    # Bump to 0.1.0a
-  rake roll:bump                   # Bump to 0.1.1
-  rake roll:major                  # Bump to 1.0.0
-  rake roll:minor                  # Bump to 0.2.0
+    rake roll                        # shows version and all options
+    rake roll:pre                    # Bump to 0.1.0a
+    rake roll:bump                   # Bump to 0.1.1
+    rake roll:major                  # Bump to 1.0.0
+    rake roll:minor                  # Bump to 0.2.0
 
   The above will do a dry run, and show the changelog updates in the
   terminal window
@@ -36,14 +36,6 @@ Or install it yourself as:
 
     rake roll:bump PUSH=true
 
-  INITIAL SETUP
-
-    Create a VERSION file with the tag 0.0.1 (and git tag 0.0.1) if a
-    version file does not already exist, it will then create CHANGELOG
-    file if one does not already exist, use:
-
-    rake roll:build
-
   CHANGELOG
 
     Only commits starting with * will be added to the changelog, example:
@@ -52,6 +44,11 @@ Or install it yourself as:
     * Feature: #1111 Adding rake_roll to the Gemfile
     * HotFix: Don't Delete current users
 
+  FILES
+
+    rake roll will create a VERSION and CHANGELOG file on the root of
+    your project if they do not already exist.
+
   TODO
 
     Write tests

data/VERSION

@@ -0,0 +1 @@
+0.1.3

data/lib/rake_roll/git_commands.rb

@@ -0,0 +1,41 @@
+module RakeRoll
+
+  module GitCommands
+
+    def get_current_branch
+      #run as a direct command to retrieve the output
+      `git rev-parse --abbrev-ref HEAD`.chomp
+    end
+
+    def git_push_branch(branch)
+      puts "Pushing to origin #{branch}"
+      system("git push origin #{branch}")
+    end
+
+    def git_push_tags
+      puts "Pushing tags"
+      system("git push --tags")
+    end
+
+    def git_log(log_type)
+      #run as a direct command to retrieve the output
+      `git log #{log_type}`
+    end
+
+    def git_add(file)
+      puts "Adding #{file}"
+      system("git add #{file}")
+    end
+
+    def git_tag(tag)
+      puts "Creating tag #{new_version}"
+      system("git tag #{tag}")
+    end
+
+    def git_commit(message)
+      puts "Commiting: #{message}"
+      system("git commit -a -m '#{message}'")
+    end
+
+  end
+end

data/lib/rake_roll/roller.rb

@@ -1,6 +1,8 @@
 module RakeRoll
   class Roller
 
+    include GitCommands
+
     attr_reader :current_version, :current_branch
     attr_accessor :new_version
 
@@ -20,7 +22,7 @@ module RakeRoll
     end
 
     def current_branch
-      @current_branch ||= `git rev-parse --abbrev-ref HEAD`.chomp
+      @current_branch ||= get_current_branch
     end
 
     def new_version
@@ -31,9 +33,7 @@ module RakeRoll
       puts "----------------------"
       puts "CHANGELOG"
       puts parsed_git_log
-      if parsed_git_log.empty?
-        puts "WARNING: no new CHANGELOG commits added"
-      end
+      puts "WARNING: no new CHANGELOG commits added" if parsed_git_log.empty?
       puts "----------------------"
     end
 
@@ -50,25 +50,26 @@ module RakeRoll
     end
 
     def parsed_git_log(tag=nil)
-      git_log(tag).split("\n").select{|line| line[0] == "*"}
+      tag ||= current_branch
+      log_type = "#{current_version}..#{tag} --pretty=format:'%s'"
+      git_log(log_type).split("\n").select{|line| line[0] == "*"}
     end
 
     def push
       puts "Rake Rolling..."
-      if parsed_git_log.empty?
-        puts "WARNING: no new CHANGELOG commits added"
-      end
-      update_version
+      puts "WARNING: no new CHANGELOG commits added" if parsed_git_log.empty?
+      update_version_file
       update_changelog
-      commit_changes
-      update_tag
-      push_tag_and_branch
+      git_commit("Updating Version to #{new_version}")
+      git_tag(new_version)
+      git_push_branch(@current_branch)
+      git_push_tags
       puts RakeRoll::Never.new.line
     end
 
     private
 
-    def update_version
+    def update_version_file
       puts "updating version to #{new_version}"
       File.open("VERSION", "w") {|f| f.write(new_version) }
     end
@@ -90,38 +91,13 @@ module RakeRoll
       system("mv changelog.tmp CHANGELOG")
     end
 
-    def commit_changes
-      puts "committing changes"
-      system("git commit -a -m 'Updating Version to #{new_version}'")
-    end
-
-    def update_tag
-      puts "updating tag to #{new_version}"
-      system("git tag #{new_version}")
-    end
-
-    def push_tag_and_branch
-      puts "pushing tag and branch"
-      system("git push origin #{@current_branch}")
-      system("git push --tags")
-    end
-
-    def format
-      #"--pretty=format:'%s | %an | %h'"
-      "--pretty=format:'%s'"
-    end
-
-    def git_log(tag=nil)
-      tag ||= current_branch
-      `git log #{current_version}..#{tag} #{format}`
-    end
-
     def build_version
       File.open("VERSION", "w") {|f| f.write("0.0.1") }
       File.open("CHANGELOG", "w") {|f| f.write("0.0.1") } unless File.exist?("CHANGELOG")
-      system('git add VERSION CHANGELOG')
-      system('git commit -a -m "Creating Version and Changelog version 0.0.1"')
-      system('git tag 0.0.1')
+      git_add("VERSION")
+      git_add("CHANGELOG")
+      git_commit("Creating Version and Changelog version 0.0.1")
+      git_tag("0.0.1")
     end
 
   end

data/lib/rake_roll/tasks/roll.rake

@@ -1,6 +1,6 @@
 task :roll => :environment do
   roller = RakeRoll::Roller.new
-  version = RakeRoll::Version.new(roller.current_version)
+  version = RakeRoll::Versioning.new(roller.current_version)
   puts "----------------------"
   puts "rake roll options are:"
   puts "----------------------"
@@ -18,10 +18,10 @@ end
 desc "bump the version, update the tag and changelog"
 namespace :roll do
 
-  desc "#{RakeRoll::Roller.new.current_version} => #{RakeRoll::Version.new(RakeRoll::Roller.new.current_version).bump}"
+  desc "#{RakeRoll::Roller.new.current_version} => #{RakeRoll::Versioning.new(RakeRoll::Roller.new.current_version).bump}"
   task :bump => :environment do
     roller = RakeRoll::Roller.new
-    version = RakeRoll::Version.new(roller.current_version)
+    version = RakeRoll::Versioning.new(roller.current_version)
     if version
       roller.new_version = version.bump
       do_your_thing(roller, version, "bump")
@@ -30,10 +30,10 @@ namespace :roll do
     end
   end
 
-  desc "#{RakeRoll::Roller.new.current_version} => #{RakeRoll::Version.new(RakeRoll::Roller.new.current_version).major}"
+  desc "#{RakeRoll::Roller.new.current_version} => #{RakeRoll::Versioning.new(RakeRoll::Roller.new.current_version).major}"
   task :major => :environment do
     roller = RakeRoll::Roller.new
-    version = RakeRoll::Version.new(roller.current_version)
+    version = RakeRoll::Versioning.new(roller.current_version)
     if version
       roller.new_version = version.major
       do_your_thing(roller, version, "major")
@@ -42,10 +42,10 @@ namespace :roll do
     end
   end
 
-  desc "#{RakeRoll::Roller.new.current_version} => #{RakeRoll::Version.new(RakeRoll::Roller.new.current_version).minor}"
+  desc "#{RakeRoll::Roller.new.current_version} => #{RakeRoll::Versioning.new(RakeRoll::Roller.new.current_version).minor}"
   task :minor => :environment do
     roller = RakeRoll::Roller.new
-    version = RakeRoll::Version.new(roller.current_version)
+    version = RakeRoll::Versioning.new(roller.current_version)
     if version
       roller.new_version = version.minor
       do_your_thing(roller, version, "minor")
@@ -54,10 +54,10 @@ namespace :roll do
     end
   end
 
-  desc "#{RakeRoll::Roller.new.current_version} => #{RakeRoll::Version.new(RakeRoll::Roller.new.current_version).pre}"
+  desc "#{RakeRoll::Roller.new.current_version} => #{RakeRoll::Versioning.new(RakeRoll::Roller.new.current_version).pre}"
   task :pre => :environment do
     roller = RakeRoll::Roller.new
-    version = RakeRoll::Version.new(roller.current_version)
+    version = RakeRoll::Versioning.new(roller.current_version)
     if version
       roller.new_version = version.pre
       do_your_thing(roller, version, "pre")

data/lib/rake_roll/version.rb

@@ -1,61 +1,5 @@
 module RakeRoll
 
-  class Version
-
-    attr_reader :current_version
-
-    def initialize(current_version)
-      @current_version = check_current_version(current_version)
-    end
-
-    def bump
-      nums = current_version.split(".")
-      last_number = nums[-1].scan(/\d/).first.to_i
-      last_number = last_number + 1
-      nums[-1] = last_number
-      nums.join(".")
-    end
-
-    def pre
-      nums = current_version.split(".")
-      pre_letter = nums[-1].scan(/\D/).first
-      if pre_letter
-        next_letter = pre_letter.next
-        nums[-1].gsub!(pre_letter, next_letter)
-      else
-        nums[-1] = nums[-1] + "a"
-      end
-      nums.join(".")
-    end
-
-    def minor
-      nums = current_version.split(".")
-      minor_number = nums[1].scan(/\d/).first.to_i
-      minor_number = minor_number + 1
-      nums[1] = minor_number.to_s
-      nums.last.gsub!(/\D/, "")
-      nums[-1] = "0" if nums.length == 3
-      nums.join(".")
-    end
-
-    def major
-      nums = current_version.split(".")
-      major_number = nums[0].scan(/\d/).first.to_i
-      major_number = major_number + 1
-      nums[0] = major_number
-      nums[-1] = "0"
-      nums[-2] = "0" if nums.length == 3
-      nums.join(".")
-    end
-
-    private
-
-    def check_current_version(current)
-      splits = current.split(".")
-      return false if splits.size < 2 || splits.size > 3
-      current
-    end
-
-  end
+  VERSION = File.read(File.expand_path("../../../VERSION", __FILE__)).chomp
 
 end

data/lib/rake_roll/versioning.rb

@@ -0,0 +1,64 @@
+module RakeRoll
+
+  class Versioning
+
+    attr_reader :current_version
+
+    def initialize(current_version)
+      @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
+        if pre_letter
+          next_letter = pre_letter.next
+          nums[-1].gsub!(pre_letter, next_letter)
+        else
+          nums[-1] = nums[-1] + "a"
+        end
+        nums.join(".")
+      end
+    end
+
+    def minor
+      if nums = current_version.dup
+        minor_number = nums[1].scan(/\d/).first.to_i
+        minor_number = minor_number + 1
+        nums[1] = minor_number.to_s
+        nums.last.gsub!(/\D/, "")
+        nums[-1] = "0" if nums.length == 3
+        nums.join(".")
+      end
+    end
+
+    def major
+      if nums = current_version.dup
+        major_number = nums[0].scan(/\d/).first.to_i
+        major_number = major_number + 1
+        nums[0] = major_number
+        nums[-1] = "0"
+        nums[-2] = "0" if nums.length == 3
+        nums.join(".")
+      end
+    end
+
+    private
+
+    def validate_current_version(current)
+      splits = current.split(".")
+      splits.size < 2 || splits.size > 3 ? false : splits
+    end
+
+  end
+
+end

data/lib/rake_roll.rb

@@ -1,6 +1,8 @@
 require "rake"
 require "rake_roll/version"
+require "rake_roll/versioning"
 require "rake_roll/never"
+require "rake_roll/git_commands"
 require "rake_roll/roller"
 import File.join(File.dirname(__FILE__), "rake_roll/tasks/roll.rake")
 

data/rake_roll.gemspec

@@ -1,10 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'rake_roll/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "rake_roll"
-  spec.version       = "0.1.2"
+  spec.version       = RakeRoll::VERSION
   spec.authors       = ["Stuart Hanscombe"]
   spec.email         = ["hanscs1969@yahoo.co.uk"]
   spec.summary       = "RakeRoll: Git version tagger and changelog creator"
@@ -19,5 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 0"
+  spec.add_development_dependency "rspec", "~> 0"
   spec.add_development_dependency "pry", "~> 0"
 end

data/spec/lib/rake_roll/roller_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+describe RakeRoll::Roller do
+
+  let(:roller) { RakeRoll::Roller.new }
+
+  it "Should check the current version" do
+    expect(roller.current_version).to eq(RakeRoll::VERSION)
+  end
+
+  it "Should accept a new version" 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 
+
+  it "Should Roll out the changes" do
+    #TODO Mock all those system calls
+  end
+
+end

data/spec/lib/rake_roll/versioning_spec.rb

@@ -0,0 +1,88 @@
+describe RakeRoll::Versioning do
+
+
+  it "should validate the version" do
+    expect(RakeRoll::Versioning.new("1").current_version).to eq(false)
+  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")
+    end
+
+    it "#pre should => 1.0.0 to 1.0.0a" do
+      expect(version.pre).to eq("1.0.0a")
+    end
+
+    it "#minor should => 1.0.0 to 1.1.0" do
+      expect(version.minor).to eq("1.1.0")
+    end
+
+    it "#major should => 1.0.0 to 2.0.0" do
+      expect(version.major).to eq("2.0.0")
+    end
+
+  end
+
+  context "Dealing with 2 levels" do
+
+    let(:version) { RakeRoll::Versioning.new("1.0") }
+
+    it "#bump should => 1.0 to 1.1" do
+      expect(version.bump).to eq("1.1")
+    end
+
+    it "#pre should => 1.0 to 1.0a" do
+      expect(version.pre).to eq("1.0a")
+    end
+
+    it "#minor should => 1.0 to 1.1" do
+      expect(version.minor).to eq("1.1")
+    end
+
+    it "#major should => 1.0 to 2.0" do
+      expect(version.major).to eq("2.0")
+    end
+
+  end
+
+  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")
+    end
+
+    it "#major should => 1.5a to 2.0" do
+      expect(RakeRoll::Versioning.new("1.5a").major).to eq("2.0")
+    end
+
+    it "#minor should => 1.9a to 1.10" do
+      expect(RakeRoll::Versioning.new("1.9a").minor).to eq("1.10")
+    end
+
+    it "#pre should => 1.5a to 1.5b" 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")
+    end
+
+    it "#major should => 1.5.5a to 2.0.0" do
+      expect(RakeRoll::Versioning.new("1.5.5a").major).to eq("2.0.0")
+    end
+
+    it "#minor should => 1.5.5a to 1.6.0" do
+      expect(RakeRoll::Versioning.new("1.5.5a").minor).to eq("1.6.0")
+    end
+
+    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
+    
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require "rspec"
+require_relative "../lib/rake_roll"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_roll
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Stuart Hanscombe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -62,18 +76,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- VERSION
 - lib/rake_roll.rb
+- lib/rake_roll/git_commands.rb
 - lib/rake_roll/never.rb
 - lib/rake_roll/roller.rb
 - lib/rake_roll/tasks/roll.rake
 - lib/rake_roll/version.rb
+- lib/rake_roll/versioning.rb
 - rake_roll.gemspec
 - spec/lib/rake_roll/roller_spec.rb
-- spec/lib/rake_roll/version_spec.rb
+- spec/lib/rake_roll/versioning_spec.rb
 - spec/spec_helper.rb
 homepage: http://www.thelazycamel.com
 licenses:
@@ -101,5 +119,5 @@ specification_version: 4
 summary: 'RakeRoll: Git version tagger and changelog creator'
 test_files:
 - spec/lib/rake_roll/roller_spec.rb
-- spec/lib/rake_roll/version_spec.rb
+- spec/lib/rake_roll/versioning_spec.rb
 - spec/spec_helper.rb