pindo 5.13.1 → 5.13.3

data/lib/pindo/module/appstore/bundleid_helper.rb

@@ -0,0 +1,349 @@
+require 'spaceship'
+require 'json'
+
+module Pindo
+  # Bundle ID 管理辅助类
+  # 负责在 Apple 开发者中心创建和配置 Bundle ID
+  class BundleIdHelper
+
+    # 从配置文件中提取所有必要的信息
+    # @param config_json [Hash] 配置 JSON 对象
+    # @return [Hash] 提取的配置信息
+    def self.extract_config_info(config_json)
+      config_info = {}
+
+      # 提取 Apple ID
+      if config_json['account_info'] && config_json['account_info']['apple_acount_id']
+        config_info[:apple_id] = config_json['account_info']['apple_acount_id']
+      end
+
+      # 提取 Bundle ID 信息
+      if config_json['app_info']
+        app_info = config_json['app_info']
+        config_info[:bundle_id] = app_info['app_identifier']
+        config_info[:bundle_id_pushcontent] = app_info['app_identifier_pushcontent']
+        config_info[:bundle_id_pushservice] = app_info['app_identifier_pushservice']
+        config_info[:bundle_id_keyboard] = app_info['app_identifier_keyboard']
+        config_info[:bundle_id_imessage] = app_info['app_identifier_imessage']
+        config_info[:bundle_id_extension] = app_info['app_identifier_extension']
+        config_info[:bundle_id_siri] = app_info['app_identifier_siri']
+        config_info[:bundle_id_siriui] = app_info['app_identifier_siriui']
+        config_info[:bundle_id_widget] = app_info['app_identifier_widget']
+        config_info[:bundle_id_extensionad] = app_info['app_identifier_extensionad']
+        config_info[:bundle_id_watchapp] = app_info['app_identifier_watchapp']
+        config_info[:bundle_id_watchapp_extension] = app_info['app_identifier_watchapp_extension']
+      end
+
+      # 提取 App Group 和 iCloud ID
+      if config_json['app_setting']
+        app_setting = config_json['app_setting']
+        config_info[:group_id] = app_setting['app_group_id']
+        config_info[:icloud_id] = app_setting['app_icloud_id']
+      end
+
+      config_info
+    end
+
+    # 执行 Bundle ID 创建流程
+    # @param config_json [Hash] 配置 JSON 对象
+    # @param sign_flag [Boolean] 签名标志
+    def self.execute_bundleid_creation(config_json:, sign_flag: false)
+      # 提取配置信息
+      config_info = extract_config_info(config_json)
+
+      # 验证必需字段
+      raise "配置文件中缺少 Apple ID" if config_info[:apple_id].nil? || config_info[:apple_id].empty?
+      raise "配置文件中缺少 Bundle ID" if config_info[:bundle_id].nil? || config_info[:bundle_id].empty?
+
+      # 登录 Apple 开发者中心
+      puts config_info[:apple_id]
+      puts "Login #{config_info[:apple_id]}..."
+      Spaceship.login(config_info[:apple_id].to_s)
+      Spaceship.select_team
+
+      # 创建 App Group
+      app_group = nil
+      if !config_info[:group_id].nil?
+        app_group = create_group_id(group_id: config_info[:group_id])
+      end
+
+      # 配置参数
+      parms = ["push_notification", "app_group"]
+
+      # 创建 iCloud ID
+      app_icloud = nil
+      if !config_info[:icloud_id].nil?
+        app_icloud = create_icloud_id(icloud_id: config_info[:icloud_id])
+        parms << "iclound"
+      end
+
+      # 创建主应用 Bundle ID
+      app = create_bundleid(
+        bundle_id: config_info[:bundle_id],
+        app_group: app_group,
+        app_icloud: app_icloud,
+        setting_array: parms
+      )
+
+      # 创建各种扩展的 Bundle ID
+      create_extension_bundleids(app, app_group, app_icloud, config_info)
+    end
+
+    # 创建 Bundle ID
+    # @param bundle_id [String] Bundle ID
+    # @param app_group [Object] App Group 对象
+    # @param app_icloud [Object] iCloud Container 对象
+    # @param setting_array [Array] 配置数组
+    # @return [Object] 创建的 App 对象
+    def self.create_bundleid(bundle_id:, app_group: nil, app_icloud: nil, setting_array: [])
+      return nil if bundle_id.nil?
+
+      # 查找或创建 Bundle ID
+      app = Spaceship::Portal.app.find(bundle_id)
+      puts
+
+      if app.nil?
+        puts "Create bundle id #{bundle_id} in apple developer center..."
+        app = Spaceship::Portal.app.create!(bundle_id: bundle_id, name: bundle_id.gsub('.', ''))
+      else
+        puts "Find bundle id #{bundle_id} in apple developer center..."
+      end
+
+      bundle_id_obj = Spaceship::ConnectAPI::BundleId.find(bundle_id)
+
+      # 配置 Game Center
+      if !bundle_id_obj.nil?
+        if !setting_array.nil? && setting_array.to_s.include?("game_center")
+          puts "Enable #{bundle_id} game_center on"
+          bundle_id_obj.update_capability("GAME_CENTER", enabled: true)
+        else
+          puts "Enable #{bundle_id} game_center off"
+          bundle_id_obj.update_capability("GAME_CENTER", enabled: false)
+        end
+      end
+
+      return nil if setting_array.nil? || setting_array.length == 0
+
+      # 配置 Push Notification
+      if !app.nil? && setting_array.to_s.include?("push_notification")
+        puts "Enable #{bundle_id} push on"
+        app.update_service(Spaceship::Portal.app_service.push_notification.on)
+      else
+        app.update_service(Spaceship::Portal.app_service.push_notification.off)
+        puts "Enable #{bundle_id} push off"
+      end
+
+      # 配置 Siri
+      if !app.nil? && setting_array.to_s.include?("siri")
+        puts "Enable #{bundle_id} siri on"
+        app.update_service(Spaceship::Portal.app_service.siri_kit.on)
+      else
+        app.update_service(Spaceship::Portal.app_service.siri_kit.off)
+        puts "Enable #{bundle_id} siri off"
+      end
+
+      # 配置 Sign with Apple
+      if !bundle_id_obj.nil? && setting_array.to_s.include?("apple_signin")
+        puts "Enable #{bundle_id} Sign with Apple on"
+        settings = build_settings_for(settings_key: "APPLE_ID_AUTH_APP_CONSENT", options_key: "PRIMARY_APP_CONSENT")
+        bundle_id_obj.update_capability("APPLE_ID_AUTH", enabled: true, settings: settings)
+      else
+        puts "Enable #{bundle_id} Sign with Apple off"
+        bundle_id_obj.update_capability("APPLE_ID_AUTH", enabled: false)
+      end
+
+      # 配置 App Group
+      if !app_group.nil? && setting_array.to_s.include?("app_group")
+        puts "Enable #{bundle_id} group on"
+        app.update_service(Spaceship::Portal.app_service.app_group.on)
+        app.associate_groups([app_group])
+      else
+        puts "Enable #{bundle_id} group off"
+        app.update_service(Spaceship::Portal.app_service.app_group.off)
+      end
+
+      # 配置 iCloud
+      if !app_icloud.nil? && setting_array.to_s.include?("iclound")
+        puts "Enable #{bundle_id} icloud on"
+        app.update_service(Spaceship::Portal.app_service.cloud.on)
+        app.update_service(Spaceship::Portal.app_service.cloud_kit.cloud_kit)
+        app.associate_cloud_containers([app_icloud])
+      else
+        puts "Enable #{bundle_id} icloud off"
+        app.update_service(Spaceship::Portal.app_service.cloud.off)
+      end
+
+      app
+    end
+
+    # 创建 App Group
+    # @param group_id [String] Group ID
+    # @return [Object] App Group 对象
+    def self.create_group_id(group_id:)
+      return nil if group_id.nil?
+
+      app_group = Spaceship::Portal.app_group.find(group_id)
+
+      if app_group.nil?
+        puts "Create group_id #{group_id} in apple developer center..."
+        app_group = Spaceship::Portal.app_group.create!(group_id: group_id, name: group_id.gsub('.', ''))
+      else
+        puts "Group_id #{group_id} is existed in apple developer center !!!"
+      end
+
+      app_group
+    end
+
+    # 创建 iCloud Container
+    # @param icloud_id [String] iCloud ID
+    # @return [Object] iCloud Container 对象
+    def self.create_icloud_id(icloud_id:)
+      return nil if icloud_id.nil?
+
+      puts "icloud_id +++++ #{icloud_id}"
+      app_icloud = Spaceship::Portal.cloud_container.find(icloud_id)
+
+      if app_icloud.nil?
+        puts "Create icloud_id #{icloud_id} in apple developer center..."
+        app_icloud = Spaceship::Portal.cloud_container.create!(identifier: icloud_id, name: icloud_id.gsub('.', ''))
+      else
+        puts "icloud_id #{icloud_id} is existed in apple developer center !!!"
+      end
+
+      app_icloud
+    end
+
+    # 构建设置
+    # @param settings_key [String] 设置键
+    # @param options_key [String] 选项键
+    # @return [Array] 设置数组
+    def self.build_settings_for(settings_key:, options_key:)
+      [{
+        key: settings_key,
+        options: [{
+          key: options_key
+        }]
+      }]
+    end
+
+    # 创建扩展的 Bundle ID
+    # @param app [Object] 主应用对象
+    # @param app_group [Object] App Group 对象
+    # @param app_icloud [Object] iCloud Container 对象
+    # @param config_info [Hash] 配置信息
+    def self.create_extension_bundleids(app, app_group, app_icloud, config_info)
+      return if app.nil?
+
+      # Push Content Extension
+      if !config_info[:bundle_id_pushcontent].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_pushcontent],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["push_notification"]
+        )
+      end
+
+      # Push Service Extension
+      if !config_info[:bundle_id_pushservice].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_pushservice],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["push_notification"]
+        )
+      end
+
+      # Keyboard Extension
+      if !config_info[:bundle_id_keyboard].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_keyboard],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["app_group"]
+        )
+      end
+
+      # iMessage Extension
+      if !config_info[:bundle_id_imessage].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_imessage],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["app_group"]
+        )
+      end
+
+      # Siri Extension
+      if !config_info[:bundle_id_siri].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_siri],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["app_group", "siri"]
+        )
+      end
+
+      # Siri UI Extension
+      if !config_info[:bundle_id_siriui].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_siriui],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["app_group", "siri"]
+        )
+      end
+
+      # Widget Extension
+      if !config_info[:bundle_id_widget].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_widget],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["app_group"]
+        )
+      end
+
+      # General Extension
+      if !config_info[:bundle_id_extension].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_extension],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["app_group"]
+        )
+      end
+
+      # Ad Extension
+      if !config_info[:bundle_id_extensionad].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_extensionad],
+          app_group: app_group,
+          app_icloud: app_icloud,
+          setting_array: ["app_group"]
+        )
+      end
+
+      # Watch App
+      if !config_info[:bundle_id_watchapp].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_watchapp],
+          app_group: nil,
+          app_icloud: app_icloud,
+          setting_array: ["push_notification"]
+        )
+      end
+
+      # Watch App Extension
+      if !config_info[:bundle_id_watchapp_extension].nil?
+        create_bundleid(
+          bundle_id: config_info[:bundle_id_watchapp_extension],
+          app_group: nil,
+          app_icloud: app_icloud,
+          setting_array: ["push_notification"]
+        )
+      end
+    end
+
+  end
+end

