pindo 5.19.3 → 5.19.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a77caec349df71376df7ea433567423ae745f767297fb29377e265f123b63d8
-  data.tar.gz: 5f8040b7e13937405b635906ad34dcd4466af83292d65b823968d22fce9f3081
+  metadata.gz: b7cccaa492d62d373f89fd3af414f3536ca43d47a840cc916b2629445cb581e3
+  data.tar.gz: 70f7ad8f931126af81fb7bceae2f54b35d1adc4d34b3991cde6b3a6c6422b950
 SHA512:
-  metadata.gz: 9fb90c4d057aab583df7780e4e8880c47507da9c64f9b05dfb48b778c87ae1695cf33711c6b777ad6540284f97a101ba5c28f10e8d6a91dfc6243b6a4a25843f
-  data.tar.gz: 57f746e6f8a01dcebab6615d1e30de5d7b6a1eb2b221bf8db50a10c66a0aab240279064b86f89bef7e0ccace8186eaf87da42a008a2f50f2a403f0d5ee5ec593
+  metadata.gz: 9ac4563509d172649298ca22c6f1459b2805521c2c0aa226f6ba9dacdb95b287814d92c70b5b747ac0be9f783c929f180d430dc72c179b76b764e65922ce30c2
+  data.tar.gz: 8383a7f60e3970a37e7e3311a6f930dfc9fb68ca49fc56c48ba868678739ed6215ea63d5f326b86ee690afb747a98bede384378e163229094c0e9a2b972c7be9

data/lib/pindo/base/git_handler.rb

@@ -443,7 +443,7 @@ module Pindo
         return config_repo_dir
       end
 
-      def git_addpush_repo(path:nil, message:"res", commit_file_params:nil)
+      def git_addpush_repo(path:nil, message:"chore(config): 提交配置变更", commit_file_params:nil)
         # gitee.com 仓库自动去除代理；is_gitee_repo? 命令已带 -C，无需 chdir
         if is_gitee_repo?(local_repo_dir: path)
           return without_proxy { git_addpush_repo_impl(path: path, message: message, commit_file_params: commit_file_params) }
@@ -452,7 +452,7 @@ module Pindo
         git_addpush_repo_impl(path: path, message: message, commit_file_params: commit_file_params)
       end
 
-      def git_addpush_repo_impl(path:nil, message:"res", commit_file_params:nil)
+      def git_addpush_repo_impl(path:nil, message:"chore(config): 提交配置变更", commit_file_params:nil)
         current=Dir.pwd
         Dir.chdir(path)
         begin
@@ -467,7 +467,7 @@ module Pindo
                 end
               end
               if need_commit
-                git! ['commit', '-m ' + "#{message}"]
+                git! ['commit', '-m', message]
                 git! ['push']
               else
                 # puts "\n#{path}\n!!!仓库中文件未发生变化，无需提交!!!\n"
@@ -478,7 +478,7 @@ module Pindo
               # puts files_list
               if !files_list.nil? && files_list.size > 0
                   git! ['add', '-A']
-                  git! ['commit', '-m ' + "#{message}"]
+                  git! ['commit', '-m', message]
                   git! ['push']
               else
                 puts "\n#{path}\n!!!仓库中文件未发生变化，无需提交!!!\n"
@@ -620,7 +620,7 @@ module Pindo
 
         def handle_commit_all(project_dir, branch, commit_message = nil)
             # 使用传入的 commit_message，如果没有则使用默认值
-            message = commit_message || "build: 构建产生提交"
+            message = commit_message || "chore(build): 构建产生提交"
 
             Funlog.instance.fancyinfo_start("开始提交文件...")
             git! ['add', '-A']

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

@@ -150,7 +150,7 @@ module Pindo
 
                     pindo_dir = File.expand_path(pindo_single_config.pindo_dir)
                     config_repo_dir = File.join(pindo_dir, @bundle_id)
-                    Pindo::GitHandler.git_addpush_repo(path: config_repo_dir, message: "download app iap", commit_file_params: ["fastlane/iap/iap_appstore_download.json"])
+                    Pindo::GitHandler.git_addpush_repo(path: config_repo_dir, message: "chore(config): 下载应用 iap 配置", commit_file_params: ["fastlane/iap/iap_appstore_download.json"])
 
                     update_app_share_secrets(app_id: app_id, need_create: false)
                 end
@@ -295,7 +295,7 @@ module Pindo
                             file.close
                         end
 
-                        Pindo::GitHandler.git_addpush_repo(path: config_repo_dir, message: "update app shared secret", commit_file_params: ["config.json"])
+                        Pindo::GitHandler.git_addpush_repo(path: config_repo_dir, message: "chore(config): 更新应用 shared secret", commit_file_params: ["config.json"])
 
                     end
 

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

@@ -211,7 +211,7 @@ module Pindo
                             # 只提交 config.json 到 Git 仓库
                             Pindo::GitHandler.git_addpush_repo(
                                 path: app_config_dir,
-                                message: "sync capabilities from Apple Developer Portal",
+                                message: "chore(config): 同步 Apple Developer Portal 的 capabilities",
                                 commit_file_params: ["config.json"]
                             )
 

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

@@ -17,7 +17,7 @@ module Pindo
             class Autoresign < Ios
 
                 include Appselect
-                self.summary = 'IPA包重签名工具'
+                self.summary = 'iOS IPA / macOS App 重签名工具'
 
                 # 启用缓存机制
                 def self.use_cache?
@@ -25,7 +25,7 @@ module Pindo
                 end
 
                 self.description = <<-DESC
-                    使用最新的证书重签名IPA包。
+                    使用最新的证书重签名 iOS IPA 或 macOS App。
 
                     支持功能:
 
@@ -35,6 +35,8 @@ module Pindo
 
                         * 支持指定IPA路径
 
+                        * 使用 --macos 对 macOS .app 目录进行 Developer ID / Development 重签名
+
                         * 支持上传到JPS测试平台
 
                         * 支持发送测试通知
@@ -47,6 +49,10 @@ module Pindo
 
                         $ pindo ios autoresign demo.ipa                           # 重签名指定IPA文件
 
+                        $ pindo ios autoresign Demo.app --macos                  # 重签名指定 macOS App
+
+                        $ pindo ios autoresign --app=Demo.app --macos            # 使用选项指定 macOS App
+
                         $ pindo ios autoresign --adhoc                            # 使用adhoc证书重签名
 
                         $ pindo ios autoresign --deploy                           # 使用发布bundle id
@@ -65,7 +71,7 @@ module Pindo
                 DESC
 
                 self.arguments = [
-                    CLAide::Argument.new('path/to/demo.ipa', true),
+                    CLAide::Argument.new('path/to/demo.ipa|path/to/Demo.app', true),
                 ]
 
                 def self.option_items
