groundskeeper-bitcore 0.33.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 153df8ecf60a6641ad33e45fa3f3cb889a0ab59cdb7b52ce894b86df0713b645
-  data.tar.gz: d3223b8fd86b82f6288c73d1facce11d44d402dfe7cb17c2ec0e7dae26b5c9d4
+  metadata.gz: 20af3093a5dec644b3154a1ce496399237d369ef1daeaef4a14eac5fb32f5b42
+  data.tar.gz: ae223a79c3b8bdbb1cda27debe7a27ed91c9f8fd8818b7b54bdb4884c5ac21e4
 SHA512:
-  metadata.gz: 1f6847e707ff46d4e4306bae339f01985e4b20a1575319ffd7a5a8f04ef3af145c14eb552db74191f48acc2e602c9634232ec77f276bc3a6c06dbb7176cef2d4
-  data.tar.gz: 977946f4b403c6319bb914d39aac9abf73bd66438ebc6a96c23b579148fc87bb547073c24f26ffc44266be460e4c265d18d2ce066a37111d328b7dde337c9de0
+  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
@@ -432,10 +432,11 @@ module Groundskeeper
       version_int = version.minor.to_i
       current_version_int = current_version.minor.to_i
       deployed_issues = []
-      ((current_version_int + 1)..version_int).each do |version_to_deploy|
-        version_name = "#{repository.name} 0.#{version_to_deploy}.0"
-        deployed_issues.append(jira.fetch_issues_by_fix_version(version_name))
+      ((current_version_int)..version_int).each do |version_to_deploy|
+        version_name = "0.#{version_to_deploy}.0"
+        deployed_issues.append(jira.fetch_issues_by_fix_version(project: project, version: version_name))
       end
+      deployed_issues.uniq!
 
       action = if self.class.stage == PRODUCTION
                  Jira::DEPLOY_TO_PRODUCTION

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/jira.rb

@@ -68,9 +68,9 @@ module Groundskeeper
       # :nocov:
 
       # :nocov:
-      def fetch_issues_by_fix_version(version:)
+      def fetch_issues_by_fix_version(project:, version:)
         search_path = "/rest/api/2/search"
-        query = "fixVersion=\"#{version}\""
+        query = "fixVersion=\"#{project.repo_name} #{version}\""
         request_url = "#{search_path}?fields=key&jql=#{CGI.escape(query)}"
         response = client.get(request_url).body
 
@@ -141,15 +141,15 @@ module Groundskeeper
     def transition_remote_issues(transition_type, issue_ids)
       issue_ids.each do |issue_id|
         client.transition_issue(
-          issue_id: issue_id,
+          issue_id: issue_id[0],
           transition_id: TRANSITION_IDS[transition_type]
         )
       end
     end
 
     # :nocov:
-    def fetch_issues_by_fix_version(version)
-      client.fetch_issues_by_fix_version(version: version)
+    def fetch_issues_by_fix_version(project:, version:)
+      client.fetch_issues_by_fix_version(project: project, version: version)
     end
     # :nocov:
 

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.33.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.33.0
+  version: 0.35.0
 platform: ruby
 authors:
 - RADD
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-12 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jira-ruby