pindo 5.13.9 → 5.13.11

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

@@ -6,12 +6,15 @@ require 'pindo/base/executable'
 require 'pindo/module/unity/unity_helper'
 require 'pindo/module/build/build_helper'
 require 'pindo/module/task/task_manager'
-require 'pindo/module/task/model/git_tag_task'
+require 'pindo/module/task/model/git/git_commit_task'
+require 'pindo/module/task/model/git/git_tag_task'
 require 'pindo/module/task/model/unity/unity_update_task'
 require 'pindo/module/task/model/unity/unity_yoo_asset_task'
 require 'pindo/module/task/model/unity/unity_export_task'
 require 'pindo/module/task/model/build_task'
 require 'pindo/module/task/model/jps/jps_upload_task'
+require 'pindo/module/task/model/jps/jps_message_task'
+require 'pindo/options/options'
 
 module Pindo
     class Command
@@ -19,7 +22,6 @@ module Pindo
             class Autobuild < Web
         
                 include Appselect
-                include Pindo::Githelper
 
                 self.summary = '打包Unity WebGL包'
 
@@ -56,34 +58,42 @@ module Pindo
                     # 暂无参数
                 ]
 
+                # 定义此命令使用的参数项
+                def self.option_items
+                    @option_items ||= Pindo::Options::OptionGroup.merge(
+                        Pindo::Options::JPSOptions.select(:proj, :upload, :send),
+                        Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
+                        Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
+                        Pindo::Options::GitOptions.all
+                    )
+                end
+
                 # 命令的选项列表
                 def self.options
                     [
                         ['--bundleid', '指定打包的bundleID'],
-                        # 指定上传到JPS的项目
-                        ['--proj',   '指定上传到测试平台的项目名称'],
-                        # 上传编译包
-                        ['--upload', '上传编译后的ipa到测试平台'],
-                        # 发送通知
-                        ['--send',   '上传成功后发送测试通知'],
-                        # 编译完成后再本地打开webgl包
-                        ['--run',   '编译完成后再本地打开webgl包'],
-                        ['--skiplib', '跳过Unity必备库更新（加快构建速度）'],
-                        ['--skipyoo', '跳过YooAsset资源打包（加快构建速度）']
-                    ].concat(super)
+                        ['--run',   '编译完成后再本地打开webgl包']
+                    ].concat(option_items.map(&:to_claide_option)).concat(super)
                 end
 
                 def initialize(argv)
+                    @options = initialize_options(argv)
 
                     @args_deploy_flag = argv.flag?('deploy', false)
                     @args_adhoc_flag = argv.flag?('adhoc', false)
-                    @args_upload_flag = argv.flag?('upload', false)
-                    @args_send_flag = argv.flag?('send', false)
-                    @args_proj_name = argv.option('proj')
+                    @args_upload_flag = @options[:upload] || false
+                    @args_send_flag = @options[:send] || false
+                    @args_proj_name = @options[:proj]
                     @args_bundle_id = argv.option('bundleid')
                     @args_run_flag = argv.flag?('run', false)
-                    @args_skip_lib = argv.flag?('skiplib', false)
-                    @args_skip_yoo = argv.flag?('skipyoo', false)
+                    @args_skip_lib = @options[:skiplib] || false
+                    @args_skip_yoo = @options[:skipyoo] || false
+
+                    # Git 参数
+                    @args_release_branch = @options[:release_branch] || 'master'
+                    @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc] || 'mini')
+                    @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type] || 'new')
+                    @args_tag_pre = @options[:tag_pre] || 'v'
 
                     if @args_send_flag
                         @args_upload_flag = true
@@ -102,10 +112,7 @@ module Pindo
                     pindo_project_dir = Dir.pwd
 
                     # 加载 JPS 配置（如果存在）
-                    context = Pindo::PindoContext.instance
-                    context.load_and_apply_jps_config(pindo_project_dir)
-                    # 确认并应用缓存（如果有）
-                    context.confirm_and_apply_cache
+                    Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir)
 
                     # 准备配置
                     config = prepare_web_config(pindo_project_dir)
@@ -195,18 +202,34 @@ module Pindo
                     # Web 只支持 Unity 工程
                     tasks = []
 
-                    # 1. Git 标签任务（如果需要上传）
+                    # 1. Git 提交任务（如果需要上传）
                     if @args_upload_flag
