pindo 5.17.5 → 5.18.4

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

@@ -0,0 +1,199 @@
+require 'fileutils'
+require 'json'
+require 'spaceship'
+require 'pindo/module/appstore/bundleid_helper'
+require 'pindo/base/git_handler'
+require 'pindo/config/build_info_manager'
+
+module Pindo
+  class Command
+    class Utils < Command
+      class Renewbundleid < Utils
+
+            include Appselect
+
+            self.summary = '从Apple开发者中心同步所有bundle id的capabilities到config.json'
+
+            self.description = <<-DESC
+                    从Apple Developer Portal读取当前账号下所有Bundle ID的Capability状态,
+                    写入各项目config.json的capabilities字段并提交到Git仓库。
+
+                    支持功能:
+
+                        * 批量读取所有Bundle ID的Capability状态
+
+                        * 自动识别App Group、iCloud容器的关联ID
+
+                        * 将capabilities写入config.json并提交到Git仓库
+
+                        * 支持dry-run预览模式
+
+                    使用示例:
+
+                        $ pindo utils renewbundleid                    # 同步所有bundle id的capabilities
+
+                        $ pindo utils renewbundleid --dry-run          # 预览模式,不修改文件
+
+                    注意事项:
+
+                        * 确保已登录Apple Developer账号
+
+                        * 该操作会修改所有相关项目的config.json
+            DESC
+
+            self.arguments = []
+
+            def self.options
+              [
+                ['--dry-run', '预览模式,只显示差异不修改文件']
+              ].concat(super)
+            end
+
+            def initialize(argv)
+              @dry_run = argv.flag?('dry-run', false)
+              super
+            end
+
+            def run
+                @dev_bundle_id_array = all_dev_bundleid()
+                @tool_bundle_id_array = all_tool_bundleid()
+                @deploy_bundle_id_array = all_release_bundleid()
+                all_bundle_ids = @dev_bundle_id_array + @deploy_bundle_id_array + @tool_bundle_id_array
+
+                puts "共 #{all_bundle_ids.length} 个 Bundle ID 需要处理"
+                puts
+
+                # 只登录一次
+                first_config = load_first_config(all_bundle_ids)
+                if first_config.nil?
+                    puts "无法加载任何 config.json，退出"
+                    return
+                end
+
+                apple_id = first_config.dig('account_info', 'apple_acount_id')
+                if apple_id.nil? || apple_id.empty? || apple_id.include?("__________")
+                    puts "config.json 中缺少有效的 Apple ID"
+                    return
+                end
+
+                puts "Login #{apple_id}..."
+                Spaceship.login(apple_id.to_s)
+                Spaceship.select_team
+                puts
+
+                success_count = 0
+                fail_count = 0
+                skip_count = 0
+
+                all_bundle_ids.each do |bundle_id|
+                    if bundle_id.include?("*")
+                        bundle_id = bundle_id.gsub(".*", "")
+                    end
+
+                    begin
+                        result = update_bundleid_capabilities(bundle_id: bundle_id)
+                        case result
+                        when :success then success_count += 1
+                        when :skip then skip_count += 1
+                        end
+                    rescue => err
+                        puts "  #{bundle_id} — 失败: #{err.message}"
+                        fail_count += 1
+                    end
+                end
+
+                puts
+                puts "完成: #{success_count} 成功, #{fail_count} 失败, #{skip_count} 跳过"
+            end
+
+            private
+
+            def load_first_config(bundle_ids)
+                bundle_ids.each do |bundle_id|
+                    bid = bundle_id.include?("*") ? bundle_id.gsub(".*", "") : bundle_id
+                    begin
+                        app_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: bid)
+                        config_file = File.join(app_config_dir, "config.json")
+                        if File.exist?(config_file)
+                            return JSON.parse(File.read(config_file))
+                        end
+                    rescue
+                        next
+                    end
+                end
+                nil
+            end
+
+            def update_bundleid_capabilities(bundle_id: nil)
+                # 获取 config 仓库目录
+                app_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: bundle_id)
+                config_file = File.join(app_config_dir, "config.json")
+
+                unless File.exist?(config_file)
+                    puts "  #{bundle_id} — config.json 不存在，跳过"
+                    return :skip
+                end
+
+                config_json = JSON.parse(File.read(config_file))
+                app_info = config_json['app_info']
+
+                if app_info.nil? || app_info['app_identifier'].nil? || app_info['app_identifier'].empty?
+                    puts "  #{bundle_id} — 缺少 app_identifier，跳过"
+                    return :skip
+                end
+
+                main_bundle_id = app_info['app_identifier']
+                puts "读取 #{main_bundle_id} 的 Capability..."
+
+                capabilities = Pindo::BundleIdHelper.fetch_capabilities_from_portal(bundle_id: main_bundle_id)
+
+                if capabilities.nil?
+                    puts "  #{main_bundle_id} — Portal 中未找到，跳过"
+                    return :skip
+                end
+
+                # 显示 capabilities
+                capabilities.each do |key, value|
+                    puts "  #{key}: #{value.is_a?(String) ? "\"#{value}\"" : value}"
+                end
+
+                if @dry_run
+                    old_capabilities = app_info['capabilities'] || {}
+                    has_diff = false
+                    capabilities.each do |key, new_value|
+                        old_value = old_capabilities[key]
+                        if old_value.nil?
+                            puts "  + #{key}: #{new_value.is_a?(String) ? "\"#{new_value}\"" : new_value}"
+                            has_diff = true
+                        elsif old_value != new_value
+                            puts "  ~ #{key}: #{old_value} -> #{new_value}"
+                            has_diff = true
+                        end
+                    end
+                    puts "  (无差异)" unless has_diff
+                    puts
+                    return :success
+                end
+
+                # 写入 config.json
+                config_json['app_info']['capabilities'] = capabilities
+                File.open(config_file, "w") do |f|
+                    f.write(JSON.pretty_generate(config_json) + "\n")
+                end
+
+                # 提交到 Git 仓库
+                Pindo::GitHandler.git_addpush_repo(
+                    path: app_config_dir,
+                    message: "sync capabilities from Apple Developer Portal",
+                    commit_file_params: ["config.json"]
+                )
+
+                puts "  #{main_bundle_id} — capabilities 已同步"
+                puts
+                :success
+            end
+
+      end
+    end
+  end
+end

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

