pindo 5.13.1 → 5.13.2

data/lib/pindo/module/task/model/jps_resign_task.rb

@@ -0,0 +1,185 @@
+require_relative '../pindo_task'
+require_relative '../task_config'
+require 'pindo/module/pgyer/pgyerhelper'
+
+module Pindo
+  module TaskSystem
+    # JPS 重签名任务
+    # 从 JPS 平台下载应用并使用指定证书重签名
+    class JPSResignTask < PindoTask
+      attr_reader :app_info_obj, :version_info, :cert_id, :send_flag
+
+      def self.task_type
+        :jps_resign
+      end
+
+      # 重试配置
+      def self.default_retry_mode
+        RetryMode::DELAYED  # 延迟重试
+      end
+
+      def self.default_retry_count
+        2  # 默认可以重试 2 次
+      end
+
+      def self.default_retry_delay
+        10  # 默认延迟 10 秒
+      end
+
+      # 初始化 JPS 重签名任务
+      # @param options [Hash] 选项
+      # @option options [Hash] :app_info_obj JPS 应用信息对象（可选，如为 nil 则延迟获取）
+      # @option options [String] :project_name 项目名称（可选）
+      # @option options [String] :cert_id 重签名使用的 Bundle ID（可选，nil 表示交互选择）
+      # @option options [Boolean] :send_flag 是否发送到测试群（默认 false，始终会发送给自己）
+      def initialize(options = {})
+        @app_info_obj = options[:app_info_obj]
+        @project_name = options[:project_name]
+        @cert_id = options[:cert_id]
+        @send_flag = options[:send_flag] || false
+        @version_info = nil
+
+        # 设置重签名任务的优先级为 LOW，确保在上传任务之后执行
+        options[:priority] ||= TaskPriority::LOW
+
+        super("JPS 重签名", options)
+      end
+
+      def validate
+        # app_info_obj 可以延迟获取，不在这里验证
+        true
+      end
+
+      protected
+
+      def do_work
+        pgyer_helper = PgyerHelper.share_instace
+
+        # 1. 如果没有 app_info_obj，延迟获取
+        if @app_info_obj.nil?
+          fetch_jps_config
+        end
+
+        # 2. 获取要重签名的版本
+        @version_info = pgyer_helper.get_versioon_history_item(
+          app_info_obj: @app_info_obj,
+          list_select_flat: false
+        )
+
+        if @version_info.nil?
+          @retry_count = 0  # 没有版本记录时不重试
+          raise "没有找到上传记录"
+        end
+
+        # 3. 获取证书列表
+        cert_list = pgyer_helper.get_cert_list
+
+        if cert_list.nil? || cert_list.empty?
+          @retry_count = 0  # 没有证书时不重试
+          raise "没有找到可用的证书"
+        end
+
+        # 4. 选择证书
+        cert_item = select_certificate(cert_list)
+
+        if cert_item.nil?
+          @retry_count = 0  # 没有匹配的证书时不重试
+          raise "未找到匹配的证书"
+        end
+
+        # 5. 执行重签名
+        result = pgyer_helper.resign(
+          package_id: @version_info["id"],
+          cert_id: cert_item["id"]
+        )
+
+        unless result
+          raise "重签名失败"
+        end
+
+        # 6. 获取重签名后的版本信息
+        @version_info = pgyer_helper.get_versioon_history_item(
+          app_info_obj: @app_info_obj,
+          list_select_flat: false
+        )
+
+        if @version_info.nil?
+          raise "重签名成功但无法获取新版本信息"
+        end
+
+        # 7. 打印版本信息
+        pgyer_helper.print_app_version_info(
+          app_info_obj: @app_info_obj,
+          app_version_info_obj: @version_info
+        )
+
+        # 8. 发送消息给自己
+        pgyer_helper.send_apptest_msg(
+          app_info_obj: @app_info_obj,
+          app_version_info_obj: @version_info,
+          receiveType: "self"
+        )
+
+        # 9. 如果需要发送到测试群
+        if @send_flag
+          pgyer_helper.send_apptest_msg(
+            app_info_obj: @app_info_obj,
+            app_version_info_obj: @version_info,
+            chatEnv: "DevTest",
+            receiveType: "chat"
+          )
+        end
+
+        {
+          success: true,
+          version_info: @version_info,
+          cert_id: cert_item["mainBundleId"]
+        }
+      end
+
+      private
+
+      # 延迟获取 JPS 配置
+      def fetch_jps_config
+        puts "  获取 JPS 配置..."
+
+        # 获取当前工作目录
+        working_directory = Dir.pwd
+
+        # 调用 PgyerHelper 获取配置
+        @app_info_obj = PgyerHelper.share_instace.prepare_upload(
+          working_directory: working_directory,
+          proj_name: @project_name
+        )
+
+        unless @app_info_obj
+          raise "无法获取 JPS 配置"
+        end
+      end
+
+      # 选择证书
+      def select_certificate(cert_list)
+        if @cert_id.nil? && cert_list.size > 0
+          # 交互式选择证书
+          bundle_id_list = cert_list.map { |cert| [cert["certType"], cert["mainBundleId"]].join("_") }
+          cli = HighLine.new
+          selected = cli.choose do |menu|
+            menu.prompt = "请选择重签名的证书:"
+            menu.choices(*bundle_id_list)
+          end
+
+          # 根据选择找到对应的证书
+          cert_list.select { |certitem|
+            [certitem["certType"], certitem["mainBundleId"]].join("_") == selected
+          }.first
+        else
+          # 根据 cert_id 查找 adhoc 证书
+          cert_list.select { |certitem|
+            certitem["mainBundleId"] == @cert_id &&
+            certitem["certType"].downcase.include?("adhoc")
+          }.first
+        end
+      end
+    end
+  end
+end