+                      git_commit_task = Pindo::TaskSystem::GitCommitTask.new(
+                        config[:project_path],
+                        release_branch: @args_release_branch,
+                        ver_inc: @args_ver_inc,
+                        tag_type: @args_tag_type,
+                        tag_pre: @args_tag_pre
+                      )
+                      tasks << git_commit_task
+                      last_task = git_commit_task
+
+                      # 2. Git 标签任务（依赖提交任务，在 Unity 导出之前创建）
                       git_tag_task = Pindo::TaskSystem::GitTagTask.new(
-                        config[:project_path]
+                        config[:project_path],
+                        release_branch: @args_release_branch,
+                        ver_inc: @args_ver_inc,
+                        tag_type: @args_tag_type,
+                        tag_pre: @args_tag_pre
                       )
+                      git_tag_task.dependencies << git_commit_task.id
                       tasks << git_tag_task
+                      last_task = git_tag_task
+                    else
+                      last_task = nil
                     end
 
-                    # 记录上一个任务，用于依赖链
-                    last_task = tasks.first
-
-                    # 2. Unity 更新必备库任务（可选）
+                    # 3. Unity 更新必备库任务（可选）
                     unless @args_skip_lib
                       unity_update_task = Pindo::TaskSystem::UnityUpdateTask.new(
                         project_path: config[:project_path]
@@ -216,7 +239,7 @@ module Pindo
                       last_task = unity_update_task
                     end
 
-                    # 3. Unity YooAsset 资源构建任务（可选，依赖上一个任务）
+                    # 4. Unity YooAsset 资源构建任务（可选，依赖上一个任务）
                     unless @args_skip_yoo
                       unity_yoo_task = Pindo::TaskSystem::UnityYooAssetTask.new(
                         'web',
@@ -227,7 +250,7 @@ module Pindo
                       last_task = unity_yoo_task
                     end
 
-                    # 4. Unity 导出任务（依赖上一个任务）
+                    # 5. Unity 导出任务（依赖上一个任务）
                     # Web 平台导出路径
                     web_export_path = File.join(config[:project_path], "GoodPlatform", "WebGL")
 
@@ -244,7 +267,7 @@ module Pindo
                     unity_export_task.dependencies << last_task.id if last_task
                     tasks << unity_export_task
 
-                    # 5. 构建任务（Web 只需要检查输出）
+                    # 6. 构建任务（Web 只需要检查输出）
                     build_task = Pindo::TaskSystem::BuildTask.create_task(
                       platform: :web,
                       mode: :dev,
@@ -260,23 +283,34 @@ module Pindo
                     build_task.dependencies << unity_export_task.id
                     tasks << build_task
 
-                    # 6. 上传任务（如果需要）
+                    # 7. 上传和消息发送任务（如果需要）
                     if @args_upload_flag
                       # WebGL 输出路径: GoodPlatform/WebGL/build
                       webgl_build_path = File.join(config[:project_path], 'GoodPlatform', 'WebGL', 'build')
+
+                      # 7.1 创建上传任务
                       upload_task = Pindo::TaskSystem::JPSUploadTask.new(
                         'html',
                         webgl_build_path,
                         nil,
                         app_info_obj: config[:app_info_obj],
                         workflow_info: config[:workflow_info],
-                        project_name: @args_proj_name,
-                        context: {
-                          send_to_chat: @args_send_flag
-                        },
-                        dependencies: [build_task.id]
+                        project_name: @args_proj_name
                       )
+                      upload_task.dependencies << build_task.id
                       tasks << upload_task
+
+                      # 7.2 创建消息发送任务（依赖上传任务）
+                      # app_version_info 将从 upload_task 的数据参数中获取
+                      message_task = Pindo::TaskSystem::JPSMessageTask.new(
+                        nil,  # app_version_info 为 nil，从依赖任务获取
+                        app_info_obj: config[:app_info_obj],
+                        project_name: @args_proj_name,
+                        send_message_type: @args_send_flag ? 'group' : 'self',
+                        data_dependencies: [upload_task.id]  # 从 upload_task 获取数据
+                      )
+                      message_task.dependencies << upload_task.id  # 执行顺序依赖
+                      tasks << message_task
                     end
 
                     tasks

data/lib/pindo/command.rb

@@ -6,8 +6,6 @@ require 'pindo/version'
 require 'pindo/base/funlog'
 require 'pindo/base/hashhelper'
 require 'pindo/base/plaininformative'
-require 'pindo/base/githelper'
-require 'pindo/base/pindocontext'
 require 'pindo/client/giteeclient'
 require 'pindo/config/pindoconfig'
 
@@ -22,7 +20,6 @@ module Pindo
 
     class Command < CLAide::Command
 
-        include Pindo::Githelper
         include Pindoconfig::Mixin
         include Funlog::Mixin
 
@@ -61,8 +58,6 @@ module Pindo
         def self.use_cache?
           false  # 默认不使用缓存
         end
-        # 注意：缓存组的定义已经移至 PindoContext#get_command_group 中统一管理
-        # 使用命令名作为组名，如 ios:autobuild, and:autobuild, web:autobuild
 
         # 自动推导命令名称
         # @return [String] 命令名称，例如：Pindo::Command::Ios::Autobuild → 'ios:autobuild'
@@ -123,8 +118,6 @@ module Pindo
         end
 
         def self.run(argv)
-            # 直接调用父类的 run 方法
-            # PindoContext 的设置在 initialize 中处理
             super(argv)
         end
 
@@ -143,55 +136,6 @@ module Pindo
 
             # 设置全局 verbose 标志
             ENV['PINDO_VERBOSE'] = '1' if @args_verbose_flag
-
-            # 在非抽象命令初始化时设置上下文（但不在显示帮助时）
-            if !self.class.abstract_command? && !is_help_request
-                context = Pindo::PindoContext.instance
-
-                # 只在上下文未设置时才设置（避免重复设置）
-                if context.instance_variable_get(:@current_command).nil?
-                    # 获取完整的命令路径
-                    command_parts = []
-                    current = self.class
-                    while current < Pindo::Command
-                        if current.command && current.command != 'pindo'
-                            command_parts.unshift(current.command)
-                        end
-                        current = current.superclass
-                    end
-                    command_name = command_parts.empty? ? self.class.command : command_parts.join(':')
-
-                    # 配置选项
-                    cache_enabled_value = self.class.respond_to?(:use_cache?) ? self.class.use_cache? : false
-                    options = {
-                        cache_enabled: cache_enabled_value,
-                        verbose: @args_verbose_flag
-                    }
-
-                    # 获取项目根目录（Git仓库根目录或当前目录）
-                    project_dir = get_project_root_directory(Dir.pwd)
-
-                    context.set_context(command_name, project_dir, options)
-                end
-            end
-        end
-
-        private
-
-        # 获取项目根目录（优先使用Git仓库根目录）
-        def get_project_root_directory(current_dir)
-            # 尝试获取Git仓库根目录
-            begin
-                git_root = `cd "#{current_dir}" && git rev-parse --show-toplevel 2>/dev/null`.strip
-                if $?.success? && !git_root.empty?
-                    return git_root
-                end
-            rescue
-                # git命令失败，继续使用当前目录
-            end
-
-            # 如果不是Git仓库，返回当前目录
-            current_dir
         end
 
     end

data/lib/pindo/config/build_info_manager.rb

@@ -1,6 +1,6 @@
 require 'singleton'
 require 'fileutils'
-require 'pindo/base/githelper'
+require 'pindo/base/git_handler'
 require 'pindo/config/pindoconfig'
 
 module Pindo
@@ -9,7 +9,6 @@ module Pindo
   # 负责管理应用配置仓库的拉取、更新等操作
   class BuildInfoManager
     include Singleton
-    include Pindo::Githelper
     include Pindo::Pindoconfig::Mixin
 
     class << self
@@ -30,7 +29,7 @@ module Pindo
 
       # 获取配置仓库目录
       begin
-        app_config_dir = clong_buildconfig_repo(repo_name: normalized_repo_name)
+        app_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: normalized_repo_name)
       rescue StandardError => e
         puts "拉取配置仓库失败: #{e.message}"
         return false
@@ -71,7 +70,7 @@ module Pindo
       gitee_client = GiteeClient.new(access_token: pindo_single_config.gitee_api_key)
 
       # 获取模板配置仓库目录
-      demo_dir = clong_buildconfig_repo(repo_name: pindo_single_config.demo_bundle_id)
+      demo_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: pindo_single_config.demo_bundle_id)
 
       # 确定仓库公开类型和所有者组织
       public_type = 0
@@ -97,7 +96,7 @@ module Pindo
         end
 
         # 克隆配置仓库
-        app_config_dir = clong_buildconfig_repo(repo_name: repo_name)
+        app_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: repo_name)
         system "open #{app_config_dir}"
 
         if File.exist?(app_config_dir)
