pindo 5.18.5 → 5.18.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c5570599c0e84edb77c22267e890c57f736800bc046581d7a902e28b4b5c33f
-  data.tar.gz: 46b689df14719e8a7b0ef3af23e209d9e70484b3915b45a02c8c014ab1d2ddb3
+  metadata.gz: 507433d1ad0c9e38e5c143ed5bd5464a0a4935b274803aa8ec28d48f8edd7d8c
+  data.tar.gz: 1e5e3fa81ef4c65da10dd1a64d234e68098a5539c29e8f13674245b7600a6ad5
 SHA512:
-  metadata.gz: c2e5bb57d0a922210eff69f20fc7aabdf42660f01073e2a56378f32ff2380173eedd37b00e54f368051566903ac95c37f7139b17760c19c17ce889422e7078a8
-  data.tar.gz: 84d21199d7e08ad161a286090fbbc40c0a421f021f654dfde9b663fffc2c0921927e6a95a7cc0db21b074a1a4af0dcd28e354183bcf4bd5bb318dc178cf0a37b
+  metadata.gz: e49b021ce357d5f50a53bf308ff4267fa82cd2ff89bbdf8dd3649b0b871eaac6909d65abce3e9e72145724ccde41aae8a9ded3f94052b880f520f1eeb947693d
+  data.tar.gz: 27bda2c8b2a7cd1e41fdfcf510508628cc4b2fbe3481b2a83077075a68097989b69215d3a4e3cb07257dec05a0f6ad812645923d83b4a5bb5ba9050fb570bba7

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

@@ -2,7 +2,7 @@ require 'highline/import'
 require 'fileutils'
 require 'pindo/base/executable'
 require 'pindo/module/build/build_helper'
-require 'pindo/module/build/git_repo_helper'
+require 'pindo/module/utils/git_repo_helper'
 require 'pindo/module/android/android_build_helper'
 require 'pindo/module/android/android_config_helper'
 require 'pindo/module/task/task_manager'

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

@@ -4,7 +4,7 @@ require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
 require 'pindo/module/build/build_helper'
-require 'pindo/module/build/git_repo_helper'
+require 'pindo/module/utils/git_repo_helper'
 require 'pindo/module/xcode/xcode_build_config'
 require 'pindo/module/xcode/xcode_build_helper'
 require 'pindo/config/ios_config_parser'

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

@@ -4,7 +4,7 @@ require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
 require 'pindo/module/build/build_helper'
-require 'pindo/module/build/git_repo_helper'
+require 'pindo/module/utils/git_repo_helper'
 require 'pindo/module/xcode/xcode_build_config'
 require 'pindo/module/xcode/xcode_build_helper'
 require 'pindo/module/task/task_manager'

data/lib/pindo/command/jps/upload.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 require 'json'
 require 'faraday'
 require 'pindo/module/pgyer/pgyerhelper'
-require 'pindo/module/build/git_repo_helper'
+require 'pindo/module/utils/git_repo_helper'
 require 'pindo/module/build/build_helper'
 require 'pindo/module/task/task_manager'
 require 'pindo/module/task/model/jps/jps_upload_task'

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

@@ -5,7 +5,7 @@ require 'fileutils'
 require 'pindo/base/executable'
 require 'pindo/module/unity/unity_helper'
 require 'pindo/module/build/build_helper'
-require 'pindo/module/build/git_repo_helper'
+require 'pindo/module/utils/git_repo_helper'
 require 'pindo/module/task/pindo_task'
 require 'pindo/module/task/task_manager'
 require 'pindo/module/task/model/build_task'

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

@@ -1,6 +1,8 @@
 require 'highline/import'
 require 'fileutils'
 require 'pindo/options/options'
+require 'pindo/module/utils/git_repo_helper'
+require 'pindo/module/utils/git_hook_helper'
 
 module Pindo
   class Command
@@ -8,28 +10,31 @@ module Pindo
       class Repoinit < Utils
 
         # 命令的简要说明 - 初始化git仓库配置
-        self.summary = '初始化git仓库中git cliff的配置'
+        self.summary = '初始化git仓库配置（.gitignore、commit统计hook、git-cliff）'
 
         # 命令的详细说明,包含用法示例
         self.description = <<-DESC
-                    初始化git仓库中git cliff的配置。
+                    初始化git仓库配置。
 
                     支持功能:
 
-                        * 初始化git cliff配置
+                        * 检查并补充 .gitignore 规则（默认）
 
-                        * 生成配置文件
+                        * 安装 commit 变更统计 hook（默认，支持普通仓库/子模块/Husky）
+
+                        * 初始化 git-cliff 配置（需指定 --cliff）
 
                     使用示例:
 
