pindo 5.14.6 → 5.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da83c30dd943e6edfa9320b5944d43b76fd467c2ebdf1aff2f010a07235628a9
-  data.tar.gz: a05b5d981a1431cfc9c0659d20966f4eaafee7433de93d27ebddb11310a57678
+  metadata.gz: 0e61c4fa7bc1f944011a7d2da6ea5f88e6964cf4156fbfc820a82f87f8376b15
+  data.tar.gz: '0826f4b21c1fdd8145763b8357dddfa7f6c06a461b128bb458b7c75886ba5208'
 SHA512:
-  metadata.gz: bf83411f15e4a91b3c80d5add990d84e6a00513deee5943304a0a5cb72a29d9495d8cbbd14da5e8463bd4345d2e778997e7947cb7bc681d4046e362eb7fadb1d
-  data.tar.gz: efee3ed4cf27cc7206f57543865397dc126d3c4e902451a59b617e2547fa8c5fae96330dcd9c9b9f3b2ddc12545024537fe46620199a3261a32da8afb1dc7902
+  metadata.gz: a1379dd0f212e82aad3c889d9c06374810441728700616d9a2293c647bbe0272318d744dcfd4056edf69d8bde847a9394225c334a3909e419f34321d38d9f29f
+  data.tar.gz: df9c68524dbdbd81f29e3134c9b1a25de3e6fc57e29346b5beae93bcccb8ac1186bbfe7e3f4a86dbfb81ebc5356f91eeb852cf9a6f504144225c3715e9a63975

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/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/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/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(

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.7"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.14.6
+  version: 5.14.7
 platform: ruby
 authors:
 - wade
@@ -189,20 +189,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