@@ -115,7 +114,7 @@ module Pindo
         end
       else
         # 仓库已存在，直接打开
-        app_config_dir = clong_buildconfig_repo(repo_name: repo_name)
+        app_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: repo_name)
         system "open #{app_config_dir}"
         puts "⚠ 配置仓库已存在: #{app_config_dir}"
         return app_config_dir
@@ -169,7 +168,7 @@ module Pindo
         f.write(JSON.pretty_generate(git_repo_json))
       end
 
-      git_addpush_repo(path: pindo_setting_dir, message: "add #{repo_name}")
+      Pindo::GitHandler.git_addpush_repo(path: pindo_setting_dir, message: "add #{repo_name}")
     end
 
     # 更新应用配置仓库（从模板复制）
@@ -201,7 +200,7 @@ module Pindo
       end
 
       # 提交并推送到远程仓库
-      git_addpush_repo(path: app_config_dir, message: "init app config")
+      Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "init app config")
     end
   end
 

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

@@ -5,6 +5,7 @@ require_relative 'android_project_helper'
 require_relative '../../base/executable'
 require_relative 'android_res_helper'
 require 'pindo/module/build/icon_downloader'
+require 'pindo/module/build/git_repo_helper'
 
 module Pindo
 
@@ -64,7 +65,7 @@ module Pindo
             raise ArgumentError, "版本号不能为空" if version_code.nil?
 
             # 验证version_code的有效性