-                        $ pindo utils repoinit                   # 初始化配置
+                        $ pindo utils repoinit                   # 检查 .gitignore + 安装统计 hook
+                        $ pindo utils repoinit --cliff           # 同时初始化 git-cliff
         DESC
 
         # 命令的参数列表
         self.arguments = []
 
         def self.option_items
-          @option_items ||= Pindo::Options::UtilsOptions.select(:mode, :retag)
+          @option_items ||= Pindo::Options::UtilsOptions.select(:cliff)
         end
 
         def self.options
@@ -39,22 +44,34 @@ module Pindo
         def initialize(argv)
           @options = initialize_options(argv)
 
-          @mode = @options[:mode] || 'minor'
-          @force_retag = @options[:retag] || false
-
-          unless ['major', 'minor', 'patch'].include?(@mode)
-            raise Informative, "mode参数必须是 major, minor 或 patch"
-          end
+          @enable_cliff = @options[:cliff] || false
 
           super
           @additional_args = argv.remainder!
         end
 
         def run
-          
+
           pindo_project_dir = Dir.pwd
-          build_helper = Pindo::BuildHelper.share_instance
-          Pindo::GitRepoHelper.share_instance.check_check_and_install_cliff(pindo_project_dir)
+
+          unless Pindo::GitHandler.is_git_directory?(local_repo_dir: pindo_project_dir)
+            Funlog.instance.fancyinfo_warning("当前目录不是 Git 仓库，跳过初始化")
+            return
+          end
+
+          current_git_root_path = Pindo::GitHandler.git_root_directory(local_repo_dir: pindo_project_dir)
+          git_repo_helper = Pindo::GitRepoHelper.share_instance
+
+          # 1. 检查并补充 .gitignore 规则
+          git_repo_helper.check_gitignore(current_git_root_path)
+
+          # 2. 安装 commit 变更统计 hook（主仓库 + 子模块，支持 Husky）
+          Pindo::GitHookHelper.share_instance.install_commit_stats_hook(current_git_root_path)
+
+          # 3. 指定 --cliff 参数时，才检测安装 git-cliff 并初始化配置
+          if @enable_cliff
+            git_repo_helper.check_and_install_cliff(pindo_project_dir)
+          end
 
         end
 

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

@@ -1,7 +1,7 @@
 require 'highline/import'
 require 'fileutils'
 require 'pindo/base/git_handler'
-require 'pindo/module/build/git_repo_helper'
+require 'pindo/module/utils/git_repo_helper'
 require 'pindo/module/task/task_manager'
 require 'pindo/module/task/model/git/git_commit_task'
 require 'pindo/module/task/model/git/git_tag_task'

data/lib/pindo/module/android/android_config_helper.rb

@@ -6,7 +6,7 @@ require_relative 'android_project_helper'
 require_relative '../../base/executable'
 require_relative 'android_res_helper'
 require 'pindo/module/utils/file_downloader'
-require 'pindo/module/build/git_repo_helper'
+require 'pindo/module/utils/git_repo_helper'
 
 module Pindo
 

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

@@ -1443,7 +1443,6 @@ module Pindo
 
         def get_app_list_in_pgyer()
 
