pindo 5.13.6 → 5.13.9

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

@@ -0,0 +1,155 @@
+require 'pindo/module/task/model/unity_task'
+require 'pindo/base/funlog'
+
+module Pindo
+  module TaskSystem
+    # Unity YooAsset 资源构建任务
+    # 用于构建 YooAsset 资源包
+    class UnityYooAssetTask < UnityTask
+      attr_reader :platform
+
+      def self.task_type
+        :unity_yoo_asset
+      end
+
+      # @param platform [String] 目标平台 ('ios', 'android', 'web')
+      # @param options [Hash] 额外选项
+      #   - :project_path [String] Unity 项目路径（默认当前目录）
+      def initialize(platform, options = {})
+        @platform = platform
+        @unity_exe_path = nil  # 将在 do_work 中自动查找
+
+        name = case platform
+               when 'ios', 'ipa'
+                 "Unity资源Yoo 打包 iOS"
+               when 'android', 'apk'
+                 "Unity资源Yoo 打包 Android"
+               when 'web', 'html'
+                 "Unity资源Yoo 打包 WebGL"
+               else
+                 "Unity资源Yoo 打包 #{platform.upcase}"
+               end
+
+        # 传递 project_path 给基类
+        project_path = options[:project_path] || Dir.pwd
+        super(name, project_path: project_path, options: options)
+      end
+
+      def validate
+        super
+
+        # 验证 Unity 工程是否存在
+        unless unity_helper.unity_project?(@unity_root_path)
+          raise Informative, "当前目录不是 Unity 工程：#{@unity_root_path}"
+        end
+
+        true
+      end
+
+      protected
+
+      def do_work
+        # 获取 Unity 版本
+        project_unity_version = get_unity_version
+
+        # 查找 Unity 执行路径
+        unless @unity_exe_path
+          @unity_exe_path = unity_helper.find_unity_path(
+            project_unity_version: project_unity_version,
+            force_change_version: false
+          )
+        end
+
+        if @unity_exe_path.nil? || @unity_exe_path.empty?
+          raise Informative, "无法找到 Unity 执行路径"
+        end
+
+        # 显示 Unity 信息
+        puts "项目路径: #{@unity_root_path}"
+        puts "Unity 执行路径: #{@unity_exe_path}"
+        puts "Unity 版本: #{project_unity_version}"
+        puts "目标平台: #{normalize_platform_name(@platform)}\n"
+
+        # 执行 YooAsset 构建
+        result = build_yoo_asset
+
+        result
+      end
+
+      # 重写清理方法，提供更精确的参数
+      def cleanup_unity_processes
+        Funlog.warning("清理 Unity 进程...")
+        begin
+          Pindo::Unity::UnityProcHelper.cleanup_unity_processes_after_build(
+            unity_exe_full_path: @unity_exe_path,
+            project_path: @unity_root_path
+          )
+        rescue => e
+          Funlog.warning("清理 Unity 进程失败: #{e.message}")
+        end
+      end
+
+      private
+
+      # 构建 YooAsset 资源
+      def build_yoo_asset
+        platform_name = normalize_platform_name(@platform)
+
+        # 调用 UnityHelper 的 build_yoo_asset 方法
+        result = unity_helper.build_yoo_asset(
+          unity_exe_full_path: @unity_exe_path,
+          project_path: @unity_root_path,
+          platform: platform_name
+        )
+
+        # 如果跳过（YooAsset 不存在），输出警告并显示命令
+        if result[:skipped]
+          Funlog.warning("项目中未检测到 YooAsset，跳过资源构建")
+          print_unity_command
+
+          return {
+            success: true,
+            skipped: true,
+            platform: @platform,
+            reason: result[:reason]
+          }
+        end
+
+        # 正常完成
+        {
+          success: true,
+          platform: @platform,
+          unity_result: result
+        }
+      end
+
+      # 打印将要执行的 Unity 命令
+      def print_unity_command
+        platform_name = normalize_platform_name(@platform)
+
+        cmd = "#{@unity_exe_path} -batchmode -quit " \
+              "-projectPath #{@unity_root_path} " \
+              "-executeMethod Yoo.Editor.YooCommandHelper.BatchBuild " \
+              "-platform #{platform_name}"
+
+        puts "\n本应执行的 Unity 命令:"
+        puts cmd
+        puts ""
+      end
+
+      # 标准化平台名称
+      def normalize_platform_name(platform)
+        case platform
+        when 'ios', 'ipa'
+          'iOS'
+        when 'android', 'apk'
+          'Android'
+        when 'web', 'html'
+          'WebGL'
+        else
+          platform.to_s
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,113 @@
+require 'pindo/module/task/pindo_task'
+require 'pindo/module/unity/unity_helper'
+require 'pindo/module/unity/unity_proc_helper'
+
+module Pindo
+  module TaskSystem
+    # Unity 任务基类
+    # 所有 Unity 相关任务的父类，提供通用的 Unity 操作和配置
+    class UnityTask < PindoTask
+      attr_reader :project_path, :unity_root_path
+
+      def initialize(name, project_path:, options: {})
+        @project_path = File.expand_path(project_path)
+        @unity_root_path = options[:unity_root_path] || @project_path
+
+        super(name, options)
+      end
+
+      # Unity 任务类型
+      def self.task_type
+        :unity
+      end
+
+      # Unity 任务默认重试配置
+      def self.default_retry_mode
+        RetryMode::DELAYED
+      end
+
+      def self.default_retry_count
+        2  # Unity 任务默认重试 2 次
+      end
+
+      def self.default_retry_delay
+        15  # Unity 任务默认延迟 15 秒重试
+      end
+
+      # 验证 Unity 项目路径
+      def validate
+        super
+
+        unless File.directory?(@project_path)
+          raise Informative, "Unity 项目路径不存在: #{@project_path}"
+        end
+
+        unless File.directory?(@unity_root_path)
+          raise Informative, "Unity 根目录不存在: #{@unity_root_path}"
+        end
+
+        true
+      end
+
+      # 获取 Unity Helper
+      def unity_helper
+        @unity_helper ||= Pindo::Unity::UnityHelper.share_instance
+      end
+
+      # 重试前清理 Unity 进程
+      def before_retry
+        super
+        cleanup_unity_processes
+      end
+
+      protected
+
+      # 检查 Unity 项目是否有效
+      def valid_unity_project?
+        # 检查是否存在 Assets 和 ProjectSettings 目录
+        assets_path = File.join(@unity_root_path, 'Assets')
+        project_settings_path = File.join(@unity_root_path, 'ProjectSettings')
+
+        File.directory?(assets_path) && File.directory?(project_settings_path)
+      end
+
+      # 清理 Unity 进程
+      def cleanup_unity_processes
+        Funlog.warning("清理 Unity 进程...")
+        begin
+          # 调用 UnityProcHelper 的清理方法
+          # 如果子类有 unity_exe_path，可以重写这个方法传入更精确的参数
+          Pindo::Unity::UnityProcHelper.cleanup_unity_processes_after_build(
+            unity_exe_full_path: nil,
+            project_path: @unity_root_path
+          )
+        rescue => e
+          Funlog.warning("清理 Unity 进程失败: #{e.message}")
+        end
+      end
+
+      # 获取 Unity 版本
+      def get_unity_version
+        version_file = File.join(@unity_root_path, 'ProjectSettings', 'ProjectVersion.txt')
+        return nil unless File.exist?(version_file)
+
+        content = File.read(version_file)
+        match = content.match(/m_EditorVersion:\s*(.+)/)
+        match ? match[1].strip : nil
+      end
+
+      # 打印 Unity 项目信息
+      def print_unity_info
+        puts "\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+        puts "  Unity 项目信息"
+        puts "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+        puts "项目路径: #{@project_path}"
+        puts "Unity 根路径: #{@unity_root_path}"
+
+        version = get_unity_version
+        puts "Unity 版本: #{version || '未知'}"
+        puts "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n"
+      end
+    end
+  end
+end

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

