pindo 5.17.5 → 5.18.4

data/lib/pindo/module/task/model/jps/jps_upload_task.rb

@@ -111,7 +111,10 @@ module Pindo
           )
         end
 
-        # 3. 上传到 JPS
+        # 3. 自动解析上传描述（未手动指定时）
+        @upload_desc = resolve_upload_desc(file_to_upload) if @upload_desc.nil?
+
+        # 4. 上传到 JPS
         app_version_info = upload_to_jps(file_to_upload)
 
         {
@@ -158,6 +161,106 @@ module Pindo
         end
       end
 
+      # 根据依赖任务类型或 IPA 描述文件类型自动推断上传描述
+      # 规则：
+      #   依赖 IosBuildAdhocTask       → "Commit id: <commit_id>"
+      #   依赖 IosBuildAppStoreTask    → "重签名"
+      #   依赖其他 IosBuildTask 子类   → nil（不传描述）
+      #   直接上传 IPA（无构建依赖）   → 检测描述文件类型后同上
+      def resolve_upload_desc(file_path)
+        # 路径1：检查任务依赖
+        if @dependencies && !@dependencies.empty?
+          @dependencies.each do |dep_id|
+            dep_task = get_dependency_task(dep_id)
+            next unless dep_task
+
+            class_name = dep_task.class.name || ''
+            is_ios_build = dep_task.class.ancestors.any? do |a|
+              a.name == 'Pindo::TaskSystem::IosBuildTask'
+            end
+            next unless is_ios_build
+
+            if class_name == 'Pindo::TaskSystem::IosBuildAdhocTask'
+              commit_id = get_current_commit_id
+              return commit_id ? "Commit id: #{commit_id}" : nil
+            elsif class_name == 'Pindo::TaskSystem::IosBuildAppStoreTask'
+              return "重签名"
+            else
+              return nil
+            end
+          end
+        end
+
+        # 路径2：直接上传 IPA 时，检测 Xcode 工程描述文件类型
+        if @file_type == 'ipa'
+          profile_type = detect_xcode_profile_type
+          case profile_type
+          when :adhoc
+            commit_id = get_current_commit_id
+            return commit_id ? "Commit id: #{commit_id}" : nil
+          when :appstore
+            return "重签名"
+          end
+        end
+
+        nil
+      end
+
+      # 获取当前 git commit id（从 upload_path 所在的 git 仓库）
+      def get_current_commit_id
+        dir = @upload_path || Dir.pwd
+        commit_id = `git -C "#{dir}" rev-parse HEAD 2>/dev/null`.strip
+        commit_id.empty? ? nil : commit_id
+      rescue
+        nil
+      end
+
+      # 检测当前目录下 Xcode 工程的描述文件类型
+      # 通过读取主 target Release 配置的 PROVISIONING_PROFILE_SPECIFIER 判断
+      # @return [Symbol, nil] :adhoc / :appstore / :development / nil
+      def detect_xcode_profile_type
+        require 'xcodeproj'
+
+        # 从 upload_path 向上查找包含 .xcodeproj 的目录
+        search_dir = File.expand_path(@upload_path || Dir.pwd)
+        project_fullname = nil
+        loop do
+          candidates = Dir.glob(File.join(search_dir, '*.xcodeproj'))
+          if candidates.any?
+            project_fullname = candidates.max_by { |f| File.mtime(f) }
+            break
+          end
+          parent = File.dirname(search_dir)
+          break if parent == search_dir  # 已到文件系统根目录
+          search_dir = parent
+        end
+
+        return nil unless project_fullname && File.exist?(project_fullname)
+
+        project_obj = Xcodeproj::Project.open(project_fullname)
+        main_target = project_obj.targets.select do |t|
+          t.respond_to?(:product_type) &&
+            t.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])
+        end.first
+        return nil unless main_target
+
+        # 优先取 Release 配置，找不到则取第一个
+        release_config = main_target.build_configurations.find { |c| c.name == 'Release' } ||
+                         main_target.build_configurations.first
+        return nil unless release_config
+
+        specifier = release_config.build_settings['PROVISIONING_PROFILE_SPECIFIER'].to_s.downcase
+        if specifier.include?('adhoc')
+          :adhoc
+        elsif specifier.include?('development')
+          :development
+        else
+          :appstore
+        end
+      rescue
+        nil
+      end
+
       # 延迟获取 JPS 配置（上传任务专用）
       # @return [Array] 返回 [app_info_obj, workflow_info]
       def fetch_jps_config(working_directory: Dir.pwd, package_type: nil)

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