-            unless valid_build_number?(version_code)
+            unless Pindo::GitRepoHelper.share_instance.valid_build_number?(version_code)
                 Funlog.instance.fancyinfo_error("Android versionCode必须在1到#{2**31-1}之间，当前值：#{version_code}")
                 return false
             end
@@ -176,16 +177,6 @@ module Pindo
             end
         end
 
-        # 验证Build号是否在有效范围内
-        # @param build_number [Integer] Build号
-        # @return [Boolean] 是否有效
-        def self.valid_build_number?(build_number)
-            return false if build_number.nil?
-
-            # Android versionCode的有效范围是1到2^31-1
-            build_number >= 1 && build_number <= 2**31 - 1
-        end
-
         # 使用package_name更新Android应用名称（strings.xml中的app_name）
         # @param project_dir [String] Android项目目录路径
         # @param package_name [String] 工作流的package_name（如："Test Demo"）

data/lib/pindo/module/appselect.rb

@@ -134,25 +134,12 @@ module Pindo
         end
 
         def get_selected_dev_bundleid()
-          # 检查环境变量
-          env_bundleid = ENV['PINDO_BUNDLE_ID']
-          if env_bundleid && !env_bundleid.empty?
-            puts "\n使用环境变量指定的Bundle ID: #{env_bundleid}"
-            puts
-            # 保存到缓存
-            require_relative '../base/pindocontext'
-            context = Pindo::PindoContext.instance
-            context.set_selection(Pindo::PindoContext::SelectionKey::BUNDLE_ID, env_bundleid)
-            return env_bundleid
-          end
+          state = Pindo::Options::GlobalOptionsState.instance
 
-          # 检查缓存
-          require_relative '../base/pindocontext'
-          context = Pindo::PindoContext.instance
-          cached_bundleid = context.get_selection(Pindo::PindoContext::SelectionKey::BUNDLE_ID)
-
-          if cached_bundleid
-            puts "\n使用之前选择的Bundle ID: #{cached_bundleid}"
+          # 检查 GlobalOptionsState 缓存（已包含环境变量和命令行参数）
+          cached_bundleid = state[:bundleid]
+          if cached_bundleid && !cached_bundleid.empty?
+            puts "\n使用已配置的Bundle ID: #{cached_bundleid}"
             puts
             return cached_bundleid
           end
@@ -164,7 +151,7 @@ module Pindo
           cli = HighLine.new
           menu_choice="None"
           puts
-          cli.choose do |menu|                                  # you can also use constants like :blue
+          cli.choose do |menu|
               menu.header = "可用的Bundle Id如下:"
               menu.prompt = "请选择使用的Bundle Id,请输入选项(1/2/3...):"
               if !all_bundleid.nil? && all_bundleid.length > 0
@@ -183,8 +170,8 @@ module Pindo
             menu_choice = "com.heroneverdie101"
           end
 
-          # 保存选择到缓存
-          context.set_selection(Pindo::PindoContext::SelectionKey::BUNDLE_ID, menu_choice)
+          # 保存选择到 GlobalOptionsState
+          state[:bundleid] = menu_choice
 
           return menu_choice;
 
@@ -218,25 +205,12 @@ module Pindo
         end
 
         def get_selected_dev_bundle_name()
-          # 检查环境变量
-          env_bundle_name = ENV['PINDO_BUNDLE_NAME']
-          if env_bundle_name && !env_bundle_name.empty?
-            puts "\n使用环境变量指定的Bundle Name: #{env_bundle_name}"
-            puts
-            # 保存到缓存
-            require_relative '../base/pindocontext'
-            context = Pindo::PindoContext.instance
-            context.set_selection(Pindo::PindoContext::SelectionKey::ANDROID_BUNDLE_NAME, env_bundle_name)
-            return env_bundle_name
-          end
-
-          # 检查缓存
-          require_relative '../base/pindocontext'
-          context = Pindo::PindoContext.instance
-          cached_bundle_name = context.get_selection(Pindo::PindoContext::SelectionKey::ANDROID_BUNDLE_NAME)
+          state = Pindo::Options::GlobalOptionsState.instance
 
