groundskeeper-bitcore 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c85ed53bac61c994b0e4e1ee83781a57ca26046128412199c0824fd93a95774
-  data.tar.gz: 3a61a6eccc60d1b40a3508b28d10cc888dde680b35e59f074f221d7f53d31aae
+  metadata.gz: 20af3093a5dec644b3154a1ce496399237d369ef1daeaef4a14eac5fb32f5b42
+  data.tar.gz: ae223a79c3b8bdbb1cda27debe7a27ed91c9f8fd8818b7b54bdb4884c5ac21e4
 SHA512:
-  metadata.gz: 6d980eba26b5dc7fd0376aa291074de4196ae75576a3460019774d6711672797541abf1d0e0943fc869bc80720c7561bbdb2c8c6ae4baac83a36d76344500b9f
-  data.tar.gz: df07fc3671092395b4797d9a6cd3d4facaa438108841b162e773f693a01dea69bb324c183cd0ddb03d10c80ed0ae24e16ab4f7bb637babe325ac2c6eb26ae08a
+  metadata.gz: 5e0d01ccf871c973228cc046fe6f2975e9ab4d82275035dfdbf96d6bafb572947f7805c1c534cb4b46fb950830a207a6b7215b2d5f01bdeebb28e4181d840936
+  data.tar.gz: 438d08ea726015370e549f91c24db7b06b572e21ffa8d97c4965ae943a8fc38c5f79d5fbfae45ef706ebd323a112377d19cdb4b47ca77c939ad78dab5742c9d5

data/lib/groundskeeper/commands.rb

@@ -232,7 +232,7 @@ module Groundskeeper
 
     def announce_latest_tag
       console.say(
-        "latest tag on this repository: #{git.latest_tag_name_across_branches}",
+        "latest tag on this repository: #{git.latest_tag_name_in_primary_branch}",
         :yellow
       )
     end

data/lib/groundskeeper/git.rb

@@ -11,8 +11,7 @@ module Groundskeeper
     TAGS_ASC = "tag -l --sort=v:refname"
     TAGS_DESC = "tag -l --sort=-v:refname"
     LATEST_TAG_COMMIT = "#{COMMAND} rev-list --tags --max-count=1".freeze
-    LATEST_TAG_NAME =
-      format("describe --tags $(%<commit>s)", commit: LATEST_TAG_COMMIT)
+    LATEST_TAG_NAME = "tag --merged $(git branch --show-current) --sort=-creatordate | head -n 1"
     LATEST_TAG_BRANCHES =
       format("branch --contains $(%<commit>s)", commit: LATEST_TAG_COMMIT)
     LATEST_CHANGES = "log %s..HEAD --oneline"
@@ -58,7 +57,7 @@ module Groundskeeper
       git.execute(TAGS_DESC).split("\n")
     end
 
-    def latest_tag_name_across_branches
+    def latest_tag_name_in_primary_branch
       git.execute(LATEST_TAG_NAME).chop
     end
 
@@ -67,7 +66,7 @@ module Groundskeeper
     end
 
     def raw_changes_since_latest_tag
-      latest_changes = format(LATEST_CHANGES, latest_tag_name_across_branches)
+      latest_changes = format(LATEST_CHANGES, latest_tag_name_in_primary_branch)
 
       git.execute(latest_changes).split("\n")
     end

data/lib/groundskeeper/repository.rb

@@ -51,7 +51,7 @@ module Groundskeeper
     end
 
     def bumped_semantic_version(type)
-      SemanticVersion.new(git.latest_tag_name_across_branches).bump(type)
+      SemanticVersion.new(git.latest_tag_name_in_primary_branch).bump(type)
     end
 
     def name

data/lib/groundskeeper/semantic_version.rb

@@ -7,6 +7,7 @@ module Groundskeeper
     MINOR = "minor"
     PATCH = "patch"
     SEMANTIC_RELEASE_TYPE = { M: MAJOR, m: MINOR, p: PATCH }.freeze
+    WORD_NUMBER_PATTERN = /^([a-zA-Z]+)-(\d+)$/
 
     attr_reader :major, :minor, :patch
 
@@ -19,19 +20,30 @@ module Groundskeeper
     # :nocov:
 
     def initialize(version)
-      @major, @minor, @patch = version.split(".").map(&:to_i)
+      if version.match(WORD_NUMBER_PATTERN)
+        @word = ::Regexp.last_match(1)
+        @number = ::Regexp.last_match(2).to_i
+      else
+        @major, @minor, @patch = version.split(".").map(&:to_i)
+      end
     end
 
+    # rubocop:disable Metrics/MethodLength
     def bump(release_type)
-      case SEMANTIC_RELEASE_TYPE[release_type.to_sym]
-      when MAJOR
-        "#{major + 1}.0.0"
-      when MINOR
-        "#{major}.#{minor + 1}.0"
-      when PATCH
-        "#{major}.#{minor}.#{patch + 1}"
+      if @major.nil? && @minor.nil? && @patch.nil?
+        "#{@word}-#{@number + 1}"
+      else
+        case SEMANTIC_RELEASE_TYPE[release_type.to_sym]
+        when MAJOR
+          "#{major + 1}.0.0"
+        when MINOR
+          "#{major}.#{minor + 1}.0"
+        when PATCH
+          "#{major}.#{minor}.#{patch + 1}"
+        end
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def >(other)
       other_version = SemanticVersion.build(other)

data/lib/groundskeeper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Groundskeeper
-  VERSION = "0.34.0"
+  VERSION = "0.35.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groundskeeper-bitcore
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - RADD
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-24 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jira-ruby