pindo 5.13.9 → 5.13.10

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

@@ -9,12 +9,15 @@ require 'pindo/module/xcode/xcode_app_config'
 require 'pindo/module/xcode/xcode_build_helper'
 require 'pindo/config/ios_config_parser'
 require 'pindo/config/build_info_manager'
+require 'pindo/config/pindoconfig'
 require 'pindo/module/task/task_manager'
 require 'pindo/module/task/model/unity/unity_config_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/git/git_commit_task'
+require 'pindo/module/task/model/git/git_tag_task'
 require 'pindo/options/options'
 
 module Pindo
@@ -61,17 +64,17 @@ module Pindo
 
         # 定义此命令使用的参数项
         def self.option_items
-          @option_items ||= Pindo::Options::BuildOptions.select(:bundleid)
+          @option_items ||= Pindo::Options::OptionGroup.merge(
+            Pindo::Options::BuildOptions.select(:bundleid),
+            Pindo::Options::UnityOptions.all,
+            Pindo::Options::GitOptions.except(:tag_pre),
+            Pindo::Options::GitOptions.select_with_defaults(tag_pre: 'ios_release_')
+          )
         end
 
         # 命令的选项列表
         def self.options
-          # 转换为 CLAide 格式
-          option_items.map { |item| item.to_claide_option }.concat([
-            ['--skipconfig', '跳过Unity编译模式配置（加快构建速度）'],
-            ['--skiplib', '跳过Unity必备库更新（加快构建速度）'],
-            ['--skipyoo', '跳过YooAsset资源打包（加快构建速度）']
-          ]).concat(super)
+          option_items.map(&:to_claide_option).concat(super)
         end
 
         def initialize(argv)
@@ -88,6 +91,11 @@ module Pindo
           @args_skip_lib = argv.flag?('skiplib', false)
           @args_skip_yoo = argv.flag?('skipyoo', false)
 
+          # Git 参数
+          @args_release_branch = @options[:release_branch] || 'master'
+          @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type] || 'new')
+          @args_tag_pre = @options[:tag_pre] || 'ios_release_'
+
           super(argv)
         end
 
@@ -176,6 +184,18 @@ module Pindo
 
             tasks = []
 
+            # 0. Git 提交任务（使用 IosConfigParser 的版本号）
+            fixed_version = Pindo::IosConfigParser.instance.app_version
+            git_commit_task = Pindo::TaskSystem::GitCommitTask.new(
+              project_path,
+              release_branch: @args_release_branch,
+              tag_type: @args_tag_type,
+              tag_pre: @args_tag_pre,
+              fixed_version: fixed_version
+            )
+            tasks << git_commit_task
+            last_task = git_commit_task
+
             # 1. Unity 任务链（仅 Unity 工程）
             if is_unity
               # 确定 iOS 导出路径
@@ -183,15 +203,13 @@ module Pindo
               ios_path = File.join(project_path, "GoodPlatform", "iOS")
               ios_export_path = File.exist?(base_ios_path) ? base_ios_path : ios_path
 
-              # 记录上一个任务，用于依赖链
-              last_task = nil
-
               # 1.1 Unity 配置编译模式任务（可选）
               unless @args_skip_config
                 unity_config_task = Pindo::TaskSystem::UnityConfigTask.new(
                   'release',  # AppStore 使用 release 模式
                   project_path: project_path
                 )
+                unity_config_task.dependencies << last_task.id
                 tasks << unity_config_task
                 last_task = unity_config_task
               end
@@ -201,7 +219,7 @@ module Pindo
                 unity_update_task = Pindo::TaskSystem::UnityUpdateTask.new(
                   project_path: project_path
                 )
-                unity_update_task.dependencies << last_task.id if last_task
+                unity_update_task.dependencies << last_task.id
                 tasks << unity_update_task
                 last_task = unity_update_task
               end
@@ -212,7 +230,7 @@ module Pindo
                   'ios',
                   project_path: project_path
                 )
-                unity_yoo_task.dependencies << last_task.id if last_task
+                unity_yoo_task.dependencies << last_task.id
                 tasks << unity_yoo_task
                 last_task = unity_yoo_task
               end
