Merge pull request #40 from codacy/fix/fix-commit-counting

Fix/fix commit counting

Author: Daniel Reigada

spec/git-version-spec.cr

@@ -319,7 +319,7 @@ describe GitVersion do
       tmp.exec %(git merge myfeature)
 
       tmp.exec %(git checkout master)
-      tmp.exec %(git rebase dev)
+      tmp.exec %(git rebase --no-gpg-sign dev)
       version = git.get_version
       version.should eq("1.0.1")
     ensure
@@ -345,7 +345,7 @@ describe GitVersion do
 
       tmp.exec %(git checkout dev)
       tmp.exec %(git commit --no-gpg-sign --allow-empty -m "4")
-      tmp.exec %(git rebase master)
+      tmp.exec %(git rebase --no-gpg-sign master)
 
       tmp.exec %(git checkout master)
       tmp.exec %(git merge --no-gpg-sign --no-ff dev)
@@ -443,7 +443,9 @@ describe GitVersion do
       tmp.exec %(git init)
       tmp.exec %(git checkout -b master)
       tmp.exec %(git commit --no-gpg-sign --allow-empty -m "1")
-      tmp.exec %(git tag "0.1.0-asd")
+      tmp.exec %(git tag "0.1.0")
+      tmp.exec %(git commit --no-gpg-sign --allow-empty -m "feature: 2")
+      tmp.exec %(git tag "0.2.0-asd")
       tmp.exec %(git commit --no-gpg-sign --allow-empty -m ":breaking: 2")
 
       version = git.get_version
@@ -484,7 +486,7 @@ describe GitVersion do
 
       version = git.get_version
       hash = git.current_commit_hash
-      version.should eq("1.0.0-v1.0.#{hash}")
+      version.should eq("1.0.0-v1.1.#{hash}")
     ensure
       tmp.cleanup
     end
@@ -498,11 +500,12 @@ describe GitVersion do
 
       tmp.exec %(git init)
       tmp.exec %(git checkout -b master)
-      tmp.exec %(git commit --no-gpg-sign --allow-empty -m "1")
-      tmp.exec %(git tag "v1.0.0")
+      tmp.exec %(git commit --no-gpg-sign --allow-empty -m "feature: 1")
+      tmp.exec %(git tag "v1.1.0")
+      tmp.exec %(git commit --no-gpg-sign --allow-empty -m "2")
 
       version = git.get_version
-      version.should eq("v1.0.1")
+      version.should eq("v1.1.1")
     ensure
       tmp.cleanup
     end
@@ -559,7 +562,7 @@ describe GitVersion do
 
       version = git.get_version
       hash = git.current_commit_hash
-      version.should eq("1.0.0-v1.0.#{hash}")
+      version.should eq("1.0.0-v1.3.#{hash}")
     ensure
       tmp.cleanup
     end
@@ -703,6 +706,7 @@ describe GitVersion do
 
       tmp.exec %(git init)
       tmp.exec %(git checkout -b master)
