pindo 5.11.4 → 5.12.1

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

@@ -0,0 +1,519 @@
+require 'singleton'
+require 'pindo/base/githelper'
+require 'pindo/base/executable'
+require 'pindo/base/pindocontext'
+require 'highline/import'
+
+module Pindo
+  class GitRepoHelper
+    include Singleton
+    include Pindo::Githelper
+
+    attr_accessor :temp_tag_decision
+
+    class << self
+      def share_instance
+        instance
+      end
+    end
+
+    # 主入口函数 - 创建并推送 Git 标签
+    # @param project_dir [String] 项目目录
+    # @param mode [String] 版本号增加模式 (major/minor/patch)
+    # @param force_retag [Boolean] 是否强制重新打tag
+    # @param custom_tag [String] 自定义tag版本号
+    # @param release_branch [String] 发布分支名称，默认为 'master'
+    def create_and_push_tag(project_dir:, mode: 'minor', force_retag: false, custom_tag: nil, release_branch: 'master')
+      puts project_dir
+
+      # 1. 验证 Git 仓库
+      unless is_git_directory?(local_repo_dir: project_dir)
+        Funlog.instance.fancyinfo_error("当前目录不是git仓库，请在git仓库目录下执行此命令")
+        return
+      end
+
+      # 获取git仓库根目录
+      root_dir = git_root_directory(local_repo_dir: project_dir)
+      if root_dir.nil?
+        Funlog.instance.fancyinfo_error("无法获取git仓库根目录")
+        return
+      end
+
+      # 2. 处理未提交的文件
+      process_need_add_files(project_dir: root_dir)
+
+      # 3. 获取当前分支
+      current_branch = git!(%W(-C #{root_dir} rev-parse --abbrev-ref HEAD)).strip
+      coding_branch = current_branch
+
+      # 4. 合并到发布分支
+      Funlog.instance.fancyinfo_start("开始合并到#{release_branch}分支")
+      merge_to_release_branch(
+        project_dir: root_dir,
+        release_branch: release_branch,
+        coding_branch: coding_branch
+      )
+
+      # 5. 添加版本标签
+      add_release_tag(
+        project_dir: root_dir,
+        increment_mode: mode,
+        force_retag: force_retag,
+        custom_tag: custom_tag
+      )
+    end
+
+    # 检查并安装 git-cliff
+    # @param project_path [String] 项目路径
+    def check_check_and_install_cliff(project_path)
+      if is_git_directory?(local_repo_dir: project_path)
+        current_git_root_path = git_root_directory(local_repo_dir: project_path)
+        unless File.exist?(File.join(current_git_root_path, 'cliff.toml'))
+          add_git_cliffconfig(current_git_root_path)
+        end
+      end
+
+      begin
+        if !system('which git-cliff > /dev/null 2>&1')
+          puts "安装git-cliff..."
+          install_gitcliff()
+        end
+      rescue
+        Funlog.instance.fancyinfo_error("安装git-cliff出现错误")
+        return
+      end
+    end
+
+    # 写入 .gitignore 文件
+    # @param git_root_dir [String] Git 根目录
+    def write_gitignore(git_root_dir)
+      gitignore_path = File.join(git_root_dir, '.gitignore')
+
+      # 定义要添加的gitignore规则数组
+      ignore_rules = [
+        'Temp',
+        'Logs',
+        'build_ios.log',
+        'feishu.json',
+        'CHANGELOG.md',
+        'GoodPlatform/iOS/*',
+        'GoodPlatform/Android/*',
+        'GoodPlatform/BaseiOS/Unity/*',
+        'GoodPlatform/BaseiOS/Pods/',
+        'GoodPlatform/BaseiOS/build',
+        'GoodPlatform/BaseiOS/config.json',
+        'GoodPlatform/BaseiOS/Podfile.lock',
+        'GoodPlatform/BaseAndroid/Unity/*',
+        'GoodPlatform/BaseAndroid/build',
+        'GoodPlatform/WebGL',
+        'config.json',
+        'Assets/Packages',
+        'Assets/WebGLTemplates.meta',
+        'Assets/WebGLTemplates/',
+        'Packages/packages-lock.json'
+      ]
+
+      # 读取现有的gitignore内容
+      existing_lines = []
+      if File.exist?(gitignore_path)
+        existing_lines = File.readlines(gitignore_path).map(&:strip)
+      end
+
+      # 过滤出需要添加的规则（不存在的）
+      rules_to_add = ignore_rules.reject { |rule| existing_lines.include?(rule) }
+
+      # 如果有需要添加的规则，则添加
+      unless rules_to_add.empty?
+        File.open(gitignore_path, 'a') do |f|
+          # 检查是否已有Pindo标记，如果没有则添加
+          pindo_marker = '# Added by Pindo (pindo_common_ignore_1.0.0)'
+          f.puts("\n#{pindo_marker}") unless existing_lines.include?(pindo_marker.strip)
+
+          # 添加每条新规则
+          rules_to_add.each do |rule|
+            f.puts(rule)
+          end
+        end
+      end
+    end
+
+    # 添加 git-cliff 配置
+    # @param project_path [String] 项目路径
+    def add_git_cliffconfig(project_path)
+      temp_dir = Dir.pwd
+      Funlog.instance.fancyinfo_start("添加日志变更git-cliff配置...")
+      if is_git_directory?(local_repo_dir: project_path)
+        current_git_root_path = git_root_directory(local_repo_dir: project_path)
+        Dir.chdir(current_git_root_path)
+        pindo_common_dir = clone_pindo_common_config_repo(force_delete:false)
+        if File.exist?(File.join(pindo_common_dir, 'cliff.toml'))
+          FileUtils.cp_r(File.join(pindo_common_dir, 'cliff.toml'), File.join(current_git_root_path, 'cliff.toml'))
+        end
+        Funlog.instance.fancyinfo_update("仓库添加git-cliff配置")
+        write_gitignore(current_git_root_path)
+        Funlog.instance.fancyinfo_update("仓库添加.gitignore")
+        Dir.chdir(current_git_root_path)
+        current_branch = git!(%W(-C #{current_git_root_path} rev-parse --abbrev-ref HEAD)).strip
+        git!(%W(-C #{current_git_root_path} add cliff.toml))
+        git!(%W(-C #{current_git_root_path} add .gitignore))
+        commit_message = "docs: 添加日志变更配置".encode('UTF-8')
+        git!(%W(-C #{current_git_root_path} commit -m #{commit_message}))
+        git!(%W(-C #{current_git_root_path} push origin #{current_branch}))
+      else
+        Funlog.instance.fancyinfo_error("当前目录不是git仓库，请在git仓库根目录下执行此命令")
+        Dir.chdir(temp_dir)
+        return
+      end
+      Funlog.instance.fancyinfo_success("日志变更git-cliff配置完成!")
+      Dir.chdir(temp_dir)
+    end
+
+    # 安装 git-cliff
+    def install_gitcliff
+      puts "\n检查git-cliff命令是否安装"
+      begin
+        if !system('which git-cliff > /dev/null 2>&1')
+          system('bash -c "$(curl -fsSL https://gitee.com/goodtools/env/raw/master/gitcliff_install.sh)"')
+        end
+      rescue
+        Funlog.instance.fancyinfo_error("安装git-cliff出现错误")
+      end
+    end
+
+    # 检查是否需要添加 Git 标签
+    # @param project_path [String] 项目路径
+    # @param auto_mode [Boolean] 是否自动模式
+    # @return [Array<Boolean, Array>] [是否需要添加tag, tag参数]
+    def check_is_need_add_tag?(project_path, auto_mode: false)
+      tag_action_parms = nil
+      is_need_add_tag = false
+
+      if is_git_directory?(local_repo_dir: project_path)
+        current_git_root_path = git_root_directory(local_repo_dir: project_path)
+        latest_tag = get_latest_version_tag(project_dir: current_git_root_path)
+
+        unless is_tag_at_head?(git_root_dir: current_git_root_path, tag_name: latest_tag)
+          # 检查环境变量
+          env_tag_decision = ENV['PINDO_TAG_DECISION']
+          if env_tag_decision && !env_tag_decision.empty?
+            case env_tag_decision.downcase
+            when 'new', 'new_tag', '1'
+              puts "\n环境变量指定：新增版本号,打新Tag"
+              puts
+              tag_action_parms = []
+              is_need_add_tag = true
+              # 保存到缓存
+              context = PindoContext.instance
+              decision = {
+                tag_action_parms: tag_action_parms,
+                is_need_add_tag: is_need_add_tag,
+                action: :new_tag,
+                description: "新增版本号,打新Tag"
+              }
+              context.set_selection(PindoContext::SelectionKey::TAG_DECISION, decision)
+              return is_need_add_tag, tag_action_parms
+            when 'retag', 'recreate', '2'
+              puts "\n环境变量指定：将上次的Tag删除重新打Tag"
+              puts
+              tag_action_parms = ['--retag']
+              is_need_add_tag = true
+              # 保存到缓存
+              context = PindoContext.instance
+              decision = {
+                tag_action_parms: tag_action_parms,
+                is_need_add_tag: is_need_add_tag,
+                action: :recreate_tag,
+                description: "将上次的Tag删除重新打Tag"
+              }
+              context.set_selection(PindoContext::SelectionKey::TAG_DECISION, decision)
+              return is_need_add_tag, tag_action_parms
+            when 'skip', 'no', 'none', '3'
+              puts "\n环境变量指定：不需要Tag继续编译"
+              puts
+              tag_action_parms = nil
+              is_need_add_tag = false
+              # 保存到缓存
+              context = PindoContext.instance
+              decision = {
+                tag_action_parms: tag_action_parms,
+                is_need_add_tag: is_need_add_tag,
+                action: :continue_without_tag,
+                description: "不需要Tag继续编译且上传"
+              }
+              context.set_selection(PindoContext::SelectionKey::TAG_DECISION, decision)
+              return is_need_add_tag, tag_action_parms
+            when 'exit', 'quit', '4'
+              Funlog.instance.fancyinfo_error("环境变量指定：终止退出编译!")
+              return false, nil
+            end
+          end
+
+          if auto_mode
+            # 在自动化模式或没有交互式终端时，默认选择新增版本号打新Tag
+            puts "检测到当前代码没有打Tag，在自动模式下将自动新增版本号并打新Tag"
+            tag_action_parms = []
+            is_need_add_tag = true
+          else
+            # 检查是否已有用户选择
+            context = PindoContext.instance
+            # 优先从持久化缓存读取，如果没有则从内存临时缓存读取
+            cached_decision = context.get_selection(PindoContext::SelectionKey::TAG_DECISION)
+
+            # 只有当持久化缓存中确实不存在该键时，才从临时缓存读取
+            if cached_decision.nil? && !context.has_selection?(PindoContext::SelectionKey::TAG_DECISION)
+              # 从 GitRepoHelper 的临时缓存读取
+              cached_decision = self.temp_tag_decision
+            end
+
+            if cached_decision && cached_decision.is_a?(Hash)
+              # 使用之前的选择
+              puts "\n使用之前的选择：#{cached_decision[:description]}"
+              tag_action_parms = cached_decision[:tag_action_parms]
+              is_need_add_tag = cached_decision[:is_need_add_tag]
+
+              # 如果是退出选择，则返回
+              if cached_decision[:action] == :exit
+                Funlog.instance.fancyinfo_error("终止退出编译!")
+                return false, nil
+              end
+            else
+              # 第一次询问
+              cli = HighLine.new
+              selected_action = nil
+              selected_description = nil
+
+              menu_options = {
+                "新增版本号,打新Tag" => -> {
+                  tag_action_parms = []
+                  selected_action = :new_tag
+                  selected_description = "新增版本号,打新Tag"
+                  is_need_add_tag = true
+                  :new_tag
+                },
+                "将上次的Tag删除重新打Tag" => -> {
+                  tag_action_parms = []
+                  tag_action_parms << "--retag"
+                  selected_action = :recreate_tag
+                  selected_description = "将上次的Tag删除重新打Tag"
+                  is_need_add_tag = true
+                  :recreate_tag
+                },
+                "不需要Tag继续编译且上传，手动修改上传备注" => -> {
+                  puts ""
+                  tag_action_parms = nil
+                  selected_action = :continue_without_tag
+                  selected_description = "不需要Tag继续编译且上传"
+                  is_need_add_tag = false
+                  :continue_without_tag
+                },
+                "终止退出编译" => -> {
+                  tag_action_parms = nil
+                  selected_action = :exit
+                  selected_description = "终止退出编译"
+                  is_need_add_tag = false
+                  Funlog.instance.fancyinfo_error("终止退出编译!")
+                  :exit
+                }
+              }
+
+              result = cli.choose do |menu|
+                menu.header = "当前代码并没有打Tag,上传的Changelog需要Tag"
+                menu.prompt = "请选中打Tag的方式, 请输入选项(1/2/3...):"
+                menu_options.each do |option, action|
+                  menu.choice(option) { action.call }
+                end
+              end
+
+              # 如果选择退出，直接返回
+              return false, nil if selected_action == :exit
+
+              # 保存用户选择
+              # 只有选择"新增版本号,打新Tag"时才保存到持久化缓存
+              if selected_action == :new_tag
+                # 保存到持久化缓存（文件）
+                context.set_selection(PindoContext::SelectionKey::TAG_DECISION, {
+                  action: selected_action,
+                  description: selected_description,
+                  tag_action_parms: tag_action_parms,
+                  is_need_add_tag: is_need_add_tag
+                })
+                # 清除临时缓存
+                self.temp_tag_decision = nil
+              else
+                # 清空持久化缓存
+                context.set_selection(PindoContext::SelectionKey::TAG_DECISION, nil)
+                # 保存到临时缓存（仅在内存中，不会写入文件）
+                self.temp_tag_decision = {
+                  action: selected_action,
+                  description: selected_description,
+                  tag_action_parms: tag_action_parms,
+                  is_need_add_tag: is_need_add_tag
+                }
+              end
+            end
+          end
+        end
+      end
+
+      return [is_need_add_tag, tag_action_parms]
+    end
+
+    private
+
+    # 添加版本标签
+    # @param project_dir [String] 项目目录
+    # @param increment_mode [String] 版本号增加模式 (major/minor/patch)
+    # @param force_retag [Boolean] 是否强制重新打tag
+    # @param custom_tag [String] 自定义tag版本号
+    def add_release_tag(project_dir:, increment_mode: "minor", force_retag: false, custom_tag: nil)
+      raise ArgumentError, "项目目录不能为空" if project_dir.nil?
+
+      # 如果指定了自定义tag，直接使用
+      if custom_tag && !custom_tag.empty?
+        Funlog.instance.fancyinfo_start("使用指定的tag版本: #{custom_tag}")
+
+        # 确保tag有v前缀
+        new_tag = custom_tag.start_with?('v') ? custom_tag : "v#{custom_tag}"
+
+        # 检查tag是否已存在
+        existing_tags = git!(%W(-C #{project_dir} tag -l)).split("\n")
+        if existing_tags.include?(new_tag)
+          if force_retag
+            Funlog.instance.fancyinfo_update("tag #{new_tag} 已存在，强制重新打tag")
+            git!(%W(-C #{project_dir} tag -d #{new_tag}))
+            git!(%W(-C #{project_dir} push origin :refs/tags/#{new_tag}))
+          else
+            Funlog.instance.fancyinfo_success("tag #{new_tag} 已存在")
+            Funlog.instance.fancyinfo_success("仓库路径: #{project_dir}")
+            return
+          end
+        end
+
+        # 创建tag并推送
+        git!(%W(-C #{project_dir} tag #{new_tag}))
+        git!(%W(-C #{project_dir} push origin #{new_tag}))
+
+        Funlog.instance.fancyinfo_success("创建tag: #{new_tag}")
+        Funlog.instance.fancyinfo_success("仓库路径: #{project_dir}")
+        return
+      end
+
+      # 原有的自动递增逻辑
+      Funlog.instance.fancyinfo_start("开始创建初tag")
+      latest_tag = get_latest_version_tag(project_dir: project_dir)
+      if latest_tag.nil?
+        new_tag = create_next_version_tag(
+          project_dir: project_dir,
+          tag_prefix: "v",
+          increment_mode: increment_mode,
+          force_retag: false
+        )
+        Funlog.instance.fancyinfo_success("创建初始tag: #{new_tag}")
+        Funlog.instance.fancyinfo_success("仓库路径: #{project_dir}")
+        return
+      end
+
+      if is_tag_at_head?(git_root_dir: project_dir, tag_name: latest_tag)
+        Funlog.instance.fancyinfo_success("当前commit已有tag: #{latest_tag}，无需重新打tag")
+        Funlog.instance.fancyinfo_success("仓库路径: #{project_dir}")
+        return
+      end
+
+      Funlog.instance.fancyinfo_success("最近的上次tag是: #{latest_tag} ")
+      new_tag = create_next_version_tag(
+          project_dir: project_dir,
+          tag_prefix: "v",
+          increment_mode: increment_mode,
+          force_retag: force_retag
+      )
+
+      Funlog.instance.fancyinfo_success("当前仓库的tag: #{new_tag}")
+      Funlog.instance.fancyinfo_success("仓库路径: #{project_dir}")
+    end
+
+    # 合并到发布分支
+    # @param project_dir [String] 项目目录
+    # @param release_branch [String] 发布分支名称
+    # @param coding_branch [String] 当前开发分支名称
+    def merge_to_release_branch(project_dir:, release_branch:, coding_branch:)
+      current_project_dir = project_dir
+      Funlog.instance.fancyinfo_start("开始合并到#{release_branch}分支")
+      if !coding_branch.eql?(release_branch)
+        coding_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{coding_branch})).strip
+        release_branch_commit_id = nil
+
+        if remote_branch_exists?(local_repo_dir: current_project_dir, branch: release_branch)
+          Funlog.instance.fancyinfo_update("存在#{release_branch}远程分支")
+          if local_branch_exists?(local_repo_dir: current_project_dir, branch: release_branch)
+            Funlog.instance.fancyinfo_update("存在#{release_branch}本地分支")
+            git!(%W(-C #{current_project_dir} checkout #{release_branch}))
+          else
+            Funlog.instance.fancyinfo_update("不存在#{release_branch}本地分支")
+            git!(%W(-C #{current_project_dir} checkout -b #{release_branch} origin/#{release_branch}))
+          end
+
+          git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{release_branch} #{release_branch}))
+          git!(%W(-C #{current_project_dir} fetch origin #{release_branch}))
+          git!(%W(-C #{current_project_dir} merge origin/#{release_branch}))
+
+          # 执行合并操作，捕获输出以便后续检查冲突
+          stdout, exit_status = Executable.capture_command('git', %W(-C #{current_project_dir} merge #{coding_branch}), :capture => :out)
+
+          # 检查是否有冲突（git merge 在有冲突时返回非0状态）
+          conflict_filelist = git!(%W(-C #{current_project_dir} diff --name-only --diff-filter=U --relative))
+          if !conflict_filelist.nil? && conflict_filelist.size > 0
+            puts "合并代码冲突， 冲突文件如下："
+            raise Informative, "请手动处理冲突的文件！！！"
+          else
+            git!(%W(-C #{current_project_dir} push))
+            Funlog.instance.fancyinfo_success("代码已经合并到#{release_branch}分支")
+            # 获取 release_branch 的 commit ID（处理空分支情况）
+            begin
+              release_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{release_branch})).strip
+            rescue => e
+              # 分支可能存在但没有提交（空分支），此时使用 coding_branch 的 commit
+              Funlog.instance.fancyinfo_update("#{release_branch}分支为空或获取commit失败，将使用当前分支commit")
+              release_branch_commit_id = coding_branch_commit_id
+            end
+          end
+
+        else
+          if local_branch_exists?(local_repo_dir: current_project_dir, branch: release_branch)
+            Funlog.instance.fancyinfo_update("不存在#{release_branch}远程分支")
+            Funlog.instance.fancyinfo_update("存在#{release_branch}本地分支")
+            git!(%W(-C #{current_project_dir} checkout #{release_branch}))
+            git!(%W(-C #{current_project_dir} checkout -b #{release_branch}_temp))
+            git!(%W(-C #{current_project_dir} checkout #{coding_branch}))
+            git!(%W(-C #{current_project_dir} branch -D #{release_branch}))
+          else
+            Funlog.instance.fancyinfo_update("不存在#{release_branch}远程分支")
+            Funlog.instance.fancyinfo_update("不存在#{release_branch}本地分支")
+          end
+
+          git!(%W(-C #{current_project_dir} checkout -b #{release_branch}))
+          git!(%W(-C #{current_project_dir} push origin #{release_branch}))
+          git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{release_branch} #{release_branch}))
+
+          Funlog.instance.fancyinfo_success("代码已经合并到#{release_branch}分支")
+          # 获取 release_branch 的 commit ID（处理空分支情况）
+          begin
+            release_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{release_branch})).strip
+          rescue => e
+            # 新创建的分支，commit ID 应该与 coding_branch 相同
+            release_branch_commit_id = coding_branch_commit_id
+          end
+        end
+
+        git!(%W(-C #{current_project_dir} checkout #{coding_branch}))
+        if release_branch_commit_id && !release_branch_commit_id.eql?(coding_branch_commit_id)
+          git!(%W(-C #{current_project_dir} merge #{release_branch}))
+          Funlog.instance.fancyinfo_success("已将#{release_branch}合并到#{coding_branch}")
+        end
+        git!(%W(-C #{current_project_dir} push origin #{coding_branch}))
+        Funlog.instance.fancyinfo_success("已推送#{coding_branch}分支到远程")
+      else
+        Funlog.instance.fancyinfo_success("代码处于#{coding_branch}分支,无需合并")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,85 @@
+require 'open-uri'
+require 'openssl'
+require 'fileutils'
+
+module Pindo
+  module IconDownloader
+    # 带重试机制的文件下载
+    # @param url [String] 下载URL
+    # @param save_path [String] 保存路径
+    # @param max_retries [Integer] 最大重试次数，默认3次
+    # @param retry_delay [Integer] 重试间隔秒数，默认2秒
+    # @param options [Hash] URI.open 的选项
+    # @return [Boolean] 是否下载成功
+    def self.download_file_with_retry(url:, save_path:, max_retries: 3, retry_delay: 2, options: {})
+      return false if url.nil? || url.empty?
+      return false if save_path.nil? || save_path.empty?
+
+      # 默认选项
+      default_options = {
+        read_timeout: 30,
+        open_timeout: 10,
+        redirect: true,
+        ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE
+      }
+      merged_options = default_options.merge(options)
+
+      # 确保目录存在
+      save_dir = File.dirname(save_path)
+      FileUtils.mkdir_p(save_dir) unless File.exist?(save_dir)
+
+      attempt = 0
+      last_error = nil
+
+      while attempt < max_retries
+        attempt += 1
+        begin
+          URI.open(url, merged_options) do |file|
+            File.binwrite(save_path, file.read)
+          end
+
+          # 验证文件已下载
+          if File.exist?(save_path) && File.size(save_path) > 0
+            return true
+          else
+            raise "下载的文件为空或不存在"
+          end
+        rescue => e
+          last_error = e
+          if attempt < max_retries
+            Funlog.instance.fancyinfo_error("下载失败 (第#{attempt}次): #{e.message}，#{retry_delay}秒后重试...")
+            sleep(retry_delay)
+          end
+        end
+      end
+
+      # 所有重试都失败
+      Funlog.instance.fancyinfo_error("下载失败，已重试#{max_retries}次: #{last_error&.message}")
+      false
+    end
+
+    # 带重试机制的 Icon 下载
+    # @param icon_url [String] Icon的下载URL
+    # @param save_path [String] 保存路径
+    # @param max_retries [Integer] 最大重试次数，默认3次
+    # @return [Boolean] 是否下载成功
+    def self.download_icon_with_retry(icon_url:, save_path:, max_retries: 3)
+      Funlog.instance.fancyinfo_start("正在从 JPS 下载项目 Icon...")
+
+      success = download_file_with_retry(
+        url: icon_url,
+        save_path: save_path,
+        max_retries: max_retries,
+        retry_delay: 2
+      )
+
+      if success
+        Funlog.instance.fancyinfo_success("Icon 下载成功!")
+      else
+        Funlog.instance.fancyinfo_error("Icon 下载失败!")
+      end
+
+      success
+    end
+  end
+end

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

@@ -98,6 +98,7 @@ module Pindo
             when 'ipa' then 'ipa_workflow'
             when 'apk' then 'apk_workflow'
             when 'zip' then 'webgl_workflow'
+            when 'app' then 'macos_workflow'
             else
               puts "[JPSConfig] 不支持的 package_type: #{package_type}"
               return result
@@ -1015,8 +1016,8 @@ module Pindo
                         puts "使用项目配置文件: #{project_cliff_toml}" if ENV['DEBUG']
                         cliff_config_cmd = "git-cliff -c \"#{project_cliff_toml}\" #{cliff_args} -o -"
                     else
-                        # 策略2: 使用 Pindo 默认配置文件（使用与 check_and_install_cliff 相同的方法）
-                        pindo_common_dir = clone_pindo_common_config_repo(force_delete:false)
+                        # 策略2: 使用 Pindo 默认配置文件（直接从 Pindoconfig 获取目录，避免更新仓库）
+                        pindo_common_dir = Pindoconfig.instance.pindo_common_configdir
                         pindo_cliff_toml = File.join(pindo_common_dir, 'cliff.toml')
                         if File.exist?(pindo_cliff_toml)
                             puts "使用 Pindo 默认配置文件: #{pindo_cliff_toml}" if ENV['DEBUG']
@@ -1038,19 +1039,22 @@ module Pindo
                             end
                             puts "git-cliff 输出成功" if ENV['DEBUG']
                         else
-                            puts "\n\e[31m错误: git-cliff 执行失败\e[0m"
+                            Funlog.warning("git-cliff 执行失败，使用默认描述")
                             error_msg = stderr && !stderr.empty? ? stderr : stdout
-                            puts "\e[31m错误信息: #{error_msg}\e[0m"
-                            puts "\e[33m请检查 git-cliff 配置或联系管理员\e[0m"
-                            raise Informative, "git-cliff 执行失败，无法生成版本描述"
+                            puts "错误信息: #{error_msg}" if ENV['DEBUG']
+                            # 使用默认描述而不是抛出异常
+                            description = "版本更新"
                         end
                     else
                         # 没有找到任何配置文件
-                        puts "\n\e[31m错误: 未找到 cliff.toml 配置文件\e[0m"
-                        puts "\e[33m请确保:\e[0m"
-                        puts "\e[36m  1. 项目根目录存在 cliff.toml 文件\e[0m"
-                        puts "\e[36m  2. 或 Pindo 工具目录存在默认配置文件\e[0m"
-                        raise Informative, "缺少 cliff.toml 配置文件，无法生成版本描述"
+                        Funlog.warning("未找到 cliff.toml 配置文件，使用默认描述")
+                        if ENV['DEBUG']
+                            puts "请确保:"
+                            puts "  1. 项目根目录存在 cliff.toml 文件"
+                            puts "  2. 或 Pindo 工具目录存在默认配置文件"
+                        end
+                        # 使用默认描述而不是抛出异常
+                        description = "版本更新"
                     end
 
                     Dir.chdir(temp_dir)
@@ -1195,6 +1199,7 @@ module Pindo
             when 'ipa' then 'ipa_workflow'
             when 'apk' then 'apk_workflow'
             when 'zip' then 'webgl_workflow'
+            when 'app' then 'macos_workflow'
             else raise Informative, "不支持的 package_type: #{package_type}"
           end