Updated changes for the COULD HAVE and SHOULD HAVE

README.md

@@ -74,3 +74,14 @@ I have successfully done this on BitBucket using the "Jira Hooks for BitBucket"
 
 This RegEx should also be quite usable in other plugins or handwritten hooks as it does not require multiline or other switches to be supported.
 It allows the `+bump` message to appear anywhere in the commit message as long as it is not adjacent to other text. (i.e. `my+patch` and `+patching` will be rejected.
+
+### Developer guide
+
+#### How to test
+
+Simply run `rake` for the simple test without output, and `rake doc` for the more verbose output. Test are located in the `spec` folder. 
+
+#### Install gem
+
+`rake install`
+

lib/plusbump.rb

@@ -3,92 +3,99 @@
 require 'rugged'
 
 module PlusBump
-	def self.bump(ref, latest, debug: false)
+  def self.bump(ref, latest, debug: false)
 
-	  # Defaults
-	  major = /\+major/
-	  minor = /\+minor/
-	  patch = /\+patch/
-	  base = '0.0.0'
-	  prefix = ''
+    # Defaults
+    major = /\+major/
+    minor = /\+minor/
+    patch = /\+patch/
+    base = '0.0.0'
+    prefix = ''
 
-	  # Init Repo from current directory
-	  repository = Rugged::Repository.new(Dir.pwd)
-	  tagcollection = Rugged::TagCollection.new(repository)
+    # Init Repo from current directory
+    repository = Rugged::Repository.new(Dir.pwd)
+    tagcollection = Rugged::TagCollection.new(repository)
 
 
-	  w = Rugged::Walker.new(repository)
-	  # Initialise the walker to start at current HEAD
-	  head = repository.lookup(repository.head.target.oid)
-	  w.push(head)
+    w = Rugged::Walker.new(repository)
+    # Initialise the walker to start at current HEAD
+    head = repository.lookup(repository.head.target.oid)
+    w.push(head)
 
-	  if latest.nil?
-	    tail = repository.rev_parse(ref)
-	    w.hide(tail)
-	  else
-	    candidates = []
-	    puts "Searching for at tag that matches the glob pattern: " + latest if debug
+    if latest.nil?
+      tail = repository.rev_parse(ref)
+      w.hide(tail)
+    else
+      candidates = []
+      puts "Searching for at tag that matches the glob pattern: " + latest if debug
+      tagcollection.each(latest+'*') do |tag|
+        unless repository.merge_base(tag.target, head).nil?
+          puts "Found matching tag on correct branch: " + tag.name if debug
+          candidates << tag
+        end
+      end
 
-	    tagcollection.each(latest+'*') do |tag|
-	      unless repository.merge_base(tag.target, head).nil?
-	        puts "Found matching tag on correct branch: " + tag.name if debug
-	        candidates << tag
-	      end
-	    end
+      if candidates.empty?
+        puts "No matching tag found for "+latest
+      else
+        candidates.sort! {|a,b| a.target.time <=> b.target.time }
+        latest_match = candidates.last
+        puts "Newest matching tag: #{latest_match.name}" if debug
+        puts "Newest matching tag sha: #{latest_match.target.oid}" if debug
+        #set target of matching commit as the tail of our walker
+        w.hide(latest_match.target)
+        #unless input['<semver_version_string>']
+          base = latest_match.name.sub(latest,'')
+          puts "latest: #{latest}" if debug
+          puts "match.Name: #{latest_match.name}" if debug
+          puts "Base: #{base}" if debug
+        #end
+
+      end
+    end
 
-	    if candidates.empty?
-	      puts "No matching tag found for "+latest
-	    else
-	      candidates.sort! {|a,b| a.target.time <=> b.target.time }
-	      latest_match = candidates.last
-	      puts "Newest matching tag: #{latest_match.target.oid}" if debug
-	      #set target of matching commit as the tail of our walker
-	      w.hide(latest_match.target)
-	    end
-	  end
+    # Handle X.Y.Z-SPECIAL by saving SPECIAL part for later
+    split = base.split('-')
+    v_number = split[0].split('.')
+    special = ''
 
-	  # Handle X.Y.Z-SPECIAL by saving SPECIAL part for later
-	  split = base.split('-')
-	  v_number = split[0].split('.')
-	  special = ''
+    #TODO: Above could probably be re-written to use the semver gem for parsing.
 
-	  #TODO: Above could probably be re-written to use the semver gem for parsing.
+    major_bump = false
+    minor_bump = false
+    patch_bump = false
 
-	  major_bump = false
-	  minor_bump = false
-	  patch_bump = false
+    #walk through all commits looking for version bump requests
+    w.each do |commit|
+      puts "Commit: " + commit.oid if debug
+      if major =~ commit.message
+        puts "bumps major" if debug
+        major_bump = true
+      elsif minor =~ commit.message
+        puts "bump minor" if debug
+        minor_bump = true
+      else
+        patch_bump = true
+      end
+    end
 
-	  #walk through all commits looking for version bump requests
-	  w.each do |commit|
-	    puts "Commit: " + commit.oid if debug
-	    if major =~ commit.message
-	      puts "bumps major" if debug
-	      major_bump = true
-	    elsif minor =~ commit.message
-	      puts "bump minor" if debug
-	      minor_bump = true
-	    else
-	      patch_bump = true
-	    end
-	  end
+    result = SemVer.new(v_number[0].to_i, v_number[1].to_i, v_number[2].to_i, special)
 
-	  result = SemVer.new(v_number[0].to_i, v_number[1].to_i, v_number[2].to_i, special)
+    if major_bump
+      result.major += 1
+      result.minor = 0
+      result.patch = 0
+    elsif minor_bump
+      result.minor += 1
+      result.patch = 0
+    elsif patch_bump
+      result.patch += 1
+    else
+      puts "No version increment"
+    end
 
-	  if major_bump
-	    result.major += 1
-	    result.minor = 0
-	    result.patch = 0
-	  elsif minor_bump
-	    result.minor += 1
-	    result.patch = 0
-	  elsif patch_bump
-	    result.patch += 1
-	  else
-	    puts "No version increment"
-	  end
+    final_res = prefix + (result.format "%M.%m.%p%s")
 
-	  final_res = prefix + (result.format "%M.%m.%p%s")
-
-	  return final_res
-	end
+    return final_res
+  end
 end