pindo 5.13.1 → 5.13.2

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

@@ -12,15 +12,15 @@ 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'
+require 'pindo/options/options'
+require 'pindo/options/helpers/bundleid_selector'
 
 module Pindo
     class Command
         class Ios < Command
             class Autobuild < Ios
 
-                include Appselect
-                include Pindo::Githelper
                 # 命令的简要说明 - 打包iOS工程并发布到JPS
                 self.summary = '编译IPA(支持Xcode/Unity工程),自动修改工程,支持上传JPS'
 
@@ -65,30 +65,48 @@ module Pindo
                     # 暂无参数
                 ]
 
+                # 定义此命令使用的参数项（类方法，避免重复定义）
+                def self.option_items
+                    @option_items ||= begin
+                        items = Pindo::Options::OptionGroup.merge(
+                            Pindo::Options::BuildOptions.select(:bundleid, :build_type),
+                            Pindo::Options::JPSOptions.select(:proj, :upload, :send)
+                        )
+
+                        # 为 bundleid 参数添加 value_block（交互式选择）
+                        bundleid_item = items.find { |item| item.key == :bundleid }
+                        if bundleid_item
+                            bundleid_item.value_block = proc do |command_instance|
+                                # 根据构建类型选择不同的 Bundle ID
+                                build_type = command_instance.instance_variable_get(:@build_type) || 'dev'
+                                Pindo::Options::BundleIdSelector.select_bundleid(build_type)
+                            end
+                        end
+
+                        items
+                    end
+                end
+
                 # 命令的选项列表
                 def self.options
-                    [
-                        ['--bundleid=ID', '指定打包的Bundle ID'],
-                        ['--proj=NAME',   '指定上传到测试平台的项目名称'],
-                        ['--upload',      '编译后上传到测试平台（上传成功后自动发送给自己）'],
-                        ['--send',        '发送通知到测试群组（同时也会发送给自己）'],
-                        ['--adhoc',       '使用AdHoc证书打包（默认使用Dev证书）'],
-                        ['--deploy',      '使用发布证书打包']
-                    ].concat(super)
+                    # 转换为 CLAide 格式
+                    option_items.map { |item| item.to_claide_option }.concat(super)
                 end
 
                 def initialize(argv)
+                    # 先提取 build_type（因为 bundleid 的 value_block 需要用到它）
+                    @build_type = argv.option('build_type', 'dev')
 
-                    @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_bundle_id = argv.option('bundleid')
+                    # 一行代码完成参数初始化（自动推导命令名、自动启用缓存）
+                    @options = initialize_options(argv)
 
-                    if @args_send_flag
-                        @args_upload_flag = true
-                    end
+                    # 保存参数到实例变量
+                    @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]
 
                     super
                     @additional_args = argv.remainder!
@@ -102,25 +120,31 @@ module Pindo
                 def run
                     pindo_project_dir = Dir.pwd
 
-                    # 加载 JPS 配置（如果存在）
-                    context = Pindo::PindoContext.instance
-                    context.load_and_apply_jps_config(pindo_project_dir)
-                    # 确认并应用缓存（如果有）
-                    context.confirm_and_apply_cache
+                    begin
+                        # 加载 JPS 配置（如果存在）
+                        context = Pindo::PindoContext.instance
+                        context.load_and_apply_jps_config(pindo_project_dir)
 
-                    # 准备配置
-                    config = prepare_ios_config(pindo_project_dir)
+                        # 注意：参数缓存已在 initialize 中通过 GlobalOptionsState 处理
+                        # 不再使用 PindoContext 的缓存机制
 
-                    # 创建并执行任务
-                    tasks = make_build_task(config)
+                        # 准备配置
+                        config = prepare_ios_config(pindo_project_dir)
 
-                    # 添加到任务管理器并执行
-                    task_manager = Pindo::TaskSystem::TaskManager.instance
-                    task_manager.clear_all
-                    tasks.each { |task| task_manager.add_task(task) }
-                    task_manager.start
+                        # 创建并执行任务
+                        tasks = make_build_task(config)
 
-                    system "open #{pindo_project_dir}"
+                        # 添加到任务管理器并执行
+                        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
 
                 private
@@ -158,6 +182,7 @@ module Pindo
                                 'ios',
                                 project_path: config[:project_path],
                                 export_path: ios_export_path,
+                                deploy_mode: @build_type,  # 根据 build_type 传递部署模式
                                 context: unity_context
                             )
                             unity_task.dependencies << git_tag_task.id