@@ -73,11 +79,11 @@ module Pindo
                         items = []
 
                         # 添加工具参数（ToolOptions）
-                        items.concat(Pindo::Options::ToolOptions.select(:ipa, :deploy))
+                        items.concat(Pindo::Options::ToolOptions.select(:ipa, :app, :deploy))
 
                         # 添加构建类型参数（BuildOptions）
                         items.concat(Pindo::Options::BuildOptions.select(
-                            :dev, :adhoc, :develop_id, :build_type
+                            :bundleid, :dev, :adhoc, :develop_id, :build_type
                         ))
 
                         # 添加证书相关参数（CertOptions）
@@ -106,9 +112,10 @@ module Pindo
                       @options = initialize_options(argv)
 
                       # 优先使用选项参数，如果没有则使用位置参数
-                      @args_ipa_file = @options[:ipa] || positional_ipa
+                      @args_ipa_file = @options[:app] || @options[:ipa] || positional_ipa
 
                     @args_deploy_flag = @options[:deploy]
+                    @args_bundle_id = @options[:bundleid]
 
                     # JPS 参数（从 options 中获取）
                     @args_upload_flag = @options[:upload]
@@ -154,7 +161,8 @@ module Pindo
 
                     # 处理平台类型
                     @platform_type = @options[:platform]
-                    if @args_macos_flag
+                    # --app 只用于 macOS，指定即隐含 macOS 平台，无需再显式加 --macos
+                    if @args_macos_flag || @options[:app]
                         @platform_type = 'macos'
                     end
 
@@ -165,15 +173,18 @@ module Pindo
 
                     super
                     @additional_args = argv.remainder!
+                    unless @additional_args.empty?
+                        raise Informative, "只允许指定一个安装包路径，多余参数: #{@additional_args.join(' ')}"
+                    end
                 end
 
 
                 def run
                     begin
-                        # 1. 查找 IPA 文件
+                        # 1. 查找待签名包（iOS 为 IPA，macOS 为 .app）
                         ipa_file_path = find_ipa_file()
                         unless ipa_file_path && File.exist?(ipa_file_path)
-                            raise Informative, "未找到需要重签名的 IPA 文件"
+                            raise Informative, "未找到需要重签名的安装包"
                         end
 
                         # 2. 选择 Bundle ID
@@ -187,7 +198,7 @@ module Pindo
                         app_info_obj, workflow_info = prepare_jps_config()
 
                         # 5. 计算重签名后的 IPA 文件名