@@ -224,8 +242,9 @@ module Pindo
                 export_path: ios_export_path,
                 deploy_mode: 'release'  # AppStore 使用 release 模式
               )
-              unity_export_task.dependencies << last_task.id if last_task
+              unity_export_task.dependencies << last_task.id
               tasks << unity_export_task
+              last_task = unity_export_task
             end
 
             # 2. 构建任务
@@ -248,9 +267,40 @@ module Pindo
               mode: :release,
               options: build_options
             )
-            build_task.dependencies << tasks.last.id if tasks.any?
+            build_task.dependencies << last_task.id
             tasks << build_task
 
+            # 3. Git 标签任务 - 项目仓库（使用 IosConfigParser 的版本号）
+            fixed_version = Pindo::IosConfigParser.instance.app_version
+            git_tag_task = Pindo::TaskSystem::GitTagTask.new(
+              project_path,
+              release_branch: @args_release_branch,
+              tag_type: @args_tag_type,
+              tag_pre: @args_tag_pre,
+              fixed_version: fixed_version
+            )
+            git_tag_task.dependencies << build_task.id
+            tasks << git_tag_task
+
+            # 4. Git 标签任务 - 配置仓库（使用 IosConfigParser 的版本号）
+            app_repo_name = Pindo::IosConfigParser.instance.app_repo_name
+            if app_repo_name && !app_repo_name.empty?
+              pindo_dir = File.expand_path(Pindoconfig.instance.pindo_dir)
+              config_repo_path = File.join(pindo_dir, app_repo_name)
+
+              if File.exist?(config_repo_path)
+                config_git_tag_task = Pindo::TaskSystem::GitTagTask.new(
+                  config_repo_path,
+                  release_branch: @args_release_branch,
+                  tag_type: @args_tag_type,
+                  tag_pre: @args_tag_pre,
+                  fixed_version: fixed_version
+                )
+                config_git_tag_task.dependencies << git_tag_task.id
+                tasks << config_git_tag_task
+              end
+            end
+
             tasks
           else
             raise Informative, "当前目录不是工程目录，不能编译"

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

@@ -5,7 +5,6 @@ require 'fileutils'
 require 'pindo/base/executable'
 require 'pindo/config/ios_config_parser'
 require 'pindo/config/build_info_manager'
-require 'pindo/base/pindocontext'
 require 'pindo/module/task/task_manager'
 require 'pindo/module/task/model/resign/ipa_local_resign_task'
 require 'pindo/module/task/model/jps/jps_upload_task'
@@ -139,8 +138,7 @@ module Pindo
         def run
           begin
             # 加载 JPS 配置（如果存在）
-            context = Pindo::PindoContext.instance
-            context.load_and_apply_jps_config(Dir.pwd)
+            Pindo::BuildHelper.share_instance.load_jps_build_config(Dir.pwd)
 
             # 1. 查找或指定 IPA 文件
             ipa_file_path = find_ipa_file()

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

@@ -4,17 +4,18 @@ require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
 require 'pindo/module/build/build_helper'
-require 'pindo/module/build/version_helper'
+require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/xcode/xcode_build_config'
 require 'pindo/module/xcode/xcode_build_helper'
-require 'pindo/base/pindocontext'
 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'
 require 'pindo/options/helpers/bundleid_selector'
 require 'pindo/config/build_info_manager'
@@ -32,9 +33,7 @@ module Pindo
                 def self.use_cache?
                     true  # 此命令启用缓存
                 end
-                # 缓存组已在 PindoContext#get_command_group 中定义
-                # ios:autobuild 与 unity:ipa 共享 'ios:autobuild' 缓存组
-    
+
                 # 命令的详细说明,包含用法示例
                 self.description = <<-DESC
                     编译IPA,自动修改工程配置并支持上传到JPS测试平台。
@@ -74,7 +73,10 @@ module Pindo
                     @option_items ||= begin
                         items = Pindo::Options::OptionGroup.merge(
                             Pindo::Options::BuildOptions.select(:bundleid, :build_type),
-                            Pindo::Options::JPSOptions.select(:proj, :upload, :send)
+                            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
                         )
 
                         # 为 bundleid 参数添加 value_block（交互式选择）
