pindo 5.13.1 → 5.13.3

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

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