-                        resigned_ipa_file = ipa_file_path.gsub(/\.ipa$/, '_resigned.ipa')
+                        resigned_ipa_file = resigned_package_path(ipa_file_path)
 
                         # 6. 创建任务
                         tasks = create_resign_tasks(
@@ -214,21 +225,25 @@ module Pindo
 
                 # 查找 IPA 文件
                 def find_ipa_file
-                      # 1. 如果通过选项或位置参数指定了 IPA 文件且存在，直接返回
-                      if @args_ipa_file && File.exist?(@args_ipa_file)
-                        puts "\n使用指定的 IPA 文件: #{@args_ipa_file}"
+                      # 1. 如果通过选项或位置参数指定了安装包，严格校验后直接返回
+                      if @args_ipa_file
+                        unless File.exist?(@args_ipa_file)
+                            raise Informative, "指定的安装包不存在: #{@args_ipa_file}"
+                        end
+                        validate_package_path!(@args_ipa_file)
+                        puts "\n使用指定的安装包: #{@args_ipa_file}"
                         puts "修改时间: #{File.mtime(@args_ipa_file)}"
                         return @args_ipa_file
                       end
 
                     # 2. 在当前目录查找最新的非 _resigned 的 IPA
                     current_dir = Dir.pwd
-                    ipa_files = Dir.glob(File.join(current_dir, "*.ipa"))
+                    pattern = macos_platform? ? "*.app" : "*.ipa"
+                    ipa_files = Dir.glob(File.join(current_dir, pattern))
 
-                    # 过滤掉 _resigned.ipa 并找到最新的
-                    ipa_file = ipa_files.max_by do |f|
-                        File.basename(f).include?("_resigned") ? Time.local(0, 1, 1) : File.mtime(f)
-                    end
+                    # 排除已经重签名的产物并找到最新安装包
+                    ipa_files.reject! { |f| File.basename(f).include?("_resigned") }
+                    ipa_file = ipa_files.max_by { |f| File.mtime(f) }
 
                     if ipa_file && File.exist?(ipa_file)
                         puts "\n自动找到 IPA 文件: #{ipa_file}"
@@ -237,12 +252,13 @@ module Pindo
                     end
 
                     # 3. 如果没有找到，从终端输入
-                    puts "\n⚠️  未找到 IPA 文件"
-                    puts "请输入 IPA 文件路径（支持相对路径或绝对路径）："
+                    package_name = macos_platform? ? "macOS .app" : "IPA"
+                    puts "\n⚠️  未找到 #{package_name}"
+                    puts "请输入 #{package_name} 路径（支持相对路径或绝对路径）："
 
-                    ipa_path = ask("IPA 文件路径: ") do |q|
-                        q.validate = /\.ipa$/i
-                        q.responses[:not_valid] = "❌ 请输入有效的 IPA 文件路径（必须以 .ipa 结尾）"
+                    ipa_path = ask("安装包路径: ") do |q|
+                        q.validate = macos_platform? ? /\.app$/i : /\.ipa$/i
+                        q.responses[:not_valid] = "❌ 请输入有效的 #{package_name} 路径"
                     end
 
                     # 去除首尾空格
@@ -251,7 +267,8 @@ module Pindo
                     # 验证文件是否存在
                     if ipa_path && !ipa_path.empty?
                         if File.exist?(ipa_path)
-                            puts "✓ 使用输入的 IPA 文件: #{ipa_path}"
+                            validate_package_path!(ipa_path)
+                            puts "✓ 使用输入的安装包: #{ipa_path}"
                             puts "  修改时间: #{File.mtime(ipa_path)}"
                             return ipa_path
                         else
@@ -262,8 +279,32 @@ module Pindo
                     nil
                 end
 
+                def macos_platform?
+                    @platform_type.to_s.downcase == 'macos'
+                end
+
+                def validate_package_path!(path)
+                    if macos_platform?
+                        unless File.directory?(path) && path.downcase.end_with?('.app')
+                            raise Informative, "--macos 模式要求输入 macOS .app 目录: #{path}"
+                        end
+                    elsif !File.file?(path) || !path.downcase.end_with?('.ipa')
+                        raise Informative, "iOS 模式要求输入 .ipa 文件: #{path}"
+                    end
+                end
+
+                def resigned_package_path(path)
+                    extension = macos_platform? ? '.app' : '.ipa'
+                    path.sub(/#{Regexp.escape(extension)}$/i, "_resigned#{extension}")
+                end
+
                 # 选择 Bundle ID（根据 build_type）
                 def select_bundle_id
+                    if @args_bundle_id && !@args_bundle_id.empty?
+                        puts "\n使用指定的 Bundle ID: #{@args_bundle_id}"
+                        return @args_bundle_id
+                    end
+
                     if @args_deploy_flag || @build_type != 'development'
                         get_selected_deploy_bundleid()
                     else
@@ -274,8 +315,9 @@ module Pindo
                 # 拉取应用配置
                 def pull_app_config(bundle_id)
                     require 'pindo/config/build_info_manager'
+                    repo_name = bundle_id.sub(/\.\*$/, '')
                     Pindo::BuildInfoManager.share_instance.pull_appconfig_with_reponame(
-                        repo_name: bundle_id,
+                        repo_name: repo_name,
                         target_dir: Dir.pwd
                     )
                 end
@@ -283,9 +325,8 @@ module Pindo
                 # 准备 JPS 配置
                 def prepare_jps_config
                     if @args_upload_flag
-                        # 根据 Xcode 工程类型动态设置 package_type（macOS 工程使用 'mac'，否则使用 'ipa'）
-                        is_macos = Pindo::BuildHelper.share_instance.macos_project?(Dir.pwd)
-                        package_type = is_macos ? 'mac' : 'ipa'
+                        # 以平台类型为唯一判定口径，与 create_resign_tasks 的上传任务保持一致
+                        package_type = macos_platform? ? 'mac' : 'ipa'
                         app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
                             working_directory: Dir.pwd,
                             conf: @args_conf,
@@ -327,7 +368,7 @@ module Pindo
                     # 2. 上传任务（仅在需要时创建）
                     if @args_upload_flag && app_info_obj
                         upload_task = Pindo::TaskSystem::JPSUploadTask.new(
-                            'ipa',
+                            macos_platform? ? 'mac' : 'ipa',
                             Dir.pwd,
                             resigned_ipa_file,
                             app_info_obj: app_info_obj,

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

@@ -270,7 +270,7 @@ module Pindo
                         begin FileUtils.mkdir_p(dest_dir) rescue StandardError => e end
                         FileUtils.cp_r(podspec, File.join(dest_dir, File.basename(podspec)))
                         puts "上传到仓库 #{private_source.repo}"
-                        git_addpush_repo(path:private_source.repo, message:"add #{pod_name} #{tag_name}")
+                        git_addpush_repo(path:private_source.repo, message:"chore(pod): 添加 #{pod_name} #{tag_name}")
                     end
                 end
 

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

@@ -188,7 +188,7 @@ module Pindo
             tag_type: @args_tag_type,
             tag_pre: @args_tag_pre,
             process_type: process_type,
-            commit_message: "chore: packbuild 更新 v#{confirmed_version} Release Notes",
+            commit_message: "chore(nuget): 更新 nuget v#{confirmed_version} Release Notes",
             fixed_version: confirmed_version # 传入确认后的版本号
           )
           tasks << git_commit_task

data/lib/pindo/command/utils/copyconfig.rb

@@ -170,7 +170,7 @@ module Pindo
               # 只提交 config.json
               Pindo::GitHandler.git_addpush_repo(
                 path: new_config_dir,
-                message: "init config from #{@from_bundle_id}"
+                message: "chore(config): 初始化 #{@from_bundle_id} 的配置"
               )
 
               puts

data/lib/pindo/command/utils/renewbundleid.rb

@@ -184,7 +184,7 @@ module Pindo
                 # 提交到 Git 仓库
                 Pindo::GitHandler.git_addpush_repo(
                     path: app_config_dir,
-                    message: "sync capabilities from Apple Developer Portal",
+                    message: "chore(config): 同步 Apple Developer Portal 的 capabilities",
                     commit_file_params: ["config.json"]
                 )
 

data/lib/pindo/config/build_info_manager.rb

@@ -220,7 +220,7 @@ module Pindo
         f.write(JSON.pretty_generate(git_repo_json))
       end
 
-      Pindo::GitHandler.git_addpush_repo(path: pindo_setting_dir, message: "add #{repo_name}")
+      Pindo::GitHandler.git_addpush_repo(path: pindo_setting_dir, message: "chore(config): 添加 #{repo_name} 仓库")
     end
 
     # 更新应用配置仓库（从模板复制）
@@ -252,7 +252,7 @@ module Pindo
       end
 
       # 提交并推送到远程仓库
-      Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "init app config")
+      Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "chore(config): 初始化应用配置")
     end
   end
 

data/lib/pindo/module/appstore/itcapp_helper.rb

@@ -186,7 +186,7 @@ module Pindo
         if File.exist?(app_config_file)
           modify_appconfig_file(config_file: app_config_file, app_info_detail: app)
           Pindo::GitHandler.prepare_gitenv()
-          Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "modify apple id")
+          Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "chore(config): 修改 apple id")
         end
       rescue StandardError => e
         puts "更新远程配置仓库失败: #{e.message}"

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

@@ -127,7 +127,7 @@ module Pindo
                 f.write(JSON.pretty_generate(swark_authorize_json))
             end
 
-            Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "add swark authorize json")
+            Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "chore(config): 添加 swark 授权配置")
         end
 
     end

data/lib/pindo/module/cert/cert_helper.rb

@@ -143,7 +143,7 @@ module Pindo
 
         # 提交并推送到远程仓库
         Pindo::GitHandler.prepare_gitenv()
-        Pindo::GitHandler.git_addpush_repo(path: cert_repo_dir, message: "remove #{apple_id} certs")
+        Pindo::GitHandler.git_addpush_repo(path: cert_repo_dir, message: "chore(cert): 删除 #{apple_id} 的证书")
 
         puts "✓ Git 仓库证书清理完成"
       end

data/lib/pindo/module/cert/pem_helper.rb

@@ -65,7 +65,7 @@ module Pindo
           FileUtils.cp_r(File.join(push_path, "."), push_repo_dir)
 
           Pindo::GitHandler.prepare_gitenv()
-          Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "add push cert")
+          Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "chore(cert): 添加推送证书")
 
           puts "✓ 证书已上传到配置仓库: #{push_repo_dir}"
         end

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

@@ -432,7 +432,7 @@ module Pindo
 
           # 确保已登录
           unless login
-            raise Informative, "请先登录 JPS 网站"
+            raise Informative, "JPS 未登录或登录已失效，请执行 pindo jps login 重新登录"
           end
 
           # 获取 app_info_obj
@@ -506,7 +506,7 @@ module Pindo
                 end
 
                 unless login