-          if cached_bundle_name
-            puts "\n使用之前选择的Bundle Name: #{cached_bundle_name}"
+          # 检查 GlobalOptionsState 缓存（已包含环境变量和命令行参数）
+          cached_bundle_name = state[:bundle_name]
+          if cached_bundle_name && !cached_bundle_name.empty?
+            puts "\n使用已配置的Bundle Name: #{cached_bundle_name}"
             puts
             return cached_bundle_name
           end
@@ -265,8 +239,8 @@ module Pindo
           puts "选择的Bundle Name是: #{menu_choice}"
           puts
 
-          # 保存选择到缓存
-          context.set_selection(Pindo::PindoContext::SelectionKey::ANDROID_BUNDLE_NAME, menu_choice)
+          # 保存选择到 GlobalOptionsState
+          state[:bundle_name] = menu_choice
 
           return menu_choice
         end

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

@@ -180,16 +180,13 @@ module Pindo
 
       # 修改远程配置仓库
       begin
-        require_relative '../../base/githelper'
-        include Pindo::Githelper
-
-        app_config_dir = clong_buildconfig_repo(repo_name: bundle_id)
+        app_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: bundle_id)
         app_config_file = File.join(app_config_dir, "config.json")
 
         if File.exist?(app_config_file)
           modify_appconfig_file(config_file: app_config_file, app_info_detail: app)
-          prepare_gitenv()
-          git_addpush_repo(path: app_config_dir, message: "modify apple id")
+          Pindo::GitHandler.prepare_gitenv()
+          Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "modify apple id")
         end
       rescue StandardError => e
         puts "更新远程配置仓库失败: #{e.message}"

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

@@ -14,24 +14,6 @@ module Pindo
           end
         end
 
-        def delete_libtarget_firebase_shell(project_path)
-          puts "[-] 开始检查并删除 Unity-iPhone下的Firebase Crashlytics脚本..."
-          if File.directory?(File.join(project_path, 'Unity')) && File.exist?(File.join(project_path, 'Unity', 'Unity-iPhone.xcodeproj'))
-            unity_project_path = File.join(project_path, 'Unity', 'Unity-iPhone.xcodeproj')
-            xcdoe_unitylib_project = Xcodeproj::Project::open(unity_project_path)
-            xcdoe_unitylib_project.targets.each do |target|
-              target.shell_script_build_phases&.each do |phase|
-                if phase.name.eql?("Crashlytics Run Script")
-                  puts "    从target:#{target.name}中删除: #{phase.name} ..."
-                  target.build_phases.delete(phase)
-                end
-              end
-            end
-            xcdoe_unitylib_project.save()
-            puts "[✔] 完成检查并删除 Unity-iPhone下的Firebase Crashlytics脚本..."
-          end
-        end
-
         def unity_project?(project_path)
           # 检查Unity工程的关键文件和目录
           project_settings_path = File.join(project_path, "ProjectSettings")
@@ -208,6 +190,34 @@ module Pindo
             target_dir: target_dir
           )
         end
+
+        # 加载 JPSBuildConfig.json 并设置项目名称到 GlobalOptionsState
+        # @param project_dir [String] 项目目录
+        # @return [String, nil] 项目名称（如果存在）
+        def load_jps_build_config(project_dir)
+          # 检测工程类型：Unity 工程配置在 ProjectSettings 目录
+          config_file = if unity_project?(project_dir)
+            File.join(project_dir, 'ProjectSettings', 'JPSBuildConfig.json')
+          else
+            File.join(project_dir, 'JPSBuildConfig.json')
+          end
+
+          return nil unless File.exist?(config_file)
+
+          begin
+            config = JSON.parse(File.read(config_file))
+            project_name = config['project_name']
+            if project_name && !project_name.empty?
+              # 设置到 GlobalOptionsState
+              Pindo::Options::GlobalOptionsState.instance[:proj] = project_name
+              puts "使用 JPS 配置的项目名称: #{project_name}"
+              return project_name
+            end
+          rescue => e
+            puts "加载 JPSBuildConfig.json 失败: #{e.message}" if ENV['PINDO_VERBOSE'] == '1'
+          end
+          nil
+        end
       end
 
 end