apadmi_grout 3.0.0 → 3.0.1.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8923ffd455567fa6a2c5d5472f4a789774ce6ef908338deee9dc8d52b63de33
-  data.tar.gz: 65e30d6c06c05f0ab2f132336a994dbee4fff7c0384311b4eb91ee3e05010875
+  metadata.gz: 2b4dc32ad592cfe4759341af5327f80f0f1eb5b067b9eab72ff9b428fc82cc3b
+  data.tar.gz: 6e1b769f878a99adf7ad362f2690023584f3dad7b829175c769ba95f5b92a1c3
 SHA512:
-  metadata.gz: 886dad14e21540cd5f8bbfdc74f8b33e78321eeae62a5d89b0d9ecdb568b15f8ffb928291ce443a68e7c55c349f39a2c6fce69ec902f694711adbdc6df62df0c
-  data.tar.gz: 1db680639fc0621edaeb1346a51be1b1bb9d90dae3772969dcd4edd1e531a22ad81c630034fd83c98753a687c70e330d09ef382b29fcc7e160a62812ad4a6f70
+  metadata.gz: f4c50f009c0421f1eb6d00549cca5665a6717e2f26ab1542898107a476b9ae48706269eaca656602a5ac2aeca2e17719e0647327fb6235fde122c2c464d0e61a
+  data.tar.gz: 578bd2ed0f11d462294072be19de710f54f88720c3aad2b38c4dbf5ad4a5b9ee0e8fba0dac49c8ac59bc52f3a05025d43aebebf8553a47a921d67e94dabe5f5e

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Core Changelog
 
-## [3.0.0] - TBD
+## [3.0.1.pre1] - TBD
+* Bump dependencies to support Ruby 4
+
+## [3.0.0] - 2026-04-22
 * Support blank fields in release notes template
 * Rename "Release Date" to "Build Date" to more accurately reflect the field in default release notes template
 * Add utilities for writing and reading confluence files

data/lib/apadmi/grout/actions/generate_release_notes_action/issue_classifier.rb

@@ -16,16 +16,19 @@ module Apadmi
     class JiraIssueClassifier < IssueClassifier
       # @param issues [Array<Apadmi::Grout::Issue>]
       def classify(issues)
-        tasks = filter_issues_by_type(%w[Task], issues)
-        features = filter_issues_by_type(%w[Story], issues)
-        improvements = filter_issues_by_type(%w[Improvement Rework Debt], issues)
-        defects = filter_issues_by_type(%w[Bug], issues)
+        unclassified = issues.find_all { |issue| issue.issue_type == Apadmi::Grout::Issue::UNCLASSIFIED_ISSUE_TYPE }
+        classified = issues - unclassified
+        tasks = filter_issues_by_type(%w[Task], classified)
+        features = filter_issues_by_type(%w[Story], classified)
+        improvements = filter_issues_by_type(%w[Improvement Rework Debt], classified)
+        defects = filter_issues_by_type(%w[Bug], classified)
         ClassifiedIssues.new(
           tasks,
           features,
           improvements,
           defects,
-          issues - tasks - features - improvements - defects
+          classified - tasks - features - improvements - defects,
+          unclassified
         )
       end
     end
@@ -34,16 +37,19 @@ module Apadmi
     class AdoIssueClassifier < IssueClassifier
       # @param issues [Array<Apadmi::Grout::Issue>]
       def classify(issues)
-        tasks = filter_issues_by_type(%w[Task], issues)
-        features = filter_issues_by_type(["User Story", "Feature"], issues)
-        improvements = filter_issues_by_type(["Improvement", "Tech Debt"], issues)
-        defects = filter_issues_by_type(%w[Bug], issues)
+        unclassified = issues.find_all { |issue| issue.issue_type == Apadmi::Grout::Issue::UNCLASSIFIED_ISSUE_TYPE }
+        classified = issues - unclassified
+        tasks = filter_issues_by_type(%w[Task], classified)
+        features = filter_issues_by_type(["User Story", "Feature"], classified)
+        improvements = filter_issues_by_type(["Improvement", "Tech Debt"], classified)
+        defects = filter_issues_by_type(%w[Bug], classified)
         ClassifiedIssues.new(
           tasks,
           features,
           improvements,
           defects,
-          issues - tasks - features - improvements - defects
+          classified - tasks - features - improvements - defects,
+          unclassified
         )
       end
     end

data/lib/apadmi/grout/actions/issues_from_changelog_action.rb

@@ -19,9 +19,43 @@ module Apadmi
         ids = issue_ids_from_changelog(changelog)
 
         @logger.message("Found issue ids: #{ids.join(", ")}")
-        @board_service.find_issues_by_keys(ids)
+        found_issues = @board_service.find_issues_by_keys(ids)
+
+        # ADO strips the '#' prefix from returned Issue#key (e.g. '#16' → '16'),
+        # so check both forms when detecting missing tickets.
+        found_keys_normalised = found_issues.to_set { |i| i.key.to_s }
+        missing_ids = ids.reject do |id|
+          normalised = id.delete_prefix(@ticket_prefix.to_s)
+          found_keys_normalised.include?(id) || found_keys_normalised.include?(normalised)
+        end
+
+        return found_issues if missing_ids.empty?
+
+        commit_lines = commit_line_for_ids(changelog)
+        fallback_issues = missing_ids.map do |id|
+          Apadmi::Grout::Issue.unclassified(id, commit_lines[id] || id)
+        end
+
+        found_issues + fallback_issues
       end
 
