pindo 5.17.4 → 5.18.3

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

@@ -0,0 +1,144 @@
+require 'fileutils'
+require 'json'
+
+module Pindo
+  class Command
+    class Utils < Command
+      class Allcopyconfig < Utils
+
+            include Appselect
+
+            self.summary = '批量复制所有配置仓库到新的组织前缀'
+
+            self.description = <<-DESC
+                    遍历当前账号下所有Bundle ID配置仓库,
+                    批量执行copyconfig命令将每个仓库复制到新的组织前缀下。
+
+                    支持功能:
+
+                        * 自动遍历所有dev、tool、release的bundle id
+
+                        * 对每个bundle id执行copyconfig复制
+
+                        * 替换组织前缀和Apple ID
+
+                        * 记录并汇总失败的bundle id
+
+                    使用示例:
+
+                        $ pindo utils allcopyconfig --to-prefix=com.eyesofstorms --apple-id=eyesofstorms@hotmail.com
+
+                    注意事项:
+
+                        * 确保目标组织在Gitee上有创建仓库的权限
+
+                        * 已存在的目标仓库会被跳过
+            DESC
+
+            self.arguments = []
+
+            def self.options
+              [
+                ['--to-prefix', '目标组织前缀 (如 com.eyesofstorms)'],
+                ['--apple-id', '新的Apple开发者账号邮箱']
+              ].concat(super)
+            end
+
+            def initialize(argv)
+              @to_prefix = argv.option('to-prefix')
+              @new_apple_id = argv.option('apple-id')
+              super
+            end
+
+            def validate!
+              super
+              help! "请通过 --to-prefix 指定目标组织前缀 (如 com.eyesofstorms)" if @to_prefix.nil? || @to_prefix.empty?
+              help! "请通过 --apple-id 指定新的Apple开发者账号" if @new_apple_id.nil? || @new_apple_id.empty?
+            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 "目标前缀: #{@to_prefix}"
+                puts "目标 Apple ID: #{@new_apple_id}"
+                puts "共 #{all_bundle_ids.length} 个 Bundle ID 需要复制"
+                puts
+
+                success_count = 0
+                skip_count = 0
+                failed_ids = []
+
+                all_bundle_ids.each_with_index do |from_bundle_id, index|
+                    if from_bundle_id.include?("*")
+                        # 通配符 bundle id: com.heroneverdie101.* -> 仓库名 com.heroneverdie101
+                        clean_from = from_bundle_id.gsub(".*", "")
+                        new_bundle_id = @to_prefix
+
+                        puts "=" * 60
+                        puts "[#{index + 1}/#{all_bundle_ids.length}] #{clean_from} -> #{new_bundle_id}"
+                        puts "=" * 60
+
+                        begin
+                            args_temp = []
+                            args_temp << new_bundle_id
+                            args_temp << "--from=#{clean_from}"
+                            args_temp << "--apple-id=#{@new_apple_id}"
+                            Pindo::Command::Utils::Copyconfig.run(args_temp)
+                            success_count += 1
+                        rescue => err
+                            puts "  失败: #{err.message}"
+                            failed_ids << clean_from
+                        end
+
+                        puts
+                        next
+                    end
+
+                    # 计算新 bundle id: 替换前缀
+                    from_parts = from_bundle_id.split('.')
+                    if from_parts.length < 3
+                        puts "[#{index + 1}/#{all_bundle_ids.length}] #{from_bundle_id} — 格式不合法，跳过"
+                        skip_count += 1
+                        next
+                    end
+
+                    app_name_parts = from_parts[2..]
+                    new_bundle_id = "#{@to_prefix}.#{app_name_parts.join('.')}"
+
+                    puts "=" * 60
+                    puts "[#{index + 1}/#{all_bundle_ids.length}] #{from_bundle_id} -> #{new_bundle_id}"
+                    puts "=" * 60
+
+                    begin
+                        args_temp = []
+                        args_temp << new_bundle_id
+                        args_temp << "--from=#{from_bundle_id}"
+                        args_temp << "--apple-id=#{@new_apple_id}"
+                        Pindo::Command::Utils::Copyconfig.run(args_temp)
+                        success_count += 1
+                    rescue => err
+                        puts "  失败: #{err.message}"
+                        failed_ids << from_bundle_id
+                    end
+
+                    puts
+                end
+
+                # 汇总
+                puts "=" * 60
+                puts "完成: #{success_count} 成功, #{failed_ids.length} 失败, #{skip_count} 跳过"
+
+                if !failed_ids.empty?
+                    puts
+                    puts "失败的 Bundle ID:"
+                    failed_ids.each { |bid| puts "  #{bid}" }
+                end
+            end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,207 @@
+require 'fileutils'
+require 'json'
+require 'pindo/base/git_handler'
+require 'pindo/config/build_info_manager'
+
+module Pindo
+  class Command
+    class Utils < Command
+      class Copyconfig < Utils
+
+            self.summary = '从已有配置仓库复制创建新的配置仓库，替换bundle id前缀'
+
+            self.description = <<-DESC
+                    从已有的配置仓库复制内容创建新的配置仓库,
+                    并将config.json中所有bundle id的组织前缀替换为新的前缀。
+
+                    支持功能:
+
+                        * 在Gitee上创建新的配置仓库
+
+                        * 复制源仓库的所有内容到新仓库
+
+                        * 自动替换config.json中所有bundle id的组织前缀
+
+                        * 只修改config.json, 其他文件保持不变
+
+                    使用示例:
+
+                        $ pindo utils copyconfig com.neworg.app --from=com.oldorg.app
+
+                    注意事项:
+
+                        * 源仓库必须已存在
+
+                        * 新仓库名称不能与已有仓库重名
+            DESC
+
+            self.arguments = [
+                CLAide::Argument.new('new_bundle_id', false)
+            ]
+
+            def self.options
+              [
+                ['--from', '源配置仓库的bundle id'],
+                ['--apple-id', '新的Apple开发者账号邮箱']
+              ].concat(super)
+            end
+
+            def initialize(argv)
+              @new_bundle_id = argv.shift_argument
+              @from_bundle_id = argv.option('from')
+              @new_apple_id = argv.option('apple-id')
+              super
+            end
+
+            def validate!
+              super
+              help! "请指定新的 bundle id" if @new_bundle_id.nil? || @new_bundle_id.empty?
+              help! "请通过 --from 指定源 bundle id" if @from_bundle_id.nil? || @from_bundle_id.empty?
+            end
+
+            def run
+              # 提取组织前缀: com.heroneverdie101.xxx -> com.heroneverdie101
+              from_parts = @from_bundle_id.split('.')
+              new_parts = @new_bundle_id.split('.')
+
+              if from_parts.length < 2 || new_parts.length < 2
+                puts "bundle id 格式错误，至少需要两段 (如 com.org)"
+                return
+              end
+
+              from_prefix = from_parts[0..1].join('.')
+              new_prefix = new_parts[0..1].join('.')
+
+              puts "源仓库: #{@from_bundle_id}"
+              puts "新仓库: #{@new_bundle_id}"
+              puts "前缀替换: #{from_prefix} -> #{new_prefix}"
+              puts
+
+              # 拉取源仓库
+              puts "拉取源配置仓库..."
+              source_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: @from_bundle_id)
+              source_config = File.join(source_dir, "config.json")
+
+              unless File.exist?(source_config)
+                puts "源仓库 #{@from_bundle_id} 中不存在 config.json"
+                return
+              end
+
+              # 创建新仓库
+              puts "创建新配置仓库 #{@new_bundle_id}..."
+              require_relative '../../client/giteeclient'
+
+              pindo_single_config = Pindoconfig.instance
+              gitee_client = GiteeClient.new(access_token: pindo_single_config.gitee_api_key)
+
+              owner_org = pindo_single_config.build_test_org
+
+              puts "目标组织: #{owner_org}"
+
+              success = gitee_client.gitee_create_repo(
+                owner: owner_org,
+                repo_name: @new_bundle_id,
+                public_type: 2
+              )
+
+              unless success
+                puts "创建仓库失败，仓库可能已存在"
+                return
+              end
+
+              # 将新仓库注册到 git_base_url.json，确保 clong_buildconfig_repo 能找到正确的 org
+              build_info_manager = Pindo::BuildInfoManager.share_instance
+              build_info_manager.modify_repo_setting(
+                repo_name: @new_bundle_id,
+                owner_org: owner_org
+              )
+
+              Funlog.instance.fancyinfo_update("等待 Gitee 仓库初始化...")
+              sleep 2
+
+              # 克隆新仓库
+              new_config_dir = nil
+              3.times do |i|
+                begin
+                  new_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: @new_bundle_id)
+                  break if new_config_dir && File.exist?(new_config_dir)
+                rescue => e
+                  if i < 2
+                    Funlog.instance.fancyinfo_update("克隆失败 (#{i + 1}/3)，3秒后重试...")
+                    sleep 3
+                  else
+                    puts "克隆仓库失败: #{e.message}"
+                    return
+                  end
+                end
+              end
+
+              # 复制源仓库所有内容到新仓库
+              puts "复制源仓库内容..."
+              Dir.glob(File.join(source_dir, '*'), File::FNM_DOTMATCH).each do |item|
+                basename = File.basename(item)
+                next if basename == '.' || basename == '..' || basename == '.git'
+                FileUtils.cp_r(item, new_config_dir)
+              end
+
+              # 修改 config.json
+              new_config_file = File.join(new_config_dir, "config.json")
+              if File.exist?(new_config_file)
+                config_json = JSON.parse(File.read(new_config_file))
+
+                # 替换所有 bundle id 的组织前缀
+                replace_prefix_in_hash(config_json, from_prefix, new_prefix)
+                puts "已替换 config.json 中的 #{from_prefix} -> #{new_prefix}"
+
+                # 更新 Apple ID
+                if @new_apple_id && !@new_apple_id.empty?
+                  if config_json['account_info'] && config_json['account_info']['apple_acount_id']
+                    old_apple_id = config_json['account_info']['apple_acount_id']
+                    config_json['account_info']['apple_acount_id'] = @new_apple_id
+                    puts "已替换 apple_acount_id: #{old_apple_id} -> #{@new_apple_id}"
+                  end
+                end
+
+                File.open(new_config_file, "w") do |f|
+                  f.write(JSON.pretty_generate(config_json) + "\n")
+                end
+              end
+
+              # 只提交 config.json
+              Pindo::GitHandler.git_addpush_repo(
+                path: new_config_dir,
+                message: "init config from #{@from_bundle_id}"
+              )
+
+              puts
+              puts "配置仓库创建完成: #{new_config_dir}"
+            end
+
+            private
+
+            # 递归替换 Hash 中所有字符串值的前缀
+            def replace_prefix_in_hash(obj, from_prefix, new_prefix)
+              case obj
+              when Hash
+                obj.each do |key, value|
+                  if value.is_a?(String)
+                    obj[key] = value.gsub(from_prefix, new_prefix)
+                  else
+                    replace_prefix_in_hash(value, from_prefix, new_prefix)
+                  end
+                end
+              when Array
+                obj.each_with_index do |value, i|
+                  if value.is_a?(String)
+                    obj[i] = value.gsub(from_prefix, new_prefix)
+                  else
+                    replace_prefix_in_hash(value, from_prefix, new_prefix)
+                  end
+                end
+              end
+            end
+
+      end
+    end
+  end
+end

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

@@ -75,7 +75,7 @@ module Pindo
 
                     Funlog.instance.fancyinfo_start("正在生成icon...")
                     begin
-                        XcodeResHelper.create_icons(icon_name: icon_name, new_icon_dir: new_icon_dir)
+                        XcodeResHelper.create_icons(icon_name: icon_name, new_icon_dir: new_icon_dir, proj_dir: Dir.pwd)
                         Funlog.instance.fancyinfo_success("生成icon成功!")
                     rescue StandardError => e
                         Funlog.instance.fancyinfo_error("生成icon失败!")
@@ -101,4 +101,4 @@ module Pindo
             end
         end
     end
-end
+end

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