data/lib/pindo/module/task/model/{upload_task.rb → jps_upload_task.rb}

@@ -4,9 +4,9 @@ require 'pindo/module/pgyer/pgyerhelper'
 
 module Pindo
   module TaskSystem
-    # 上传任务
-    # 上传构建产物到测试平台（JPS）
-    class UploadTask < PindoTask
+    # JPS 上传任务
+    # 上传构建产物到 JPS 测试平台
+    class JPSUploadTask < PindoTask
       attr_reader :file_type, :upload_path, :upload_file
 
       def self.task_type

data/lib/pindo/module/task/model/unity_export_task.rb

@@ -31,6 +31,7 @@ module Pindo
         @is_library_mode = false  # 不再支持库模式
         @index_count = options[:context] ? options[:context][:index_count] : nil
         @export_path = options[:export_path]  # 可由参数传入，nil 表示自动检测
+        @deploy_mode = options[:deploy_mode] || 'dev'  # 部署模式：dev/adhoc/release，默认 dev
 
         name = case platform
                when 'ios', 'ipa'
@@ -188,7 +189,8 @@ module Pindo
             project_path: @unity_project_path,
             platform: platform,
             isLibrary: @is_library_mode,
-            indexNo: @index_count
+            indexNo: @index_count,
+            deployMode: @deploy_mode
           )
 
           # 清理 Unity 进程

data/lib/pindo/module/unity/unity_helper.rb

@@ -422,7 +422,7 @@ module Pindo
         nil
       end
 
-      def build_project(unity_exe_full_path:nil, project_path:nil, platform: nil, isLibrary: false, indexNo: nil)
+      def build_project(unity_exe_full_path:nil, project_path:nil, platform: nil, isLibrary: false, indexNo: nil, deployMode: nil)
 
         # 检查是否有Unity进程在运行，传入Unity路径和项目路径以精确匹配
         check_unity_processes(unity_exe_full_path: unity_exe_full_path, project_path: project_path)
@@ -434,6 +434,7 @@ module Pindo
         additional_args[:platform] = platform if platform
         additional_args[:buildtype] = 'library' if isLibrary
         additional_args[:indexno] = indexNo if indexNo
+        additional_args[:deploymode] = deployMode || 'dev' if deployMode || true  # 默认为 dev
 
         # 使用GoodUnityBuild.BuildManager.BatchBuild进行构建
         result = execute_unity_command(unity_exe_full_path, project_path, additional_args)