@@ -83,8 +83,8 @@ module Pindo
 
                 fixed_bundleid_array.each do |bundle_id|
                     # begin
-                        if bundle_id.eql?("com.heroneverdie101.*")
-                            bundle_id = "com.heroneverdie101"
+                        if bundle_id.include?("*")
+                            bundle_id = bundle_id.gsub(".*", "")
                         end
                       fixed_cert(bundle_id:bundle_id, renew_flag:@renew_cert_flag, upload_flag:@upload_flag, fixed_bundleid_flag:@fixedid_flag)
                     # rescue => err
@@ -123,58 +123,60 @@ module Pindo
                     )
                 end
 
-                if @fast_flag
-
-                    if @dev_bundle_id_array.include?(bundle_id) || @tool_bundle_id_array.include?(bundle_id)
-                        args_temp = []
-                        args_temp << "--config=#{config_file_path}"
-                        args_temp << "--build_type=dev"
-                        if renew_flag
-                            args_temp << "--renew"
-                        end
-                        if upload_flag
-                            args_temp << "--upload"
-                        end
-                        Pindo::Command::Appstore::Cert::run(args_temp)
-                    end
-
-                    if @deploy_bundle_id_array.include?(bundle_id)
-                        args_temp = []
-                        args_temp << "--config=#{config_file_path}"
-                        args_temp << "--build_type=adhoc"
-                        if renew_flag
-                            args_temp << "--renew"
-                        end
-                        if upload_flag
-                            args_temp << "--upload"
-                        end
-                        Pindo::Command::Appstore::Cert::run(args_temp)
-                    end
-
-                else
-
-                    args_temp = []
-                    args_temp << "--config=#{config_file_path}"
-                    args_temp << "--build_type=dev"
-                    if renew_flag
-                        args_temp << "--renew"
-                    end
-                    if upload_flag
-                        args_temp << "--upload"
-                    end
-                    Pindo::Command::Appstore::Cert::run(args_temp)
-
-                    args_temp = []
-                    args_temp << "--config=#{config_file_path}"
-                    args_temp << "--build_type=adhoc"
-                    if renew_flag
-                        args_temp << "--renew"
-                    end
-                    if upload_flag
-                        args_temp << "--upload"
-                    end
-                    Pindo::Command::Appstore::Cert::run(args_temp)
-                end
+                Pindo::Command::Appstore::Bundleid::run([])
+
+                # if @fast_flag
+
+                #     if @dev_bundle_id_array.include?(bundle_id) || @tool_bundle_id_array.include?(bundle_id)
+                #         args_temp = []
+                #         args_temp << "--config=#{config_file_path}"
+                #         args_temp << "--build_type=dev"
+                #         if renew_flag
+                #             args_temp << "--renew"
+                #         end
+                #         if upload_flag
+                #             args_temp << "--upload"
+                #         end
+                #         Pindo::Command::Appstore::Cert::run(args_temp)
+                #     end
+
+                #     if @deploy_bundle_id_array.include?(bundle_id)
+                #         args_temp = []
+                #         args_temp << "--config=#{config_file_path}"
+                #         args_temp << "--build_type=adhoc"
+                #         if renew_flag
+                #             args_temp << "--renew"
+                #         end
+                #         if upload_flag
+                #             args_temp << "--upload"
+                #         end
+                #         Pindo::Command::Appstore::Cert::run(args_temp)
+                #     end
+
+                # else
+
+                #     args_temp = []
+                #     args_temp << "--config=#{config_file_path}"
+                #     args_temp << "--build_type=dev"
+                #     if renew_flag
+                #         args_temp << "--renew"
+                #     end
+                #     if upload_flag
+                #         args_temp << "--upload"
+                #     end
+                #     Pindo::Command::Appstore::Cert::run(args_temp)
+
+                #     args_temp = []
+                #     args_temp << "--config=#{config_file_path}"
+                #     args_temp << "--build_type=adhoc"
+                #     if renew_flag
+                #         args_temp << "--renew"
+                #     end
+                #     if upload_flag
+                #         args_temp << "--upload"
+                #     end
+                #     Pindo::Command::Appstore::Cert::run(args_temp)
+                # end
             end
 
 