-
             params = {
                 pageNo:1,
                 pageSize:1000
@@ -1452,28 +1451,21 @@ module Pindo
             app_info_list = Pindoconfig.instance.get_pgyerapps_info_list()
             if app_info_list.nil?
                 res_data = @pgyer_client.get_project_list(params:params)
-                # puts JSON.pretty_generate(res_data)
-                if !res_data["data"].nil? && res_data["data"].size > 0
-                    app_info_list = res_data["data"]
-                    Pindoconfig.instance.set_pgyerapps_info_list(app_info_list:app_info_list)
-                end
-            end
-
-            if app_info_list.nil?
-                res_data = @pgyer_client.get_project_list(params:params)
-                # puts JSON.pretty_generate(res_data)
-                if !res_data["data"].nil? && res_data["data"].size > 0
+                if res_data && !res_data["data"].nil? && res_data["data"].size > 0
                     app_info_list = res_data["data"]
                     Pindoconfig.instance.set_pgyerapps_info_list(app_info_list:app_info_list)
+                elsif res_data
+                    error_msg = res_data["msg"] || "未知错误"
+                    error_code = res_data["code"]
+                    Funlog.instance.fancyinfo_error("拉取项目列表失败: [#{error_code}] #{error_msg}")
                 end
             end
 
             if app_info_list.nil?
                 Funlog.instance.fancyinfo_error("拉取app信息列表失败!")
-                raise Informative, "JPS网络数据异常!!!"
+                raise Informative, "JPS网络数据异常，请检查网络连接或重新登录(pindo repo login)"
             end
 
-
             return app_info_list
         end
 

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

@@ -1,6 +1,6 @@
 require_relative 'android_build_task'
 require 'pindo/module/build/build_helper'
-require 'pindo/module/build/git_repo_helper'
+require 'pindo/module/utils/git_repo_helper'
 require 'pindo/base/git_handler'
 require 'pindo/module/android/android_config_helper'
 require 'pindo/module/android/android_build_helper'

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

@@ -1,7 +1,7 @@
 require_relative 'ios_build_task'
 require 'pindo/base/git_handler'
 require 'pindo/module/build/build_helper'
-require 'pindo/module/build/git_repo_helper'
+require 'pindo/module/utils/git_repo_helper'
 require 'pindo/module/xcode/xcode_build_config'
 require 'pindo/module/xcode/xcode_build_helper'
 require 'pindo/module/xcode/xcode_app_config'
@@ -222,7 +222,7 @@ module Pindo
           increase_buildnumber_in_file(app_config_file)
 
           # 提交到配置仓库
-          require 'pindo/module/build/git_repo_helper'
+          require 'pindo/module/utils/git_repo_helper'
           git_helper = Pindo::GitRepoHelper.share_instance
           git_helper.git_addpush_repo(
             path: app_config_repo_dir,
@@ -271,7 +271,7 @@ module Pindo
           build_verify_json = nil
         end
 
-        require 'pindo/module/build/git_repo_helper'
+        require 'pindo/module/utils/git_repo_helper'
         git_helper = Pindo::GitRepoHelper.share_instance
         release_code_commit = git_helper.git_latest_commit_id(local_repo_dir: @project_path)
 

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

@@ -1,7 +1,6 @@
 require_relative 'ios_build_task'
 require 'pindo/module/build/build_helper'
-require 'pindo/module/build/git_repo_helper'
-require 'pindo/module/build/git_repo_helper'
+require 'pindo/module/utils/git_repo_helper'
 require 'pindo/module/xcode/xcode_build_config'
 require 'pindo/module/xcode/xcode_build_helper'
 require 'pindo/module/xcode/xcode_app_config'
@@ -170,7 +169,7 @@ module Pindo
           increase_buildnumber_in_file(app_config_file)
 
           # 提交到配置仓库
-          require 'pindo/module/build/git_repo_helper'
+          require 'pindo/module/utils/git_repo_helper'
           git_helper = Pindo::GitRepoHelper.share_instance
           git_helper.git_addpush_repo(
             path: app_config_repo_dir,
@@ -219,7 +218,7 @@ module Pindo
           build_verify_json = nil
         end
 
-        require 'pindo/module/build/git_repo_helper'
+        require 'pindo/module/utils/git_repo_helper'
         git_helper = Pindo::GitRepoHelper.share_instance
         release_code_commit = git_helper.git_latest_commit_id(local_repo_dir: @project_path)
 

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

@@ -1,7 +1,6 @@
 require_relative 'ios_build_task'
 require 'pindo/module/build/build_helper'
-require 'pindo/module/build/git_repo_helper'
-require 'pindo/module/build/git_repo_helper'
+require 'pindo/module/utils/git_repo_helper'
 require 'pindo/module/xcode/xcode_build_config'
 require 'pindo/module/xcode/xcode_build_helper'
 require 'pindo/module/xcode/cocoapods_helper'

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

@@ -1,6 +1,7 @@
 require 'pindo/module/task/model/git_task'
 require 'pindo/base/git_handler'
-require 'pindo/module/build/git_repo_helper'
+require 'pindo/module/utils/git_repo_helper'
+require 'pindo/module/utils/git_hook_helper'
 require 'pindo/options/helpers/git_constants'
 
 module Pindo
@@ -86,7 +87,10 @@ module Pindo
         # 2. 检查并修复 .gitignore（可能创建新提交，但 fixed_version 已经确定）
         git_repo_helper.check_gitignore(root_dir)
 
-        # 3. 检查并处理未提交的文件（使用 GitHandler）
+        # 3. 检查并安装 commit 变更统计 hook（主仓库 + 子模块）
+        Pindo::GitHookHelper.share_instance.install_commit_stats_hook(root_dir)
+
+        # 4. 检查并处理未提交的文件（使用 GitHandler）
         # process_type 已经在初始化时确定（由外部传入或默认为 skip）
         begin
             Pindo::GitHandler.process_need_add_files(
@@ -120,7 +124,7 @@ module Pindo
           }
         end
 
-        # 4. Stash 工作目录的残留修改（为分支同步做准备）
+        # 5. Stash 工作目录的残留修改（为分支同步做准备）
         coding_branch = nil
         stash_saved = false
         stash_name = "pindo_stash_#{Time.now.strftime('%Y%m%d%H%M%S')}_#{rand(1000)}"
@@ -132,13 +136,13 @@ module Pindo
         end
 
         begin
-          # 5. 获取当前分支
+          # 6. 获取当前分支
           coding_branch = get_current_branch_name
 
-          # 6. 检查并推送本地提交到远程（确保本地和远程同步）
+          # 7. 检查并推送本地提交到远程（确保本地和远程同步）
           Pindo::GitHandler.check_unpushed_commits(project_dir: root_dir, branch: coding_branch)
 
-          # 7. 分支同步：将 coding_branch 和 release_branch 双向合并（确保两分支在同一节点）
+          # 8. 分支同步：将 coding_branch 和 release_branch 双向合并（确保两分支在同一节点）
           if coding_branch != @release_branch
             Funlog.instance.fancyinfo_start("开始同步 #{coding_branch} 和 #{@release_branch} 分支")
             Pindo::GitHandler.merge_branches(
@@ -150,7 +154,7 @@ module Pindo
             Funlog.instance.fancyinfo_success("分支同步完成，#{coding_branch} 和 #{@release_branch} 现在在同一节点")
           end
 
-          # 8. 计算 build_version
+          # 9. 计算 build_version
           # 优先级 1: 如果指定了 fixed_version（外部传入或从 HEAD tag 获取），使用它
           if @fixed_version && !@fixed_version.empty?
             @build_version = @fixed_version
@@ -172,7 +176,7 @@ module Pindo
           end
 
         ensure
-          # 9. 还原 stash（无论成功或失败都执行）
+          # 10. 还原 stash（无论成功或失败都执行）
           if stash_saved
             begin
               stash_list = Pindo::GitHandler.git!(%W(-C #{root_dir} stash list)).strip
@@ -193,7 +197,7 @@ module Pindo
         end
 
         
-        # 10. 显示主仓库和所有子仓库的 commit info
+        # 11. 显示主仓库和所有子仓库的 commit info
         display_all_repos_commit_info(root_dir)
 
         {
@@ -205,12 +209,12 @@ module Pindo
       end
 
       # ----------------------------------------------------
-      # 10. 显示主仓库和所有子仓库的 commit id 和 commit message
+      # 11. 显示主仓库和所有子仓库的 commit id 和 commit message
       # ----------------------------------------------------
       def display_all_repos_commit_info(root_dir)
         Funlog.instance.fancyinfo_start("仓库及子模块 Commit 信息概览")
 
-        # 10.1 主仓库
+        # 11.1 主仓库
         begin
           main_info = Pindo::GitHandler.git!(%W(-C #{root_dir} log -1 --format=%h|%s)).strip
           main_id, main_msg = main_info.split('|', 2)
@@ -221,7 +225,7 @@ module Pindo
           Funlog.instance.warning("获取主仓库信息失败: #{e.message}")
         end
 
-        # 10.2 子模块
+        # 11.2 子模块
         begin
           # 使用 git submodule status 获取列表，更可靠
           submodule_status_output = Pindo::GitHandler.git!(%W(-C #{root_dir} submodule status --recursive)).strip

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

@@ -1,6 +1,6 @@
 require 'pindo/module/task/model/git_task'
 require 'pindo/base/git_handler'
-require 'pindo/module/build/git_repo_helper'
+require 'pindo/module/utils/git_repo_helper'
 
 module Pindo
   module TaskSystem

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

@@ -1,6 +1,6 @@
 require 'pindo/module/task/pindo_task'
 require 'pindo/base/git_handler'
-require 'pindo/module/build/git_repo_helper'
+require 'pindo/module/utils/git_repo_helper'
 
 module Pindo
   module TaskSystem

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

@@ -0,0 +1,370 @@
+require 'singleton'
+require 'fileutils'
+require 'pindo/base/git_handler'
+
+module Pindo
+  class GitHookHelper
+    include Singleton
+
+    class << self
+      def share_instance
+        instance
+      end
+    end
+
+    # Hook 版本号，修改 hook 内容时递增此版本
+    HOOK_VERSION = '1.0.0'
+
+    # 版本标记前缀（用于在 hook 文件中识别版本）
+    HOOK_VERSION_PREFIX = '# pindo_commit_stats_hook_version:'
+
+    # 变更统计关键字（用于旧版 hook 特征识别）
+    COMMIT_STATS_MARKER = '变更统计'
+
+    # 为仓库及其子模块安装 prepare-commit-msg hook（自动追加变更统计）
+    # 支持普通仓库、子模块、Husky 项目
+    # 版本匹配则跳过，版本不匹配或无版本则覆盖
+    # @param git_root_dir [String] Git 仓库根目录
+    def install_commit_stats_hook(git_root_dir)
+      Funlog.instance.fancyinfo_start("安装 commit 变更统计 hook (v#{HOOK_VERSION})...")
+
+      # 1. 主仓库
+      install_hook_to_repo(git_root_dir)
+
+      # 2. 子模块
+      begin
+        submodule_output = Pindo::GitHandler.git!(%W(-C #{git_root_dir} submodule status --recursive)).strip
+        unless submodule_output.empty?
+          submodule_output.each_line do |line|
+            parts = line.strip.split(' ')
+            next if parts.length < 2
+            sub_path = File.join(git_root_dir, parts[1])
+            if File.directory?(sub_path) && (File.directory?(File.join(sub_path, '.git')) || File.file?(File.join(sub_path, '.git')))
+              install_hook_to_repo(sub_path)
+            end
+          end
+        end
+      rescue => e
+        Funlog.instance.fancyinfo_warning("子模块检测跳过: #{e.message}") if ENV['PINDO_DEBUG']
+      end
+
+      Funlog.instance.fancyinfo_success("commit 变更统计 hook 安装完成!")
+    end
+
+    private
+
+    # 从文件内容中提取 hook 版本号
+    # @param content [String] 文件内容
+    # @return [String, nil] 版本号，未找到返回 nil
+    def extract_hook_version(content)
+      if content =~ /#{Regexp.escape(HOOK_VERSION_PREFIX)}\s*(.+)/
+        $1.strip
+      else
+        nil
+      end
+    end
+
+    # 判断是否需要安装/更新 hook
+    # 通过 pindo 版本标记识别自己安装的 hook，绝不覆盖第三方 hook
+    # 同时兼容旧版批量脚本安装的无版本标记 hook（通过特征识别）
+    # @param content [String] 已有文件内容
+    # @return [Symbol]
+    #   :skip    — 版本一致，无需操作
+    #   :update  — pindo 安装的旧版本，需覆盖升级
+    #   :install — 文件为空或不存在，首次安装
+    #   :foreign — 非 pindo 安装的已有 hook，跳过不干预
+    def check_hook_status(content)
+      existing_version = extract_hook_version(content)
+
+      if existing_version
+        # 有 pindo 版本标记 → 是 pindo 自己安装的
+        existing_version == HOOK_VERSION ? :skip : :update
+      elsif pindo_legacy_hook?(content)
+        # 无版本标记但特征匹配旧版批量脚本安装的 hook → 视为旧版，允许升级
+        :update
+      elsif !content.strip.empty?
+        # 无任何 pindo 特征且文件非空 → 第三方 hook，不干预
+        :foreign
+      else
+        # 文件为空 → 首次安装
+        :install
+      end
+    end
+
+    # 判断是否为旧版批量脚本（apply-to-all-repos）安装的 hook
+    # 通过多个核心特征片段组合识别，至少命中 3 个才视为旧版 pindo hook
+    # @param content [String] 文件内容
+    # @return [Boolean]
+    def pindo_legacy_hook?(content)
+      fingerprints = [
+        'COMMIT_MSG_FILE=$1',              # hook 参数接收
+        'git diff --cached -M --numstat',  # 暂存区统计命令
+        "stats_msg=\"#{COMMIT_STATS_MARKER}:", # 统计消息拼接
+        'COMMIT_SOURCE=$2',                # hook 第二参数
+      ]
+      matched = fingerprints.count { |fp| content.include?(fp) }
+      matched >= 3
+    end
+
+    # 为单个仓库安装 hook
+    # @param repo_path [String] 仓库路径
+    def install_hook_to_repo(repo_path)
+      repo_name = File.basename(repo_path)
+
+      # 优先检测 Husky 项目
+      husky_dir = File.join(repo_path, '.husky')
+      if File.directory?(husky_dir)
+        install_hook_to_husky(repo_path, husky_dir)
+        return
+      end
+
+      # 普通仓库 / 子模块
+      git_dir = resolve_git_dir(repo_path)
+      unless git_dir && File.directory?(git_dir)
+        Funlog.instance.fancyinfo_error("  [#{repo_name}] 无法找到 Git 目录")
+        return
+      end
+
+      hook_path = File.join(git_dir, 'hooks', 'prepare-commit-msg')
+      FileUtils.mkdir_p(File.join(git_dir, 'hooks'))
+
+      if File.exist?(hook_path)
+        status = check_hook_status(File.read(hook_path))
+        case status
+        when :skip
+          Funlog.instance.fancyinfo_success("  [#{repo_name}] hook 已是最新版本 (v#{HOOK_VERSION})，跳过")
+          return
+        when :foreign
+          Funlog.instance.fancyinfo_warning("  [#{repo_name}] 检测到非 pindo 安装的 hook，跳过")
+          return
+        when :update
+          old_version = extract_hook_version(File.read(hook_path)) || '未知'
+          Funlog.instance.fancyinfo_update("  [#{repo_name}] hook 版本更新 (v#{old_version} → v#{HOOK_VERSION})")
+        end
+      end
+
+      File.write(hook_path, full_hook_content)
+      File.chmod(0755, hook_path)
+      Funlog.instance.fancyinfo_success("  [#{repo_name}] hook 已安装 (v#{HOOK_VERSION})")
+    end
+
+    # 安装 hook 到 Husky 项目
+    def install_hook_to_husky(repo_path, husky_dir)
+      repo_name = File.basename(repo_path)
+
+      # 修复 .husky/_/ 内部目录被误写入的情况（清理新版或旧版 pindo hook）
+      internal_hook = File.join(husky_dir, '_', 'prepare-commit-msg')
+      if File.exist?(internal_hook)
+        internal_content = File.read(internal_hook)
+        if extract_hook_version(internal_content) || pindo_legacy_hook?(internal_content)
+          internal_content.sub!(/# --- 变更统计 ---.*/m, '')
+          internal_content.sub!(/^#{Regexp.escape(HOOK_VERSION_PREFIX)}.*/m, '')
+          internal_content.sub!(/^COMMIT_MSG_FILE=\$1.*/m, '')
+          File.write(internal_hook, internal_content)
+          Funlog.instance.fancyinfo_success("  [#{repo_name}] 已修复 .husky/_/prepare-commit-msg")
+        end
+      end
+
+      # 查找已有的 prepare-commit-msg（排除 _/ 内部目录）
+      existing_hook = find_husky_hook(husky_dir)
+
+      if existing_hook
+        existing_content = File.read(existing_hook)
+        status = check_hook_status(existing_content)
+
+        case status
+        when :skip
+          Funlog.instance.fancyinfo_success("  [#{repo_name}] husky hook 已是最新版本 (v#{HOOK_VERSION})，跳过")
+          return
+        when :foreign
+          Funlog.instance.fancyinfo_warning("  [#{repo_name}] 检测到非 pindo 安装的 husky hook，跳过")
+          return
+        when :update
+          # 移除 pindo 旧版统计代码，再追加新版本
+          old_version = extract_hook_version(existing_content) || '未知'
+          cleaned = remove_old_stats_block(existing_content)
+          File.write(existing_hook, cleaned)
+          Funlog.instance.fancyinfo_update("  [#{repo_name}] husky hook 版本更新 (v#{old_version} → v#{HOOK_VERSION})")
+        when :install
+          # 文件存在但内容为空，直接追加
+        end
+
+        # :update 和 :install 都走到这里，追加新版本到文件末尾
+        File.open(existing_hook, 'a') do |f|
+          f.puts ""
+          f.puts "# --- 变更统计 ---"
+          f.puts hook_core_content
+        end
+        Funlog.instance.fancyinfo_success("  [#{repo_name}] 已追加到 #{existing_hook.sub(repo_path + '/', '')} (husky)")
+      else
+        # 新建文件，检测风格
+        hook_path = File.join(husky_dir, 'prepare-commit-msg')
+        style = detect_husky_style(husky_dir)
+
+        case style[:type]
+        when :bare
+          File.write(hook_path, hook_core_content)
+        when :shebang_with_source
+          content = "#!/usr/bin/env sh\n#{style[:source_line]}\n\n#{hook_core_content}"
+          File.write(hook_path, content)
+        else
+          content = "#!/usr/bin/env sh\n\n#{hook_core_content}"
+          File.write(hook_path, content)
+        end
+
+        File.chmod(0755, hook_path)
+        Funlog.instance.fancyinfo_success("  [#{repo_name}] 已新建 .husky/prepare-commit-msg (husky v#{HOOK_VERSION})")
+      end
+    end
+
+    # 移除已有内容中的旧统计代码块
+    # @param content [String] 文件内容
+    # @return [String] 清理后的内容
+    def remove_old_stats_block(content)
+      # 优先按 "# --- 变更统计 ---" 标记截断
+      if content.include?('# --- 变更统计 ---')
+        content.sub(/\n*# --- 变更统计 ---.*/m, '')
+      elsif content.include?('COMMIT_MSG_FILE=$1')
+        content.sub(/\n*COMMIT_MSG_FILE=\$1.*/m, '')
+      else
+        content
+      end
+    end
+
+    # 获取实际的 .git 目录路径（支持子模块）
+    def resolve_git_dir(repo_path)
+      git_path = File.join(repo_path, '.git')
+      if File.file?(git_path)
+        # 子模块：.git 是文件，内容为 "gitdir: xxx"
+        content = File.read(git_path).strip
+        if content.start_with?('gitdir:')
+          git_dir = content.sub('gitdir:', '').strip
+          git_dir = File.expand_path(git_dir, repo_path) unless git_dir.start_with?('/')
+          return git_dir
+        end
+        nil
+      elsif File.directory?(git_path)
+        git_path
+      else
+        nil
+      end
+    end
+
+    # 在 .husky 目录中查找已有的 prepare-commit-msg（排除 _/ 内部目录）
+    def find_husky_hook(husky_dir)
+      Dir.glob(File.join(husky_dir, '**', 'prepare-commit-msg')).find do |path|
+        !path.include?(File.join(husky_dir, '_'))
+      end
+    end
+
+    # 检测 Husky hook 文件风格
+    # @return [Hash] { type: :bare | :shebang | :shebang_with_source, source_line: String | nil }
+    def detect_husky_style(husky_dir)
+      # 找任意一个已有的 hook 文件作为参考（排除 _/ 内部目录和隐藏文件）
+      sample_hook = Dir.glob(File.join(husky_dir, '*')).find do |path|
+        File.file?(path) &&
+          !File.basename(path).start_with?('.') &&
+          File.extname(path) != '.sh' &&
+          !path.include?(File.join(husky_dir, '_'))
+      end
+
+      return { type: :shebang, source_line: nil } unless sample_hook
+
+      lines = File.readlines(sample_hook)
+      first_line = lines.first&.strip || ''
+
+      if first_line.start_with?('#!')
+        # 检查是否有 source 行
+        source_line = lines.find { |l| l.strip.start_with?('. "') }&.strip
+        if source_line
+          { type: :shebang_with_source, source_line: source_line }
+        else
+          { type: :shebang, source_line: nil }
+        end
+      else
+        { type: :bare, source_line: nil }
+      end
+    end
+
+    # 完整 hook 文件内容（带 shebang，用于 .git/hooks 直接写入）
+    # 版本标记由 hook_core_content 统一提供，此处不重复写入
+    def full_hook_content
+      "#!/bin/bash\n\n# Git Hook: prepare-commit-msg\n# 功能: 在提交信息末尾自动添加变更统计信息\n\n#{hook_core_content}"
+    end
+
+    # Hook 核心逻辑（不含 shebang，可追加到已有文件）
+    def hook_core_content
+      <<~HOOK
+        #{HOOK_VERSION_PREFIX} #{HOOK_VERSION}
+        COMMIT_MSG_FILE=$1
+        COMMIT_SOURCE=$2
+
+        # 只在正常提交时添加统计(不在 merge、amend 等情况下添加)
+        if [ "$COMMIT_SOURCE" = "message" ] || [ "$COMMIT_SOURCE" = "template" ] || [ -z "$COMMIT_SOURCE" ]; then
+
+            # 读取原始提交信息
+            original_msg=$(cat "$COMMIT_MSG_FILE")
+
+            # 检查最后一行是否已经包含变更统计
+            last_line=$(echo "$original_msg" | tail -n 1)
+            if echo "$last_line" | grep -q "变更统计:"; then
+                exit 0
+            fi
+
+            # 获取暂存区的变更统计
+            stats=$(git diff --cached -M --numstat)
+            stats_no_r=$(git diff --cached -M --numstat --diff-filter=DAMT)
+
+            if [ -n "$stats" ]; then
+                files_changed=$(echo "$stats" | wc -l | tr -d ' ')
+                insertions=$(echo "$stats_no_r" | awk '{sum += $1} END {print sum}')
+                deletions=$(echo "$stats_no_r" | awk '{sum += $2} END {print sum}')
+
+                name_status=$(git diff --cached -M --name-status)
+                new_files=$(echo "$name_status" | grep "^A" | wc -l | tr -d ' ')
+                modified_files=$(echo "$name_status" | grep "^M" | wc -l | tr -d ' ')
+                deleted_files=$(echo "$name_status" | grep "^D" | wc -l | tr -d ' ')
+                moved_files=$(echo "$name_status" | grep "^R" | awk -F'\\t' '{ n=split($2,a,"/"); m=split($3,b,"/"); if(a[n]==b[m]) sum+=1 } END {print sum+0}')
+                renamed_files=$(echo "$name_status" | grep "^R" | awk -F'\\t' '{ n=split($2,a,"/"); m=split($3,b,"/"); if(a[n]!=b[m]) sum+=1 } END {print sum+0}')
+
+                insertions=${insertions:-0}
+                deletions=${deletions:-0}
+                new_files=${new_files:-0}
+                modified_files=${modified_files:-0}
+                deleted_files=${deleted_files:-0}
+                moved_files=${moved_files:-0}
+                renamed_files=${renamed_files:-0}
+
+                file_changes=""
+                [ "$new_files" -gt 0 ] && file_changes="${file_changes}+${new_files}新增 "
+                [ "$modified_files" -gt 0 ] && file_changes="${file_changes}~${modified_files}修改 "
+                [ "$deleted_files" -gt 0 ] && file_changes="${file_changes}-${deleted_files}删除 "
+                [ "$moved_files" -gt 0 ] && file_changes="${file_changes}^${moved_files}移动 "
+                [ "$renamed_files" -gt 0 ] && file_changes="${file_changes}%${renamed_files}重命名 "
+                file_changes=$(echo "$file_changes" | sed 's/ $//')
+
+                line_changes=""
+                [ "$insertions" -gt 0 ] && line_changes="${line_changes}+${insertions}行"
+                [ "$deletions" -gt 0 ] && {
+                    [ -n "$line_changes" ] && line_changes="${line_changes}/"
+                    line_changes="${line_changes}-${deletions}行"
+                }
+
+                if [ -n "$file_changes" ] && [ -n "$line_changes" ]; then
+                    stats_msg="变更统计: ${files_changed}个文件（${file_changes}）（${line_changes}）"
+                elif [ -n "$file_changes" ]; then
+                    stats_msg="变更统计: ${files_changed}个文件（${file_changes}）"
+                elif [ -n "$line_changes" ]; then
+                    stats_msg="变更统计: ${files_changed}个文件（${line_changes}）"
+                else
+                    stats_msg="变更统计: ${files_changed}个文件"
+                fi
+
+                printf '%s\\n\\n%s\\n' "$original_msg" "$stats_msg" > "$COMMIT_MSG_FILE"
+            fi
+        fi
+      HOOK
+    end
+
+  end
+end

data/lib/pindo/module/{build → utils}/git_repo_helper.rb

@@ -18,7 +18,7 @@ module Pindo
 
     # 检查并安装 git-cliff
     # @param project_path [String] 项目路径
-    def check_check_and_install_cliff(project_path)
+    def check_and_install_cliff(project_path)
       if Pindo::GitHandler.is_git_directory?(local_repo_dir: project_path)
         current_git_root_path = Pindo::GitHandler.git_root_directory(local_repo_dir: project_path)
         unless File.exist?(File.join(current_git_root_path, 'cliff.toml'))

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

@@ -277,10 +277,22 @@ module Pindo
         def self.add_single_scheme(plist_dict, scheme_value)
             return false if scheme_value.nil? || scheme_value.empty?
 
-            # 检查是否已存在
-            return false if plist_dict["CFBundleURLTypes"].any? { |item| item["CFBundleURLName"] == scheme_value }
+            # 查找 CFBundleURLName 匹配的已有条目
+            existing_item = plist_dict["CFBundleURLTypes"].find { |item| item["CFBundleURLName"] == scheme_value }
 
-            # 创建新的URL Type
+            if existing_item
+              # 已有同名条目，检查 CFBundleURLSchemes 是否包含该值
+              schemes = existing_item["CFBundleURLSchemes"]
+              if schemes.is_a?(Array) && schemes.include?(scheme_value)
+                return false
+              end
+              # CFBundleURLSchemes 中没有该值，补充进去
+              existing_item["CFBundleURLSchemes"] = [] unless schemes.is_a?(Array)
+              existing_item["CFBundleURLSchemes"] << scheme_value
+              return true
+            end
+
+            # 不存在同名条目，创建新的 URL Type
             url_type = {
                 "CFBundleTypeRole" => "Editor",
                 "CFBundleURLName" => scheme_value,

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

@@ -117,6 +117,17 @@ module Pindo
             default_value: false,
             optional: true,
             example: 'pindo web run --debug'
+          ),
+
+          cliff: OptionItem.new(
+            key: :cliff,
+            name: 'git-cliff',
+            description: '检测并安装 git-cliff 工具，初始化 cliff 配置',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_CLIFF',
+            default_value: false,
+            optional: true,
+            example: 'pindo utils repoinit --cliff'
           )
         }
       end

data/lib/pindo/version.rb

@@ -6,13 +6,13 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.18.5"
+  VERSION = "5.18.6"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'
     VERSION_INFO_FILE = File.expand_path('~/.pindo/version_info.yml')
     CHECK_INTERVAL = 5 * 60 * 60   # 5小时检查一次
-    CONFIG_MIN_VERSION = '1.8.0'  # 硬编码的配置版本要求
+    CONFIG_MIN_VERSION = '1.9.0'  # 硬编码的配置版本要求
 
     class << self
       # 主版本检查方法（保持向后兼容）

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.18.5
+  version: 5.18.6
 platform: ruby
 authors:
 - wade
@@ -109,20 +109,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
@@ -393,7 +393,6 @@ files:
 - lib/pindo/module/appstore/itcapp_helper.rb
 - lib/pindo/module/build/build_helper.rb
 - lib/pindo/module/build/confuse_xcodeproj.rb
-- lib/pindo/module/build/git_repo_helper.rb
 - lib/pindo/module/build/swark_helper.rb
 - lib/pindo/module/cert/cert_helper.rb
 - lib/pindo/module/cert/keychain_helper.rb
@@ -463,6 +462,8 @@ files:
 - lib/pindo/module/unity/unity_helper.rb
 - lib/pindo/module/unity/unity_proc_helper.rb
 - lib/pindo/module/utils/file_downloader.rb
+- lib/pindo/module/utils/git_hook_helper.rb
+- lib/pindo/module/utils/git_repo_helper.rb
 - lib/pindo/module/webserver/brotli_file_handler.rb
 - lib/pindo/module/webserver/preview/preview.css
 - lib/pindo/module/webserver/preview/preview.html