-                  raise Informative, "请先登录JPS网站"
+                  raise Informative, "JPS 未登录或登录已失效，请执行 pindo jps login 重新登录"
                 end
 
                 puts "[PINDO_DEBUG] 正在查找项目: #{config_result[:project_name]}" if ENV['PINDO_DEBUG']
@@ -686,7 +686,7 @@ module Pindo
 
 
             else
-                raise Informative, "请先登录JPS网站"
+                raise Informative, "JPS 未登录或登录已失效，请执行 pindo jps login 重新登录"
             end
             @proj_name = upload_proj_name
             app_info_obj
@@ -751,23 +751,7 @@ module Pindo
                 if !ipa_file_upload.nil? &&
                     File.extname(ipa_file_upload).downcase.eql?(".exe")
 
-                    windows_exe_path = File.expand_path(ipa_file_upload)
-                    windows_build_dir = File.dirname(windows_exe_path)
-                    windows_zip_dir = File.dirname(windows_build_dir)
-                    windows_build_name = File.basename(windows_exe_path, File.extname(windows_exe_path))
-                    windows_exe_name = File.basename(windows_exe_path)
-                    windows_zip_fullname = File.join(windows_zip_dir, windows_build_name + ".zip")
-
-                    if File.exist?(windows_zip_fullname)
-                        FileUtils.rm_rf(windows_zip_fullname)
-                    end
-
-                    Zip::File.open(windows_zip_fullname, Zip::File::CREATE) do |zipfile|
-                        Dir.chdir(windows_build_dir) do
-                            zipfile.add(windows_exe_name, windows_exe_name)
-                        end
-                    end
-                    ipa_file_upload = windows_zip_fullname
+                    ipa_file_upload = package_windows_exe_for_upload(ipa_file_upload)
                 end
                 unless !ipa_file_upload.nil? && File.exist?(ipa_file_upload)
                     return
@@ -898,6 +882,25 @@ module Pindo
 
         end
 
+        def package_windows_exe_for_upload(exe_file_upload)
+            windows_exe_path = File.expand_path(exe_file_upload)
+            windows_build_dir = File.dirname(windows_exe_path)
+            windows_zip_dir = File.dirname(windows_build_dir)
+            windows_build_name = File.basename(windows_exe_path, File.extname(windows_exe_path))
+            windows_exe_name = File.basename(windows_exe_path)
+            windows_zip_fullname = File.join(windows_zip_dir, windows_build_name + ".zip")
+
+            if File.exist?(windows_zip_fullname)
+                FileUtils.rm_rf(windows_zip_fullname)
+            end
+
+            Zip::File.open(windows_zip_fullname, Zip::File::CREATE) do |zipfile|
+                zipfile.add(windows_exe_name, windows_exe_path)
+            end
+
+            windows_zip_fullname
+        end
+
         # 上传 media 文件（图片、视频等）到 JPS
         # 上传成功后自动更新 commit_log 记录
         #
@@ -1457,7 +1460,7 @@ module Pindo
 
             if app_info_list.nil?
                 Funlog.instance.fancyinfo_error("拉取app信息列表失败!")
-                raise Informative, "JPS网络数据异常，请检查网络连接或重新登录(pindo repo login)"
+                raise Informative, "JPS网络数据异常，请检查网络连接或重新登录(pindo jps login)"
             end
 
             return app_info_list

data/lib/pindo/module/resign/ipa_resign_adapter.rb

@@ -0,0 +1,14 @@
+require 'pindo/module/xcode/ipa_resign_helper'
+
+module Pindo
+  module Resign
+    class IpaResignAdapter
+      def resign(package_path:, bundle_id:, **_options)
+        Pindo::IpaResignHelper.resign_ipa(
+          ipa_file_path: package_path,
+          bundle_id: bundle_id
+        )
+      end
+    end
+  end
+end

data/lib/pindo/module/resign/mac_app_resign_adapter.rb

@@ -0,0 +1,16 @@
+require 'pindo/module/xcode/mac_app_resign_helper'
+
+module Pindo
+  module Resign
+    class MacAppResignAdapter
+      def resign(package_path:, bundle_id:, signing_identity:, profiles:, **_options)
+        Pindo::MacAppResignHelper.resign_app(
+          app_path: package_path,
+          bundle_id: bundle_id,
+          signing_identity: signing_identity,
+          profiles: profiles
+        )
+      end
+    end
+  end
+end

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

@@ -200,7 +200,7 @@ module Pindo
           git_helper = Pindo::GitRepoHelper.share_instance
           git_helper.git_addpush_repo(
             path: app_config_repo_dir,
-            message: "increate build number",
+            message: "chore(config): 递增 build number",
             commit_file_params: ["config.json"]
           )
         end

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

@@ -173,7 +173,7 @@ module Pindo
           git_helper = Pindo::GitRepoHelper.share_instance
           git_helper.git_addpush_repo(
             path: app_config_repo_dir,
-            message: "increate build number",
+            message: "chore(config): 递增 build number",
             commit_file_params: ["config.json"]
           )
         end

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

@@ -27,7 +27,7 @@ module Pindo
       #   - tag_pre: tag前缀，默认 'v'
       #   - fixed_version: 外部指定的固定版本号
       #   - process_type: 未提交文件的处理方式 ('skip', 'commit', 'reset', 'stash')，默认 'skip'
-      #   - commit_message: 提交消息，默认 'build: 构建产生提交'
+      #   - commit_message: 提交消息，默认 'chore(build): 构建产生提交'
       #
       # 版本号计算逻辑：
       #   1. 如果 fixed_version 为 nil 且 HEAD 存在 tag 且工作目录干净，
@@ -38,7 +38,7 @@ module Pindo
         # GitCommitTask 特有的属性
         @fixed_version = options[:fixed_version]  # 外部指定的固定版本号
         @process_type = options[:process_type] || Pindo::UncommittedFilesProcessType::SKIP_WITH_TAG # 默认跳过但打tag
-        @commit_message = options[:commit_message] || 'build: 构建产生提交' # 默认提交消息
+        @commit_message = options[:commit_message] || 'chore(build): 构建产生提交' # 默认提交消息
 
         options[:project_path] = project_path
         # 调用基类初始化（基类会设置 release_branch, ver_inc, tag_type, tag_pre 等通用属性）

data/lib/pindo/module/task/model/resign/ipa_local_resign_task.rb

@@ -3,6 +3,8 @@ require 'pindo/module/task/task_config'
 require 'pindo/module/cert/cert_helper'
 require 'pindo/config/ios_config_parser'
 require 'pindo/module/xcode/ipa_resign_helper'
+require 'pindo/module/resign/ipa_resign_adapter'
+require 'pindo/module/resign/mac_app_resign_adapter'
 
 module Pindo
   module TaskSystem