data/lib/pindo/command/utils.rb

@@ -7,6 +7,9 @@ require 'pindo/command/utils/device'
 # require 'pindo/command/utils/tgate'
 # require 'pindo/command/utils/boss'
 require 'pindo/command/utils/renewcert'
+require 'pindo/command/utils/renewbundleid'
+require 'pindo/command/utils/copyconfig'
+require 'pindo/command/utils/allcopyconfig'
 require 'pindo/command/utils/repoinit'
 require 'pindo/command/utils/tag'
 require 'pindo/command/utils/updateconfig'

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

@@ -154,31 +154,35 @@ module Pindo
                 def run
                     pindo_project_dir = Dir.pwd
 
-                    # 加载 JPS 配置（如果存在）
-                    Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir)
+                    begin
+                        # 加载 JPS 配置（如果存在）
+                        Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir, conf: @args_conf)
 
-                    # 准备配置
-                    config = prepare_web_config(pindo_project_dir)
+                        # 准备配置
+                        config = prepare_web_config(pindo_project_dir)
 
-                    # 创建并执行任务
-                    tasks = make_build_task(config)
+                        # 创建并执行任务
+                        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 = Pindo::TaskSystem::TaskManager.instance
+                        task_manager.clear_all
+                        tasks.each { |task| task_manager.add_task(task) }
 
-                    # 执行任务（根据 --multi 参数决定模式）
-                    if @args_multi_flag
-                        task_manager.start(mode: :concurrent, max_workers: 3)
-                    else
-                        task_manager.start
-                    end
+                        # 执行任务（根据 --multi 参数决定模式）
+                        if @args_multi_flag
+                            task_manager.start(mode: :concurrent, max_workers: 3)
+                        else
+                            task_manager.start
+                        end
 
-                    system "open #{pindo_project_dir}"
+                        system "open #{pindo_project_dir}"
 
-                    # 可选运行 WebGL
-                    Pindo::Command::Web::Run.run([]) if @args_run_flag
+                        # 可选运行 WebGL
+                        Pindo::Command::Web::Run.run([]) if @args_run_flag
+                    ensure
+                        Pindo::Options::GlobalOptionsState.instance.clear
+                    end
                 end
 
                 private
@@ -270,12 +274,14 @@ module Pindo
                     )
                     tasks << git_commit_task
 
-                    # 2. Git 标签任务（总是创建，依赖提交任务，在 Unity 导出之前创建）
-                    # 所有参数都从 GitCommitTask 获取
-                    git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
-                    git_tag_task.dependencies << git_commit_task.id
-                    tasks << git_tag_task
-                    last_task = git_tag_task
+                    # 2. Git 标签任务（skip_without_tag 模式下不创建）
+                    git_tag_task = nil
+                    unless process_type == Pindo::UncommittedFilesProcessType::SKIP_WITHOUT_TAG
+                        git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
+                        git_tag_task.dependencies << git_commit_task.id
+                        tasks << git_tag_task
+                        last_task = git_tag_task
+                    end
 
                     # 3. Unity 更新必备库任务（可选）
                     unless @args_skip_lib
@@ -417,7 +423,7 @@ module Pindo
                       )
                       # 依赖 Git Commit、Git Tag 和 Bind Package 任务
                       workflow_message_task.dependencies << git_commit_task.id
-                      workflow_message_task.dependencies << git_tag_task.id
+                      workflow_message_task.dependencies << git_tag_task.id if git_tag_task
                       workflow_message_task.dependencies << bind_package_task.id
                       tasks << workflow_message_task
                     end

data/lib/pindo/config/build_info_manager.rb

@@ -174,9 +174,7 @@ module Pindo
       end
     end
 
-    private
-
-    # 修改仓库设置（测试环境）
+    # 将仓库注册到 git_base_url.json，指定其所属 org
     def modify_repo_setting(repo_name:, owner_org:)
       pindo_setting_dir = pindo_single_config.pindo_env_configdir
       git_repo_file = pindo_single_config.git_base_url_fullname