apadmi_grout 2.8.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75c06e02304d0547ca158b319c9c88e895753233fd06da8d864c402ae89946e1
-  data.tar.gz: 6fda7788c5401a14481f715f4007dec869219438304b0206dfce5eb3735c3e07
+  metadata.gz: 38b855b9ef4ad0a1eef926a35eba5617026fdd30492c3ea276322292bbc50908
+  data.tar.gz: faef8331a80aec884df2c46f0e6825b9f34cc8d3f40dc4ba0475ef7eae6b552f
 SHA512:
-  metadata.gz: b34320096c5d746f833c48ab31d00933188fdfe86c607a5529f58f03f15b8fb2636ba752b8d5a2743bf4b0d98563c39d21a64b950fb8706b278cc4ddca2500fb
-  data.tar.gz: 38c1b2705c12d5fb8480270a26022f1266f0bb9b15da84ffde2447ada05e7de497356a46ae759a1fc3a91fefb1aa50524a30bf52094e0da6fec31ebcdc9f763c
+  metadata.gz: d27a7df171ba6bc2c2cd556eb4daec3622a24182a65def0105e8d2359026ad46fffc8256897e1311f9ef8e21fd7af1414ba7ddb0f9e135634322cf30b9f98ab1
+  data.tar.gz: 51175e4daa39722ce76dabdede628f51a0a3d3114cc9baa14d516772e409e6213e3938eab73b36fbdeb1c8caae167347331dfabc4fb1c59f718e4c2f7afd86b6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Core Changelog
 
+## [2.10.0] - 2025-09-11
+* Temporarily point jira-ruby active pull request to point to JIRA apis that haven't been removed.
+
+## [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
 

data/lib/apadmi/grout/service/board_service/jira_board_service.rb

@@ -31,7 +31,7 @@ module Apadmi
         return [] if keys.length <= 0
 
         jql_search = "project = '#{@project}' AND issue IN (#{keys.join(", ")})"
-        issues = @jira_client.Issue.jql(jql_search, { max_results: 1000 }).uniq
+        issues = @jira_client.Issue.jql(jql_search, { max_results: 1000, fields: ["*navigable"] }).uniq
         convert(issues)
       end
 
@@ -54,7 +54,7 @@ module Apadmi
           AND Flagged is EMPTY
         }
 
-        issues = @jira_client.Issue.jql(jql_search, { max_results: 1000 }).uniq
+        issues = @jira_client.Issue.jql(jql_search, { max_results: 1000, fields: ["*navigable"] }).uniq
         convert(issues)
       end
 
@@ -73,19 +73,21 @@ module Apadmi
       def flag_ticket(key, comment)
         payload = "{\"flag\":true,\"issueKeys\":[\"#{key}\"],\"commentVisibility\":\"\",\"comment\":\"#{comment}\"}"
         @network_service.do_post("/rest/greenhopper/1.0/xboard/issue/flag/flag.json", payload)
+        sleep 2 # Seems to take a while for flagging and unflagging to register
       end
 
       # @param [String] key
       def un_flag_ticket(key)
         payload = "{\"flag\":false,\"issueKeys\":[\"#{key}\"],\"commentVisibility\":\"\",\"comment\":\"Unflagged by CI\"}"
         @network_service.do_post("/rest/greenhopper/1.0/xboard/issue/flag/flag.json", payload)
+        sleep 2 # Seems to take a while for flagging and unflagging to register
       end
 
       # @param [String] key
       # @return bool
       def flagged?(key)
         jql_search = "project = '#{@project}' AND issue IN (#{key}) AND Flagged is not EMPTY"
-        response = @jira_client.Issue.jql(jql_search, { max_results: 1 }).uniq
+        response = @jira_client.Issue.jql(jql_search, { max_results: 1000, fields: ["*navigable"] }).uniq
         response != []
       end
 
@@ -115,7 +117,7 @@ module Apadmi
       # @return [Array<Apadmi::Grout::Issue>]
       def get_tickets_by_component(component_key)
         jql_search = "project = '#{@project}' AND component IN ('#{component_key}')"
-        convert(@jira_client.Issue.jql(jql_search, { max_results: 1000 }).uniq)
+        convert(@jira_client.Issue.jql(jql_search, { max_results: 1000, fields: ["*navigable"] }).uniq)
       end
 
       # @param [String] key
@@ -153,7 +155,7 @@ module Apadmi
       def get_ticket_subtask(keys, component = nil)
         jql_search = "project = '#{@project}' AND parent IN #{keys.to_s.gsub("[", "(").gsub("]", ")")}"\
                       + (component.nil? ? "" : " AND component IN ('#{component}')")
-        convert(@jira_client.Issue.jql(jql_search, { max_results: 1000 }).uniq)
+        convert(@jira_client.Issue.jql(jql_search, { max_results: 1000, fields: ["*navigable"] }).uniq)
       end
 
       # @param [String] release_date

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

@@ -68,6 +68,29 @@ 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

data/lib/apadmi/grout/version.rb

@@ -2,6 +2,6 @@
 
 module Apadmi
   module Grout
-    VERSION = "2.8.0"
+    VERSION = "2.10.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apadmi_grout
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Apadmi
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -28,16 +28,16 @@ dependencies:
   name: jira-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ metadata:
   documentation_uri: https://apadmi-grout.web.app/
   source_code_uri: https://bitbucket.org/apadmi/apadmi-grout-ruby/
   changelog_uri: https://bitbucket.org/apadmi/apadmi-grout-ruby/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Apadmi build tool utils for use through Fastlane on Android and iOS.
 test_files: []