data/lib/pindo/module/xcode/ipa_resign_helper.rb

@@ -0,0 +1,210 @@
+require 'fileutils'
+require 'sigh'
+require 'zip'
+require 'pindo/config/pindoconfig'
+
+module Pindo
+    class IpaResignHelper
+
+        class << self
+
+            # 重签名 IPA 文件的主入口方法
+            # @param ipa_file_path [String] IPA 文件路径（可选，如果为 nil 则自动查找当前目录下的 IPA）
+            # @param bundle_id [String] 新的 Bundle ID
+            # @return [String, nil] 重签名后的 IPA 文件路径，失败返回 nil
+            def resign_ipa(ipa_file_path: nil, bundle_id:)
+                ipa_path = find_ipa_file(ipa_file_path)
+
+                if ipa_path.nil? || ipa_path.empty?
+                    puts "未找到 IPA 文件"
+                    return nil
+                end
+
+                # 准备重签名的 IPA（修改 Bundle ID）
+                resigned_ipa_path = prepare_resign_ipa(ipa_name: ipa_path, bundle_id: bundle_id)
+
+                if resigned_ipa_path.nil?
+                    puts "准备重签名 IPA 失败"
+                    return nil
+                end
+
+                # 使用新证书签名
+                sign_ipa_with_new_cert(ipa_name: resigned_ipa_path, bundle_id: bundle_id)
+
+                resigned_ipa_path
+            end
+
+            private
+
+            # 查找 IPA 文件
+            # @param ipa_file_path [String, nil] 指定的 IPA 文件路径
+            # @return [String, nil] IPA 文件的完整路径
+            def find_ipa_file(ipa_file_path)
+                if ipa_file_path
+                    return File.expand_path(ipa_file_path)
+                end
+
+                # 自动查找当前目录下的 IPA 文件
+                current_dir = Dir.pwd
+                Dir.foreach(current_dir) do |file|
+                    if file =~ /(.*).ipa/
+                        return File.join(current_dir, file)
+                    end
+                end
+
+                nil
+            end
+
+            # 准备重签名的 IPA（修改 Bundle ID）
+            # @param ipa_name [String] 原始 IPA 文件路径
+            # @param bundle_id [String] 新的 Bundle ID
+            # @return [String, nil] 准备好的 IPA 文件路径
+            def prepare_resign_ipa(ipa_name:, bundle_id:)
+                ipa_base_name = File.basename(ipa_name, ".ipa")
+                ipa_dir = File.dirname(ipa_name)
+
+                resign_ipa_name = ipa_base_name + "_resigned.ipa"
+                resign_ipa_full_name = File.join(ipa_dir, resign_ipa_name)
+                FileUtils.cp_r(ipa_name, resign_ipa_full_name)
+                puts resign_ipa_full_name
+
+                tmp_time = "tmp_" + Time.now.strftime('%y%m%d_%H%M%S')
+                tmp_dir = File.join(ipa_dir, tmp_time)
+                FileUtils.mkdir(tmp_dir) unless File.exist?(tmp_dir)
+
+                # 解压 IPA
+                command = "unzip -q \"#{resign_ipa_full_name}\" -d #{tmp_dir}"
+                puts command
+                system command
+
+                payload_path = File.join(tmp_dir, "Payload")
+                if File.exist?(payload_path)
+                    FileUtils.rm_rf(resign_ipa_full_name)
+                end
+
+                # 查找 .app 目录
+                modify_content_path = ""
+                Dir.foreach(payload_path) do |file|
+                    if file =~ /(.*).app/
+                        modify_content_path = File.join(payload_path, file)
+                        break
+                    end
+                end
+
+                # 修改 Info.plist 中的 Bundle ID
+                modify_ipa_info_plist(modify_content_path: modify_content_path, bundle_id: bundle_id)
+
+                # 重新打包 IPA
+                current_dir = Dir.pwd
+                if File.exist?(payload_path)
+                    Dir.chdir(tmp_dir)
+                    command = "zip -qry \"#{resign_ipa_full_name}\" * "
+                    puts command
+                    system command
+                    Dir.chdir(current_dir)
+                end
+
+                # 清理临时目录
+                FileUtils.rm_rf(tmp_dir) if File.exist?(resign_ipa_full_name)
+
+                resign_ipa_full_name
+            end
+
+            # 修改 IPA 中的 Info.plist 文件
+            # @param modify_content_path [String] .app 目录路径
+            # @param bundle_id [String] 新的 Bundle ID
+            def modify_ipa_info_plist(modify_content_path:, bundle_id:)
+                main_info_plist = File.join(modify_content_path, "Info.plist")
+                puts main_info_plist
+
+                # 确保 PlistBuddy 可用
+                unless File.exist?("/usr/local/bin/PlistBuddy")
+                    command = 'ln -s /usr/libexec/PlistBuddy /usr/local/bin/PlistBuddy'
+                    system command
+                end
+
+                # 读取旧的 Bundle ID
+                old_bundle_id_command = '/usr/local/bin/PlistBuddy -c "Print :CFBundleIdentifier" ' + main_info_plist
+                puts old_bundle_id_command
+                old_bundle_id = ""
+                IO.popen(old_bundle_id_command) { |f| old_bundle_id = f.gets }
+                puts old_bundle_id
+
+                # 修改主应用的 Bundle ID
+                exchange_bundleid_command = '/usr/local/bin/PlistBuddy -c "Set :CFBundleIdentifier ' + bundle_id + '" ' + main_info_plist
+                puts exchange_bundleid_command
+                system exchange_bundleid_command
+
+                # 修改插件扩展的 Bundle ID
+                plugin_path = File.join(modify_content_path, "PlugIns")
+                if File.exist?(plugin_path)
+                    Dir.foreach(plugin_path) do |file|
+                        next unless file =~ /(.*).appex/
+
+                        appex_path = File.join(plugin_path, file)
+                        tmp_info_plist = File.join(appex_path, "Info.plist")
+
+                        old_bundle_id_command = '/usr/local/bin/PlistBuddy -c "Print :CFBundleIdentifier" ' + tmp_info_plist
+                        puts old_bundle_id_command
+                        old_plugin_bundle_id = ""
+                        IO.popen(old_bundle_id_command) { |f| old_plugin_bundle_id = f.gets }
+                        puts "old_bundle_id = #{old_plugin_bundle_id}"
+
+                        # 根据插件类型修改 Bundle ID
+                        update_plugin_bundle_id(tmp_info_plist, old_plugin_bundle_id, bundle_id)
+                    end
+                end
+            end
+
+            # 更新插件的 Bundle ID
+            # @param plist_path [String] 插件的 Info.plist 路径
+            # @param old_bundle_id [String] 旧的 Bundle ID
+            # @param new_base_bundle_id [String] 新的基础 Bundle ID
+            def update_plugin_bundle_id(plist_path, old_bundle_id, new_base_bundle_id)
+                plugin_types = [
+                    ".content", ".service", ".imessage", ".keyboard",
+                    ".siri", ".widget", ".siriui", ".extension",
+                    ".extensionad", ".extensionporn"
+                ]
+
+                plugin_types.each do |suffix|
+                    if old_bundle_id.include?(suffix)
+                        new_plugin_bundle_id = new_base_bundle_id + suffix
+                        exchange_bundleid_command = '/usr/local/bin/PlistBuddy -c "Set :CFBundleIdentifier ' + new_plugin_bundle_id + '" ' + plist_path
+                        puts exchange_bundleid_command
+                        system exchange_bundleid_command
+                        break
+                    end
+                end
+            end
+
+            # 使用新证书签名 IPA
+            # @param ipa_name [String] IPA 文件路径
+            # @param bundle_id [String] Bundle ID
+            def sign_ipa_with_new_cert(ipa_name:, bundle_id:)
+                require 'pindo/config/pindoconfig'
+
+                profil_info_array = Pindo::PindoSingleConfig.instance.get_cert_info
+                bundle_id_signing_identity = profil_info_array.first['signing_identity']
+
+                profile_dict = build_resign_profile_dict(profil_info_array: profil_info_array)
+
+                # 调用 Sigh::Resign 进行重签名
+                # resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path)
+                Sigh::Resign.resign(ipa_name, bundle_id_signing_identity, profile_dict, nil, nil, nil, nil, nil, bundle_id, true, nil)
+            end
+
+            # 构建重签名用的 profile 字典
+            # @param profil_info_array [Array<Hash>] 证书信息数组
+            # @return [Hash] Bundle ID 到 profile 路径的映射
+            def build_resign_profile_dict(profil_info_array:)
+                resign_dict = {}
+                profil_info_array.each do |profil_info|
+                    resign_dict[profil_info["bundle_id"]] = profil_info["profile_path"]
+                end
+                resign_dict
+            end
+
+        end
+    end
+end

