apadmi_grout 2.7.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c359c320e340ceb70fd0b212f657bb858958fa8fb5ef6037dca5891fc50a90f6
-  data.tar.gz: f4d9eaf0b6fec2ede3829844314fbafc25c4f2a378185e4656f562f58e08b09f
+  metadata.gz: fa7ac0cd2f88e84cd7dfbde2c5d303d7387e83ba83e0cc8e1d8f503599b61e01
+  data.tar.gz: 21e9a197f5e22264462e01394e1c1b87bb289cbc3a7f20a65c7e50b254e1754c
 SHA512:
-  metadata.gz: 669edb4b69e604ba1a4cde88bb8b46bf073c26765dcb3f819dc55f2fcc118008fde3bfac3e0c343e85a338fcbdeda2f1f57246c2db065565921f40e209dcaf3e
-  data.tar.gz: 81eef18800723d403d6ecf016b87486253d06b4b1f15725189752afea71a6dce4dd7b79d62a945a5382f3486be3709089b9d04c6608c9df2632059d36e31b958
+  metadata.gz: cf9f60b7ecc1a71bc307147afdd178ac8761a4a4938c6382d51fd449297750a8d7f918a3a7eaa614631be8b989d722bbedbbdbfe89231a1803a2b868b7b3f26c
+  data.tar.gz: b68eac0ceac55699401b7679278f6958c0b595c4cab8999281c4bd4f0bcf10bf90dc0af31627ff7455e4dfe5eb9b7f89f21036d8abbcb0e877c058d2ba8402a8

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Core Changelog
 
+## [2.9.0] - 2025-05-28
+* Add git util for getting the last tag of a given pattern which is on an ancestor commit of HEAD
+
+## [2.8.0] - 2025-05-22
+* Add ability to disable use of the undocumented JIRA apis
+
 ## [2.7.0] - 2024-09-24
 * Add utility for checking for unmerged release branches before deployments
 

data/lib/apadmi/grout/actions/find_tickets_to_move_action/find_tickets_to_move_jira_action.rb

@@ -39,7 +39,7 @@ module Apadmi
         options = nil
       )
         custom_flag_messages ||= Apadmi::Grout::FlagMessages.default(status)
-        options ||= Apadmi::Grout::JiraFindTicketsOptions.new(include_no_sprint_tickets: false)
+        options ||= Apadmi::Grout::JiraFindTicketsOptions.new(include_no_sprint_tickets: false, inspect_prs: true)
 
         issues = @jira_board_service.search_unblocked_issues(
           component, status, [], options
@@ -55,11 +55,7 @@ module Apadmi
           @git_utils.merge_changelog(issue_keys)
         )
 
-        final_list = issues.filter do |issue|
-          # Decide whether to include this ticket based on PRs
-          status = process_prs(issue, custom_flag_messages)
-          decide_should_include(issue, status, changelog_ids)
-        end
+        final_list = filter_on_prs(changelog_ids, custom_flag_messages, issues, options)
 
         @logger.message("Final list:  #{final_list.map(&:key).join(", ")}")
         final_list
@@ -67,6 +63,18 @@ module Apadmi
 
       private
 
+      def filter_on_prs(changelog_ids, custom_flag_messages, issues, options)
+        if options.inspect_prs
+          issues.filter do |issue|
+            # Decide whether to include this ticket based on PRs
+            status = process_prs(issue, custom_flag_messages)
+            decide_should_include(issue, status, changelog_ids)
+          end
+        else
+          issues
+        end
+      end
+
       # @param issue [Apadmi::Grout::Issue]
       # @param pr_status [Int] status of whether or not we can move
       # @param changelog_ids [Array<String>] the ticket ids pulled from git

data/lib/apadmi/grout/models/find_tickets_options.rb

@@ -7,11 +7,12 @@ module Apadmi
 
     # Jira specific find tickets options
     class JiraFindTicketsOptions < FindTicketsOptions
-      attr_reader :include_no_sprint_tickets
+      attr_reader :include_no_sprint_tickets, :inspect_prs
 
       # @param include_no_sprint_tickets [String] whether or not to include tickets with no sprint assigned
-      def initialize(include_no_sprint_tickets: false)
+      def initialize(include_no_sprint_tickets: false, inspect_prs: true)
         @include_no_sprint_tickets = include_no_sprint_tickets
+        @inspect_prs = inspect_prs
       end
 
       def ==(other)
@@ -19,7 +20,7 @@ module Apadmi
       end
 
       def state
-        [@include_no_sprint_tickets]
+        [@include_no_sprint_tickets, @inspect_prs]
       end
     end
 

data/lib/apadmi/grout/utils/git_utils.rb

@@ -68,16 +68,50 @@ module Apadmi
         @@default.commit_hash
       end
 
+      # Returns the hash of the last git tag which is an ancestor commit of the current HEAD and matches the given pattern
+      # @param pattern [String]
+      def self.last_ancestor_tag_hash(pattern)
+        @@default.last_ancestor_tag_hash(pattern)
+      end
+
+      def last_ancestor_tag_hash(pattern)
+        tag_name = last_ancestor_tag(pattern)
+        stdout, stderr, status = Open3.capture3("git #{@repo_path_arg} rev-list -n 1 #{tag_name}")
+        raise "Failed to find a tag: #{tag_name}: #{stderr}" unless status.success?
+
+        stdout.strip
+      end
+
+      # Returns the name of the last git tag which is an ancestor commit of the current HEAD and matches the given pattern
+      # @param pattern [String]
+      def last_ancestor_tag(pattern)
+        stdout, stderr, status = Open3.capture3("git #{@repo_path_arg} describe --tags --match '#{pattern}' --abbrev=0")
+        raise "Failed to find a tag matching pattern: #{pattern}: #{stderr}" unless status.success?
+
+        stdout.strip
+      end
+
       # Gets the number of commits accessible from HEAD treating the history as a graph.
       # See more details here: https://git-scm.com/docs/git-rev-list
       # @return [String] The number of commits
       def number_of_commits
+        raise "Repo is a shallow clone so this method will always return 1" if is_shallow_clone
+
         stdout, stderr, status = Open3.capture3("git #{@repo_path_arg} rev-list HEAD --count")
         raise "Failed to get commit number: #{stderr}" unless status.success?
 
         stdout.strip
       end
 
+      # Helper function to check if a repo is a shallow clone
+      # @return [Boolean] If the repo is a shallow clone
+      def is_shallow_clone
+        stdout, stderr, status = Open3.capture3("git #{@repo_path_arg} rev-parse --is-shallow-repository")
+        raise "Failed to check if repo is shallow clone: #{stderr}" unless status.success?
+
+        stdout.strip.downcase == "true"
+      end
+
       # Gets the number of commits accessible from HEAD treating the history as a graph.
       # See more details here: https://git-scm.com/docs/git-rev-list
       # @return [String] The number of commits

data/lib/apadmi/grout/version.rb

@@ -2,6 +2,6 @@
 
 module Apadmi
   module Grout
-    VERSION = "2.7.0"
+    VERSION = "2.9.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apadmi_grout
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Apadmi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-27 00:00:00.000000000 Z
+date: 2025-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday