pindo 5.12.2 → 5.13.2

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

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

@@ -5,10 +5,9 @@ require 'highline'
 
 module Pindo
     class Command
-        class Deploy < Command
-            class Updateconfig < Deploy
-                
-                include Command::DeployOptions
+        class Utils < Command
+            class Updateconfig < Utils
+
                 include Hashhelper
                 include Appselect
 
@@ -22,9 +21,9 @@ module Pindo
     - 保留用户自定义配置的同时更新模板结构
 
 使用示例:
-    pindo deploy updateconfig path/to/config.json
-    pindo deploy updateconfig ./config.json
-    pindo deploy updateconfig config.json
+    pindo utils updateconfig path/to/config.json
+    pindo utils updateconfig ./config.json
+    pindo utils updateconfig config.json
                 DESC
         
                 self.arguments = [

data/lib/pindo/command/utils.rb

@@ -10,6 +10,8 @@ require 'pindo/command/utils/renewcert'
 require 'pindo/command/utils/repoinit'
 require 'pindo/command/utils/feishu'
 require 'pindo/command/utils/tag'
+require 'pindo/command/utils/updateconfig'
+require 'pindo/command/utils/fabric'
 
 
 module Pindo

data/lib/pindo/command/web/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
@@ -234,7 +234,7 @@ module Pindo
                     if @args_upload_flag
                       # WebGL 输出路径: GoodPlatform/WebGL/build
                       webgl_build_path = File.join(config[:project_path], 'GoodPlatform', 'WebGL', 'build')
-                      upload_task = Pindo::TaskSystem::UploadTask.new(
+                      upload_task = Pindo::TaskSystem::JPSUploadTask.new(
                         'html',
                         webgl_build_path,
                         nil,

data/lib/pindo/command.rb

@@ -28,16 +28,15 @@ module Pindo
 
         require "fastlane"
         require "match"
-        require 'pindo/options/deployoptions'
+        require 'pindo/options/options'
         require 'pindo/module/appselect'
         require 'pindo/module/build/confuse_xcodeproj'
-        require 'pindo/module/cert/xcodecerthelper'
+        require 'pindo/module/cert/xcode_cert_helper'
         
         require 'pindo/module/appstore/appstore_in_app_purchase'
         require 'pindo/module/appstore/appstore_metadata_fastlane_helper'
         require 'pindo/module/appstore/appstore_metadata_connect_api_helper'
 
-        require 'pindo/command/deploy'
         require 'pindo/command/env'
         require 'pindo/command/utils'
         require 'pindo/command/jps'
@@ -65,6 +64,34 @@ module Pindo
         # 注意：缓存组的定义已经移至 PindoContext#get_command_group 中统一管理
         # 使用命令名作为组名，如 ios:autobuild, and:autobuild, web:autobuild
 
+        # 自动推导命令名称
+        # @return [String] 命令名称，例如：Pindo::Command::Ios::Autobuild → 'ios:autobuild'
+        def self.command_name
+          @command_name ||= begin
+            # 从类名推导，例如：
+            # Pindo::Command::Ios::Autobuild → ['Ios', 'Autobuild'] → 'ios:autobuild'
+            parts = name.split('::').drop(2)  # 去掉 'Pindo' 和 'Command'
+            parts.map(&:downcase).join(':')
+          end
+        end
+
+        # 初始化参数（便捷方法）
+        # @param argv [CLAide::ARGV] 命令行参数
+        # @param command_name [String, nil] 命令名称（可选，默认自动推导）
+        # @param directory [String, nil] 工作目录（可选，默认当前目录）
+        # @param enable_cache [Boolean, nil] 是否启用缓存（可选，默认使用 use_cache?）
+        # @return [OptionConfiguration] 参数配置对象
+        def initialize_options(argv, command_name: nil, directory: nil, enable_cache: nil)
+          Pindo::Options::OptionInitializer.initialize(
+            self,
+            argv,
+            self.class.option_items,
+            command_name || self.class.command_name,
+            directory: directory,
+            enable_cache: enable_cache.nil? ? self.class.use_cache? : enable_cache
+          )
+        end
+
 
         DEFAULT_ROOT_OPTIONS = [
           ['--version', '查看pindo版本'],

data/lib/pindo/config/build_info_manager.rb

@@ -0,0 +1,176 @@
+require 'singleton'
+require 'fileutils'
+require 'pindo/base/githelper'
+
+module Pindo
+
+  # 构建信息管理器
+  # 负责管理应用配置仓库的拉取、更新等操作
+  class BuildInfoManager
+    include Singleton
+    include Pindo::Githelper
+
+    class << self
+      def share_instance
+        instance
+      end
+    end
+
+    # 拉取应用配置仓库
+    # @param repo_name [String] 仓库名称（Bundle ID）
+    # @param target_dir [String, nil] 目标目录（默认：当前目录）
+    # @return [Boolean] 是否成功拉取配置
+    def pull_appconfig_with_reponame(repo_name:, target_dir: nil)
+      return false if repo_name.nil? || repo_name.empty?
+
+      # 规范化仓库名称：去除尾部的 .* （通配符转换）
+      normalized_repo_name = repo_name.end_with?('.*') ? repo_name.chomp('.*') : repo_name
+
+      # 获取配置仓库目录
+      begin
+        app_config_dir = clong_buildconfig_repo(repo_name: normalized_repo_name)
+      rescue StandardError => e
+        puts "拉取配置仓库失败: #{e.message}"
+        return false
+      end
+
+      # 确定目标目录
+      target_dir ||= Dir.pwd
+
+      # 如果配置仓库目录与目标目录不同，且存在 config.json，则复制
+      if !app_config_dir.eql?(target_dir) && File.exist?(File.join(app_config_dir, 'config.json'))
+        begin
+          FileUtils.cp_r(File.join(app_config_dir, "config.json"), target_dir)
+          puts "✓ 配置文件已复制到: #{target_dir}"
+          return true
+        rescue StandardError => e
+          puts "复制配置文件失败: #{e.message}"
+          return false
+        end
+      elsif app_config_dir.eql?(target_dir)
+        puts "✓ 配置文件已存在于目标目录"
+        return true
+      else
+        puts "⚠ 配置仓库中未找到 config.json"
+        return false
+      end
+    end
+
+    # 创建应用配置仓库
+    # @param bundle_id [String] Bundle ID（作为仓库名称）
+    # @param test_flag [Boolean] 是否为测试环境（默认：false）
+    # @return [String, nil] 成功返回配置仓库目录路径，失败返回 nil
+    def create_appconfig_with_bundleid(bundle_id:, test_flag: false)
+      return nil if bundle_id.nil? || bundle_id.empty?
+
+      require_relative '../client/giteeclient'
+
+      # 获取 Gitee 客户端
+      gitee_client = GiteeClient.new(access_token: pindo_single_config.gitee_api_key)
+
+      # 获取模板配置仓库目录
+      demo_dir = clong_buildconfig_repo(repo_name: pindo_single_config.demo_bundle_id)
+
+      # 确定仓库公开类型和所有者组织
+      public_type = 0
+      owner_org = pindo_single_config.build_deploy_org
+      repo_name = bundle_id
+
+      if test_flag
+        owner_org = pindo_single_config.build_test_org
+        public_type = 2
+      end
+
+      # 创建 Gitee 仓库
+      success = gitee_client.gitee_create_repo(
+        owner: owner_org,
+        repo_name: repo_name,
+        public_type: public_type
+      )
+
+      if success
+        # 如果是测试环境，修改仓库设置
+        if test_flag
+          modify_repo_setting(repo_name: repo_name, owner_org: owner_org)
+        end
+
+        # 克隆配置仓库
+        app_config_dir = clong_buildconfig_repo(repo_name: repo_name)
+        system "open #{app_config_dir}"
+
+        if File.exist?(app_config_dir)
+          # 从模板仓库复制配置文件
+          update_appconfig_repo(
+            bundle_id: bundle_id,
+            demo_dir: demo_dir,
+            app_config_dir: app_config_dir
+          )
+          puts "✓ 配置仓库创建成功: #{app_config_dir}"
+          return app_config_dir
+        else
+          puts "❌ 创建应用配置仓库失败"
+          return nil
+        end
+      else
+        # 仓库已存在，直接打开
+        app_config_dir = clong_buildconfig_repo(repo_name: repo_name)
+        system "open #{app_config_dir}"
+        puts "⚠ 配置仓库已存在: #{app_config_dir}"
+        return app_config_dir
+      end
+    end
+
+    private
+
+    # 修改仓库设置（测试环境）
+    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
+      git_repo_json = JSON.parse(File.read(git_repo_file))
+      git_repo_json ||= {}
+
+      if git_repo_json
+        git_repo_json[repo_name] = owner_org
+      end
+
+      File.open(git_repo_file, "w") do |f|
+        f.write(JSON.pretty_generate(git_repo_json))
+      end
+
+      git_addpush_repo(path: pindo_setting_dir, message: "add #{repo_name}")
+    end
+
+    # 更新应用配置仓库（从模板复制）
+    def update_appconfig_repo(bundle_id:, demo_dir:, app_config_dir:)
+      return unless File.exist?(demo_dir)
+
+      # 复制 config.json
+      if File.exist?(File.join(demo_dir, "config.json"))
+        FileUtils.cp_r(File.join(demo_dir, "config.json"), app_config_dir)
+      end
+
+      # 复制 fastlane 目录
+      if File.exist?(File.join(demo_dir, "fastlane"))
+        FileUtils.cp_r(File.join(demo_dir, "fastlane"), app_config_dir)
+      end
+
+      # 复制 launch 目录
+      if File.exist?(File.join(demo_dir, "launch"))
+        FileUtils.cp_r(File.join(demo_dir, "launch"), app_config_dir)
+      end
+
+      # 替换 config.json 中的 Bundle ID
+      config_file = File.join(app_config_dir, "config.json")
+      if File.exist?(config_file)
+        text = File.read(config_file)
+        demo_bundle_id = pindo_single_config.demo_bundle_id
+        new_contents = text.gsub(/#{demo_bundle_id}/, bundle_id)
+        File.open(config_file, "w") { |file| file.puts new_contents }
+      end
+
+      # 提交并推送到远程仓库
+      git_addpush_repo(path: app_config_dir, message: "init app config")
+    end
+  end
+
+end

data/lib/pindo/config/ios_config_parser.rb

@@ -0,0 +1,404 @@
+require 'singleton'
+require 'json'
+
+module Pindo
+  # iOS 配置解析器（单例模式）
+  # 专门用于解析和处理 iOS 项目的 config.json 配置文件
+  #
+  # 使用示例:
+  #   parser = Pindo::IosConfigParser.instance
+  #   parser.load_config(config_file: 'path/to/config.json')
+  #
+  #   # 获取 Apple ID
+  #   apple_id = parser.apple_id
+  #
+  #   # 获取 Bundle ID 映射
+  #   bundle_id_map = parser.get_bundle_id_map
+  #
+  #   # 命令行参数覆盖
+  #   parser.override_apple_id('custom@apple.com')
+  #   parser.override_bundle_id('com.example.app')
+  class IosConfigParser
+    include Singleton
+
+    attr_reader :config_file_path, :config_json
+
+    def initialize
+      @config_file_path = nil
+      @config_json = nil
+      @config_data = {}
+      @overrides = {}
+    end
+
+    # 加载配置文件
+    # @param config_file [String] config.json 文件路径
+    # @raise [StandardError] 文件不存在或格式错误
+    def load_config(config_file:)
+      unless File.exist?(config_file)
+        raise "配置文件不存在: #{config_file}"
+      end
+
+      @config_file_path = File.expand_path(config_file)
+
+      begin
+        @config_json = JSON.parse(File.read(@config_file_path))
+      rescue JSON::ParserError => e
+        raise "配置文件格式错误: #{e.message}"
+      end
+
+      # 解析配置
+      parse_config_data
+
+      # 检查配置版本
+      check_config_version
+
+      self
+    end
+
+    # 重新加载配置文件
+    def reload
+      return unless @config_file_path
+      load_config(config_file: @config_file_path)
+    end
+
+    # 清除所有配置和覆盖
+    def clear
+      @config_file_path = nil
+      @config_json = nil
+      @config_data = {}
+      @overrides = {}
+    end
+
+    # ==================== 账号信息 ====================
+
+    # 获取 Apple ID
+    # @return [String, nil] Apple 账号 ID
+    def apple_id
+      @overrides[:apple_id] || @config_data[:apple_id]
+    end
+
+    # 覆盖 Apple ID（命令行参数）
+    # @param value [String] Apple ID
+    def override_apple_id(value)
+      @overrides[:apple_id] = value if value && !value.empty?
+    end
+
+    # 获取公司名称
+    # @return [String, nil] 公司名称
+    def company_name
+      @overrides[:company_name] || @config_data[:company_name]
+    end
+
+    # 覆盖公司名称
+    # @param value [String] 公司名称
+    def override_company_name(value)
+      @overrides[:company_name] = value if value && !value.empty?
+    end
+
+    # ==================== Bundle ID 信息 ====================
+
+    # 获取主应用 Bundle ID
+    # @return [String, nil] Bundle ID
+    def bundle_id
+      @overrides[:bundle_id] || @config_data[:bundle_id]
+    end
+
+    # 覆盖主应用 Bundle ID（命令行参数）
+    # @param value [String] Bundle ID
+    def override_bundle_id(value)
+      @overrides[:bundle_id] = value if value && !value.empty?
+    end
+
+    # 获取 Push Content Extension Bundle ID
+    # @return [String, nil]
+    def bundle_id_pushcontent
+      @config_data[:bundle_id_pushcontent]
+    end
+
+    # 获取 Push Service Extension Bundle ID
+    # @return [String, nil]
+    def bundle_id_pushservice
+      @config_data[:bundle_id_pushservice]
+    end
+
+    # 获取 Keyboard Extension Bundle ID
+    # @return [String, nil]
+    def bundle_id_keyboard
+      @config_data[:bundle_id_keyboard]
+    end
+
+    # 获取 iMessage Extension Bundle ID
+    # @return [String, nil]
+    def bundle_id_imessage
+      @config_data[:bundle_id_imessage]
+    end
+
+    # 获取通用 Extension Bundle ID
+    # @return [String, nil]
+    def bundle_id_extension
+      @config_data[:bundle_id_extension]
+    end
+
+    # 获取 Siri Extension Bundle ID
+    # @return [String, nil]
+    def bundle_id_siri
+      @config_data[:bundle_id_siri]
+    end
+
+    # 获取 Siri UI Extension Bundle ID
+    # @return [String, nil]
+    def bundle_id_siriui
+      @config_data[:bundle_id_siriui]
+    end
+
+    # 获取 Widget Extension Bundle ID
+    # @return [String, nil]
+    def bundle_id_widget
+      @config_data[:bundle_id_widget]
+    end
+
+    # 获取广告 Extension Bundle ID
+    # @return [String, nil]
+    def bundle_id_extensionad
+      @config_data[:bundle_id_extensionad]
+    end
+
+    # 获取 Porn Extension Bundle ID
+    # @return [String, nil]
+    def bundle_id_extensionporn
+      @config_data[:bundle_id_extensionporn]
+    end
+
+    # 获取 Watch App Bundle ID
+    # @return [String, nil]
+    def bundle_id_watchapp
+      @config_data[:bundle_id_watchapp]
+    end
+
+    # 获取 Watch App Extension Bundle ID
+    # @return [String, nil]
+    def bundle_id_watchapp_extension
+      @config_data[:bundle_id_watchapp_extension]
+    end
+
+    # 获取所有 Bundle ID 的映射
+    # @return [Hash] Bundle ID 映射，键为类型，值为 Bundle ID
+    # @example
+    #   {
+    #     "bundle_id" => "com.example.app",
+    #     "bundle_id_pushcontent" => "com.example.app.content",
+    #     "bundle_id_pushservice" => "com.example.app.service",
+    #     ...
+    #   }
+    def get_bundle_id_map
+      {
+        "bundle_id" => bundle_id,
+        "bundle_id_pushcontent" => bundle_id_pushcontent,
+        "bundle_id_pushservice" => bundle_id_pushservice,
+        "bundle_id_keyboard" => bundle_id_keyboard,
+        "bundle_id_imessage" => bundle_id_imessage,
+        "bundle_id_extension" => bundle_id_extension,
+        "bundle_id_siri" => bundle_id_siri,
+        "bundle_id_siriui" => bundle_id_siriui,
+        "bundle_id_widget" => bundle_id_widget,
+        "bundle_id_extensionad" => bundle_id_extensionad,
+        "bundle_id_extensionporn" => bundle_id_extensionporn,
+        "bundle_id_watchapp" => bundle_id_watchapp,
+        "bundle_id_watchapp_extension" => bundle_id_watchapp_extension
+      }.compact
+    end
+
+    # 获取 Bundle ID 数组（去除 nil 值）
+    # @return [Array<String>] Bundle ID 数组
+    def get_bundle_id_array
+      get_bundle_id_map.values
+    end
+
+    # ==================== App Group 和 iCloud ====================
+
+    # 获取 App Group ID
+    # @return [String, nil]
+    def group_id
+      @config_data[:group_id]
+    end
+
+    # 获取 iCloud Container ID
+    # @return [String, nil]
+    def icloud_id
+      @config_data[:icloud_id]
+    end
+
+    # ==================== 应用信息 ====================
+
+    # 获取应用名称
+    # @return [String, nil]
+    def app_name
+      @config_data[:app_name]
+    end
+
+    # 获取应用版本
+    # @return [String, nil]
+    def app_version
+      @config_data[:app_version]
+    end
+
+    # 获取 App ID (Apple Store Connect)
+    # @return [String, nil]
+    def app_id_ios
+      @config_data[:app_id_ios]
+    end
+
+    # ==================== 项目信息 ====================
+
+    # 获取项目名称
+    # @return [String, nil]
+    def project_name
+      @config_data[:project_name]
+    end
+
+    # 获取 Xcode 构建类型
+    # @return [String, nil]
+    def xcode_build_type
+      @config_data[:xcode_build_type]
+    end
+
+    # 获取 iOS 部署目标版本
+    # @return [String, nil]
+    def ios_deployment_target
+      @config_data[:ios_deployment_target]
+    end
+
+    # ==================== 配置验证 ====================
+
+    # 验证必需的配置项是否存在
+    # @param required_keys [Array<Symbol>] 必需的配置键
+    # @raise [StandardError] 缺少必需配置
+    def validate_required(*required_keys)
+      missing_keys = []
+
+      required_keys.each do |key|
+        value = send(key) rescue nil
+        missing_keys << key if value.nil? || (value.respond_to?(:empty?) && value.empty?)
+      end
+
+      unless missing_keys.empty?
+        raise "配置文件缺少必需项: #{missing_keys.join(', ')}"
+      end
+    end
+
+    # 检查配置是否已加载
+    # @return [Boolean]
+    def loaded?
+      !@config_json.nil?
+    end
+
+    # ==================== 调试和信息 ====================
+
+    # 打印所有配置信息（用于调试）
+    def print_config_info
+      puts "\n" + "=" * 80
+      puts "iOS 配置信息"
+      puts "=" * 80
+      puts "配置文件: #{@config_file_path}"
+      puts
+      puts "【账号信息】"
+      puts "  Apple ID: #{apple_id}"
+      puts "  Company Name: #{company_name}"
+      puts
+      puts "【应用信息】"
+      puts "  App Name: #{app_name}"
+      puts "  App Version: #{app_version}"
+      puts "  App ID (iOS): #{app_id_ios}"
+      puts
+      puts "【Bundle ID】"
+      puts "  Main App: #{bundle_id}"
+      get_bundle_id_map.each do |type, id|
+        next if type == "bundle_id"
+        puts "  #{type}: #{id}"
+      end
+      puts
+      puts "【App Group & iCloud】"
+      puts "  Group ID: #{group_id}"
+      puts "  iCloud ID: #{icloud_id}"
+      puts
+      puts "【项目信息】"
+      puts "  Project Name: #{project_name}"
+      puts "  Xcode Build Type: #{xcode_build_type}"
+      puts "  iOS Deployment Target: #{ios_deployment_target}"
+      puts "=" * 80
+      puts
+    end
+
+    private
+
+    # 解析配置数据
+    def parse_config_data
+      return unless @config_json
+
+      # 解析账号信息
+      if @config_json['account_info']
+        account_info = @config_json['account_info']
+        @config_data[:apple_id] = account_info['apple_acount_id']
+        @config_data[:company_name] = account_info['acount_company_name']
+      end
+
+      # 解析应用信息
+      if @config_json['app_info']
+        app_info = @config_json['app_info']
+        @config_data[:bundle_id] = app_info['app_identifier']
+        @config_data[:bundle_id_pushcontent] = app_info['app_identifier_pushcontent']
+        @config_data[:bundle_id_pushservice] = app_info['app_identifier_pushservice']
+        @config_data[:bundle_id_keyboard] = app_info['app_identifier_keyboard']
+        @config_data[:bundle_id_imessage] = app_info['app_identifier_imessage']
+        @config_data[:bundle_id_extension] = app_info['app_identifier_extension']
+        @config_data[:bundle_id_siri] = app_info['app_identifier_siri']
+        @config_data[:bundle_id_siriui] = app_info['app_identifier_siriui']
+        @config_data[:bundle_id_widget] = app_info['app_identifier_widget']
+        @config_data[:bundle_id_extensionad] = app_info['app_identifier_extensionad']
+        @config_data[:bundle_id_extensionporn] = app_info['app_identifier_extensionporn']
+        @config_data[:bundle_id_watchapp] = app_info['app_identifier_watchapp']
+        @config_data[:bundle_id_watchapp_extension] = app_info['app_identifier_watchapp_extension']
+
+        @config_data[:app_name] = app_info['app_name']
+        @config_data[:app_version] = app_info['app_version']
+        @config_data[:app_id_ios] = app_info['app_id_ios']
+      end
+
+      # 解析 App Setting
+      if @config_json['app_setting']
+        app_setting = @config_json['app_setting']
+        @config_data[:group_id] = app_setting['app_group_id']
+        @config_data[:icloud_id] = app_setting['app_icloud_id']
+      end
+
+      # 解析项目信息
+      if @config_json['project_info']
+        project_info = @config_json['project_info']
+        @config_data[:project_name] = project_info['project_name']
+        @config_data[:xcode_build_type] = project_info['xcode_build_type']
+        @config_data[:ios_deployment_target] = project_info['ios_deployment_targe'] # 注意：原配置中是 targe 而不是 target
+      end
+    end
+
+    # 检查配置版本
+    def check_config_version
+      return unless @config_json
+      return unless @config_json['app_info']
+      return unless @config_json['app_info']['app_config_version']
+
+      require_relative '../base/funlog'
+
+      remote_version = @config_json['app_info']['app_config_version'].to_s
+      project_dir = File.dirname(@config_file_path)
+      local_version_file = File.join(project_dir, ".app_config_version")
+
+      if File.exist?(local_version_file)
+        local_version = File.read(local_version_file).strip
+        if local_version != remote_version
+          Funlog.instance.fancyinfo_warning("配置版本不匹配！本地: #{local_version}, 远程: #{remote_version}")
+        end
+      end
+    end
+
+  end
+end