pindo 5.12.2 → 5.13.2

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

@@ -9,7 +9,7 @@ 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'
+require 'pindo/module/task/model/jps_upload_task'
 
 module Pindo
   class Command
@@ -197,7 +197,7 @@ module Pindo
 
             # 4. 上传任务（如果需要）
             if @args_upload_flag
-              upload_task = Pindo::TaskSystem::UploadTask.new(
+              upload_task = Pindo::TaskSystem::JPSUploadTask.new(
                 'apk',
                 File.join(android_project_path, 'build'),
                 nil,

data/lib/pindo/command/android.rb

@@ -1,7 +1,6 @@
 
 require 'pindo/command/android/autobuild'
 require 'pindo/command/android/autoresign'
-require 'pindo/command/android/build'
 require 'pindo/command/android/keystore'
 
 

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

@@ -3,347 +3,294 @@ require 'xcodeproj'
 require 'find'
 require 'fileutils'
 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/module/xcode/xcodeappconfig'
+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/unity_export_task'
+require 'pindo/module/task/model/build_task'
+require 'pindo/module/task/model/jps_upload_task'
+require 'pindo/options/options'
+require 'pindo/options/helpers/bundleid_selector'
 
 module Pindo
-    class Command
-        class Appstore < Command
-            class Adhocbuild < Appstore
+  class Command
+    class Appstore < Command
+      class Adhocbuild < Appstore
 
-                include Command::DeployOptions
-                
-                include XcodeAppConfig
-                include Appselect
-                
+        # 命令的简要说明 - 打包 AdHoc 包并发布到 JPS
+        self.summary = '编译 AdHoc IPA(支持Xcode/Unity工程),自动修改工程,支持上传JPS'
 
-                self.summary = '测试时设置Xcode工程编译参数并自动编译及上传'
+        # 启用缓存机制
+        def self.use_cache?
+          true  # 此命令启用缓存
+        end
+
+        # 命令的详细说明,包含用法示例
+        self.description = <<-DESC
+          编译 AdHoc IPA,自动修改工程配置并支持上传到JPS测试平台。
 
-                self.description = <<-DESC
-                    测试时设置Xcode工程编译参数并自动编译及上传。
+          支持功能:
 
-                    支持功能:
+            * 自动修改工程配置（Bundle ID、Display Name、URL Schemes）
 
-                        * 设置Xcode工程编译参数
+            * 编译生成 AdHoc IPA 文件
 
-                        * 自动编译生成IPA
+            * 支持上传到JPS测试平台
 
-                        * 上传到测试平台
+            * 支持发送测试通知
 
-                        * 发送测试通知
-
-                    使用示例:
-
-                        $ pindo appstore adhocbuild                    # 设置参数并编译
-
-                        $ pindo appstore adhocbuild --upload           # 编译并上传
-
-                        $ pindo appstore adhocbuild --send             # 编译、上传并发送通知
-
-                        $ pindo appstore adhocbuild --increase         # 自动增加版本号
-                DESC
-
-                self.arguments = [
-                    CLAide::Argument.new('path/to/config.json', false),
-                ]
-
-                def self.options
-                    [
-                        ['--proj', '指定哪个项目(忽略大小写空格等等字符): --proj=\"prancksoundv4\"'],
-                        ['--upload', '编译完成后是否上传ipa到JPS: 用法:pindo appstore output --upload'],
-                        ['--send',  '上传到之后是否发送测试信息,用法:pindo appstore output --send'],
-                        ['--increase', '自动增加编译的app版本号，用法:pindo appstore output --increase'],
-
-                    ].concat(super)
-                end
-
-                def initialize(argv)
-
-                    @args_proj_name = argv.option('proj')
-                    @args_upload_flag = argv.flag?('upload', false)
-                    @args_send_flag = argv.flag?('send', false)
-                    @args_increase_flag = argv.flag?('increase', false)
+            * 支持CI/CD自动化构建
 
+            * 支持自动增加版本号
 
-                    if @args_send_flag
-                        @args_upload_flag = true
-                    end
+          使用示例:
 
-                    super
-                end
+            $ pindo appstore adhocbuild                              # 编译 AdHoc 包
 
+            $ pindo appstore adhocbuild --upload                     # 编译并上传到JPS
 
-                def run
+            $ pindo appstore adhocbuild --send                       # 编译、上传并发送群组通知
 
-                    build_type_array = @config_json["project_info"]["xcode_build_type"].split("_") || []
-                    @args_nocreate_flag = false
-                    @args_quswark_flag = false
-                    @args_normal_flag = false
+            $ pindo appstore adhocbuild --increase                   # 自动增加版本号
 
-                    if build_type_array.include?("nocreate")
-                        @args_nocreate_flag = true
-                    end
-                    if build_type_array.include?("normal")
-                        @args_normal_flag = true
-                    end
-                    if build_type_array.include?("quark") || build_type_array.include?("swark")
-                        @args_quswark_flag = true
-                    end
+            $ pindo appstore adhocbuild --proj="My App"              # 指定项目名称
 
-                    if @args_increase_flag
-                        auto_increase_buildnumber(app_config_file:File.join(Dir.pwd, "config.json"))
-                        app_config_repo_dir = File.join(pindo_single_config.pindo_dir, @deploy_identifier)
-                        auto_increase_buildnumber(app_config_file:File.join(app_config_repo_dir, "config.json"))
-                        git_addpush_repo(path:app_config_repo_dir, message:"increate build number", commit_file_params:["config.json"])
-                    end
+            $ pindo appstore adhocbuild --bundleid=com.example.app  # 指定 Bundle ID
+        DESC
 
-                    app_info_obj = nil
-                    workflow_info = nil
-                    if @args_upload_flag || @args_send_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'
-                        )
-                    end
-                
-                
+        # 命令的参数列表
+        self.arguments = [
+          # 暂无参数
+        ]
 
-                    output_fun()
+        # 定义此命令使用的参数项（类方法，避免重复定义）
+        def self.option_items
+          @option_items ||= begin
+            items = Pindo::Options::OptionGroup.merge(
+              Pindo::Options::BuildOptions.select(:bundleid),
+              Pindo::Options::JPSOptions.select(:proj, :upload, :send)
+            )
 
-                    pindo_new_project_dir = Dir.pwd
-                    build_path = File.join(pindo_new_project_dir, "build", "*.ipa")
-                    ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+            # 添加 increase 参数
+            items << Pindo::Options::OptionItem.new(
+              key: :increase,
+              description: '自动增加编译的app版本号',
+              type: Pindo::Options::OptionItem::Boolean,
+              optional: true,
+              example: 'pindo appstore adhocbuild --increase'
+            )
 
-                    if !ipa_file_upload.nil? && !app_info_obj.nil?
-                        result_data = PgyerHelper.share_instace.start_upload(
-                            app_info_obj: app_info_obj,
-                            ipa_file_upload: ipa_file_upload,
-                            description: nil,
-                            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_new_project_dir}"
-
-                end
-
-
-                def output_fun
-
-                    currentDir = Dir.pwd
-                    pindo_dir = File::expand_path(pindo_single_config.pindo_dir)
-                    app_config_dir = File.join(pindo_dir, @deploy_identifier)
-                    app_config_dir = clong_buildconfig_repo(repo_name: @deploy_repo_name)
-
-
-                    args_temp = []
-                    args_temp << @args_appconfig
-
-                    args = get_build_type_args()
-                    args_temp = args_temp | args
-
-                    args = get_release_build_args()
-                    args_temp = args_temp | args
-
-
-                    pindo_new_project_dir = Dir.pwd
-                    unless @args_nocreate_flag
-                        Pindo::Command::Utils::Renewproj::run(args_temp)
-                        pindo_new_project_dir = ENV["pindo_new_project_dir"]
-                        system "open #{pindo_new_project_dir}"
-                        puts "New Project: #{pindo_new_project_dir}"
-                    end
-
-
-                    Dir.chdir(pindo_new_project_dir)
-                    begin
-                        FileUtils.rm_rf(File.join(pindo_new_project_dir, "Podfile.lock"))
-                        FileUtils.rm_rf(File.join(pindo_new_project_dir, "Pods"))
-                    rescue StandardError => e
-                    end
-
-
-                    Dir.chdir(pindo_new_project_dir)
-                    modify_release_config(project_dir:pindo_new_project_dir, config_json:@config_json)
-                    Pindo::Command::Deploy::Configproj::run(args_temp)
-                    modify_release_firebase(project_dir:pindo_new_project_dir, config_json:@config_json)
-
-
-                    if File.exist?(File.join(pindo_new_project_dir, "Podfile"))
-                        Pindo::Command::Ios::Podupdate::run([])
-
-                        begin
-                            remove_test_pod_modue(project_dir:pindo_new_project_dir)
-                            Pod::Command::Install::run([]) 
-                        rescue => error
-                            puts(error.to_s)
-                            raise Informative, "pod install失败！！先pod install 完成后成编译 !"
-                        end
-
-
-                        pod_lock_file = File.join(pindo_new_project_dir, "Podfile.lock")
-                        if !File.exist?(pod_lock_file)
-                            raise Informative, "pod install失败！！先pod install 完成后成编译 !"
-                        end
-
-                        Pindo::XcodeBuildHelper.backup_podfile_lock(project_dir:pindo_new_project_dir, app_config_dir:app_config_dir, appversion:@config_json["app_info"]["app_build_version"])
-
-                    end
-
-                    if @args_quswark_flag
-                        Dir.chdir(pindo_new_project_dir)
-                        quark_temp = ["./config.json", "--adhoc"]
-                        Pindo::Command::Deploy::Quswark::run(quark_temp)
-                    end
-
-                    unless @args_normal_flag
-                        Dir.chdir(pindo_new_project_dir)
-                        Pindo::Command::Dev::Confuseproj::run(args_temp)
-                    end
-
-                    Dir.chdir(pindo_new_project_dir)
-                    Pindo::Command::Deploy::Cert::run(args_temp)
-
-                    Dir.chdir(pindo_new_project_dir)
-                    Pindo::Command::Deploy::Build::run(args_temp)
-
-
-                    build_path = File.join(pindo_new_project_dir, "build", "*.ipa")
-                    ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
-
-                    unless @args_normal_flag
-                        if !ipa_file.nil? && File.exist?(ipa_file_upload)
-                            if @args_quswark_flag
-                                Dir.chdir(pindo_new_project_dir)
-                                quark_temp = ["./config.json", "--adhoc"]
-                                Pindo::Command::Deploy::Quswark::run(quark_temp)
-                            end
+            items
+          end
+        end
+
+        # 命令的选项列表
+        def self.options
+          # 转换为 CLAide 格式
+          option_items.map { |item| item.to_claide_option }.concat(super)
+        end
 
-                            args_temp << "--push"
-                            Dir.chdir(pindo_new_project_dir)
-                            Pindo::Command::Deploy::Confusecode::run(args_temp)
+        def initialize(argv)
+          # 一行代码完成参数初始化（自动推导命令名、自动启用缓存）
+          @options = initialize_options(argv)
 
-                            Dir.chdir(pindo_new_project_dir)
-                            Pindo::Command::Deploy::Build::run(args_temp)
+          # 保存参数到实例变量
+          @args_bundle_id = @options[:bundleid]
+          @args_send_flag = @options[:send]
+          # send 依赖 upload：如果指定了 send，自动启用 upload
+          @args_upload_flag = @options[:send] || @options[:upload]
+          @args_proj_name = @options[:proj]
+          @args_increase_flag = @options[:increase]
+
+          super
+          @additional_args = argv.remainder!
+        end
+
+        def validate!
+          super
+        end
 
-                        end
-                    end
+        def run
+          pindo_project_dir = Dir.pwd
+
+          begin
+            # 加载 JPS 配置（如果存在）
+            context = Pindo::PindoContext.instance
+            context.load_and_apply_jps_config(pindo_project_dir)
+
+            # 注意：参数缓存已在 initialize 中通过 GlobalOptionsState 处理
+            # 不再使用 PindoContext 的缓存机制
+
+            # 处理配置文件
+            prepare_config(pindo_project_dir)
+
+            # 准备配置
+            config = prepare_ios_config(pindo_project_dir)
+
+            # 创建并执行任务
+            tasks = make_build_task(config)
+
+            # 添加到任务管理器并执行
+            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}"
+          ensure
+            # 清除命令状态（如果启用了缓存，这里会自动保存）
+            Pindo::Options::GlobalOptionsState.instance.clear
+          end
+        end
 
