pindo 5.11.3 → 5.12.1

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

@@ -6,7 +6,13 @@ require 'pindo/base/executable'
 require 'pindo/module/build/build_helper'
 require 'pindo/module/build/version_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/unity_export_task'
+require 'pindo/module/task/model/build_task'
+require 'pindo/module/task/model/upload_task'
 
 module Pindo
     class Command
@@ -102,239 +108,138 @@ module Pindo
                     # 确认并应用缓存（如果有）
                     context.confirm_and_apply_cache
 
+                    # 准备配置
+                    config = prepare_ios_config(pindo_project_dir)
 
-                    @mainapp_bundleid= nil
-                    if @args_bundle_id
-                        @mainapp_bundleid = @args_bundle_id
-                    else
-                        if @args_deploy_flag
-                            @mainapp_bundleid = get_selected_deploy_bundleid()
-                        else
-                            @mainapp_bundleid = get_selected_dev_bundleid()
-                        end
-                    end
-
-
-                    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
-                    args_temp << "--bundleid=#{@mainapp_bundleid}" if @mainapp_bundleid
-                    case project_type
-                    when :ios
-                        ios_autobuild
-                    when :android
-                        puts "Android 工程， 请使用 pindo and build"
+                    # 创建并执行任务
+                    tasks = make_build_task(config)
 
-                    when :unity
-                        Pindo::Command::Unity::Ipa::run(args_temp)
-                    else
-                        raise Informative, "当前目录不是工程目录，不能编译"
-                    end
+                    # 添加到任务管理器并执行
+                    task_manager = Pindo::TaskSystem::TaskManager.instance
+                    task_manager.clear_all
+                    tasks.each { |task| task_manager.add_task(task) }
+                    task_manager.start
 
+                    system "open #{pindo_project_dir}"
                 end
 
-                def ios_autobuild
-                    # 记录构建开始时间
-                    build_start_time = Time.now
+                private
 
-                    pindo_project_dir = Dir.pwd
+                # 创建构建任务
+                def make_build_task(config)
+                    # 检测项目类型
                     build_helper = Pindo::BuildHelper.share_instance
-                    if @args_upload_flag
-                      is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
-                      if is_need_add_tag
-                          Pindo::Command::Utils::Tag::run(tag_action_parms)
-                      end
-                    end
-                    new_project_fullname = Dir.glob(File.join(pindo_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-                    if !new_project_fullname.nil? && File.exist?(new_project_fullname)
-                        build_helper.delete_libtarget_firebase_shell(pindo_project_dir)
-                    end
-                                    
-
-                    app_info_obj = nil
-                    workflow_info = nil
-                    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'
-                    )
+                    project_type = build_helper.project_type(config[:project_path])
 
-                    # ===== 使用 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
-                      )
-                    else
-                      raise Informative, "未获取到工作流信息"
-                    end
-
-                    # ===== 从 JPS 下载并替换项目 Icon =====
-                    if app_info_obj && app_info_obj["projectIcon"] && !app_info_obj["projectIcon"].empty?
-                      icon_replace_success = Pindo::XcodeBuildConfig.download_and_replace_icon_from_url(
-                        project_dir: pindo_project_dir,
-                        icon_url: app_info_obj["projectIcon"]
-                      )
-
-                      # 如果 projectIcon 不为空且下载失败，抛出异常终止执行
-                      unless icon_replace_success
-                        raise Informative, "Icon 下载或替换失败，请检查 Icon URL 是否有效: #{app_info_obj["projectIcon"]}"
-                      end
-                    else
-                      Funlog.warning("未配置 Icon URL，跳过 Icon 替换")
-                    end
-
-                    # ===== 更新版本号和Build号（仅在Git仓库中）=====
-                    version_helper = Pindo::VersionHelper.share_instance
-                    version_info = version_helper.get_version_info(project_dir: pindo_project_dir)
+                    case project_type
+                    when :android
+                        raise Informative, "Android 工程， 请使用 pindo and build"
+                    when :ios, :unity
+                        # 判断是否是 Unity 工程
+                        is_unity = (project_type == :unity)
 
