pindo 5.14.6 → 5.14.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da83c30dd943e6edfa9320b5944d43b76fd467c2ebdf1aff2f010a07235628a9
-  data.tar.gz: a05b5d981a1431cfc9c0659d20966f4eaafee7433de93d27ebddb11310a57678
+  metadata.gz: 68b5c0f86d764eff85c26932fb2ba31d4e7078adca1d216b9c6e40901cc5408c
+  data.tar.gz: 1389910ee8c9fd7f571634001816e8e5776ead59cf59c65fb806edf57b1eb020
 SHA512:
-  metadata.gz: bf83411f15e4a91b3c80d5add990d84e6a00513deee5943304a0a5cb72a29d9495d8cbbd14da5e8463bd4345d2e778997e7947cb7bc681d4046e362eb7fadb1d
-  data.tar.gz: efee3ed4cf27cc7206f57543865397dc126d3c4e902451a59b617e2547fa8c5fae96330dcd9c9b9f3b2ddc12545024537fe46620199a3261a32da8afb1dc7902
+  metadata.gz: 3cd5a36c2d7fc0a607c53f47595cf129c05129066bc77894d984b1e4e639ba017f0045edf224efd1b12352521bf200a9001a7cef1ebb9852d81f3087b3e4b72a
+  data.tar.gz: 66c0fe689c8bd6ba4c51b4db4f75486fd33941a73d9f47396699e32adcb8e96d13b0dd6e427c653e255bdf54d9c1907504a8059bba605e05cdc91eb1b962d487

data/lib/pindo/base/git_handler.rb

@@ -662,8 +662,12 @@ module Pindo
 
       # 获取最新的符合规范的 commit
       # @param project_dir [String] 项目目录路径
+      # @param tag_prefix [String] tag前缀，用于检查 HEAD 是否有版本 tag，默认 'v'
       # @return [Hash] 包含 :commit_id, :commit_time, :commit_desc