@@ -205,7 +205,8 @@ module Pindo
           platform: platform,
           isLibrary: @is_library_mode,
           indexNo: @index_count,
-          deployMode: @deploy_mode
+          deployMode: @deploy_mode,
+          auto_kill: @auto_kill
         )
       end
     end

data/lib/pindo/module/task/model/unity/unity_update_task.rb

@@ -81,7 +81,8 @@ module Pindo
         # 调用 UnityHelper 的 force_update_libraries 方法
         result = unity_helper.force_update_libraries(
           unity_exe_full_path: @unity_exe_path,
-          project_path: @unity_root_path
+          project_path: @unity_root_path,
+          auto_kill: @auto_kill
         )
 
         # 返回成功结果

data/lib/pindo/module/task/model/unity/unity_yoo_asset_task.rb

@@ -100,7 +100,8 @@ module Pindo
         result = unity_helper.build_yoo_asset(
           unity_exe_full_path: @unity_exe_path,
           project_path: @unity_root_path,
-          platform: platform_name
+          platform: platform_name,
+          auto_kill: @auto_kill
         )
 
         # 如果跳过（YooAsset 不存在），输出警告并显示命令

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

@@ -8,11 +8,12 @@ module Pindo
     # Unity 任务基类
     # 所有 Unity 相关任务的父类，提供通用的 Unity 操作和配置
     class UnityTask < PindoTask
-      attr_reader :project_path, :unity_root_path
+      attr_reader :project_path, :unity_root_path, :auto_kill
 
       def initialize(name, options = {})
         @project_path = options[:project_path] ? normalize_path(options[:project_path]) : nil
         @unity_root_path = options[:unity_root_path] ? normalize_path(options[:unity_root_path]) : @project_path
+        @auto_kill = options[:auto_kill] || false
 
         super(name, options)
       end

data/lib/pindo/module/task/task_manager.rb

@@ -117,6 +117,14 @@ module Pindo
 
         # 输出执行摘要
         @reporter.print_execution_summary
+
+        # 检查失败任务，有失败则抛出异常（确保进程返回非零退出码）
+        report = execution_report
+        if report[:failed] > 0
+          failed_tasks = @queue.completed_snapshot.select { |t| t.status == TaskStatus::FAILED }
+          failed_names = failed_tasks.map(&:name).join(', ')
+          raise Informative, "#{report[:failed]} 个任务执行失败: #{failed_names}"
+        end
       end
 
       # 获取执行报告

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

@@ -46,11 +46,11 @@ module Pindo
       # ============================================
 
       # 检查 GoodUnityBuild 版本是否满足要求
-      def check_goodunitybuild_version(unity_exe_full_path, project_path)
+      def check_goodunitybuild_version(unity_exe_full_path, project_path, auto_kill: false)
         Funlog.instance.fancyinfo_start("检查 GoodUnityBuild 版本")
 
         # 检查是否有Unity进程在运行