+      private
+
+      # @param changelog [String] raw git changelog
+      # @return [Hash{String => String}] mapping ticket ID to cleaned first commit line containing it
+      def commit_line_for_ids(changelog)
+        cleaned_changelog = changelog.gsub(/\(pull request.*\)/, "")
+        result = {}
+        cleaned_changelog.each_line do |line|
+          line.scan(/(#{@ticket_prefix}\d+)/).flatten.each do |id|
+            result[id] ||= line.strip.delete_prefix("- ").strip
+          end
+        end
+        result
+      end
+
+      public
+
       # @param changelog [String] raw git changelog
       # @return [Array<String>] list of issue ids from changelog
       def issue_ids_from_changelog(changelog)

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

@@ -8,8 +8,17 @@ module Apadmi
     # @param status [String] The current status on the board
     # @param issue_type [String] Raw string representing issue type e.g "In Progress"
     # @param url [String] url to the issue
-    # @param raw_object [JIRA::Resource::Issue|Hash] The underlying raw object from the platform
+    # @param raw_object [JIRA::Resource::Issue, Hash, nil] The underlying raw object from the platform.
+    #   nil for unclassified fallback issues created from commit messages when the ticket was not found.
     Issue = Struct.new(:key, :summary, :status, :issue_type, :url, :raw_object) do
+      # Creates a fallback issue from a commit message when the ticket ID could not be found in the board.
+      # @param key [String] the ticket ID as extracted from the commit (e.g. "PPT-999")
+      # @param summary [String] the first line of the commit message
+      # @return [Apadmi::Grout::Issue]
+      def self.unclassified(key, summary)
+        Issue.new(key, summary, "Unknown", Issue::UNCLASSIFIED_ISSUE_TYPE, "", nil)
+      end
+
       # @return [Apadmi::Grout::Issue]
       def self.from_ado_hash(hash)
         Issue.new(
@@ -45,5 +54,8 @@ module Apadmi
         issues.map { |i| Issue.from_jira_issue(i, base_url) }
       end
     end
+
+    # Issue type string used for fallback issues created from commit messages when the ticket was not found in the board.
+    Issue::UNCLASSIFIED_ISSUE_TYPE = "Unclassified"
   end
 end

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

@@ -7,17 +7,23 @@ module Apadmi
     # @param improvements [Array<Apadmi::Grout::Issue>]
     # @param defects [Array<Apadmi::Grout::Issue>] aka bugs
     # @param others [Array<Apadmi::Grout::Issue>] any other non-standard issue types
+    # @param unclassified [Array<Apadmi::Grout::Issue>] commits whose ticket IDs could not be found in Jira/ADO
     ClassifiedIssues = Struct.new(
       :tasks,
       :features,
       :improvements,
       :defects,
-      :others
+      :others,
+      :unclassified
     ) do
+      def initialize(tasks, features, improvements, defects, others, unclassified = [])
+        super
+      end
+
       # @return returns true if all categories are empty
       def empty?
         tasks.empty? && features.empty? &&
-          improvements.empty? && defects.empty? && others.empty?
+          improvements.empty? && defects.empty? && others.empty? && unclassified.empty?
       end
     end
 

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

@@ -72,7 +72,15 @@ Commit Hash: {{config.commit_hash}}
 * [{{issue_type}} - {{ key }} - {{ summary }}]({{ url }})
   {{/ classified_issues.others}}
 
-{{/ classified_issues.others.first}}}
+{{/ classified_issues.others.first}}{{# classified_issues.unclassified.first}}
+### Unclassified
+  {{# classified_issues.unclassified}}
+* {{ key }} - {{ summary }}
+  {{/ classified_issues.unclassified}}
+
+_Note: These commits reference ticket IDs that could not be found in the board._
+
+{{/ classified_issues.unclassified.first}}}
       end
     end
 

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

@@ -57,6 +57,11 @@ module Apadmi
       # @param [Apadmi::Grout::Issue] issue
       # @param [String] state_name
       def transition_issue(issue, state_name)
+        if issue.raw_object.nil?
+          warn "Skipping transition for unclassified fallback issue #{issue.key}"
+          return
+        end
+
         transitions = @jira_client.Transition.all(issue: issue.raw_object)
         transition = transitions.find { |elem| elem.name.downcase == state_name.downcase }
 
@@ -132,6 +137,11 @@ module Apadmi
       # @param [Apadmi::Grout::Issue] issue
       # @return [Array<PullRequest>]
       def get_ticket_prs(issue)
+        if issue.raw_object.nil?
+          warn "Skipping PR lookup for unclassified fallback issue #{issue.key}"
+          return []
+        end
+
         query_string = "issueId=#{issue.raw_object.id}&applicationType=bitbucket&dataType=pullrequest"
         response = @network_service.do_get("/rest/dev-status/latest/issue/details?#{query_string}")
 
@@ -206,6 +216,11 @@ module Apadmi
         versions = create_or_get_versions(version_names)
 
         issues.each do |issue|
+          if issue.raw_object.nil?
+            warn "Skipping fix version assignment for unclassified fallback issue #{issue.key}"
+            next
+          end
+
           existing_ids = issue.raw_object.fixVersions.map(&:id)
           missing = versions.reject { |v| existing_ids.include?(v.id) }
           next if missing.empty?

data/lib/apadmi/grout/version.rb

@@ -2,6 +2,6 @@
 
 module Apadmi
   module Grout
-    VERSION = "3.0.0"
+    VERSION = "3.0.1.pre1"
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: apadmi_grout
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1.pre1
 platform: ruby
 authors:
 - Apadmi
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -30,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +120,6 @@ 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:
 rdoc_options: []
 require_paths:
 - lib
@@ -136,8 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Apadmi build tool utils for use through Fastlane on Android and iOS.
 test_files: []