-      def get_latest_conventional_commit(project_dir:nil)
+      # 优先级：
+      #   1. 如果 HEAD 存在版本 tag，直接返回 HEAD（认为有 tag 的 commit 是有效的发布节点）
+      #   2. 否则，返回最新的符合 Conventional Commits 规范的提交
+      def get_latest_conventional_commit(project_dir:nil, tag_prefix: 'v')
           result = {
             commit_id: nil,
             commit_time: nil,
@@ -672,9 +676,27 @@ module Pindo
 
           return result if project_dir.nil? || !File.exist?(project_dir)
 
-          Dir.chdir(project_dir) do
-            # 获取最近 15 条 commit 历史
-            output = `git log -15 --format="%H|%ci|%s" 2>/dev/null`.strip
+          # 获取 git 根目录
+          git_root = git_root_directory(local_repo_dir: project_dir)
+          return result unless git_root
+
+          begin
+            # 优先级 1: 检查 HEAD 是否有版本 tag
+            if head_has_version_tag?(project_dir: git_root, tag_prefix: tag_prefix)
+              # HEAD 有版本 tag，直接返回 HEAD 的 commit 信息
+              head_info = git!(%W(-C #{git_root} log -1 --format=%H|%ci|%s HEAD)).strip
+              if !head_info.empty?
+                parts = head_info.split('|', 3)
+                result[:commit_id] = parts[0]
+                result[:commit_time] = parts[1]
+                result[:commit_desc] = parts[2]
+                puts "  HEAD 存在版本 tag，使用 HEAD commit: #{result[:commit_desc]}"
+                return result
+              end
+            end
+
+            # 优先级 2: 获取最近 15 条 commit 历史（排除 merge commits）
+            output = git!(%W(-C #{git_root} log -15 --no-merges --format=%H|%ci|%s)).strip
 
             if output.empty?
               Funlog.instance.warning("未找到 git commit 历史")
@@ -691,13 +713,16 @@ module Pindo
               }
             end
 
-            # 定义符合规范的提交类型
-            valid_prefixes = ['feat:', 'fix:', 'docs:', 'style:', 'refactor:', 'perf:', 'test:', 'build:', 'ci:', 'chore:', 'revert:']
+            # 定义符合规范的提交类型（Conventional Commits 规范）
+            valid_types = ['feat', 'fix', 'docs', 'style', 'refactor', 'perf', 'test', 'build', 'ci', 'chore', 'revert']
 
-            # 筛选符合规范的提交
+            # 筛选符合规范的提交（支持 type: 和 type(scope): 两种格式）
             conventional_commits = commits.select do |commit|
-              desc = commit[:commit_desc].to_s.strip
-              valid_prefixes.any? { |prefix| desc.downcase.start_with?(prefix) }
+              desc = commit[:commit_desc].to_s.strip.downcase
+              # 匹配 "type:" 或 "type(" 格式（允许 scope）
+              valid_types.any? do |type|
+                desc.start_with?("#{type}:") || desc.start_with?("#{type}(")
+              end
             end
 
             if conventional_commits.empty?
@@ -717,6 +742,9 @@ module Pindo
 
               puts "  找到符合规范的提交: #{result[:commit_desc]}"
             end
+          rescue StandardError => e
+            Funlog.instance.warning("获取 conventional commit 失败: #{e.message}")
+            return result
           end
 
           result
@@ -780,6 +808,20 @@ module Pindo
           new_tag
       end
 
+      # 检查 HEAD 是否已有版本 tag
+      # @param project_dir [String] 项目目录
+      # @param tag_prefix [String] tag前缀，默认 'v'
+      # @return [Boolean] HEAD 是否有版本 tag
+      def head_has_version_tag?(project_dir:, tag_prefix: 'v')
+        latest_tag = get_latest_version_tag(
+          project_dir: project_dir,
+          tag_prefix: tag_prefix
+        )
+        return false if latest_tag.nil?
+
+        is_tag_at_head?(git_root_dir: project_dir, tag_name: latest_tag)
+      end
+
       # 检查仓库是否有未提交的更改（包括未暂存和已暂存的更改）
       # @param git_root_dir [String] 项目目录路径
       # @return [Boolean] 如果有未提交的更改返回true，否则返回false
@@ -804,8 +846,8 @@ module Pindo
           return false if git_root_dir.nil? || tag_name.nil?
 
           begin
-              # 获取tag的commit hash
-              tag_commit = git!(%W(-C #{git_root_dir} rev-parse #{tag_name})).strip
+              # 获取tag指向的commit hash（使用^{commit}解引用，支持annotated tag和lightweight tag）
+              tag_commit = git!(%W(-C #{git_root_dir} rev-parse #{tag_name}^{commit})).strip
               # 获取HEAD的commit hash
               head_commit = git!(%W(-C #{git_root_dir} rev-parse HEAD)).strip
 

data/lib/pindo/command/android/autobuild.rb

@@ -89,7 +89,7 @@ module Pindo
         def self.option_items
           @option_items ||= Pindo::Options::OptionGroup.merge(
             Pindo::Options::BuildOptions.select(:bundle_name),  # 添加 bundle_name 参数
-            Pindo::Options::JPSOptions.select(:proj, :upload, :send, :media),
+            Pindo::Options::JPSOptions.select(:proj, :upload, :media, :bind, :send),
             Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
             Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
             Pindo::Options::TaskOptions.select(:multi),

data/lib/pindo/command/appstore/iap.rb

@@ -411,12 +411,11 @@ module Pindo
                     puts "key_id  : #{key_id}"
                     puts "private_key  : #{private_key}"
 
-                    AppStoreDevApi.config = {
+                    @app_store_connect = AppStoreDevApi::Client.new(
                       issuer_id: issuer_id,
                       key_id: key_id,
                       private_key: private_key
-                    }
-                    @app_store_connect = AppStoreDevApi::Client.new
+                    )
                   end
                 end
 

data/lib/pindo/command/ios/autobuild.rb

@@ -100,7 +100,7 @@ module Pindo
                 def self.option_items
                     @option_items ||= Pindo::Options::OptionGroup.merge(
                         Pindo::Options::BuildOptions.select(:bundleid, :build_type),
-                        Pindo::Options::JPSOptions.select(:proj, :upload, :send, :media, :bind),
+                        Pindo::Options::JPSOptions.select(:proj, :upload, :media, :bind, :send),
                         Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
                         Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
                         Pindo::Options::TaskOptions.select(:multi),

data/lib/pindo/command/unity/autobuild.rb

@@ -100,7 +100,7 @@ module Pindo
                 def self.option_items
                     @option_items ||= Pindo::Options::OptionGroup.merge(
                         Pindo::Options::BuildOptions.select(:bundleid, :bundle_name),  # 添加 bundleid 和 bundle_name 参数
-                        Pindo::Options::JPSOptions.select(:proj, :upload, :send, :media),
+                        Pindo::Options::JPSOptions.select(:proj, :upload, :send, :media, :bind),
                         Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
                         Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
                         Pindo::Options::TaskOptions.select(:multi),

data/lib/pindo/command/web/autobuild.rb

@@ -93,7 +93,7 @@ module Pindo
                 def self.option_items
                     @option_items ||= Pindo::Options::OptionGroup.merge(
                         Pindo::Options::BuildOptions.select(:bundleid),  # 添加 bundleid 参数
-                        Pindo::Options::JPSOptions.select(:proj, :upload, :send, :media),
+                        Pindo::Options::JPSOptions.select(:proj, :upload, :send, :media, :bind),
                         Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
                         Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
                         Pindo::Options::TaskOptions.select(:multi),

data/lib/pindo/module/appselect.rb

@@ -239,6 +239,13 @@ module Pindo
           puts "选择的Bundle Name是: #{menu_choice}"
           puts
 
+          # 去除通配符后缀（如 com.test.* -> com.test）
+          if menu_choice.end_with?(".*")
+            menu_choice = menu_choice.sub(/\.\*$/, '')
+            puts "去除通配符后的Bundle Name: #{menu_choice}"
+            puts
+          end
+
           # 保存选择到 GlobalOptionsState
           state[:bundle_name] = menu_choice
 
@@ -270,6 +277,13 @@ module Pindo
           puts "选择的Bundle Name是: #{menu_choice}"
           puts
 
+          # 去除通配符后缀（如 com.test.* -> com.test）
+          if menu_choice.end_with?(".*")
+            menu_choice = menu_choice.sub(/\.\*$/, '')
+            puts "去除通配符后的Bundle Name: #{menu_choice}"
+            puts
+          end
+
           return menu_choice
         end
 

data/lib/pindo/module/build/git_repo_helper.rb

@@ -236,20 +236,25 @@ module Pindo
 
     # 获取Build号（从commit hash转换而来）
     # @param project_dir [String] 项目目录路径
-    # @return [Integer] Build号（6位16进制转10进制）
+    # @return [Integer, String] 返回 build_number 和 commit_hash
+    #   - build_number: Build号（commit hash前6位16进制转10进制）
+    #   - commit_hash: 完整的commit hash（40位）
     def get_build_number_from_commit(project_dir: nil)
       raise ArgumentError, "项目目录不能为空" if project_dir.nil?
 
       # 获取git根目录
       git_root = Pindo::GitHandler.git_root_directory(local_repo_dir: project_dir)
-      return 1 unless git_root
+      return 1, nil unless git_root
 
       begin
-        # 获取当前HEAD的commit hash前6位
-        commit_hash = Pindo::GitHandler.git!(%W(-C #{git_root} rev-parse HEAD)).strip[0..5]
+        # 获取当前HEAD的完整commit hash
+        full_commit_hash = Pindo::GitHandler.git!(%W(-C #{git_root} rev-parse HEAD)).strip
+
+        # 取前6位计算build_number
+        short_hash = full_commit_hash[0..5]
 
         # 将16进制转换为10进制
-        build_number = commit_hash.to_i(16)
+        build_number = short_hash.to_i(16)
 
         # 确保在Android versionCode安全范围内（最大值为2^31-1）
         max_value = 2**31 - 1
@@ -258,11 +263,11 @@ module Pindo
         # 确保build_number不为0
         build_number = 1 if build_number == 0
 
-        build_number
+        return build_number, full_commit_hash
       rescue StandardError => e
         Funlog.instance.fancyinfo_error("获取commit hash失败: #{e.message}")
         # 如果获取失败，返回基于时间戳的默认值
-        Time.now.to_i % 1000000 + 1
+        return Time.now.to_i % 1000000 + 1, nil
       end
     end
 
@@ -304,7 +309,7 @@ module Pindo
         current_version
       when Pindo::CreateTagType::NEW
         # 创建新tag，需要检查HEAD是否已有tag
-        if head_has_version_tag?(project_dir: project_dir, tag_prefix: tag_prefix)
+        if Pindo::GitHandler.head_has_version_tag?(project_dir: project_dir, tag_prefix: tag_prefix)
           # HEAD已有tag，不需要创建新tag，使用当前版本号
           Funlog.instance.fancyinfo_success("HEAD已存在tag，使用当前版本号: #{current_version}")
           current_version
@@ -337,19 +342,6 @@ module Pindo
       end
     end
 
-    # 检查HEAD是否已有版本tag
-    # @param project_dir [String] 项目目录
-    # @param tag_prefix [String] tag前缀
-    # @return [Boolean] HEAD是否有tag
-    def head_has_version_tag?(project_dir:, tag_prefix: 'v')
-      latest_tag = Pindo::GitHandler.get_latest_version_tag(
-        project_dir: project_dir,
-        tag_prefix: tag_prefix
-      )
-      return false if latest_tag.nil?
-
-      Pindo::GitHandler.is_tag_at_head?(git_root_dir: project_dir, tag_name: latest_tag)
-    end
 
     # 创建并推送 Tag
     # @param project_dir [String] 项目目录

data/lib/pindo/module/pgyer/pgyerhelper.rb

@@ -1551,11 +1551,83 @@ module Pindo
             end
         end
 
-        # 获取工作流中已绑定的包 ID
+        # 获取特定 commit 已绑定的包 ID
         #
+        # @param commit_id [String] Git commit SHA（必需）
+        # @param workflow_id [Integer, String] 工作流 ID（必需，API 需要）
+        # @return [Array<String>] 已绑定的包 ID 数组
+        def get_commit_bound_package_ids(commit_id:, workflow_id:)
+            return [] if commit_id.nil? || commit_id.empty?
+            return [] if workflow_id.nil?
+
+            begin
+                # 使用 commit_log/preview API 直接查询特定 commit
+                result = @pgyer_client.get_commit_log_preview(
+                    workflowId: workflow_id,
+                    commitIds: [commit_id],
+                    params: { onlyCliff: false }  # 需要完整信息
+                )
+
+                # 兼容两种响应格式
+                response_code = result&.dig("code") || result&.dig("meta", "code")
+
+                if result && (response_code == 0 || response_code == 200)
+                    # 从响应中提取 commit 信息
+                    # preview API 可能返回数组或单个对象
+                    commit_data = result&.dig("data")
+                    commit_list = commit_data.is_a?(Array) ? commit_data : [commit_data].compact
+
+                    # 查找匹配的 commit
+                    commit_info = commit_list.find { |item| item && item["commitId"] == commit_id }
+
+                    if commit_info && commit_info["bindVersions"]
+                        # 从 bindVersions 中提取所有平台的 projectPackageId
+                        bind_versions = commit_info["bindVersions"]
+                        package_ids = []
+
+                        # 遍历所有平台（ipa, apk, zip, mac, exe 等）
+                        bind_versions.each do |_platform, version_info|
+                            if version_info && version_info["projectPackageId"]
+                                package_ids << version_info["projectPackageId"]
+                            end
+                        end
+
+                        return package_ids.compact.uniq
+                    else
+                        # 如果没有找到或没有绑定信息，返回空数组（可能是首次绑定）
+                        if ENV['PINDO_DEBUG']
+                            puts "[PINDO_DEBUG] Commit #{commit_id[0..7]} 没有绑定信息"
+                        end
+                        return []
+                    end
+                else
+                    # 如果获取失败，返回空数组（不阻止绑定流程）
+                    if ENV['PINDO_DEBUG']
+                        error_msg = result&.dig("msg") || result&.dig("meta", "message") || "未知错误"
+                        puts "[PINDO_DEBUG] 获取 commit 绑定包失败: #{error_msg}"
+                    end
+                    return []
+                end
+            rescue => e
+                # 异常时返回空数组，不阻止绑定流程
+                if ENV['PINDO_DEBUG']
+                    puts "[PINDO_DEBUG] 获取 commit 绑定包异常: #{e.message}"
+                    puts "[PINDO_DEBUG] Backtrace: #{e.backtrace[0..2].join("\n")}"
+                end
+                return []
+            end
+        end
+
+        # 获取工作流中已绑定的包 ID（已废弃，请使用 get_commit_bound_package_ids）
+        #
+        # @deprecated 使用 get_commit_bound_package_ids(commit_id:, workflow_id:) 替代
         # @param workflow_id [Integer, String] 工作流 ID
         # @return [Array<String>] 已绑定的包 ID 数组
         def get_workflow_bound_package_ids(workflow_id:)
+            if ENV['PINDO_DEBUG']
+                puts "[PINDO_DEBUG] ⚠️  get_workflow_bound_package_ids 已废弃，请使用 get_commit_bound_package_ids"
+            end
+
             return [] if workflow_id.nil?
 
             begin

data/lib/pindo/module/task/model/build/android_build_dev_task.rb

@@ -146,14 +146,15 @@ module Pindo
 
           if git_root
             # 是 Git 仓库，自己计算版本号
-            build_number = git_repo_helper.get_build_number_from_commit(project_dir: @project_path)
+            build_number, commit_hash = git_repo_helper.get_build_number_from_commit(project_dir: @project_path)
             build_version = git_repo_helper.calculate_build_version(
               project_dir: @project_path,
               tag_prefix: @tag_pre,
               create_tag_type: @tag_type,
               version_increase_type: @ver_inc
             )
-            Funlog.instance.fancyinfo_success("自己计算版本号: #{build_version}, Build: #{build_number}")
+            commit_short = commit_hash ? commit_hash[0..7] : "unknown"
+            Funlog.instance.fancyinfo_success("自己计算版本号: #{build_version}, Build: #{build_number}, Commit: #{commit_short}")
           else
             # 不是 Git 仓库且没有从 GitCommitTask 获取到版本号，跳过版本更新
             Funlog.warning("非Git仓库且未从 GitCommitTask 获取到版本号，保持工程原有版本号")

data/lib/pindo/module/task/model/build/ios_build_dev_task.rb

@@ -159,14 +159,15 @@ module Pindo
 
           if git_root
             # 是 Git 仓库，自己计算版本号
-            build_number = git_repo_helper.get_build_number_from_commit(project_dir: @project_path)
+            build_number, commit_hash = git_repo_helper.get_build_number_from_commit(project_dir: @project_path)
             build_version = git_repo_helper.calculate_build_version(
               project_dir: @project_path,
               tag_prefix: @tag_pre,
               create_tag_type: @tag_type,
               version_increase_type: @ver_inc
             )
-            Funlog.instance.fancyinfo_success("自己计算版本号: #{build_version}, Build: #{build_number}")
+            commit_short = commit_hash ? commit_hash[0..7] : "unknown"
+            Funlog.instance.fancyinfo_success("自己计算版本号: #{build_version}, Build: #{build_number}, Commit: #{commit_short}")
           else
             # 不是 Git 仓库且没有从 GitCommitTask 获取到版本号，跳过版本更新
             Funlog.warning("非Git仓库且未从 GitCommitTask 获取到版本号，保持工程原有版本号")

data/lib/pindo/module/task/model/git/git_commit_task.rb

@@ -7,9 +7,6 @@ module Pindo
     # Git 提交任务
     # 负责检查并提交仓库的未提交修改
     class GitCommitTask < GitTask
-      attr_reader :release_branch, :ver_inc, :tag_type, :tag_pre
-      attr_reader :build_version, :build_number
-
       # 任务键
       def self.task_key
         :git_commit
@@ -37,18 +34,13 @@ module Pindo
       #   2. 执行 check_gitignore（可能创建新提交）
       #   3. 最终使用 fixed_version（如果有）或计算新版本号
       def initialize(project_path, options = {})
-        @release_branch = options[:release_branch] || 'master'
-        @ver_inc = options[:ver_inc] || Pindo::VersionIncreaseType::MINI
-        @tag_type = options[:tag_type] || Pindo::CreateTagType::NEW
-        @tag_pre = options[:tag_pre] || 'v'
+        # GitCommitTask 特有的属性
         @fixed_version = options[:fixed_version]  # 外部指定的固定版本号
         @process_type = options[:process_type] || 'skip' # 默认跳过
         @commit_message = options[:commit_message] || 'build: 构建产生提交' # 默认提交消息
 
-        @build_version = nil
-        @build_number = nil
         options[:project_path] = project_path
-
+        # 调用基类初始化（基类会设置 release_branch, ver_inc, tag_type, tag_pre 等通用属性）
         super("Git仓库文件提交检查", options)
       end
 
@@ -79,7 +71,7 @@ module Pindo
         # 1. 如果 fixed_version 为 nil，尝试从 HEAD 的 tag 获取版本
         # 必须在 check_gitignore 之前检查，因为 check_gitignore 可能创建提交导致 HEAD 移动
         if (@fixed_version.nil? || @fixed_version.empty?) &&
-           git_repo_helper.head_has_version_tag?(project_dir: root_dir, tag_prefix: @tag_pre) &&
+           Pindo::GitHandler.head_has_version_tag?(project_dir: root_dir, tag_prefix: @tag_pre) &&
            !Pindo::GitHandler.has_uncommitted_changes?(git_root_dir: root_dir)
           # HEAD 有 tag 且工作目录干净，使用 tag 的版本
           latest_tag = Pindo::GitHandler.get_latest_version_tag(
@@ -87,7 +79,7 @@ module Pindo
             tag_prefix: @tag_pre
           )
           @fixed_version = latest_tag.sub(/^#{@tag_pre}/, '') if latest_tag
-          Funlog.instance.fancyinfo_success("HEAD 存在 tag 且工作目录干净，设置 fixed_version: #{@fixed_version}")
+          Funlog.instance.fancyinfo_success("HEAD 存在 tag 且工作目录干净，会强制使用HEAD上的版本号: #{@fixed_version}")
         end
 
         # 2. 检查并修复 .gitignore（可能创建新提交，但 fixed_version 已经确定）
@@ -141,19 +133,21 @@ module Pindo
         # 优先级 1: 如果指定了 fixed_version（外部传入或从 HEAD tag 获取），使用它
         if @fixed_version && !@fixed_version.empty?
           @build_version = @fixed_version
-          @build_number = git_repo_helper.get_build_number_from_commit(project_dir: root_dir)
-          Funlog.instance.fancyinfo_success("使用 fixed_version: #{@build_version}, Build: #{@build_number}")
+          @build_number, @commit_hash = git_repo_helper.get_build_number_from_commit(project_dir: root_dir)
+          commit_short = @commit_hash ? @commit_hash[0..7] : "unknown"
+          Funlog.instance.fancyinfo_success("Version: #{@build_version}, Build: #{@build_number}, Commit: #{commit_short}")
 
         # 优先级 2: 计算新版本号
         else
-          @build_number = git_repo_helper.get_build_number_from_commit(project_dir: root_dir)
+          @build_number, @commit_hash = git_repo_helper.get_build_number_from_commit(project_dir: root_dir)
           @build_version = git_repo_helper.calculate_build_version(
             project_dir: root_dir,
             tag_prefix: @tag_pre,
             create_tag_type: @tag_type,
             version_increase_type: @ver_inc
           )
-          Funlog.instance.fancyinfo_success("计算新版本号: #{@build_version}, Build: #{@build_number}")
+          commit_short = @commit_hash ? @commit_hash[0..7] : "unknown"
+          Funlog.instance.fancyinfo_success("Version: #{@build_version}, Build: #{@build_number}, Commit: #{commit_short}")
         end
 
         # 9. 还原 stash（如果之前有 stash）
@@ -175,41 +169,6 @@ module Pindo
           message: "Git 提交检查完成"
         }
       end
-
-      # 构建任务参数（供其他任务使用）
-      def build_task_param
-        return {} unless @status == TaskStatus::SUCCESS
-
-        # 如果不是 Git 仓库，返回空参数（让依赖任务知道没有有效数据）
-        return {} if @build_version.nil? || @build_number.nil?
-
-        param = {
-          release_branch: @release_branch,
-          build_version: @build_version,
-          build_number: @build_number,
-          tag_pre: @tag_pre,
-          tag_type: @tag_type,
-          ver_inc: @ver_inc
-        }
-
-        # 添加 git commit 信息（供 JPSUploadMediaTask 等任务使用）
-        if @git_root_path
-          begin
-            # 获取当前 HEAD commit 信息
-            git_commit_info = Pindo::GitHandler.get_latest_conventional_commit(project_dir: @git_root_path)
-            if git_commit_info
-              param[:git_commit_id] = git_commit_info[:commit_id]
-              param[:git_commit_time] = git_commit_info[:commit_time]
-              param[:git_commit_desc] = git_commit_info[:commit_desc]
-            end
-          rescue => e
-            # 如果获取失败，不影响主流程
-            Funlog.instance.fancyinfo_warning("获取 git commit 信息失败: #{e.message}") if ENV['PINDO_DEBUG']
-          end
-        end
-
-        param
-      end
     end
   end
 end

data/lib/pindo/module/task/model/git/git_tag_task.rb

@@ -7,9 +7,6 @@ module Pindo
     # Git 标签任务
     # 负责在构建成功后创建 Git 标签
     class GitTagTask < GitTask
-      attr_reader :release_branch, :ver_inc, :tag_type, :tag_pre
-      attr_reader :build_version, :build_number
-
       # 任务键
       def self.task_key
         :git_tag
@@ -29,15 +26,8 @@ module Pindo
       #   - tag_pre: tag前缀，默认 'v'
       # 注意：版本号从 GitCommitTask 获取（GitTagTask 必须依赖 GitCommitTask）
       def initialize(project_path, options = {})
-        @release_branch = options[:release_branch] || 'master'
-        @ver_inc = options[:ver_inc] || Pindo::VersionIncreaseType::MINI
-        @tag_type = options[:tag_type] || Pindo::CreateTagType::NEW
-        @tag_pre = options[:tag_pre] || 'v'
-
-        @build_version = nil
-        @build_number = nil
         options[:project_path] = project_path
-
+        # 调用基类初始化（基类会设置所有通用属性）
         super("Git仓库打Tag", options)
       end
 
@@ -98,14 +88,15 @@ module Pindo
 
           # 优先级 2: 自己计算（降级方案，用于向后兼容或 GitCommitTask 无有效数据）
           else
-            @build_number = git_repo_helper.get_build_number_from_commit(project_dir: root_dir)
+            @build_number, @commit_hash = git_repo_helper.get_build_number_from_commit(project_dir: root_dir)
             @build_version = git_repo_helper.calculate_build_version(
               project_dir: root_dir,
               tag_prefix: @tag_pre,
               create_tag_type: @tag_type,
               version_increase_type: @ver_inc
             )
-            Funlog.instance.fancyinfo_warning("未找到 GitCommitTask 依赖，降级为自己计算版本号: #{@build_version}")
+            commit_short = @commit_hash ? @commit_hash[0..7] : "unknown"
+            Funlog.instance.fancyinfo_warning("未找到 GitCommitTask 依赖，降级为自己计算版本号: #{@build_version}, Build: #{@build_number}, Commit: #{commit_short}")
           end
 
           # 4. 创建并推送 Tag

data/lib/pindo/module/task/model/git_task.rb

@@ -1,5 +1,6 @@
 require 'pindo/module/task/pindo_task'
 require 'pindo/base/git_handler'
+require 'pindo/module/build/git_repo_helper'
 
 module Pindo
   module TaskSystem
@@ -7,10 +8,23 @@ module Pindo
     # 所有 Git 相关任务的父类，提供通用的 Git 操作和配置
     class GitTask < PindoTask
       attr_reader :project_path, :git_root_path
+      attr_reader :release_branch, :ver_inc, :tag_type, :tag_pre
+      attr_reader :build_version, :build_number, :commit_hash
 
       def initialize(name, options = {})
         @project_path = options[:project_path] ? File.expand_path(options[:project_path]) : nil
 
+        # Git 版本管理相关属性（子类可以覆盖默认值）
+        @release_branch = options[:release_branch] || 'master'
+        @ver_inc = options[:ver_inc] || Pindo::VersionIncreaseType::MINI
+        @tag_type = options[:tag_type] || Pindo::CreateTagType::NEW
+        @tag_pre = options[:tag_pre] || 'v'
+
+        # 版本信息（由子类在 do_work 中赋值）
+        @build_version = nil
+        @build_number = nil
+        @commit_hash = nil
+
         # 通过 project_path 获取 git_root_path
         @git_root_path = @project_path ? Pindo::GitHandler.git_root_directory(local_repo_dir: @project_path) : nil
 
@@ -76,6 +90,41 @@ module Pindo
         return nil unless @git_root_path
         Pindo::GitHandler.git!(%W(-C #{@git_root_path} rev-parse --abbrev-ref HEAD)).strip
       end
+
+      # 构建任务参数（供其他任务使用）
+      def build_task_param
+        return {} unless @status == TaskStatus::SUCCESS
+
+        # 如果不是 Git 仓库，返回空参数（让依赖任务知道没有有效数据）
+        return {} if @build_version.nil? || @build_number.nil?
+
+        param = {
+          release_branch: @release_branch,
+          build_version: @build_version,
+          build_number: @build_number,
+          tag_pre: @tag_pre,
+          tag_type: @tag_type,
+          ver_inc: @ver_inc
+        }
+
+        # 添加 git commit 信息（供 JPSUploadMediaTask 等任务使用）
+        if @git_root_path
+          begin
+            # 获取当前 HEAD commit 信息
+            git_commit_info = Pindo::GitHandler.get_latest_conventional_commit(project_dir: @git_root_path)
+            if git_commit_info
+              param[:git_commit_id] = git_commit_info[:commit_id]
+              param[:git_commit_time] = git_commit_info[:commit_time]
+              param[:git_commit_desc] = git_commit_info[:commit_desc]
+            end
+          rescue => e
+            # 如果获取失败，不影响主流程
+            Funlog.instance.fancyinfo_warning("获取 git commit 信息失败: #{e.message}") if ENV['PINDO_DEBUG']
+          end
+        end
+
+        param
+      end
     end
   end
 end

data/lib/pindo/module/task/model/jps/jps_bind_package_task.rb

@@ -142,24 +142,27 @@ module Pindo
           raise "缺少 workflow_info，无法获取 workflow_id"
         end
 
-        # 7. 获取工作流中已绑定的包 ID
-        existing_bound_ids = pgyer_helper.get_workflow_bound_package_ids(workflow_id: workflow_id)
+        # 7. 获取当前 commit 已绑定的包 ID
+        existing_bound_ids = pgyer_helper.get_commit_bound_package_ids(
+          commit_id: @git_commit_id,
+          workflow_id: workflow_id
+        )
 
         if existing_bound_ids.any?
-          puts "  📋 工作流中已绑定的包: #{existing_bound_ids.size} 个"
+          puts "  📋 当前 Commit 已绑定的包: #{existing_bound_ids.size} 个"
         end
 
-        # 8. 合并已绑定的包 ID 和新的包 ID（去重）
+        # 8. 合并当前 commit 已绑定的 ID 和新上传的包 ID（去重）
         merged_package_ids = (existing_bound_ids + project_package_ids).uniq
 
         puts "  📦 合并后的包 ID 数量: #{merged_package_ids.size} 个"
         if merged_package_ids.size > project_package_ids.size
           puts "     └─ 新增: #{project_package_ids.size} 个"
-          puts "     └─ 已存在: #{existing_bound_ids.size} 个"
+          puts "     └─ 已绑定: #{existing_bound_ids.size} 个"
         end
         puts ""
 
-        # 9. 批量绑定所有包
+        # 9. 批量绑定所有包（API 是覆盖式，所以需要包含已绑定的）
         Funlog.instance.fancyinfo_start("正在绑定 #{merged_package_ids.size} 个项目包...")
 
         bind_result = pgyer_helper.bind_commit_to_package(
@@ -207,16 +210,19 @@ module Pindo
 
       # 从依赖任务获取或自动获取 git commit 信息
       def fetch_git_commit_info
-        # 1. 首先尝试从 GitCommitTask 依赖任务获取
-        git_commit_data = get_data_param_by_key(:git_commit)
-        if git_commit_data && git_commit_data[:task_param]
-          param = git_commit_data[:task_param]
+        # 1. 优先从 GitTagTask 依赖任务获取（打 tag 后的 commit 信息更准确）
+        git_data = get_data_param_by_key(:git_tag)
+        # 2. 降级到 GitCommitTask
+        git_data = get_data_param_by_key(:git_commit) if git_data.nil? || git_data.empty?
+
+        if git_data && git_data[:task_param]
+          param = git_data[:task_param]
           @git_commit_id = param[:git_commit_id] if param[:git_commit_id]
           @git_commit_time = param[:git_commit_time] if param[:git_commit_time]
           @git_commit_desc = param[:git_commit_desc] if param[:git_commit_desc]
         end
 
-        # 2. 如果依赖任务没有提供，且指定了 project_dir，使用自动获取
+        # 3. 如果依赖任务都没有提供，且指定了 project_dir，使用自动获取
         if (@git_commit_id.nil? || @git_commit_id.empty?) && @project_dir
           # 查找 git 仓库根目录
           git_root = Pindo::GitHandler.git_root_directory(local_repo_dir: @project_dir)

data/lib/pindo/module/task/model/jps/jps_upload_media_task.rb

@@ -97,17 +97,20 @@ module Pindo
 
         # 2. 如果没有提供 git_commit_id，尝试从依赖任务获取或自动获取
         if @git_commit_id.nil? || @git_commit_id.empty?
-          # 2.1 首先尝试从 GitCommitTask 依赖任务获取
-          git_commit_data = get_data_param_by_key(:git_commit)
-          if git_commit_data && git_commit_data[:task_param]
-            param = git_commit_data[:task_param]
+          # 2.1 优先从 GitTagTask 依赖任务获取（打 tag 后的 commit 信息更准确）
+          git_data = get_data_param_by_key(:git_tag)
+          # 2.2 降级到 GitCommitTask
+          git_data = get_data_param_by_key(:git_commit) if git_data.nil? || git_data.empty?
+
+          if git_data && git_data[:task_param]
+            param = git_data[:task_param]
             # 尝试从 task_param 获取 commit 信息
             @git_commit_id = param[:git_commit_id] if param[:git_commit_id]
             @git_commit_time = param[:git_commit_time] if param[:git_commit_time]
             @git_commit_desc = param[:git_commit_desc] if param[:git_commit_desc]
           end
 
-          # 2.2 如果依赖任务没有提供，使用 get_latest_conventional_commit
+          # 2.3 如果依赖任务都没有提供，使用 get_latest_conventional_commit
           if @git_commit_id.nil? || @git_commit_id.empty?
             git_info = Pindo::GitHandler.get_latest_conventional_commit(project_dir: git_root)
             @git_commit_id = git_info[:commit_id]

data/lib/pindo/module/task/model/jps/jps_workflow_message_task.rb

@@ -93,11 +93,15 @@ module Pindo
 
       # 从依赖任务获取数据
       def fetch_data_from_dependencies
-        # 1. 从 GitCommitTask 获取 commit 信息
+        # 1. 获取 commit 信息（优先从 GitTagTask，降级到 GitCommitTask）
         if @git_commit_id.nil?
-          git_commit_data = get_data_param_by_key(:git_commit)
-          if git_commit_data && git_commit_data[:task_param]
-            param = git_commit_data[:task_param]
+          # 1.1 优先从 GitTagTask 依赖任务获取（打 tag 后的 commit 信息更准确）
+          git_data = get_data_param_by_key(:git_tag)
+          # 1.2 降级到 GitCommitTask
+          git_data = get_data_param_by_key(:git_commit) if git_data.nil? || git_data.empty?
+
+          if git_data && git_data[:task_param]
+            param = git_data[:task_param]
             @git_commit_id = param[:git_commit_id] if param[:git_commit_id]
             @git_commit_time = param[:git_commit_time] if param[:git_commit_time]
             @git_commit_desc = param[:git_commit_desc] if param[:git_commit_desc]

data/lib/pindo/options/groups/build_options.rb

@@ -37,8 +37,9 @@ module Pindo
             optional: true,
             cacheable: true,  # 存入文件缓存
             verify_block: proc do |value|
-              unless value =~ /^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_]*)+$/i
-                raise "Package Name 格式错误: #{value}，应该类似 com.example.app"
+              # 允许标准格式（com.example.app）或带通配符格式（com.example.*）
+              unless value =~ /^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_\*]*)+$/i
+                raise "Package Name 格式错误: #{value}，应该类似 com.example.app 或 com.example.*"
               end
             end,
             example: 'pindo android autobuild --bundle_name=com.example.app'

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.14.6"
+  VERSION = "5.14.8"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.14.6
+  version: 5.14.8
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-12-31 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -95,20 +95,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: jpsclient
   requirement: !ruby/object:Gem::Requirement
@@ -189,20 +183,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -507,7 +501,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.0.0
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 4.0.3
 specification_version: 4
 summary: easy work
 test_files: []