@@ -62,7 +64,7 @@ module Pindo
         # 设置任务优先级
         options[:priority] ||= TaskPriority::HIGH
 
-        super("重签名 IPA", options)
+        super("本地重签名", options)
       end
 
       # 验证任务参数
@@ -95,14 +97,16 @@ module Pindo
 
       # 执行重签名
       def do_work
-        # 1. 确定要重签名的 IPA 文件
+        # 1. 确定要重签名的安装包
         ipa_to_resign = determine_ipa_file
         unless ipa_to_resign && File.exist?(ipa_to_resign)
-          raise "未找到需要重签名的 IPA 文件"
+          raise "未找到需要重签名的安装包"
         end
 
+        validate_package_type!(ipa_to_resign)
+
         puts "\n▶ 重签名信息"
-        puts "  IPA: #{File.basename(ipa_to_resign)}"
+        puts "  安装包: #{File.basename(ipa_to_resign)}"
         puts "  Bundle ID: #{@bundle_id}"
         puts "  类型: #{@build_type}"
         cert_info = []
@@ -114,17 +118,23 @@ module Pindo
         load_config_if_needed
 
         # 3. 安装证书
-        install_certificate
+        provisioning_info_array = install_certificate
 
         # 4. 执行重签名
-        resigned_ipa = Pindo::IpaResignHelper.resign_ipa(
-          ipa_file_path: ipa_to_resign,
-          bundle_id: @bundle_id
+        signing_identity = Array(provisioning_info_array)
+          .map { |item| item['signing_identity'] }
+          .compact
+          .first
+        resigned_ipa = resign_adapter.resign(
+          package_path: ipa_to_resign,
+          bundle_id: @bundle_id,
+          signing_identity: signing_identity,
+          profiles: provisioning_info_array
         )
 
         # 5. 验证重签名结果
         unless resigned_ipa && File.exist?(resigned_ipa)
-          raise "重签名失败：未生成重签名后的 IPA 文件"
+          raise "重签名失败：未生成重签名后的安装包"
         end
 
         puts "✅ 重签名完成: #{File.basename(resigned_ipa)}\n"
@@ -146,13 +156,36 @@ module Pindo
         end
       end
 
+      def macos_platform?
+        @platform_type.to_s.downcase == 'macos'
+      end
+
+      def validate_package_type!(path)
+        valid = if macos_platform?
+                  File.directory?(path) && path.downcase.end_with?('.app')
+                else
+                  File.file?(path) && path.downcase.end_with?('.ipa')
+                end
+        expected = macos_platform? ? 'macOS .app 目录' : '.ipa 文件'
+        raise "当前平台要求输入 #{expected}: #{path}" unless valid
+      end
+
+      def resign_adapter
+        if macos_platform?
+          Pindo::Resign::MacAppResignAdapter.new
+        else
+          Pindo::Resign::IpaResignAdapter.new
+        end
+      end
+
       # 查找最新的 IPA 文件（排除 _resigned.ipa）
       def find_latest_ipa_file
         unless File.directory?(@ipa_path)
           return nil
         end
 
-        ipa_files = Dir.glob(File.join(@ipa_path, "*.ipa"))
+        pattern = macos_platform? ? '*.app' : '*.ipa'
+        ipa_files = Dir.glob(File.join(@ipa_path, pattern))
 
         # 过滤掉 _resigned.ipa 文件
         ipa_files = ipa_files.reject { |f| File.basename(f).include?("_resigned") }
@@ -204,6 +237,7 @@ module Pindo
         unless provisioning_info_array && !provisioning_info_array.empty?
           raise "证书获取失败：未找到有效的证书信息"
         end
+        provisioning_info_array
       end
     end
   end

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

@@ -57,7 +57,7 @@ module Pindo
         current_branch = Pindo::GitHandler.git!(%W(-C #{current_git_root_path} rev-parse --abbrev-ref HEAD)).strip
         Pindo::GitHandler.git!(%W(-C #{current_git_root_path} add cliff.toml))
         # .gitignore 已由 check_gitignore 自动添加到暂存区，无需重复添加
-        commit_message = "docs: 添加日志变更配置".encode('UTF-8')
+        commit_message = "docs(config): 添加日志变更配置".encode('UTF-8')
         Pindo::GitHandler.git!(%W(-C #{current_git_root_path} commit -m #{commit_message}))
         Pindo::GitHandler.git!(%W(-C #{current_git_root_path} push origin #{current_branch}))
       else
@@ -158,7 +158,7 @@ module Pindo
               current_branch = Pindo::GitHandler.git!(%W(-C #{git_root_dir} rev-parse --abbrev-ref HEAD)).strip
 
               # 提交
-              commit_message = "chore: 更新 .gitignore 规则"
+              commit_message = "chore(config): 更新 .gitignore 规则"
               Pindo::GitHandler.git!(%W(-C #{git_root_dir} commit -m #{commit_message}))
               Funlog.instance.fancyinfo_success("已自动提交 .gitignore 更改")
 

data/lib/pindo/module/xcode/applovin_xcode_helper.rb

@@ -230,7 +230,7 @@ module Pindo
         begin
           Pindo::GitHandler.git_addpush_repo(
             path: config_dir,
-            message: "Applovin SKAdNetworkItems",
+            message: "chore(config): 更新 Applovin SKAdNetworkItems",
             commit_file_params: ["applovin_client_config.json"]
           )
           puts "✓ 配置已保存到远程仓库"

data/lib/pindo/module/xcode/cocoapods_helper.rb

@@ -187,7 +187,7 @@ module Pindo
           FileUtils.cp(proj_pod_file, File.join(app_config_dir, "Podfile.lock"))
           Pindo::GitHandler.git_addpush_repo(
             path: app_config_dir,
-            message: "#{app_version} backup podfile.lock",
+            message: "chore(pod): 备份 #{app_version} 的 Podfile.lock",
             commit_file_params: ["Podfile.lock"]
           )
 
@@ -218,7 +218,7 @@ module Pindo
 
           Pindo::GitHandler.git_addpush_repo(
             path: app_config_dir,
-            message: "backup #{app_version} output info",
+            message: "chore(build): 备份 #{app_version} 的构建输出信息",
             commit_file_params: ["build_verify.json"]
           )
 

data/lib/pindo/module/xcode/mac_app_resign_helper.rb

@@ -0,0 +1,243 @@
+require 'fileutils'
+require 'find'
+require 'open3'
+require 'tmpdir'
+
+module Pindo
+  class MacAppResignHelper
+    BUNDLE_EXTENSIONS = %w[.app .appex .framework .xpc .bundle .plugin].freeze
+    # 需要内嵌描述文件的可执行 bundle（含独立 Bundle ID），
+    # .framework / .bundle / .plugin 属于共享代码，不单独内嵌 profile。
+    PROFILE_BUNDLE_EXTENSIONS = %w[.app .appex .xpc].freeze
+    MACHO_MAGICS = [
+      "\xFE\xED\xFA\xCE", "\xCE\xFA\xED\xFE", "\xFE\xED\xFA\xCF",
+      "\xCF\xFA\xED\xFE", "\xCA\xFE\xBA\xBE", "\xBE\xBA\xFE\xCA",
+      "\xCA\xFE\xBA\xBF", "\xBF\xBA\xFE\xCA"
+    ].map(&:b).freeze
+
+    class << self
+      def resign_app(app_path:, bundle_id:, signing_identity:, profiles: [])
+        validate_input!(app_path, signing_identity)
+        output_path = resigned_path(app_path)
+        FileUtils.rm_rf(output_path)
+        FileUtils.cp_r(app_path, output_path, preserve: true)
+
+        resolved_bundle_id = resolve_bundle_id(output_path, bundle_id)
+        puts "\n▶ macOS App 重签名"
+        puts "  输入: #{app_path}"
+        puts "  输出: #{output_path}"
+        puts "  Bundle ID: #{bundle_id} → #{resolved_bundle_id}" if bundle_id != resolved_bundle_id
+        puts "  Bundle ID: #{resolved_bundle_id}" if bundle_id == resolved_bundle_id
+        puts "  签名身份: #{signing_identity}"
+        update_main_bundle_id(output_path, resolved_bundle_id)
+
+        Dir.mktmpdir('pindo-macos-entitlements-') do |tmp_dir|
+          nested_paths = signable_paths(output_path)
+          puts "  嵌套组件: #{nested_paths.length} 个"
+          nested_paths.each_with_index do |path, index|
+            puts "  [#{index + 1}/#{nested_paths.length}] 签名: #{relative_path(path, output_path)}"
+            sign_component(path, output_path, signing_identity, profiles, tmp_dir, index)
+          end
+          puts "  签名主 App: #{File.basename(output_path)}"
+          sign_component(output_path, output_path, signing_identity, profiles, tmp_dir, 'main',
+                         bundle_id: resolved_bundle_id)
+        end
+
+        puts "  验证签名: codesign --verify --strict"
+        verify!(output_path)
+        puts "  ✓ macOS App 签名验证通过"
+        output_path
+      rescue StandardError
+        FileUtils.rm_rf(output_path) if output_path && File.exist?(output_path)
+        raise
+      end
+
+      private
+
+      def validate_input!(app_path, signing_identity)
+        unless File.directory?(app_path) && app_path.downcase.end_with?('.app')
+          raise Informative, "macOS 重签名要求输入 .app 目录: #{app_path}"
+        end
+        if signing_identity.to_s.strip.empty?
+          raise Informative, 'macOS 重签名未找到有效的 signing identity'
+        end
+        info_plist = File.join(app_path, 'Contents', 'Info.plist')
+        raise Informative, "不是有效的 macOS App，缺少 #{info_plist}" unless File.file?(info_plist)
+      end
+
+      def resigned_path(app_path)
+        app_path.sub(/\.app$/i, '_resigned.app')
+      end
+
+      def update_main_bundle_id(app_path, bundle_id)
+        return if bundle_id.to_s.empty?
+
+        plist = File.join(app_path, 'Contents', 'Info.plist')
+        success = system('/usr/libexec/PlistBuddy', '-c', "Set :CFBundleIdentifier #{bundle_id}", plist)
+        raise Informative, "修改 macOS App Bundle ID 失败: #{plist}" unless success
+      end
+
+      def resolve_bundle_id(app_path, bundle_id)
+        return bundle_id unless bundle_id.to_s.include?('*')
+
+        plist = File.join(app_path, 'Contents', 'Info.plist')
+        candidate = plist_value(plist, 'CFBundleName')
+        candidate = plist_value(plist, 'CFBundleDisplayName') if candidate.to_s.empty?
+        candidate = File.basename(app_path, '.app') if candidate.to_s.empty?
+        suffix = candidate.to_s.downcase.gsub(/[^a-z0-9-]+/, '-')
+          .gsub(/\A-+|-+\z/, '')
+        suffix = 'app' if suffix.empty?
+        bundle_id.sub('*', suffix)
+      end
+
+      def plist_value(plist, key)
+        stdout, _stderr, status = Open3.capture3(
+          '/usr/libexec/PlistBuddy', '-c', "Print :#{key}", plist
+        )
+        status.success? ? stdout.strip : nil
+      end
+
+      # 对单个可签名组件重签名。
+      # 对需要描述文件的 bundle（.app/.appex/.xpc）：内嵌匹配的 profile，并
+      # 优先使用 profile 内的 entitlements（含新的 team-identifier /
+      # application-identifier），从根本上避免沿用旧二进制里的旧身份。
+      # Developer ID 场景（profiles 为空）回退到从旧二进制导出的 entitlements。
+      def sign_component(path, app_root, identity, profiles, tmp_dir, index, bundle_id: nil)
+        entitlements =
+          if profile_required?(path)
+            component_bundle_id = bundle_id || bundle_identifier(path)
+            profile_path = matched_profile_path(component_bundle_id, profiles)
+            if profile_path
+              embed_profile_file(path, profile_path)
+              puts "      描述文件: #{File.basename(profile_path)}"
+              profile_entitlements(profile_path, tmp_dir, index) ||
+                extract_entitlements(path, tmp_dir, index)
+            elsif !Array(profiles).empty?
+              raise Informative,
+                    "未找到匹配 #{component_bundle_id} 的描述文件，无法重签名: #{relative_path(path, app_root)}"
+            else
+              extract_entitlements(path, tmp_dir, index)
+            end
+          else
+            extract_entitlements(path, tmp_dir, index)
+          end
+        codesign(path, identity, entitlements)
+      end
+
+      # 仅 .app/.appex/.xpc 这类含 Info.plist 的可执行 bundle 需要描述文件。
+      def profile_required?(path)
+        return false unless File.directory?(path)
+        return false unless PROFILE_BUNDLE_EXTENSIONS.include?(File.extname(path).downcase)
+
+        !bundle_info_plist(path).nil?
+      end
+
+      def bundle_info_plist(bundle_path)
+        [
+          File.join(bundle_path, 'Contents', 'Info.plist'),
+          File.join(bundle_path, 'Info.plist'),
+          File.join(bundle_path, 'Resources', 'Info.plist')
+        ].find { |candidate| File.file?(candidate) }
+      end
+
+      def bundle_identifier(bundle_path)
+        plist = bundle_info_plist(bundle_path)
+        plist && plist_value(plist, 'CFBundleIdentifier')
+      end
+
+      def matched_profile_path(bundle_id, profiles)
+        profile = Array(profiles).find do |item|
+          profile_bundle_id = item['bundle_id'].to_s
+          profile_bundle_id == bundle_id ||
+            (profile_bundle_id.end_with?('.*') &&
+              bundle_id.to_s.start_with?(profile_bundle_id.delete_suffix('*')))
+        end
+        profile_path = profile && profile['profile_path']
+        profile_path if profile_path && File.file?(profile_path)
+      end
+
+      def embed_profile_file(bundle_path, profile_path)
+        contents_dir = File.join(bundle_path, 'Contents')
+        dest_dir = File.directory?(contents_dir) ? contents_dir : bundle_path
+        FileUtils.cp(profile_path, File.join(dest_dir, 'embedded.provisionprofile'))
+      end
+
+      # 从描述文件解出 Entitlements，写成独立 plist 供 codesign --entitlements 使用。
+      def profile_entitlements(profile_path, tmp_dir, index)
+        decoded, _stderr, status = Open3.capture3(
+          '/usr/bin/security', 'cms', '-D', '-i', profile_path
+        )
+        return nil unless status.success?
+
+        profile_plist = File.join(tmp_dir, "profile-#{index}.plist")
+        File.write(profile_plist, decoded)
+        entitlements_xml, _err, extract_status = Open3.capture3(
+          '/usr/bin/plutil', '-extract', 'Entitlements', 'xml1', '-o', '-', profile_plist
+        )
+        return nil unless extract_status.success? && entitlements_xml.include?('<plist')
+
+        entitlements_path = File.join(tmp_dir, "profile-entitlements-#{index}.plist")
+        File.write(entitlements_path, entitlements_xml)
+        entitlements_path
+      end
+
+      def relative_path(path, app_path)
+        path.delete_prefix("#{app_path}/")
+      end
+
+      # Sign deepest nested code first. The main app is deliberately excluded
+      # here and signed last by resign_app.
+      def signable_paths(app_path)
+        paths = []
+        Find.find(app_path) do |path|
+          next if path == app_path
+          if File.directory?(path) && BUNDLE_EXTENSIONS.include?(File.extname(path).downcase)
+            paths << path
+          elsif File.file?(path) && (File.extname(path).downcase == '.dylib' || macho?(path))
+            paths << path
+          end
+        end
+        paths.uniq.sort_by { |path| [-path.count(File::SEPARATOR), File.directory?(path) ? 1 : 0] }
+      end
+
+      def macho?(path)
+        File.open(path, 'rb') { |file| MACHO_MAGICS.include?(file.read(4)) }
+      rescue Errno::EACCES, Errno::ENOENT
+        false
+      end
+
+      def extract_entitlements(path, tmp_dir, index)
+        stdout, _stderr, status = Open3.capture3(
+          '/usr/bin/codesign', '-d', '--entitlements', ':-', path
+        )
+        return nil unless status.success? && stdout.include?('<plist')
+
+        entitlements_path = File.join(tmp_dir, "#{index}.plist")
+        File.write(entitlements_path, stdout)
+        entitlements_path
+      end
+
+      def codesign(path, identity, entitlements)
+        command = [
+          '/usr/bin/codesign', '--force', '--sign', identity,
+          '--timestamp', '--options', 'runtime'
+        ]
+        command.concat(['--entitlements', entitlements]) if entitlements
+        command << path
+        _stdout, stderr, status = Open3.capture3(*command)
+        return if status.success?
+
+        raise Informative, "codesign 失败: #{path}\n#{stderr.strip}"
+      end
+
+      def verify!(app_path)
+        _stdout, stderr, status = Open3.capture3(
+          '/usr/bin/codesign', '--verify', '--strict', '--verbose=2', app_path
+        )
+        return if status.success?
+
+        raise Informative, "macOS App 签名验证失败: #{app_path}\n#{stderr.strip}"
+      end
+    end
+  end
+end

data/lib/pindo/module/xcode/xcode_build_helper.rb

@@ -48,7 +48,7 @@ module Pindo
                     file.close
                 end
 
-                git_addpush_repo(path:app_config_dir, message:"back release info", commit_file_params:["build_verify.json"])
+                git_addpush_repo(path:app_config_dir, message:"chore(build): 回写发布信息", commit_file_params:["build_verify.json"])
 
                 if File.exist?(src_pod_file)
                     FileUtils.cp_r(src_pod_file, File.join(project_dir, "Podfile.lock"))
@@ -64,7 +64,7 @@ module Pindo
           begin
                 proj_pod_file = File.join(project_dir, "Podfile.lock")
                 FileUtils.cp_r(proj_pod_file, File.join(app_config_dir, "Podfile.lock"))
-                git_addpush_repo(path:app_config_dir, message:"#{appversion} backup podfile.lock", commit_file_params:["Podfile.lock"])
+                git_addpush_repo(path:app_config_dir, message:"chore(pod): 备份 #{appversion} 的 Podfile.lock", commit_file_params:["Podfile.lock"])
 
                 bytes = File.binread(proj_pod_file)
                 checksum = Digest::MD5.hexdigest(bytes)
@@ -84,7 +84,7 @@ module Pindo
                     file.write(JSON.pretty_generate(build_verify_json))
                     file.close
                 end
-                git_addpush_repo(path:app_config_dir, message:"backup #{appversion} output info", commit_file_params:["build_verify.json"])
+                git_addpush_repo(path:app_config_dir, message:"chore(build): 备份 #{appversion} 的构建输出信息", commit_file_params:["build_verify.json"])
 
           rescue => error
               raise Informative,  "保存Podfile.lock 文件失败！！！"

data/lib/pindo/module/xcode/xcode_swark_helper.rb

@@ -333,7 +333,7 @@ module Pindo
         end
 
         # 提交到配置仓库
-        Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "swark authorize success !!!")
+        Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "chore(config): 完成 swark 授权")
 
         Funlog.instance.fancyinfo_success("Swark 授权完成！")
         return true

data/lib/pindo/options/core/option_value_parser.rb

@@ -41,13 +41,23 @@ module Pindo
       # @param item [OptionItem] 参数定义
       # @return [Object, nil] 提取的值
       def self.extract_from_argv(argv, item)
+        option_names = [item.key.to_s] + item.aliases.map(&:to_s)
+
         if item.boolean?
           # Boolean 类型：使用 flag?
-          argv.flag?(item.key.to_s, nil)
+          option_names.each do |option_name|
+            value = argv.flag?(option_name, nil)
+            return value unless value.nil?
+          end
         else
           # 其他类型：使用 option
-          argv.option(item.key.to_s, nil)
+          option_names.each do |option_name|
+            value = argv.option(option_name, nil)
+            return value unless value.nil?
+          end
         end
+
+        nil
       end
     end
   end

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

@@ -115,9 +115,10 @@ module Pindo
           file: OptionItem.new(
             key: :file,
             name: '上传文件',
-            description: '指定要上传的文件路径（支持 ipa/apk/app/exe/html）',
+            description: '指定要上传的文件路径（支持 ipa/apk/app/exe/html；兼容 --ipa 别名）',
             type: String,
             env_name: 'PINDO_JPS_FILE',
+            aliases: [:ipa],
             optional: true,
             example: 'pindo jps upload --file=path/to/app.ipa'
           ),

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

@@ -28,6 +28,24 @@ module Pindo
             example: 'pindo ios autoresign --ipa=path/to/demo.ipa'
           ),
 
+          app: OptionItem.new(
+            key: :app,
+            name: 'macOS App',
+            description: '指定要重签名的 macOS .app 目录',
+            type: String,
+            env_name: 'PINDO_APP_FILE',
+            optional: true,
+            verify_block: proc do |value|
+              unless value.downcase.end_with?('.app')
+                raise "App 路径格式错误: #{value}，必须以 .app 结尾"
+              end
+              unless File.directory?(value)
+                raise "App 目录不存在: #{value}"
+              end
+            end,
+            example: 'pindo ios autoresign --macos --app=path/to/Demo.app'
+          ),
+
           apk: OptionItem.new(
             key: :apk,
             name: 'APK 文件',

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.19.3"
+  VERSION = "5.19.5"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'
@@ -135,7 +135,10 @@ module Pindo
               puts "当前pindo版本 #{Pindo::VERSION}"
               puts "最新版本 #{pindo_latest_version}"
               puts "要求最低版本 #{pindo_mini_version}"
-              raise Informative, "请使用 gem install pindo 升级!"
+              puts "请使用 gem install pindo 升级!".red
+              # 强制升级必须真正中断：用 exit(1)(SystemExit) 绕过上层通用 rescue，
+              # 与 RubyGems API 强制升级路径保持一致；可用 PINDO_SKIP_FORCE_UPDATE=1 紧急跳过
+              exit(1)
             end
           end
 
@@ -187,7 +190,7 @@ module Pindo
         # 创建 HTTP 连接，禁用代理
         http = Net::HTTP.new(uri.host, uri.port, nil, nil)
         http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE # 忽略 SSL 证书验证
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER # 校验 SSL 证书（此连接直连 RubyGems、不走代理，公网有效证书可正常校验）
         http.open_timeout = 3  # 3秒超时
         http.read_timeout = 3
 
@@ -535,24 +538,28 @@ module Pindo
             current_branch = `git rev-parse --abbrev-ref HEAD`.strip
             current_branch = 'master' if current_branch.empty?
 
-            # 获取远程更新
-            system("git fetch origin --quiet")
+            # 获取远程更新（数组式 system 避免 shell 注入；失败即抛出，不静默吞掉）
+            system("git", "fetch", "origin", "--quiet") or
+              raise "git fetch 失败: #{repo_name}"
 
             # 强制重置到远程分支最新状态（覆盖本地修改）
-            system("git reset --hard origin/#{current_branch} --quiet")
+            system("git", "reset", "--hard", "origin/#{current_branch}", "--quiet") or
+              raise "git reset 失败: #{repo_name}"
 
-            # 设置上游分支
-            system("git branch --set-upstream-to=origin/#{current_branch} #{current_branch} --quiet 2>/dev/null")
+            # 设置上游分支（失败可忽略）
+            system("git", "branch", "--set-upstream-to=origin/#{current_branch}", current_branch, "--quiet", err: File::NULL)
 
             # 拉取最新更新
-            system("git pull --quiet")
+            system("git", "pull", "--quiet") or
+              raise "git pull 失败: #{repo_name}"
           end
         else
           # 仓库不存在，执行 git clone
           puts "  📦 克隆: #{repo_name}".cyan if ENV['PINDO_DEBUG']
           parent_dir = File.dirname(dir)
           FileUtils.mkdir_p(parent_dir) unless File.exist?(parent_dir)
-          system("git clone #{url} #{dir} --quiet")
+          system("git", "clone", url, dir, "--quiet") or
+            raise "git clone 失败: #{repo_name} (#{url})"
         end
       end
     end

data/lib/pindo.rb

@@ -21,6 +21,18 @@ module Pindo
 				# 解析参数以确定是否是 help 或 version 命令
 				coerced_argv = CLAide::ARGV.coerce(argv)
 
+				# --verbose 等效 PINDO_DEBUG=1：必须在版本检查、参数初始化等任何逻辑之前设置，
+				# 否则子命令 initialize 早期执行的调试日志会因 ENV 未就绪而丢失
+				ENV['PINDO_DEBUG'] = '1' if coerced_argv.flag?('verbose')
+
+				# 依赖库 jpsclient 有自己的调试开关 JPS_DEBUG；pindo 处于调试模式时同步打开它。
+				# 仅当 PINDO_DEBUG 为真值时才桥接：PINDO_DEBUG=0/false 因 Ruby 字符串恒为真值本会误开，
+				# 这里按 jpsclient 的真值规则排除；且不覆盖用户显式设置的 JPS_DEBUG
+				pindo_debug_val = ENV['PINDO_DEBUG'].to_s.strip.downcase
+				if !pindo_debug_val.empty? && !%w[0 false no].include?(pindo_debug_val) && !ENV['JPS_DEBUG']
+					ENV['JPS_DEBUG'] = '1'
+				end
+
 				# 显示欢迎界面（除了 help/version 命令和特定情况）
 				show_welcome_banner(argv, coerced_argv)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.19.3
+  version: 5.19.5
 platform: ruby
 authors:
 - wade
@@ -109,20 +109,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
@@ -406,6 +406,8 @@ files:
 - lib/pindo/module/cert/pem_helper.rb
 - lib/pindo/module/cert/provisioning_helper.rb
 - lib/pindo/module/pgyer/pgyerhelper.rb
+- lib/pindo/module/resign/ipa_resign_adapter.rb
+- lib/pindo/module/resign/mac_app_resign_adapter.rb
 - lib/pindo/module/task/core/concurrent_execution_strategy.rb
 - lib/pindo/module/task/core/dependency_checker.rb
 - lib/pindo/module/task/core/execution_strategy.rb
@@ -477,6 +479,7 @@ files:
 - lib/pindo/module/xcode/applovin_xcode_helper.rb
 - lib/pindo/module/xcode/cocoapods_helper.rb
 - lib/pindo/module/xcode/ipa_resign_helper.rb
+- lib/pindo/module/xcode/mac_app_resign_helper.rb
 - lib/pindo/module/xcode/res/xcode_res_constant.rb
 - lib/pindo/module/xcode/res/xcode_res_handler.rb
 - lib/pindo/module/xcode/xcode_app_config.rb