@@ -165,7 +190,7 @@ module Pindo
                         end
 
                         # 3. 构建任务
-                        build_mode = @args_deploy_flag ? :release : (@args_adhoc_flag ? :adhoc : :dev)
+                        build_mode = @build_type.to_sym
 
                         # 确定 iOS 项目路径
                         if is_unity
@@ -195,7 +220,7 @@ module Pindo
 
                         # 4. 上传任务（如果需要）
                         if @args_upload_flag
-                            upload_task = Pindo::TaskSystem::UploadTask.new(
+                            upload_task = Pindo::TaskSystem::JPSUploadTask.new(
                                 'ipa',
                                 File.join(ios_project_path, 'build'),
                                 nil,
@@ -218,12 +243,8 @@ module Pindo
 
                 # 准备 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
+                    # Bundle ID 已经通过 value_block 自动获取
+                    bundle_id = @args_bundle_id
 
                     # 获取 JPS 配置
                     app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(

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

@@ -1,8 +1,10 @@
 require 'highline/import'
 require 'xcodeproj'
-require 'find'  
+require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
+require 'pindo/config/ios_config_parser'
+require 'pindo/module/xcode/ipa_resign_helper'
 
 module Pindo
     class Command
@@ -109,10 +111,12 @@ module Pindo
                     end
                     puts "mainapp_bundleid: #{mainapp_bundleid}"
 
-                    args_temp = []
-                    args_temp << mainapp_bundleid
-
-                    Pindo::Command::Deploy::Pullconfig::run(args_temp)
+                    # 拉取应用配置
+                    require 'pindo/config/build_info_manager'
+                    Pindo::BuildInfoManager.share_instance.pull_appconfig_with_reponame(
+                        repo_name: mainapp_bundleid,
+                        target_dir: Dir.pwd
+                    )
 
                     app_info_obj = nil
                     workflow_info = nil
@@ -126,23 +130,34 @@ module Pindo
                         )
                     end
                     
-                    args_temp = []
-                    if @args_adhoc_flag
-                        args_temp << "--adhoc"
-                    else
-                        args_temp << "--dev"
-                    end
-
                     if !ipa_file_name.nil?
-                        
-                        args_temp << "--ipa=#{ipa_file_name}" 
-                        Pindo::Command::Deploy::Resign::run(args_temp)   
+                        # 加载配置获取 Bundle ID
+                        config_file = File.join(Dir.pwd, "config.json")
+                        config_parser = Pindo::IosConfigParser.instance
+                        config_parser.load_config(config_file: config_file)
+                        bundle_id = config_parser.bundle_id
+
+                        if bundle_id.nil? || bundle_id.empty?
+                            raise Informative, "无法从配置文件中获取 Bundle ID"
+                        end
 
+                        # 确定构建类型并安装证书
+                        build_type = @args_adhoc_flag ? 'adhoc' : 'dev'
+                        cert_args = build_type == 'adhoc' ? ['--build_type=adhoc'] : []
+                        Pindo::Command::Appstore::Cert::run(cert_args)
+
+                        # 使用 IpaResignHelper 进行重签名
+                        ipa_file_upload = Pindo::IpaResignHelper.resign_ipa(
+                            ipa_file_path: ipa_file_name,
+                            bundle_id: bundle_id
+                        )
+
+                        if ipa_file_upload.nil?
+                            raise Informative, "重签名失败"
+                        end
 
-                        ipa_file_name = File::expand_path(ipa_file_name)
-                        ipa_base_name = File.basename(ipa_file_name, ".ipa")
-                        ipa_dir = File.dirname(ipa_file_name)
-                        ipa_file_upload =  File.join(ipa_dir, ipa_base_name + "_resigned.ipa")
+                        puts "\n重签名成功！"
+                        puts "重签名后的 IPA: #{ipa_file_upload}"
 
                         if !ipa_file_upload.nil? && !app_info_obj.nil?
                             result_data = PgyerHelper.share_instace.start_upload(

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

@@ -159,13 +159,16 @@ module Pindo
                     end
 
 
-                    args_temp = []
-                    Pindo::Command::Deploy::Build::run(args_temp)
-
-
+                    # 使用 XcodeBuildHelper 进行构建
                     Dir.chdir(pindo_project_dir)
-                    build_path = File.join(pindo_project_dir, "build", "*.{ipa,app}")
-                    ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+                    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?
 

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

@@ -6,8 +6,6 @@ module Pindo
       class Cert < Ios
         
             include Appselect
-            
-            include XcodeCertHelper
 
             # 命令的简要说明 - 更新证书并设置工程
             self.summary = '更新证书并使用新证书设置Xcode工程'
@@ -68,28 +66,31 @@ module Pindo
                 mainapp_bundleid = get_selected_dev_bundleid()
               end
 
-              args_temp = []
-              args_temp << mainapp_bundleid
-              Pindo::Command::Deploy::Pullconfig::run(args_temp)
-
+              # 拉取应用配置
+              require 'pindo/config/build_info_manager'
+              Pindo::BuildInfoManager.share_instance.pull_appconfig_with_reponame(
+                repo_name: mainapp_bundleid,
+                target_dir: Dir.pwd
+              )
 
               project_dir = Dir.pwd
               Dir.chdir(project_dir)
-              config_json_file = File.join(project_dir,"config.json")
-              # 处理entitlements配置
-              Pindo::XcodeBuildConfig.update_entitlements_config(project_dir: project_dir, config_file: config_json_file)
 
-              args_temp = []
-              if @args_adhoc_flag
-                  args_temp << "--adhoc"
-              else
-                  args_temp << "--dev"
-              end
+              # 加载配置到 IosConfigParser
+              require 'pindo/config/ios_config_parser'
+              config_json_file = File.join(project_dir, "config.json")
+              Pindo::IosConfigParser.instance.load_config(config_file: config_json_file)
 
+              # 处理entitlements配置
+              Pindo::XcodeBuildConfig.update_entitlements_config(project_dir: project_dir)
 
+              # 确定构建类型
+              build_type = @args_adhoc_flag ? 'adhoc' : 'dev'
 
+              # 检测平台类型
               project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
               if !project_fullname.nil?
+                  require 'xcodeproj'
                   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")
@@ -97,12 +98,18 @@ module Pindo
                   end
               end
 
-              if @args_macos_flag
-                args_temp << "--macos"
-              end
-              
-              Pindo::Command::Deploy::Cert::run(args_temp)
+              platform_type = @args_macos_flag ? 'macos' : 'ios'
+
+              # 直接调用 XcodeCertHelper 安装和配置证书
+              # 配置已经加载到 IosConfigParser，不需要再传 config_file
+              require 'pindo/module/cert/xcode_cert_helper'
+              Pindo::XcodeCertHelper.install_and_config_certs(
+                build_type: build_type,
+                platform_type: platform_type,
+                project_dir: project_dir
+              )
 
+              puts "✓ 证书安装和配置完成！"
             end
 
 

data/lib/pindo/command/jps/upload.rb

@@ -6,7 +6,7 @@ require 'pindo/module/pgyer/pgyerhelper'
 require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/build/build_helper'
 require 'pindo/module/task/task_manager'
-require 'pindo/module/task/model/upload_task'
+require 'pindo/module/task/model/jps_upload_task'
 require 'pindo/module/task/model/git_tag_task'
 
 module Pindo
@@ -386,8 +386,8 @@ module Pindo
                         raise Informative, "#{@args_proj_name} 错误， 请输入正确的App代号名称， jps网站没有该App"
                     end
 
-                    # 创建 UploadTask
-                    Pindo::TaskSystem::UploadTask.new(
+                    # 创建 JPSUploadTask
+                    Pindo::TaskSystem::JPSUploadTask.new(
                         file_type,
                         upload_path,
                         upload_file,

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

@@ -10,7 +10,7 @@ require 'pindo/module/task/pindo_task'
 require 'pindo/module/task/task_manager'
 require 'pindo/module/task/model/build_task'
 require 'pindo/module/task/model/unity_export_task'
-require 'pindo/module/task/model/upload_task'
+require 'pindo/module/task/model/jps_upload_task'
 require 'pindo/module/task/model/git_tag_task'
 
 module Pindo
@@ -307,7 +307,7 @@ module Pindo
                                                  [platform, platform_path]
                                              end
 
-                    upload_task = Pindo::TaskSystem::UploadTask.new(
+                    upload_task = Pindo::TaskSystem::JPSUploadTask.new(
                         file_type,
                         upload_path,
                         nil,

data/lib/pindo/command/utils/clearcert.rb

@@ -2,7 +2,7 @@
 require 'highline/import'
 require 'fileutils'
 require 'json'
-require 'open3'
+require 'pindo/module/cert/cert_helper'
 
 module Pindo
     class Command
@@ -61,22 +61,7 @@ module Pindo
                 end
         
                 def run
-                    output, _ = Open3.capture2('security find-identity -p codesigning')
-                    identity_ids_0 = []
-                    identity_ids_1 = output.split("\n").map { |line| line.split(' ')[1] if line.include?('Apple Development') }.compact
-                    identity_ids_2 = output.split("\n").map { |line| line.split(' ')[1] if line.include?('Apple Distribution') }.compact
-                    identity_ids = identity_ids_0 + identity_ids_1 + identity_ids_2
-                    identity_ids = identity_ids.uniq
-                    puts identity_ids
-                    
-                    identity_ids.each do |identity_id|
-                        system "security delete-certificate -Z #{identity_id}"
-                    end
-
-                    profile_file_dir = File.expand_path("~/Library/MobileDevice")
-                    profile_file_patb = File.join(profile_file_dir, "Provisioning Profiles")
-                    FileUtils.rm_rf(profile_file_patb)
-                    
+                    Pindo::CertHelper.clean_local_certs
                 end
             end
         end

data/lib/pindo/command/{deploy → utils}/fabric.rb

@@ -1,15 +1,15 @@
 require 'highline/import'
 require 'xcodeproj'
-require 'find'  
+require 'find'
 require 'fileutils'
 require 'sigh'
 
 module Pindo
     class Command
-        class Deploy < Command
-            class Fabric < Deploy
-        
-    
+        class Utils < Command
+            class Fabric < Utils
+
+
                 self.summary = '上传dsym文件到Firebase'
 
                 self.description = <<-DESC
@@ -21,12 +21,12 @@ module Pindo
     - 支持iOS项目的符号文件上传
 
 使用示例:
-    pindo deploy fabric
-    cd your-project && pindo deploy fabric
+    pindo utils fabric
+    cd your-project && pindo utils fabric
                 DESC
 
                 self.arguments = [
-                   
+
                 ]
 
                 def run
@@ -39,7 +39,7 @@ module Pindo
                         if path.to_s.end_with?(".app.dSYM.zip") then
                             dsyms_file = path
                             puts "DSYMS ++++++++++ #{dsyms_file}"
-                            puts 
+                            puts
                         end
                     end
 
@@ -50,18 +50,18 @@ module Pindo
                         google_plist_path = File.join(current_project_dir, "AppEntry/GoogleService-Info.plist")
 
                         command = upload_tool_path + " -gsp " + google_plist_path + " -p ios " + dsyms_file
-                        puts 
+                        puts
                         puts command
-                        puts 
+                        puts
                         system command
 
                     end
 
- 
+
                 end
 
 
             end
         end
     end
-end
+end

data/lib/pindo/command/utils/renewcert.rb

@@ -1,5 +1,5 @@
 require 'fileutils'
-require 'pindo/module/cert/xcodecerthelper'
+require 'pindo/module/cert/xcode_cert_helper'
 require 'pindo/module/cert/cert_helper'
 
 module Pindo
@@ -8,7 +8,6 @@ module Pindo
       class Renewcert < Utils
         
             include Appselect
-            include XcodeCertHelper
 
             self.summary = '重新创建当前账号下所有的Provisioning Profile文件'
     
@@ -104,83 +103,108 @@ module Pindo
 
             def fixed_cert(bundle_id:nil, renew_flag:false, upload_flag:false, fixed_bundleid_flag: false)
 
-                args_temp = []
-                args_temp << "#{bundle_id}"
+                # 拉取应用配置
+                require 'pindo/config/build_info_manager'
+                Pindo::BuildInfoManager.share_instance.pull_appconfig_with_reponame(
+                    repo_name: bundle_id,
+                    target_dir: Dir.pwd
+                )
 
-                Pindo::Command::Deploy::Pullconfig::run(args_temp)
+                config_file_path = File.join(Dir.pwd, "config.json")
 
                 if fixed_bundleid_flag
-                    Pindo::Command::Deploy::Bundleid::run([])    
+                    # 读取 config.json
+                    config_json = JSON.parse(File.read(config_file_path))
+
+                    # 使用 BundleIdHelper 创建 Bundle ID
+                    require 'pindo/module/appstore/bundleid_helper'
+                    Pindo::BundleIdHelper.execute_bundleid_creation(
+                        config_json: config_json,
+                        sign_flag: false
+                    )
                 end
 
                 if @fast_flag
 
                     if @dev_bundle_id_array.include?(bundle_id) || @tool_bundle_id_array.include?(bundle_id)
                         args_temp = []
-                        args_temp << "--a=#{bundle_id}"
-                        args_temp << "--dev"
+                        args_temp << "--config=#{config_file_path}"
+                        args_temp << "--build_type=dev"
                         if renew_flag
-                            args_temp << "--renew"    
+                            args_temp << "--renew"
                         end
                         if upload_flag
-                            args_temp << "--upload"    
+                            args_temp << "--upload"
                         end
-                        Pindo::Command::Deploy::Cert::run(args_temp)
+                        Pindo::Command::Appstore::Cert::run(args_temp)
                     end
 
                     if @deploy_bundle_id_array.include?(bundle_id)
                         args_temp = []
-                        args_temp << "--a=#{bundle_id}"
-                        args_temp << "--adhoc"
+                        args_temp << "--config=#{config_file_path}"
+                        args_temp << "--build_type=adhoc"
                         if renew_flag
-                            args_temp << "--renew"    
+                            args_temp << "--renew"
                         end
                         if upload_flag
-                            args_temp << "--upload"    
+                            args_temp << "--upload"
                         end
-                        Pindo::Command::Deploy::Cert::run(args_temp)
+                        Pindo::Command::Appstore::Cert::run(args_temp)
                     end
 
                 else
 
                     args_temp = []
-                    args_temp << "--a=#{bundle_id}"
-                    args_temp << "--dev"
+                    args_temp << "--config=#{config_file_path}"
+                    args_temp << "--build_type=dev"
                     if renew_flag
-                        args_temp << "--renew"    
+                        args_temp << "--renew"
                     end
                     if upload_flag
-                        args_temp << "--upload"    
+                        args_temp << "--upload"
                     end
-                    Pindo::Command::Deploy::Cert::run(args_temp)
+                    Pindo::Command::Appstore::Cert::run(args_temp)
 
                     args_temp = []
-                    args_temp << "--a=#{bundle_id}"
-                    args_temp << "--adhoc"
+                    args_temp << "--config=#{config_file_path}"
+                    args_temp << "--build_type=adhoc"
                     if renew_flag
-                        args_temp << "--renew"    
+                        args_temp << "--renew"
                     end
                     if upload_flag
-                        args_temp << "--upload"    
+                        args_temp << "--upload"
                     end
-                    Pindo::Command::Deploy::Cert::run(args_temp)
+                    Pindo::Command::Appstore::Cert::run(args_temp)
                 end
             end
 
 
             def fixed_push(bundle_id:nil, fixed_bundleid: false)
-                
-                Pindo::Command::Deploy::Pullconfig::run(args_temp)
-
-                args_temp = []
-                args_temp << "--a=#{bundle_id}"
-                args_temp << "--dev"
-                Pindo::Command::Deploy::Pem::run(args_temp)
-
-                args_temp = []
-                args_temp << "--a=#{bundle_id}"
-                args_temp << "--adhoc"
-                Pindo::Command::Deploy::Pem::run(args_temp)
+
+                # 拉取应用配置
+                require 'pindo/config/build_info_manager'
+                Pindo::BuildInfoManager.share_instance.pull_appconfig_with_reponame(
+                    repo_name: bundle_id,
+                    target_dir: Dir.pwd
+                )
+
+                config_file_path = File.join(Dir.pwd, "config.json")
+                config_json = JSON.parse(File.read(config_file_path))
+
+                # 使用 PemHelper 创建开发证书
+                require 'pindo/module/cert/pem_helper'
+                Pindo::PemHelper.execute_pem_creation(
+                    config_json: config_json,
+                    dev_flag: true,
+                    deploy_repo_name: nil
+                )
+
+                # 使用 PemHelper 创建生产证书
+                Pindo::PemHelper.execute_pem_creation(
+                    config_json: config_json,
+                    dev_flag: false,
+                    deploy_repo_name: nil
+                )
 
             end
 

data/lib/pindo/command/utils/renewproj.rb

@@ -9,9 +9,6 @@ module Pindo
         class Utils < Command
             class Renewproj < Utils
 
-                include Command::DeployOptions
-
-                
                 self.summary = '重新创建Xcode工程'
         
                 self.description = <<-DESC