@@ -93,43 +95,32 @@ module Pindo
 
                 # 命令的选项列表
                 def self.options
-                    # 转换为 CLAide 格式
-                    option_items.map { |item| item.to_claide_option }.concat([
-                        ['--skiplib', '跳过Unity必备库更新（加快构建速度）'],
-                        ['--skipyoo', '跳过YooAsset资源打包（加快构建速度）']
-                    ]).concat(super)
+                    option_items.map(&:to_claide_option).concat(super)
                 end
 
                 def initialize(argv)
-                    # 检测是否是 help 请求（避免在 help 模式下执行交互式选择）
-                    # 注意：不能使用 argv.flag?，因为会消费参数，导致父类获取不到
-                    is_help = ARGV.include?('--help') || ARGV.include?('-h')
-
                     # 先提取 build_type（因为 bundleid 的 value_block 需要用到它）
                     @build_type = argv.option('build_type', 'dev')
 
-                    # 只有在非 help 模式下才初始化参数（避免触发交互式选择）
-                    if is_help
-                        @options = {}
-                        @args_send_flag = false
-                        @args_upload_flag = false
-                        @args_proj_name = nil
-                        @args_bundle_id = nil
-                    else
-                        # 一行代码完成参数初始化（自动推导命令名、自动启用缓存）
-                        @options = initialize_options(argv)
-
-                        # 保存参数到实例变量
-                        @build_type = @options[:build_type] || @build_type  # 使用 options 中的值，如果没有则用之前提取的
-                        @args_send_flag = @options[:send]
-                        # send 依赖 upload：如果指定了 send，自动启用 upload
-                        @args_upload_flag = @options[:send] || @options[:upload]
-                        @args_proj_name = @options[:proj]
-                        @args_bundle_id = @options[:bundleid]
-                    end
+                    @options = initialize_options(argv)
+
+                    # 保存参数到实例变量
+                    @build_type = @options[:build_type] || @build_type
+                    @args_send_flag = @options[:send]
+                    # send 依赖 upload：如果指定了 send，自动启用 upload
+                    @args_upload_flag = @options[:send] || @options[:upload]
+                    @args_proj_name = @options[:proj]
+                    @args_bundle_id = @options[:bundleid]
 
-                    @args_skip_lib = argv.flag?('skiplib', false)
-                    @args_skip_yoo = argv.flag?('skipyoo', false)
+                    # Unity 参数
+                    @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'
 
                     super
                     @additional_args = argv.remainder!
@@ -145,11 +136,7 @@ module Pindo
 
                     begin
                         # 加载 JPS 配置（如果存在）
-                        context = Pindo::PindoContext.instance
-                        context.load_and_apply_jps_config(pindo_project_dir)
-
-                        # 注意：参数缓存已在 initialize 中通过 GlobalOptionsState 处理
-                        # 不再使用 PindoContext 的缓存机制
+                        Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir)
 
                         # 准备配置
                         config = prepare_ios_config(pindo_project_dir)
@@ -187,9 +174,15 @@ module Pindo
 
                         tasks = []
 
-                        # 1. Git 标签任务（所有编译场景都需要打 Tag）
-                        git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
-                        tasks << git_tag_task
+                        # 1. Git 提交任务
+                        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
 
                         # 2. Unity 任务链（仅 Unity 工程）
                         if is_unity
@@ -199,7 +192,7 @@ module Pindo
                             ios_export_path = File.exist?(base_ios_path) ? base_ios_path : ios_path
 
                             # 记录上一个任务，用于依赖链
-                            last_task = git_tag_task
+                            last_task = git_commit_task
 
                             # 2.1 Unity 更新必备库任务（可选）
                             unless @args_skip_lib
@@ -254,7 +247,11 @@ module Pindo
                             upload: @args_upload_flag,
                             send: @args_send_flag,
                             app_info_obj: config[:app_info_obj],
-                            workflow_info: config[:workflow_info]
+                            workflow_info: config[:workflow_info],
+                            # Git 版本参数
+                            ver_inc: @args_ver_inc,
+                            tag_type: @args_tag_type,
+                            tag_pre: @args_tag_pre
                         }
                         build_options[:unity_root_path] = config[:project_path] if is_unity
 