data/lib/pindo/module/appstore/itcapp_helper.rb

@@ -0,0 +1,228 @@
+require 'spaceship'
+require 'json'
+require 'highline/import'
+
+module Pindo
+  # iTunes Connect App 管理辅助类
+  # 负责在 App Store Connect 中创建和管理应用
+  class ItcAppHelper
+
+    # 从配置文件中提取所有必要的信息
+    # @param config_json [Hash] 配置 JSON 对象
+    # @return [Hash] 提取的配置信息
+    def self.extract_config_info(config_json)
+      config_info = {}
+
+      # 提取 Apple ID
+      if config_json['account_info'] && config_json['account_info']['apple_acount_id']
+        config_info[:apple_id] = config_json['account_info']['apple_acount_id']
+      end
+
+      # 提取 Company Name
+      if config_json['account_info'] && config_json['account_info']['acount_company_name']
+        config_info[:company_name] = config_json['account_info']['acount_company_name'].strip
+      end
+
+      # 提取 Bundle ID
+      if config_json['app_info'] && config_json['app_info']['app_identifier']
+        config_info[:bundle_id] = config_json['app_info']['app_identifier']
+      end
+
+      # 提取版本号
+      if config_json['app_info'] && config_json['app_info']['app_version']
+        config_info[:app_version] = config_json['app_info']['app_version']
+      else
+        config_info[:app_version] = "1.0.0"  # 默认版本
+      end
+
+      config_info
+    end
+
+    # 执行 iTunes Connect App 创建流程
+    # @param config_json [Hash] 配置 JSON 对象
+    # @param config_path [String] 配置文件路径
+    # @param app_version [String, nil] 应用版本号
+    # @param company_name [String, nil] 公司名称
+    def self.execute_itcapp_creation(config_json:, config_path:, app_version: nil, company_name: nil)
+      # 提取配置信息
+      config_info = extract_config_info(config_json)
+
+      # 使用命令行参数覆盖配置
+      config_info[:app_version] = app_version if app_version
+      config_info[:company_name] = company_name if company_name
+
+      # 验证必需字段
+      raise "配置文件中缺少 Apple ID" if config_info[:apple_id].nil? || config_info[:apple_id].empty?
+      raise "配置文件中缺少 Bundle ID" if config_info[:bundle_id].nil? || config_info[:bundle_id].empty?
+
+      # 确保 Bundle ID 在开发者中心存在
+      ensure_bundle_id_exists(
+        apple_id: config_info[:apple_id],
+        bundle_id: config_info[:bundle_id],
+        config_path: config_path
+      )
+
+      # 创建 iTunes Connect App
+      puts "Create app in itc ..."
+      puts config_info[:apple_id]
+      puts "Login #{config_info[:apple_id]}..."
+
+      Spaceship::Tunes.login(config_info[:apple_id].to_s)
+      Spaceship::Tunes.select_team
+
+      app = create_itcapp(
+        bundle_id: config_info[:bundle_id],
+        app_version: config_info[:app_version],
+        company_name: config_info[:company_name]
+      )
+
+      # 修改配置文件，添加 App ID
+      if app
+        modify_appconfig_with_appid(
+          config_path: config_path,
+          bundle_id: config_info[:bundle_id],
+          app: app
+        )
+      end
+
+      app
+    end
+
+    # 确保 Bundle ID 在开发者中心存在
+    # @param apple_id [String] Apple ID
+    # @param bundle_id [String] Bundle ID
+    # @param config_path [String] 配置文件路径
+    def self.ensure_bundle_id_exists(apple_id:, bundle_id:, config_path:)
+      Spaceship::Portal.login(apple_id.to_s)
+      Spaceship::Portal.select_team
+
+      app = Spaceship::Portal.app.find(bundle_id)
+      if app.nil?
+        puts "Bundle ID #{bundle_id} 不存在，需要先创建"
+        puts "请先运行: pindo appstore bundleid #{config_path}"
+        raise "Bundle ID #{bundle_id} 不存在于 Apple 开发者中心"
+      end
+    end
+
+    # 创建 iTunes Connect App
+    # @param bundle_id [String] Bundle ID
+    # @param app_version [String] 应用版本号
+    # @param company_name [String, nil] 公司名称
+    # @return [Object] 创建的 App 对象
+    def self.create_itcapp(bundle_id:, app_version:, company_name: nil)
+      return nil if bundle_id.nil?
+
+      # 检查 App 是否已存在
+      app = Spaceship::ConnectAPI::App.find(bundle_id)
+      if app
+        puts "App is already exist !!!"
+        return app
+      end
+
+      # 生成默认 SKU ID
+      app_sku_id_fixed = bundle_id + ".sku"
+      puts "App的默认sku id 为: #{app_sku_id_fixed}"
+
+      # 让用户自定义 SKU ID
+      input_skuid = ask("请自定义输入App Sku ID: ") || nil
+      if !input_skuid.nil? && input_skuid.length > 1
+        app_sku_id_fixed = input_skuid
+      end
+
+      # 获取公司名称
+      if company_name.nil?
+        company_name = ask('Company Name : ') || nil
+      end
+
+      puts "App Sku ID   : #{app_sku_id_fixed}"
+      puts "Company Name : #{company_name}"
+
+      # 确认信息
+      answer = agree("请确认上面信息是否正确(Y/n）:")
+      unless answer
+        raise "用户取消创建，请重新运行命令"
+      end
+
+      # 生成 App 名称（移除点号，最多30个字符）
+      app_default_name = bundle_id.gsub('.', '')
+      if app_default_name.length > 30
+        app_default_name = app_default_name[0, 30]
+      end
+
+      # 创建 App
+      app = Spaceship::ConnectAPI::App.create(
+        name: app_default_name,
+        version_string: app_version,
+        sku: app_sku_id_fixed,
+        primary_locale: "en-US",
+        bundle_id: bundle_id,
+        platforms: ["IOS"],
+        company_name: company_name
+      )
+
+      puts "App is created !!!"
+      app
+    end
+
+    # 修改配置文件，添加 App ID
+    # @param config_path [String] 配置文件路径
+    # @param bundle_id [String] Bundle ID
+    # @param app [Object] App 对象
+    def self.modify_appconfig_with_appid(config_path:, bundle_id:, app:)
+      return if app.nil?
+
+      puts
+      puts "app.id : #{app.id} +++++++++"
+      puts
+
+      # 修改本地配置文件
+      modify_appconfig_file(config_file: config_path, app_info_detail: app)
+
+      # 修改远程配置仓库
+      begin
+        require_relative '../../base/githelper'
+        include Pindo::Githelper
+
+        app_config_dir = clong_buildconfig_repo(repo_name: bundle_id)
+        app_config_file = File.join(app_config_dir, "config.json")
+
+        if File.exist?(app_config_file)
+          modify_appconfig_file(config_file: app_config_file, app_info_detail: app)
+          prepare_gitenv()
+          git_addpush_repo(path: app_config_dir, message: "modify apple id")
+        end
+      rescue StandardError => e
+        puts "更新远程配置仓库失败: #{e.message}"
+      end
+    end
+
+    # 修改单个配置文件
+    # @param config_file [String] 配置文件路径
+    # @param app_info_detail [Object] App 信息对象
+    def self.modify_appconfig_file(config_file:, app_info_detail:)
+      return unless File.exist?(config_file)
+
+      config_content = JSON.parse(File.read(config_file))
+
+      File.open(config_file, "w") do |f|
+        # 更新 app_id_ios
+        config_content['app_info']['app_id_ios'] = app_info_detail.id
+
+        # 更新 apple_app_id（如果存在）
+        if config_content['app_setting'] && config_content['app_setting']["apple_app_id"]
+          config_content['app_setting']["apple_app_id"] = app_info_detail.id
+        end
+
+        # 更新 kGUKeyAppId（如果存在）
+        if config_content['app_setting'] && config_content['app_setting']["kGUKeyAppId"]
+          config_content['app_setting']["kGUKeyAppId"] = app_info_detail.id
+        end
+
+        f.write(JSON.pretty_generate(config_content))
+      end
+
+      puts "✓ 配置文件已更新: #{config_file}"
+    end
+
+  end
+end

data/lib/pindo/module/build/build_helper.rb

@@ -196,6 +196,18 @@ module Pindo
             nil
           end
         end
+
+        # 拉取应用配置仓库（委托给 BuildInfoManager）
+        # @param repo_name [String] 仓库名称（Bundle ID）
+        # @param target_dir [String, nil] 目标目录（默认：当前目录）
+        # @return [Boolean] 是否成功拉取配置
+        def pull_appconfig_with_reponame(repo_name:, target_dir: nil)
+          require_relative '../../config/build_info_manager'
+          Pindo::BuildInfoManager.share_instance.pull_appconfig_with_reponame(
+            repo_name: repo_name,
+            target_dir: target_dir
+          )
+        end
       end
 
 end