-        UnityProcHelper.check_unity_processes(unity_exe_full_path: unity_exe_full_path, project_path: project_path)
+        UnityProcHelper.check_unity_processes(unity_exe_full_path: unity_exe_full_path, project_path: project_path, auto_kill: auto_kill)
 
         # 执行 Unity 命令获取库版本
         result = UnityCommandHelper.execute_unity_command(
@@ -112,10 +112,10 @@ module Pindo
         Funlog.warning("GoodUnityBuild 库版本检查失败: #{e.message}")
       end
 
-      def export_project(unity_exe_full_path:nil, project_path:nil, platform: nil, isLibrary: false, indexNo: nil, deployMode: nil)
+      def export_project(unity_exe_full_path:nil, project_path:nil, platform: nil, isLibrary: false, indexNo: nil, deployMode: nil, auto_kill: false)
 
         # 检查是否有Unity进程在运行，传入Unity路径和项目路径以精确匹配
-        UnityProcHelper.check_unity_processes(unity_exe_full_path: unity_exe_full_path, project_path: project_path)
+        UnityProcHelper.check_unity_processes(unity_exe_full_path: unity_exe_full_path, project_path: project_path, auto_kill: auto_kill)
 
         additional_args = {}
         additional_args[:platform] = platform if platform
@@ -201,8 +201,9 @@ module Pindo
       # @param unity_exe_full_path [String] Unity 可执行文件路径
       # @param project_path [String] Unity 项目路径
       # @param platform [String] 目标平台 ('Android', 'iOS' 等)
+      # @param auto_kill [Boolean] 是否自动关闭进程（不询问用户）
       # @return [Hash] 执行结果，如果跳过则返回 { skipped: true }
-      def build_yoo_asset(unity_exe_full_path:nil, project_path:nil, platform: nil)
+      def build_yoo_asset(unity_exe_full_path:nil, project_path:nil, platform: nil, auto_kill: false)
         # 检查项目中是否存在 YooAsset
         unless yoo_asset_exists?(project_path)
           return { skipped: true, reason: 'YooAsset not found' }
@@ -211,7 +212,7 @@ module Pindo
         puts "检测到 YooAsset，开始构建资源..."
 
         # 检查是否有Unity进程在运行
-        UnityProcHelper.check_unity_processes(unity_exe_full_path: unity_exe_full_path, project_path: project_path)
+        UnityProcHelper.check_unity_processes(unity_exe_full_path: unity_exe_full_path, project_path: project_path, auto_kill: auto_kill)
 
         additional_args = {}
         additional_args[:platform] = platform if platform
@@ -244,10 +245,11 @@ module Pindo
       # 强制更新必备库（NugetForUnity）
       # @param unity_exe_full_path [String] Unity 可执行文件路径
       # @param project_path [String] Unity 项目路径
+      # @param auto_kill [Boolean] 是否自动关闭进程（不询问用户）
       # @return [Hash] 执行结果
-      def force_update_libraries(unity_exe_full_path:nil, project_path:nil)
+      def force_update_libraries(unity_exe_full_path:nil, project_path:nil, auto_kill: false)
         # 检查是否有Unity进程在运行
-        UnityProcHelper.check_unity_processes(unity_exe_full_path: unity_exe_full_path, project_path: project_path)
+        UnityProcHelper.check_unity_processes(unity_exe_full_path: unity_exe_full_path, project_path: project_path, auto_kill: auto_kill)
 
         # 使用 NugetForUnity.Joy.JoyTools.CheckForceUpdate 强制更新库
         result = UnityCommandHelper.execute_unity_command(
@@ -278,8 +280,9 @@ module Pindo
       # @param unity_exe_full_path [String] Unity 可执行文件路径
       # @param project_path [String] Unity 项目路径
       # @param deploy_mode [String] 部署模式 ('dev', 'adhoc', 'release')
+      # @param auto_kill [Boolean] 是否自动关闭进程（不询问用户）
       # @return [Hash] 执行结果
-      def config_build_mode(unity_exe_full_path:nil, project_path:nil, deploy_mode: 'dev')
+      def config_build_mode(unity_exe_full_path:nil, project_path:nil, deploy_mode: 'dev', auto_kill: false)
         # 验证 deploy_mode 参数
         valid_modes = ['dev', 'adhoc', 'release']
         unless valid_modes.include?(deploy_mode)
@@ -287,7 +290,7 @@ module Pindo
         end
 
         # 检查是否有Unity进程在运行
-        UnityProcHelper.check_unity_processes(unity_exe_full_path: unity_exe_full_path, project_path: project_path)
+        UnityProcHelper.check_unity_processes(unity_exe_full_path: unity_exe_full_path, project_path: project_path, auto_kill: auto_kill)
 
         puts "配置 GoodUnityBuild 编译模式为: #{deploy_mode}"
 

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

@@ -5,10 +5,11 @@ module Pindo
     # 所有方法均为类方法，无需实例化
     class UnityProcHelper
 
-      # 构建前检查 Unity 进程（交互式）
+      # 构建前检查 Unity 进程（交互式或自动关闭）
       # @param unity_exe_full_path [String] Unity 可执行文件路径
       # @param project_path [String] Unity 项目路径
-      def self.check_unity_processes(unity_exe_full_path: nil, project_path: nil)
+      # @param auto_kill [Boolean] 是否自动关闭进程（不询问用户）
+      def self.check_unity_processes(unity_exe_full_path: nil, project_path: nil, auto_kill: false)
         # 如果没有提供路径参数，直接跳过Unity进程检查
         if unity_exe_full_path.nil? && project_path.nil?
           return
@@ -32,6 +33,30 @@ module Pindo
             end
             puts ""
 
+            # 如果指定了 auto_kill，直接关闭进程
+            if auto_kill
+              puts "自动关闭 Unity 进程..."
+              success_count = 0
+              unity_pids.each do |process_info|
+                if kill_unity_process(process_info[:pid])
+                  puts "✅ 成功关闭进程 #{process_info[:pid]}"
+                  success_count += 1
+                else
+                  puts "❌ 关闭进程 #{process_info[:pid]} 失败"
+                end
+              end
+
+              if success_count > 0
+                puts "\n✅ 已关闭 #{success_count} 个 Unity 相关进程"
+                puts "等待3秒后继续编译..."
+                sleep(3)
+              else
+                puts "\n❌ 无法关闭 Unity 相关进程，请手动关闭后重试"
+                raise "Unity进程冲突：无法自动关闭 Unity 相关进程，请手动关闭后重试"
+              end
+              return
+            end
+
             # 询问用户是否要自动关闭Unity进程
             loop do
               puts "批处理模式需要关闭这些 Unity 进程以避免冲突"

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

@@ -4,6 +4,7 @@ require 'faraday'
 require 'xcodeproj'
 require 'pindo/base/git_handler'
 require 'pindo/config/pindoconfig'
+require 'pindo/module/xcode/xcode_build_helper'
 
 module Pindo
   # Applovin Xcode 辅助类
@@ -258,8 +259,9 @@ module Pindo
             # 跳过非 native target（如 PBXAggregateTarget）
             next unless target.respond_to?(:product_type)
             if target.product_type.to_s == "com.apple.product-type.application"
-              temp_info = target.build_configurations.first.build_settings['INFOPLIST_FILE']
-              return File.join(project_dir, temp_info) if temp_info
+              raw_path = target.build_configurations.first.build_settings['INFOPLIST_FILE']
+              resolved = Pindo::XcodeBuildHelper.resolve_info_plist_path(project_dir, raw_path, target: target)
+              return resolved if resolved
             end
           end
         rescue => e

data/lib/pindo/module/xcode/res/xcode_res_constant.rb

@@ -176,6 +176,78 @@ module Pindo
     #     return model_data
     # end
 
+    def self.xcode_macos_icon_json
+          model_data = {
+              "images" => [
+                {
+                  "size" => "16x16",
+                  "idiom" => "mac",
+                  "filename" => "app_icon_16.png",
+                  "scale" => "1x"
+                },
+                {
+                  "size" => "16x16",
+                  "idiom" => "mac",
+                  "filename" => "app_icon_32.png",
+                  "scale" => "2x"
+                },
+                {
+                  "size" => "32x32",
+                  "idiom" => "mac",
+                  "filename" => "app_icon_32.png",
+                  "scale" => "1x"
+                },
+                {
+                  "size" => "32x32",
+                  "idiom" => "mac",
+                  "filename" => "app_icon_64.png",
+                  "scale" => "2x"
+                },
+                {
+                  "size" => "128x128",
+                  "idiom" => "mac",
+                  "filename" => "app_icon_128.png",
+                  "scale" => "1x"
+                },
+                {
+                  "size" => "128x128",
+                  "idiom" => "mac",
+                  "filename" => "app_icon_256.png",
+                  "scale" => "2x"
+                },
+                {
+                  "size" => "256x256",
+                  "idiom" => "mac",
+                  "filename" => "app_icon_256.png",
+                  "scale" => "1x"
+                },
+                {
+                  "size" => "256x256",
+                  "idiom" => "mac",
+                  "filename" => "app_icon_512.png",
+                  "scale" => "2x"
+                },
+                {
+                  "size" => "512x512",
+                  "idiom" => "mac",
+                  "filename" => "app_icon_512.png",
+                  "scale" => "1x"
+                },
+                {
+                  "size" => "512x512",
+                  "idiom" => "mac",
+                  "filename" => "app_icon_1024.png",
+                  "scale" => "2x"
+                }
+              ],
+              "info" => {
+                "author" => "xcode",
+                "version" => 1
+              }
+            }
+        return model_data
+    end
+
     def self.xcode_ios_imessage_icon_json
           model_data = {
               "images" => [

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

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'xcodeproj'
 require 'json'
 require 'pindo/module/xcode/xcode_res_helper'
+require 'pindo/module/xcode/xcode_build_helper'
 require 'pindo/module/utils/file_downloader'
 require 'open-uri'
 require_relative '../../base/funlog'
@@ -39,15 +40,19 @@ module Pindo
                 # 跳过非 native target（如 PBXAggregateTarget）
                 next unless target.respond_to?(:product_type)
                 if target.product_type.to_s.eql?("com.apple.product-type.application")
-                    temp_info_file = target.build_configurations.first.build_settings['INFOPLIST_FILE']
-                    if temp_info_file && !temp_info_file.empty?
-                        info_plist_path = File.join(project_dir, temp_info_file)
-                    end
                     app_target = target
                     break  # 找到第一个application target即可
                 end
             end
 
+            return false unless app_target
+
+            # 确保 Info.plist 存在（不存在时自动创建）
+            info_plist_path = Pindo::XcodeBuildHelper.ensure_info_plist_exists(
+                project_dir: project_dir,
+                target: app_target,
+                project_obj: project_obj
+            )
             return false unless info_plist_path && File.exist?(info_plist_path)
 
             # 一次性读取plist
@@ -138,20 +143,26 @@ module Pindo
             current_bundle_id = nil
 
             project_obj = Xcodeproj::Project.open(project_fullname)
+            app_target = nil
             project_obj.targets.each do |target|
                 # 跳过非 native target（如 PBXAggregateTarget）
                 next unless target.respond_to?(:product_type)
                 if target.product_type.to_s.eql?("com.apple.product-type.application")
-                    temp_info_file = target.build_configurations.first.build_settings['INFOPLIST_FILE']
-                    if temp_info_file && !temp_info_file.empty?
-                        info_plist_path = File.join(project_dir, temp_info_file)
-                    end
+                    app_target = target
                     # 获取当前实际的 Bundle ID
                     current_bundle_id = target.build_configurations.first.build_settings['PRODUCT_BUNDLE_IDENTIFIER']
                     break  # 找到第一个application target即可
                 end
             end
 
+            return false unless app_target
+
+            # 确保 Info.plist 存在
+            info_plist_path = Pindo::XcodeBuildHelper.ensure_info_plist_exists(
+                project_dir: project_dir,
+                target: app_target,
+                project_obj: project_obj
+            )
             return false unless info_plist_path && File.exist?(info_plist_path)
             return false unless current_bundle_id && !current_bundle_id.empty?
 
@@ -209,19 +220,25 @@ module Pindo
             bundleid_scheme_name = nil
 
             project_obj = Xcodeproj::Project.open(project_fullname)
+            app_target = nil
             project_obj.targets.each do |target|
                 # 跳过非 native target（如 PBXAggregateTarget）
                 next unless target.respond_to?(:product_type)
                 if target.product_type.to_s.eql?("com.apple.product-type.application")
-                    temp_info_file = target.build_configurations.first.build_settings['INFOPLIST_FILE']
-                    if temp_info_file && !temp_info_file.empty?
-                        info_plist_path = File.join(project_dir, temp_info_file)
-                    end
+                    app_target = target
                     bundleid_scheme_name = target.build_configurations.first.build_settings['PRODUCT_BUNDLE_IDENTIFIER']
                     break  # 找到第一个application target即可
                 end
             end
 
+            return false unless app_target
+
+            # 确保 Info.plist 存在
+            info_plist_path = Pindo::XcodeBuildHelper.ensure_info_plist_exists(
+                project_dir: project_dir,
+                target: app_target,
+                project_obj: project_obj
+            )
             return false unless info_plist_path && File.exist?(info_plist_path)
 
             info_plist_dict = Xcodeproj::Plist.read_from_path(info_plist_path)
@@ -311,9 +328,10 @@ module Pindo
                             config.build_settings['CURRENT_PROJECT_VERSION'] = build_number.to_s
 
                             # 兼容旧的设置方式，通过Info.plist更新
-                            if config.build_settings['INFOPLIST_FILE']
-                                info_plist_path = File.join(project_dir, config.build_settings['INFOPLIST_FILE'])
-                                if File.exist?(info_plist_path)
+                            raw_plist_path = config.build_settings['INFOPLIST_FILE']
+                            if raw_plist_path
+                                info_plist_path = Pindo::XcodeBuildHelper.resolve_info_plist_path(project_dir, raw_plist_path, target: target)
+                                if info_plist_path
                                     update_info_plist(info_plist_path, version, build_number.to_s)
                                 end
                             end
@@ -478,7 +496,8 @@ module Pindo
                 Funlog.instance.fancyinfo_start("正在创建 icon...")
                 XcodeResHelper.create_icons(
                     icon_name: icon_download_path,
-                    new_icon_dir: new_icon_dir
+                    new_icon_dir: new_icon_dir,
+                    proj_dir: project_dir
                 )
                 Funlog.instance.fancyinfo_success("创建 icon 完成!")
 
@@ -558,7 +577,7 @@ module Pindo
                 new_icon_dir = File.join(project_dir, "icon_#{time}")
 
                 Funlog.instance.fancyinfo_start("正在创建 icon...")
-                Pindo::XcodeResHelper.create_icons(icon_name: icon_name, new_icon_dir: new_icon_dir)
+                Pindo::XcodeResHelper.create_icons(icon_name: icon_name, new_icon_dir: new_icon_dir, proj_dir: project_dir)
                 Funlog.instance.fancyinfo_success("创建 icon 完成!")
 
                 Funlog.instance.fancyinfo_start("正在替换 icon...")