@@ -266,21 +263,42 @@ module Pindo
                         build_task.dependencies << tasks.last.id if tasks.any?
                         tasks << build_task
 
-                        # 4. 上传任务（如果需要）
+                        # 4. Git 标签任务（依赖第一个编译任务）
+                        git_tag_task = Pindo::TaskSystem::GitTagTask.new(
+                            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 << build_task.id
+                        tasks << git_tag_task
+
+                        # 5. 上传和消息发送任务（如果需要）
                         if @args_upload_flag
+                            # 4.1 创建上传任务
                             upload_task = Pindo::TaskSystem::JPSUploadTask.new(
                                 'ipa',
                                 File.join(ios_project_path, 'build'),
                                 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
+
+                            # 4.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/ios/build.rb

@@ -1,209 +1,31 @@
-require 'highline/import'
-require 'fileutils'
-require 'json'
-require 'xcodeproj'
-require 'gym'
-require 'pindo/module/build/build_helper'
-require 'pindo/module/build/git_repo_helper'
-require 'pindo/module/xcode/xcode_build_config'
-require 'pindo/module/xcode/xcode_build_helper'
-
 module Pindo
     class Command
         class Ios < Command
             class Build < Ios
 
-                # 命令的简要说明 - 编译iOS工程并可选择上传到测试平台
-                self.summary = '编译IPA,不修改工程内容,支持上传到JPS测试平台'
-
-                # 启用缓存机制
-                def self.use_cache?
-                    true  # 此命令启用缓存
-                end
-                # 缓存组已在 PindoContext#get_command_group 中定义
-                # ios:build 与 ios:autobuild 共享 'ios:autobuild' 缓存组
+                # 命令的简要说明
+                # TODO: 待实现
+                self.summary = '编译IPA,不修改工程内容,支持上传到JPS测试平台（暂未实现）'
 
-                # 命令的详细说明,包含用法示例
                 self.description = <<-DESC
                     编译iOS工程并生成IPA文件，不修改工程任何配置。
 
-                    支持功能:
-
-                        * 编译iOS工程
-
-                        * 生成IPA文件
-
-                        * 支持上传到JPS测试平台
-
-                        * 支持发送测试通知
-
-                    使用示例:
-
-                        $ pindo ios build                    # 编译IPA
-
-                        $ pindo ios build --upload           # 编译并上传到JPS
-
-                        $ pindo ios build --send             # 编译、上传并发送通知
-
-                        $ pindo ios build --proj="My App"    # 指定项目名称
+                    注意: 此命令暂未实现，请使用 pindo ios autobuild 命令。
                 DESC
 
-                self.arguments = [
-
-                ]
+                self.arguments = []
 
                 def self.options
-                    [
-                        ['--proj', '指定上传到测试平台的项目名称'],
-                        ['--upload', '上传编译后的ipa到测试平台'],
-                        ['--send', '上传成功后发送测试通知'],
-                    ].concat(super)
+                    [].concat(super)
                 end
 
                 def initialize(argv)
-
-                    @args_upload_flag = argv.flag?('upload', false)  
-                    @args_send_flag = argv.flag?('send', false)  
-                    @args_proj_name = argv.option('proj')
-
-                    if @args_send_flag
-                        @args_upload_flag = true
-                    end
-
-
                     super
-                    @additional_args = argv.remainder!
                 end
 
                 def run
-                    pindo_project_dir = Dir.pwd
-
-                    build_helper = Pindo::BuildHelper.share_instance
-                    project_type = build_helper.project_type(pindo_project_dir)
-
-                    args_temp = []
-                    args_temp << "--proj=#{@args_proj_name}" if @args_proj_name
-                    args_temp << "--upload" if @args_upload_flag
-                    args_temp << "--send" if @args_send_flag
-                    case project_type
-                    when :ios
-                        ios_build
-                    when :android
-                        raise Informative,  "Android 工程， 请使用 pindo and build"
-                    when :unity
-                        raise Informative,  "Unity 工程， 请使用 pindo unity autobuild --types=ipa"
-                    else
-                        raise Informative, "当前目录不是工程目录，不能编译"
-                    end
-            
-                end
-
-                def ios_build
-
-                    pindo_project_dir = Dir.pwd
-                    build_helper = Pindo::BuildHelper.share_instance
-                    if @args_upload_flag
-                      git_repo_helper = Pindo::GitRepoHelper.share_instance
-                      is_need_add_tag, tag_action_parms = git_repo_helper.check_is_need_add_tag?(pindo_project_dir)
-                      if is_need_add_tag
-                        git_repo_helper.create_and_push_tag(
-                          project_dir: pindo_project_dir,
-                          mode: 'minor',
-                          force_retag: tag_action_parms&.include?('--retag') || false,
-                          custom_tag: nil,
-                          release_branch: 'master'
-                        )
-                      end
-                    end
-
-                    new_project_fullname = Dir.glob(File.join(pindo_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-                    puts "new_project_fullname: #{new_project_fullname}"
-                    if !new_project_fullname.nil? && File.exist?(new_project_fullname)
-                        Pindo::XcodeBuildHelper.delete_libtarget_firebase_shell(pindo_project_dir)
-                    end
-
-                    app_info_obj = nil
-                    workflow_info = nil
-                    if @args_upload_flag
-                        proj_name = @args_proj_name
-                        # 传入 package_type 获取 workflow_info
-                        app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
-                          working_directory: Dir.pwd,
-                          proj_name: proj_name,
-                          package_type: 'ipa'
-                        )
-
-                        # ===== 使用 workflow 配置更新项目 =====
-                        if workflow_info && workflow_info[:package_name]
-                          workflow_packname = workflow_info[:package_name]
-                          project_id = app_info_obj ? app_info_obj["id"] : nil
-
-                          puts "\n使用工作流配置更新 iOS 项目:"
-                          puts "  Workflow Package Name: #{workflow_packname}"
-
-                          # 一次性更新 Display Name、Bundle ID、URL Schemes 和 JPS 快捷操作
-                          Pindo::XcodeBuildConfig.update_project_with_workflow(
-                            project_dir: pindo_project_dir,
-                            workflow_packname: workflow_packname,
-                            project_id: project_id
-                          )
-
-                          # 根据实际的 Bundle ID 更新 URL Schemes
-                          Pindo::XcodeBuildConfig.update_url_schemes_with_bundleid(
-                            project_dir: pindo_project_dir,
-                            package_name: workflow_packname
-                          )
-                        else
-                          raise Informative, "未获取到工作流信息"
-                        end
-                    end
-
-
-                    # 使用 XcodeBuildHelper 进行构建
-                    Dir.chdir(pindo_project_dir)
-                    ipa_file_upload = Pindo::XcodeBuildHelper.build_project(
-                        project_dir: pindo_project_dir,
-                        icloud_id: nil
-                    )
-
-                    if ipa_file_upload.nil?
-                        raise Informative, "构建失败：未生成 IPA 文件"
-                    end
-
-                    if !ipa_file_upload.nil? && !app_info_obj.nil?
-
-                        description = nil
-                        result_data = PgyerHelper.share_instace.start_upload(
-                            app_info_obj: app_info_obj,
-                            ipa_file_upload: ipa_file_upload,
-                            description: description,
-                            workflow_info: workflow_info
-                        )
-                        if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
-                            PgyerHelper.share_instace.print_app_version_info(
-                                app_info_obj: app_info_obj,
-                                app_version_info_obj: result_data["data"]
-                            )
-                            if @args_send_flag
-                                # 始终发送给自己
-                                PgyerHelper.share_instace.send_apptest_msg(
-                                    app_info_obj: app_info_obj,
-                                    app_version_info_obj: result_data["data"],
-                                    receiveType: "self"
-                                )
-
-                                # 额外发送到测试群
-                                PgyerHelper.share_instace.send_apptest_msg(
-                                    app_info_obj: app_info_obj,
-                                    app_version_info_obj: result_data["data"],
-                                    chatEnv: "DevTest",
-                                    receiveType: "chat"
-                                )
-                            end
-                        end
-                    end
-
-                    system "open #{pindo_project_dir}"
+                    # TODO: 待实现
+                    raise Informative, "pindo ios build 命令暂未实现，请使用 pindo ios autobuild"
                 end
 
             end