-                    if version_info[:is_git_repo]
-                        # 更新iOS工程版本
-                        Pindo::XcodeBuildConfig.update_ios_project_version(
-                            project_dir: pindo_project_dir,
-                            version: version_info[:version],
-                            build_number: version_info[:build_number]
-                        )
-                    else
-                        Funlog.warning("非Git仓库，保持工程原有版本号")
-                    end
+                        tasks = []
 
-                    args_temp = []
-                    args_temp << @mainapp_bundleid
-                    Pindo::Command::Deploy::Pullconfig::run(args_temp)
-
-                    Dir.chdir(pindo_project_dir)
-                    config_json_file = File.join(pindo_project_dir,"config.json")
-
-                    # 处理entitlements配置
-                    Pindo::XcodeBuildConfig.update_entitlements_config(project_dir: pindo_project_dir, config_file: config_json_file)
-
-                    if File.exist?(File.join(pindo_project_dir, "Podfile"))
-                        
-                        args_temp = []
-                        args_temp << config_json_file
-                        Pindo::Command::Ios::Podupdate::run([])
-
-                        begin
-                            if File.exist?(File.join(pindo_project_dir, "Podfile.lock"))
-                                FileUtils.rm_rf(File.join(pindo_project_dir, "Podfile.lock"))    
-                            end
-                            if File.exist?(File.join(pindo_project_dir,"Pods"))
-                                FileUtils.rm_rf(File.join(pindo_project_dir, "Pods"))    
-                            end
-                            puts "正在执行pod deintegrate..."
-                            system 'pod deintegrate'
-                            puts "正在执行pod install..."
-                            system 'pod install'
-                        rescue => error
-                            puts(error.to_s)
-                            raise Informative, "pod install失败！！先pod install 完成后成编译 !"
+                        # 1. Git 标签任务（如果需要上传）
+                        if @args_upload_flag
+                            git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
+                            tasks << git_tag_task
                         end
 
-                        Dir.chdir(pindo_project_dir)
-                        pod_lock_file = File.join(pindo_project_dir, "Podfile.lock")
-                        if !File.exist?(pod_lock_file)
-                            raise Informative, "pod install失败！！先pod install 完成后成编译 !"
+                        # 2. Unity 导出任务（仅 Unity 工程）
+                        if is_unity
+                            # 确定 iOS 导出路径
+                            base_ios_path = File.join(config[:project_path], "GoodPlatform", "BaseiOS")
+                            ios_path = File.join(config[:project_path], "GoodPlatform", "iOS")
+                            ios_export_path = File.exist?(base_ios_path) ? base_ios_path : ios_path
+
+                            unity_context = {}
+                            unity_context[:project_name] = @args_proj_name if @args_proj_name
+
+                            unity_task = Pindo::TaskSystem::UnityExportTask.new(
+                                'ios',
+                                project_path: config[:project_path],
+                                export_path: ios_export_path,
+                                context: unity_context
+                            )
+                            unity_task.dependencies << tasks.first.id if tasks.any?
+                            tasks << unity_task
                         end
 
-                    end
-                    
-
-                    args_temp = []
-                    if @args_adhoc_flag
-                        args_temp << "--adhoc"
-                    else
-                        args_temp << "--dev"
-                    end
+                        # 3. 构建任务
+                        build_mode = @args_deploy_flag ? :release : (@args_adhoc_flag ? :adhoc : :dev)
 