data/lib/pindo/module/xcode/{xcodeappconfig.rb → xcode_app_config.rb}

@@ -209,5 +209,84 @@ module Pindo
             end
         end
 
+        # 创建发布 tag
+        # @param project_dir [String] 项目目录
+        # @param config_json [Hash] 配置 JSON
+        # @param bundle_id [String] Bundle ID
+        # @param delete_tag_name [String] 可选,要删除的 tag 名称
+        # @return [Boolean] 是否成功
+        def create_release_tag(project_dir:, config_json:, bundle_id:, delete_tag_name: nil)
+            require 'pindo/base/git_handler'
+            require 'pindo/config/pindoconfig'
+            require_relative '../../base/funlog'
+
+            begin
+                pindo_dir = File.expand_path(Pindo::PindoConfig.pindo_single_config.pindo_dir)
+                app_config_dir = File.join(pindo_dir, bundle_id)
+
+                # 如果指定了要删除的 tag
+                if !delete_tag_name.nil? && !delete_tag_name.empty?
+                    result = Pindo::GitHandler.remove_tag(local_repo_dir: project_dir, tag_name: delete_tag_name)
+                    if result
+                        puts
+                        puts "代码仓库路径#{project_dir}"
+                        puts "已删除tag : #{delete_tag_name}"
+                        puts
+                        puts
+                    end
+
+                    result = Pindo::GitHandler.remove_tag(local_repo_dir: app_config_dir, tag_name: delete_tag_name)
+                    if result
+                        puts
+                        puts "配置仓库路径#{app_config_dir}"
+                        puts "已删除tag : #{delete_tag_name}"
+                        puts
+                        puts
+                    end
+                end
+
+                # 创建新的 tag
+                if config_json && config_json["app_info"] && config_json["app_info"]["app_version"]
+                    temp_version = config_json["app_info"]["app_version"]
+                else
+                    Funlog.instance.fancyinfo_error("无法从配置中获取 app_version")
+                    return false
+                end
+
+                tag_name = "ios_release_" + temp_version
+                puts tag_name
+
+                # 为代码仓库创建 tag
+                Pindo::GitHandler.remove_tag(local_repo_dir: project_dir, tag_name: tag_name)
+                result = Pindo::GitHandler.add_tag(local_repo_dir: project_dir, tag_name: tag_name)
+                if result
+                    puts
+                    puts "代码仓库路径#{project_dir}"
+                    puts "已添加tag : #{tag_name}"
+                    puts
+                    puts
+                end
+
+                # 为配置仓库创建 tag
+                Pindo::GitHandler.remove_tag(local_repo_dir: app_config_dir, tag_name: tag_name)
+                result = Pindo::GitHandler.add_tag(local_repo_dir: app_config_dir, tag_name: tag_name)
+
+                if result
+                    puts
+                    puts "配置仓库路径#{app_config_dir}"
+                    puts "已添加tag : #{tag_name}"
+                    puts
+                    puts
+                end
+
+                return true
+
+            rescue StandardError => e
+                Funlog.instance.fancyinfo_error("创建 tag 失败: #{e.message}")
+                puts e.backtrace
+                return false
+            end
+        end
+
     end
 end