+
       # Create dir1 and tag dir1-1.0.0
       base_dir = "dir1"
       tmp.exec %(mkdir #{base_dir} && touch #{base_dir}/dummy_file)
@@ -718,16 +722,17 @@ describe GitVersion do
       tmp.exec %(git tag "dir2-1.0.0")
 
       tmp.exec %(git checkout -b dev)
+
       # Create dir2 and commit breaking
       base_dir = "dir2"
-      tmp.exec %(mkdir #{base_dir} && touch #{base_dir}/dummy_file)
+      tmp.exec %(mkdir -p #{base_dir} && touch #{base_dir}/dummy_file_2)
       tmp.exec %(git add #{base_dir}/)
-      tmp.exec %(git commit --no-gpg-sign -m "breaking: 2")
+      tmp.exec %(git commit --no-gpg-sign -m "breaking: 3")
 
       # git-version should accept the breaking tag on commit with dir2
       version = git.get_version
       hash = git.current_commit_hash
-      version.should eq("dir2-2.0.0-SNAPSHOT.0.#{hash}")
+      version.should eq("dir2-2.0.0-SNAPSHOT.1.#{hash}")
     ensure
       tmp.cleanup
     end

src/git-version.cr

@@ -24,12 +24,7 @@ module GitVersion
     end
 
     private def strip_prefix(version : String) : String | Nil
-      stripped = version.lstrip(@prefix)
-      if @prefix != "" && stripped.size >= version.size
-        nil
-      else
-        stripped
-      end
+      version.lchop?(@prefix)
     end
 
     private def exec(cmd)
@@ -75,15 +70,18 @@ module GitVersion
       return (exec cmd)[0].rjust(7, '0')
     end
 
-    def commits_distance(latest_tagged_version)
-      return (exec "git rev-list --count HEAD ^#{latest_tagged_version}")[0]
+    def commits_distance(tag : String | Nil)
+      if tag.nil?
+        return (exec "git rev-list --count HEAD")[0]
+      else
+        return (exec "git rev-list --count HEAD ^#{tag}")[0]
+      end
     rescue
       return 0
     end
 
-    def get_bumps(latest)
-      latest_exists = (exec "git tag -l #{latest}")
-      if latest_exists.any?
+    def get_bumps(latest : String | Nil)
+      if !latest.nil? && (exec "git tag -l #{latest}").any?
         last_commit = (exec "git show-ref -s #{latest}")[0]
         return (exec "git log --pretty=%B #{last_commit}..HEAD #{log_paths_filter}")
       else
@@ -99,26 +97,26 @@ module GitVersion
       branch_tags = tags_by_branch(cb)
 
       latest_version = BASE_VERSION
+      latest_tag = nil
 
       branch_tags.each do |tag|
         begin
           tag_without_prefix = strip_prefix(tag)
           if tag_without_prefix.nil?
             next
           end
-          current_tag = SemanticVersion.parse(tag_without_prefix)
-          if !current_tag.prerelease.identifiers.empty?
+          current_version = SemanticVersion.parse(tag_without_prefix)
+          if !current_version.prerelease.identifiers.empty?
             next
-          elsif (latest_version < current_tag)
-            latest_version = current_tag
+          elsif (latest_version < current_version)
+            latest_version = current_version
+            latest_tag = tag
           end
         rescue
           #
         end
       end
 
-      latest_tagged_version = latest_version
-
       latest_version =
         SemanticVersion.new(
           latest_version.major,
@@ -129,7 +127,7 @@ module GitVersion
         )
 
       major = false
-      get_bumps(latest_tagged_version).each do |bump|
+      get_bumps(latest_tag).each do |bump|
         commit = bump.downcase
         if commit.includes?(MAJOR_BUMP_COMMENT)
           latest_version =
@@ -146,7 +144,7 @@ module GitVersion
       end
 
       if !major
-        get_bumps(latest_tagged_version).each do |bump|
+        get_bumps(latest_tag).each do |bump|
           commit = bump.downcase
           if commit.includes?(MINOR_BUMP_COMMENT)
             latest_version =
@@ -165,7 +163,7 @@ module GitVersion
       if cb == @release_branch
         #
       elsif cb == @dev_branch
-        prerelease = [DEV_BRANCH_SUFFIX, commits_distance(latest_tagged_version), current_commit_hash()] of String | Int32
+        prerelease = [DEV_BRANCH_SUFFIX, commits_distance(latest_tag), current_commit_hash()] of String | Int32
         latest_version =
           SemanticVersion.new(
             latest_version.major,
@@ -176,7 +174,7 @@ module GitVersion
           )
       else
         branch_sanitized_name = cb.downcase.gsub(/[^a-zA-Z0-9]/, "")
-        prerelease = [branch_sanitized_name, commits_distance(latest_tagged_version), current_commit_hash()] of String | Int32
+        prerelease = [branch_sanitized_name, commits_distance(latest_tag), current_commit_hash()] of String | Int32
         latest_version =
           SemanticVersion.new(
             latest_version.major,