-                    project_fullname = Dir.glob(File.join(pindo_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-                    if !project_fullname.nil?
-                        project_obj = Xcodeproj::Project.open(project_fullname)
-                        project_build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
-                        if !project_build_platform.nil? && project_build_platform.eql?("macosx")
-                            @args_macos_flag = true
+                        # 确定 iOS 项目路径
+                        if is_unity
+                            ios_project_path = ios_export_path
+                        else
+                            ios_project_path = config[:project_path]
                         end
-                    end
-
-                    if @args_macos_flag
-                        args_temp << "--macos"
-                    end
-
-                    Pindo::Command::Deploy::Cert::run(args_temp)
-
-                    # 根据证书配置后的实际 Bundle ID 重新更新 URL Schemes
-                    # 因为 Cert::run 可能会修改 PRODUCT_BUNDLE_IDENTIFIER
-                    Pindo::XcodeBuildConfig.update_url_schemes_with_bundleid(
-                        project_dir: pindo_project_dir,
-                        package_name: workflow_packname
-                    )
-
-                    Dir.chdir(pindo_project_dir)
-                    Pindo::Command::Deploy::Build::run(args_temp)
 
-                    build_path = File.join(pindo_project_dir, "build", "*.{ipa,app}")
-                    ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
-                    
-                    if !ipa_file_upload.nil? && !app_info_obj.nil?  && @args_upload_flag
-                        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
+                        build_options = {
+                            project_path: ios_project_path,
+                            bundle_id: config[:bundle_id],
+                            proj_name: @args_proj_name,
+                            upload: @args_upload_flag,
+                            send: @args_send_flag,
+                            app_info_obj: config[:app_info_obj],
+                            workflow_info: config[:workflow_info]
+                        }
+                        build_options[:unity_root_path] = config[:project_path] if is_unity
+
+                        build_task = Pindo::TaskSystem::BuildTask.create_task(
+                            platform: :ios,
+                            mode: build_mode,
+                            options: build_options
                         )
-                        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"]
-                            )
-                            # 始终发送给自己
-                            PgyerHelper.share_instace.send_apptest_msg(
-                                app_info_obj: app_info_obj,
-                                app_version_info_obj: result_data["data"],
-                                receiveType: "self"
+                        build_task.dependencies << tasks.last.id if tasks.any?
+                        tasks << build_task
+
+                        # 4. 上传任务（如果需要）
+                        if @args_upload_flag
+                            upload_task = Pindo::TaskSystem::UploadTask.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]
                             )
-
-                            # 如果有 --send 参数，额外发送到测试群
-                            if @args_send_flag
-                                PgyerHelper.share_instace.send_apptest_msg(
-                                    app_info_obj: app_info_obj,
-                                    app_version_info_obj: result_data["data"],
-                                    chatEnv: "DevTest",
-                                    receiveType: "chat"
-                                )
-                            end
+                            tasks << upload_task
                         end
-                    end
-                    
-                    # 计算并显示总耗时
-                    total_time = Time.now - build_start_time
-                    minutes = (total_time / 60).to_i
-                    seconds = (total_time % 60).to_i
-                    
-                    if minutes > 0
-                      puts "\e[32m构建完成！总耗时: #{minutes}分#{seconds}秒\e[0m"
+
+                        tasks
                     else
-                      puts "\e[32m构建完成！总耗时: #{seconds}秒\e[0m"
+                        raise Informative, "当前目录不是工程目录，不能编译"
                     end
-                    
-                    puts "\e[32m正在打开目标文件夹...\e[0m"
-                    system "open #{pindo_project_dir}"
+                end
+
+                # 准备 iOS 配置
+                def prepare_ios_config(pindo_project_dir)
+                    # 获取 Bundle ID
+                    bundle_id = if @args_bundle_id
+                                  @args_bundle_id
+                                else
+                                  @args_deploy_flag ? get_selected_deploy_bundleid() : get_selected_dev_bundleid()
+                                end
+
+                    # 获取 JPS 配置
+                    app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
+                        working_directory: pindo_project_dir,
+                        proj_name: @args_proj_name,
+                        package_type: 'ipa'
+                    )
 
+                    {
+                        project_path: pindo_project_dir,
+                        bundle_id: bundle_id,
+                        app_info_obj: app_info_obj,
+                        workflow_info: workflow_info
+                    }
                 end
 
             end

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

@@ -4,7 +4,9 @@ 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
@@ -101,16 +103,23 @@ module Pindo
                     pindo_project_dir = Dir.pwd
                     build_helper = Pindo::BuildHelper.share_instance
                     if @args_upload_flag
-                      is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
+                      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
-                          Pindo::Command::Utils::Tag::run(tag_action_parms)
+                        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)
-                        build_helper.delete_libtarget_firebase_shell(pindo_project_dir)
+                        Pindo::XcodeBuildHelper.delete_libtarget_firebase_shell(pindo_project_dir)
                     end
 
                     app_info_obj = nil