@@ -254,8 +254,16 @@ module Pindo
       # 获取任务类型的显示名称
       def get_type_display_name(type)
         case type
+        when :git_tag
+          "Git仓库打标签"
+        when :unity_config
+          "Unity编译模式配置"
+        when :unity_update
+          "Unity工具库更新"
+        when :unity_yoo_asset
+          "Unity资源Yoo 打包"
         when :unity_export
-          "Unity 导出"
+          "Unity导出"
         when :build
           "编译构建"
         when :upload

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

@@ -0,0 +1,188 @@
+require 'open3'
+require 'pindo/base/funlog'
+require 'pindo/config/pindoconfig'
+require 'pindo/module/unity/unity_env_helper'
+require 'pindo/module/unity/unity_proc_helper'
+
+
+module Pindo
+  module Unity
+    # Unity 命令执行助手
+    # 负责执行 Unity 命令行操作
+    # 所有方法均为类方法，无需实例化
+    class UnityCommandHelper
+
+      # 执行 Unity 命令
+      # @param unity_exe_full_path [String] Unity 可执行文件路径
+      # @param project_path [String] Unity 项目路径
+      # @param method [String] Unity 方法名（默认: GoodUnityBuild.BuildManager.BatchBuild）
+      # @param additional_args [Hash] 额外参数
+      # @return [Hash] 执行结果 { success:, stdout:, stderr:, exit_status:, unity_version: }
+      def self.execute_unity_command(unity_exe_full_path, project_path, method: 'GoodUnityBuild.BuildManager.BatchBuild', additional_args: {})
+        if unity_exe_full_path.nil?
+          raise Informative, "Unity path not found!"
+        end
+
+        # 调试级别：通过环境变量或参数控制
+        debug_level = ENV['UNITY_BUILD_DEBUG'] || additional_args[:debug_level] || 'normal'
+        # debug_level: 'quiet' - 只显示错误
+        #              'normal' - 显示错误、警告和关键进度
+        #              'verbose' - 显示所有输出
+
+        # 检查项目路径是否存在
+        unless File.directory?(project_path)
+          raise Informative, "Unity项目路径不存在: #{project_path}"
+        end
+
+        # 检查项目是否是Unity项目
+        project_settings = File.join(project_path, "ProjectSettings")
+        unless File.directory?(project_settings)
+          raise Informative, "项目路径不是Unity项目: #{project_path}"
+        end
+
+        cmd_args = [
+          unity_exe_full_path,
+          "-batchmode",
+          "-quit",
+          "-projectPath",
+          project_path.to_s,
+          "-executeMethod",
+          method
+        ]
+
+        # Add any additional arguments
+        additional_args.each do |key, value|
+          cmd_args << "-#{key}"
+          cmd_args << value.to_s if value
+        end
+
+        puts "Unity command: #{cmd_args.join(' ')}"
+        puts ""
+
+        # 使用更智能的进度检测机制
+        progress_thread = nil
+        start_time = Time.now
+        last_output_time = Time.now
+
+        begin
+          # 使用 Open3.popen3 来实时监控输出
+          Open3.popen3(*cmd_args) do |stdin, stdout, stderr, wait_thr|
+            stdin.close
+
+            # 启动进度显示线程
+            progress_thread = Thread.new do
+              dots = 0
+              while wait_thr.alive?
+                sleep(2)
+                dots = (dots + 1) % 4
+                elapsed = (Time.now - start_time).to_i
+                print "\r\e[33mUnity 构建中#{'.' * dots}#{' ' * (3 - dots)} (已用时: #{elapsed}秒)\e[0m"
+                $stdout.flush
+              end
+            end
+
+            # 实时读取输出
+            stdout_buffer = ""
+            stderr_buffer = ""
+
+            # 定义错误关键词模式（优化正则，避免重复）
+            error_pattern = /error|exception|failed|Build completed with a result of 'Failed'/i
+            warning_pattern = /warning|warn/i
+            success_pattern = /Build completed successfully|Exiting batchmode successfully/i
+
+            # 使用非阻塞方式读取输出
+            while wait_thr.alive?
+              # 检查是否有输出可读
+              ready_streams = IO.select([stdout, stderr], nil, nil, 1)
+
+              if ready_streams
+                ready_streams[0].each do |stream|
+                  if line = stream.gets
+                    # 记录输出
+                    if stream == stdout
+                      stdout_buffer += line
+                    else
+                      stderr_buffer += line
+                    end
+                    last_output_time = Time.now
+
+                    # 根据调试级别和内容类型显示输出
+                    case debug_level
+                    when 'verbose'
+                      # 详细模式：显示所有输出
+                      puts line
+                    when 'quiet'
+                      # 安静模式：只显示错误
+                      if line.match?(error_pattern)
+                        puts "\e[31m[错误] #{line.strip}\e[0m"
+                      end
+                    else # 'normal'
+                      # 正常模式：显示错误、警告和关键进度
+                      if line.match?(error_pattern)
+                        puts "\n\e[31m[错误] #{line.strip}\e[0m"
+                      elsif line.match?(warning_pattern)
+                        puts "\n\e[33m[警告] #{line.strip}\e[0m"
+                      elsif line.match?(success_pattern)
+                        puts "\n\e[32m[成功] #{line.strip}\e[0m"
+                      elsif line.match?(/\d+%/) || line.match?(/Building|Compiling|Processing/i)
+                        # 显示进度相关信息
+                        print "\r\e[36m[进度] #{line.strip}\e[0m"
+                        $stdout.flush
+                      end
+                    end
+                  end
+                end
+              end
+
+            end
+
+            # 读取剩余输出
+            stdout_buffer += stdout.read
+            stderr_buffer += stderr.read
+
+            # 停止进度显示线程
+            progress_thread.kill if progress_thread
+
+            # 检查构建是否真的成功
+            build_success = wait_thr.value.success?
+
+            # 检查是否有构建错误的关键词
+            if stdout_buffer.match?(/Build completed with a result of 'Failed'|Build completed with a result of 'Cancelled'|BuildPlayerWindow\+BuildMethod\+Invoke|error|Error|ERROR|exception|Exception|EXCEPTION|failed|Failed|FAILED/)
+              build_success = false
+              # puts "\n\e[31m检测到构建错误信息，构建可能失败\e[0m"
+            end
+
+            if build_success
+              print "\r\e[32mUnity 构建完成！\e[0m\n"
+              # 构建完成后检查并清理可能的 Unity 进程残留
+              UnityProcHelper.cleanup_unity_processes_after_build(unity_exe_full_path: unity_exe_full_path, project_path: project_path)
+            else
+              print "\r\e[31mUnity 构建失败！\e[0m\n"
+              puts "\e[31m构建输出:\e[0m"
+              puts stdout_buffer if !stdout_buffer.empty?
+              puts "\e[31m错误输出:\e[0m"
+              puts stderr_buffer if !stderr_buffer.empty?
+              # 构建失败时也清理可能的进程残留
+              UnityProcHelper.cleanup_unity_processes_after_build(unity_exe_full_path: unity_exe_full_path, project_path: project_path)
+            end
+
+            # 返回结果
+            {
+              success: build_success,
+              stdout: stdout_buffer,
+              stderr: stderr_buffer,
+              exit_status: wait_thr.value.exitstatus,
+              unity_version: UnityEnvHelper.extract_version_from_path(unity_exe_full_path)
+            }
+          end
+        rescue => e
+          # 停止进度显示线程
+          progress_thread.kill if progress_thread
+          print "\r\e[31mUnity 构建失败！\e[0m\n"
+          raise e
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,208 @@
+module Pindo
+  module Unity
+    # Unity 环境管理助手
+    # 负责 Unity 版本查找、路径管理等环境相关功能
+    # 所有方法均为类方法，无需实例化
+    class UnityEnvHelper
+      # macOS Unity 安装路径
+      UNITY_MAC_PATHS = [
+        "/Applications/Unity/Unity.app/Contents/MacOS/Unity",
+        "/Applications/Unity/Hub/Editor/*/Unity.app/Contents/MacOS/Unity",
+        "/Applications/Unity/*/Unity.app/Contents/MacOS/Unity"
+      ]
+
+      # Windows Unity 安装路径
+      UNITY_WINDOWS_PATHS = [
+        "C:/Program Files/Unity/Editor/Unity.exe",
+        "C:/Program Files/Unity/Hub/Editor/*/Unity.exe",
+        "C:/Program Files/Unity/*/Editor/Unity.exe"
+      ]
+
+      # 查找 Unity 路径
+      # @param project_unity_version [String] 项目所需的 Unity 版本
+      # @param force_change_version [Boolean] 是否强制使用最新版本
+      # @return [String] Unity 可执行文件的完整路径
+      def self.find_unity_path(project_unity_version: nil, force_change_version: false)
+        if project_unity_version.nil? || project_unity_version.empty?
+          raise "Project Unity version is nil or empty"
+        end
+
+        unity_major_version = project_unity_version.split('.')[0..1].join('.')
+        paths = case RUBY_PLATFORM
+                when /darwin/
+                  UNITY_MAC_PATHS
+                when /mswin|mingw|windows/
+                  UNITY_WINDOWS_PATHS
+                else
+                  raise "Unsupported platform: #{RUBY_PLATFORM}"
+                end
+
+        unity_versions = []
+
+        paths.each do |path|
+          if path.include?("*")
+            Dir.glob(path).each do |expanded_path|
+              version = extract_version_from_path(expanded_path)
+              if version
+                major_version = version.split('.')[0..1].join('.')
+                unity_versions << {
+                  path: expanded_path,
+                  version: version,
+                  major_version: major_version
+                }
+              end
+            end
+          elsif File.exist?(path)
+            version = extract_version_from_path(path)
+            if version
+              major_version = version.split('.')[0..1].join('.')
+              unity_versions << {
+                path: path,
+                version: version,
+                major_version: major_version
+              }
+            end
+          end
+        end
+
+        if unity_versions.empty?
+          puts "调试信息: 搜索的Unity路径:"
+          paths.each do |path|
+            puts "  - #{path}"
+            if path.include?("*")
+              Dir.glob(path).each do |expanded_path|
+                puts "    展开: #{expanded_path}"
+              end
+            elsif File.exist?(path)
+              puts "    存在: #{path}"
+            else
+              puts "    不存在: #{path}"
+            end
+          end
+          raise Informative, "未找到任何Unity版本，请检查Unity是否正确安装"
+        end
+
+        # 精确匹配项目版本
+        select_unity_versions = unity_versions.select { |v| v[:version] == project_unity_version } || []
+        if !select_unity_versions.nil? && !select_unity_versions.empty? && select_unity_versions.length >= 1
+          return select_unity_versions.first[:path]
+        end
+
+        # 按主版本匹配
+        unity_versions.sort_by! { |v| v[:major_version] }
+        select_unity_versions = unity_versions.select { |v| v[:major_version] == unity_major_version } if unity_major_version
+        if select_unity_versions.nil? || select_unity_versions.empty?
+          if force_change_version
+            puts "强制使用最新版本: #{unity_versions.last[:version]}"
+            return unity_versions.last[:path]
+          else
+            puts "调试信息: 项目Unity版本: #{project_unity_version}"
+            puts "调试信息: 可用的Unity版本:"
+            unity_versions.each do |v|
+              puts "  - #{v[:version]} (#{v[:major_version]})"
+            end
+            raise Informative, "未找到匹配的Unity版本 #{project_unity_version}，可用的版本: #{unity_versions.map { |v| v[:version] }.join(', ')}"
+          end
+        else
+          return select_unity_versions.first[:path]
+        end
+      end
+
+      # 从路径中提取 Unity 版本号
+      # @param path [String] Unity 可执行文件路径
+      # @return [String, nil] 版本号或 nil
+      def self.extract_version_from_path(path)
+        # macOS路径格式: /Applications/Unity/Hub/Editor/2021.3.45f1/Unity.app/Contents/MacOS/Unity
+        # macOS路径格式(变体): /Applications/Unity/Hub/Editor/2021.3.45f1c1/Unity.app/Contents/MacOS/Unity
+        # macOS路径格式(旧版): /Applications/Unity/Unity.app/Contents/MacOS/Unity
+        # Windows路径格式: C:/Program Files/Unity/Hub/Editor/2021.3.45f1/Editor/Unity.exe
+        # Windows路径格式(变体): C:/Program Files/Unity/Hub/Editor/2021.3.45f1c1/Editor/Unity.exe
+        # Windows路径格式(旧版): C:/Program Files/Unity/Editor/Unity.exe
+
+        # 尝试匹配 macOS Hub 路径格式
+        if match = path.match(/Editor\/([\d.]+[a-zA-Z]\d+(?:c\d+)?)\//)
+          return match[1]
+        end
+
+        # 尝试匹配 Windows Hub 路径格式
+        if match = path.match(/([\d.]+[a-zA-Z]\d+(?:c\d+)?)\/Editor\//)
+          return match[1]
+        end
+
+        # 尝试匹配 macOS 旧版路径格式 (从Info.plist提取版本)
+        if match = path.match(/Unity\.app\/Contents\/MacOS\/Unity$/)
+          info_plist_path = File.join(File.dirname(File.dirname(path)), "Info.plist")
+          if File.exist?(info_plist_path)
+            begin
+              content = File.read(info_plist_path)
+              if content =~ /<key>CFBundleVersion<\/key>\s*<string>([^<]+)<\/string>/
+                return $1.strip
+              elsif content =~ /<key>CFBundleShortVersionString<\/key>\s*<string>Unity version ([^<]+)<\/string>/
+                return $1.strip
+              end
+            rescue => e
+              puts "警告: 无法读取Info.plist文件: #{e.message}"
+            end
+          end
+        end
+
+        # 尝试匹配 Windows 旧版路径格式
+        if match = path.match(/Unity\.exe$/)
+          # 对于旧版Unity，尝试从父目录获取版本信息
+          parent_dir = File.dirname(path)
+          if File.basename(parent_dir) =~ /^([\d.]+[a-zA-Z]\d+(?:c\d+)?)$/
+            return $1
+          end
+        end
+
+        nil
+      end
+
+      # 比较版本号 (语义化版本比较)
+      # @param v1 [String] 版本1
+      # @param v2 [String] 版本2
+      # @return [Boolean] true 如果 v1 < v2, false 否则
+      def self.version_less_than?(v1, v2)
+        return false if v1.nil? || v2.nil?
+
+        Gem::Version.new(v1) < Gem::Version.new(v2)
+      rescue ArgumentError
+        # 版本格式无效时的降级处理
+        v1.to_s < v2.to_s
+      end
+
+      # 获取项目的 Unity 版本
+      # @param project_path [String] Unity 项目路径
+      # @return [String] Unity 版本号
+      def self.get_unity_version(project_path)
+        version_path = File.join(project_path, "ProjectSettings", "ProjectVersion.txt")
+        if File.exist?(version_path)
+          content = File.read(version_path)
+          if content =~ /m_EditorVersion: (.*)/
+            version = $1.strip
+            version
+          else
+            raise "Could not parse Unity version from #{version_path}"
+          end
+        else
+          raise "Project version file not found at #{version_path}"
+        end
+      end
+
+      # 检查是否为有效的 Unity 项目
+      # @param project_path [String] 项目路径
+      # @return [Boolean] true 如果是有效的 Unity 项目
+      def self.unity_project?(project_path)
+        # 检查关键Unity工程文件和目录是否存在
+        project_settings_path = File.join(project_path, "ProjectSettings")
+        assets_path = File.join(project_path, "Assets")
+        packages_path = File.join(project_path, "Packages")
+
+        File.directory?(project_settings_path) &&
+        File.directory?(assets_path) &&
+        File.directory?(packages_path) &&
+        File.exist?(File.join(project_settings_path, "ProjectSettings.asset"))
+      end
+    end
+  end
+end