pindo 5.19.4 → 5.19.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6cdbb729bb1840389cfd9e6252bc60d44d9faa010c47295eeed07a0989b3c42
-  data.tar.gz: ef3fa0cbf75139df0333a8dbf0d9f57388c93814da2fb9077673fb0e26df46e7
+  metadata.gz: b7cccaa492d62d373f89fd3af414f3536ca43d47a840cc916b2629445cb581e3
+  data.tar.gz: 70f7ad8f931126af81fb7bceae2f54b35d1adc4d34b3991cde6b3a6c6422b950
 SHA512:
-  metadata.gz: 3ca2fab411eed7712b8d73a7693a6cd32ae2d4ae79c94c451c5b6fb61a2b4835cc7fecc3452c96cacea273f4f7f3512f5edf848a3053a3692364a813f0f02531
-  data.tar.gz: 2de8b83dfa93049cbe1e0a1d97e2d824892a92c1b788f1bd85c135fd52082079426f4ea0dc7d10b5463e0241626dbab5c2add78ba01afe2d45349f54c0349b2a
+  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/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
@@ -1460,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/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/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/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/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.19.4"
+  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.4
+  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