-                end
-
-                def get_release_build_args
-                    args_temp = []
-                    unless @apple_id.eql?(pindo_single_config.demo_apple_id)
-                        @args_apple_id = pindo_single_config.demo_apple_id
-                        args_temp << "--u=#{@args_apple_id}"
-                    end
-
-                    unless @apple_id.eql?(pindo_single_config.demo_apple_id) && @apple_id.eql?(@deploy_acount_id)
-                        if @args_bundle_id.nil? || @args_bundle_id.empty?
-                            if  @config_json && @config_json['project_info'] && @config_json['project_info']['app_type']
-                                @output_repo_name = get_deploy_repo_with_modul_name(module_name:@config_json['project_info']['app_type'])
-                                if @output_repo_name.nil? || @output_repo_name == ""
-                                    raise Informative, "config.json app_type is error!!!"
-                                end
-                                @output_config_dir = clong_buildconfig_repo(repo_name: @output_repo_name)
-                                @args_bundle_id = get_setting_bundleid_withdir(repo_dir:@output_config_dir)
-                            end
-                            args_temp << "--a=#{@args_bundle_id}"
-                        else
-                            args_temp << "--a=#{@args_bundle_id}"
-                        end
-                    end
-                    return args_temp
-                end
-
-                def modify_release_firebase(project_dir:nil, config_json:nil)
-
-                    if  config_json && config_json['project_info'] && config_json['project_info']['app_type']
-                        @output_repo_name = get_deploy_repo_with_modul_name(module_name:config_json['project_info']['app_type'])
-                        if @output_repo_name.nil? || @output_repo_name == ""
-                            raise Informative, "config.json app_type is error!!!"
-                        end
-                        @output_config_dir = clong_buildconfig_repo(repo_name: @output_repo_name)
-                        @args_bundle_id = get_setting_bundleid_withdir(repo_dir:@output_config_dir)
-                    end
-
-                    pindo_dir = File::expand_path(pindo_single_config.pindo_dir)
-                    google_info_config_dir = File.join(pindo_dir, @args_bundle_id)
-                    install_google_plist(project_dir:project_dir, app_config_dir:google_info_config_dir)
-
-                end
-
-                def modify_release_config(project_dir:nil, config_json:nil)
-
-                    if  config_json && config_json['project_info'] && config_json['project_info']['app_type']
-                        @output_repo_name = get_deploy_repo_with_modul_name(module_name:config_json['project_info']['app_type'])
-                        if @output_repo_name.nil? || @output_repo_name == ""
-                            raise Informative, "config.json app_type is error!!!"
-                        end
-                        @output_config_dir = clong_buildconfig_repo(repo_name: @output_repo_name)
-                        @args_bundle_id = get_setting_bundleid_withdir(repo_dir:@output_config_dir)
-                    end
-
-
-                    @output_config_json_file=File::join(@output_config_dir, "config.json")
-                    @output_config_json=JSON.parse(File.read(@output_config_json_file))
-                    @config_json["app_info"]["facebook_app_id"] = @output_config_json["app_info"]["facebook_app_id"]
-                    @config_json["app_info"]["facebook_client_token"] = @output_config_json["app_info"]["facebook_client_token"]
-
-                    if !@config_json["app_info"]["admob_app_id"].nil? && !@output_config_json["app_info"]["admob_app_id"].nil?
-                        @config_json["app_info"]["admob_app_id"] = @output_config_json["app_info"]["admob_app_id"]
-                    end
-                    if !@config_json["app_info"]["applovin_app_id"].nil? && !@output_config_json["app_info"]["applovin_app_id"].nil?
-                        @config_json["app_info"]["applovin_app_id"] = @output_config_json["app_info"]["applovin_app_id"]
-                    end
-
-                    # puts " @config_json[ app_setting] ================12"
-                    # puts  @config_json["app_setting"]
-
-                    @config_json["app_setting"].each do |k, v|
-                        if k.eql?("kGUKeyAppClientHost") ||  k.eql?("kGUKeyResBaseUrl") ||  k.eql?("app_web_host") || k.eql?("app_client_url") ||  k.eql?("app_client_url") then
-
-                        else
-                            if !@output_config_json["app_setting"][k].nil?
-                                @config_json["app_setting"][k] = @output_config_json["app_setting"][k]
-                            end
-                        end
-                    end
-
-                    current_config_file = File.join(project_dir, "config.json")
-                    File.open(current_config_file, "w") do |f|
-                        f.write(JSON.pretty_generate(@config_json))
-                    end
-
-                end
+        private
 
+        # 准备配置文件
+        def prepare_config(project_dir)
+          if @args_bundle_id && !@args_bundle_id.empty?
+            # 如果指定了 Bundle ID，拉取配置
+            puts "\n拉取 Bundle ID 配置: #{@args_bundle_id}"
 
+            build_info_manager = Pindo::BuildInfoManager.share_instance
+            success = build_info_manager.pull_appconfig_with_reponame(
+              repo_name: @args_bundle_id,
+              target_dir: project_dir
+            )
+
+            unless success
+              raise Informative, "拉取配置失败: #{@args_bundle_id}"
+            end
+
+            # 加载拉取的配置到 IosConfigParser
+            config_file = File.join(project_dir, "config.json")
+            if File.exist?(config_file)
+              puts "加载配置文件: #{config_file}"
+              Pindo::IosConfigParser.instance.load_config(config_file: config_file)
+            else
+              raise Informative, "配置文件不存在: #{config_file}"
+            end
+          else
+            # 如果没有指定 Bundle ID，使用当前目录的 config.json
+            config_file = File.join(project_dir, "config.json")
+
+            if File.exist?(config_file)
+              puts "\n使用当前目录配置文件: #{config_file}"
+              Pindo::IosConfigParser.instance.load_config(config_file: config_file)
+            else
+              raise Informative, "当前目录未找到 config.json 文件，请使用 --bundleid 参数指定 Bundle ID"
+            end
+          end
+        end
+
+        # 创建构建任务
+        def make_build_task(config)
+          # 检测项目类型
+          build_helper = Pindo::BuildHelper.share_instance
+          project_type = build_helper.project_type(config[:project_path])
+
+          case project_type
+          when :android
+            raise Informative, "Android 工程， 请使用 pindo android build"
+          when :ios, :unity
+            # 判断是否是 Unity 工程
+            is_unity = (project_type == :unity)
+
+            tasks = []
+
+            # 1. 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,
+                deploy_mode: 'adhoc',  # AdHoc 使用 adhoc 模式
+                context: unity_context
+              )
+              tasks << unity_task
+            end
+
+            # 2. 构建任务（AdHoc 模式）
+            build_mode = :adhoc
+
+            # 确定 iOS 项目路径
+            if is_unity
+              ios_project_path = ios_export_path
+            else
+              ios_project_path = config[:project_path]
+            end
+
+            build_options = {
+              project_path: ios_project_path,
+              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[:bundle_id] = @args_bundle_id if @args_bundle_id
+            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
+            )
+            build_task.dependencies << tasks.last.id if tasks.any?
+            tasks << build_task
+
+            # 3. 上传任务（如果需要）
+            if @args_upload_flag
+              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]
+              )
+              tasks << upload_task
             end
+
+            tasks
+          else
+            raise Informative, "当前目录不是工程目录，不能编译"
+          end
+        end
+
+        # 准备 iOS 配置
+        def prepare_ios_config(pindo_project_dir)
+          # 获取 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,
+            app_info_obj: app_info_obj,
+            workflow_info: workflow_info
+          }
         end
+
+      end
     end
+  end
 end