pindo 5.11.4 → 5.12.1

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

@@ -3,359 +3,183 @@ require_relative '../task_config'
 
 module Pindo
   module TaskSystem
+    # BuildTask 抽象基类
+    # 提供构建任务的通用框架和工厂方法
     class BuildTask < PindoTask
-      attr_reader :platform, :build_type, :output_path
+      attr_reader :platform, :project_path, :output_path, :mode
 
+      # 任务类型
       def self.task_type
         :build
       end
 
-      def self.execution_mode
-        ExecutionMode::TYPE_EXCLUSIVE  # 同类型串行（不能同时构建多个）
+      # 重试配置
+      def self.default_retry_mode
+        RetryMode::DELAYED
       end
 
-      def self.execution_type
-        ExecutionType::ASYNC  # 在新线程异步执行
+      def self.default_retry_count
+        0
       end
 
-      def initialize(platform, options = {})
-        @platform = platform
-        @build_type = options[:build_type] || platform
-        @project_path = options[:project_path] || Dir.pwd
-        @build_config = options[:build_config] || {}
-        @output_path = nil
-
-        name = case platform
-               when 'ios', 'ipa'
-                 "构建 IPA"
-               when 'android', 'apk'
-                 "构建 APK"
-               when 'web', 'html'
-                 "构建 HTML"
-               else
-                 "构建 #{platform.upcase}"
-               end
-
-        super(name, options)
+      def self.default_retry_delay
+        10
       end
 
-      protected
-
-      def do_work
-        update_progress(0, "准备构建环境...")
-
-        case @platform
-        when 'ios', 'ipa'
-          build_ios
-        when 'android', 'apk'
-          build_android
-        when 'web', 'html'
-          build_web
+      # ========== 静态工厂方法 ==========
+
+      # 根据 platform 和 mode 创建对应的构建任务实例
+      # @param platform [String, Symbol] 平台：ios/android/web
+      # @param mode [String, Symbol] 模式：dev/adhoc/release
+      # @param options [Hash] 构建选项
+      # @return [BuildTask] 对应的构建任务实例
+      def self.create_task(platform:, mode:, options: {})
+        normalized_platform = normalize_platform(platform)
+        normalized_mode = normalize_mode(mode)
+
+        case normalized_platform
+        when :ios
+          create_ios_task(normalized_mode, options)
+        when :android
+          create_android_task(normalized_mode, options)
+        when :web
+          create_web_task(normalized_mode, options)
         else
-          raise "Unsupported platform: #{@platform}"
+          raise ArgumentError, "不支持的平台: #{platform}"
         end
       end
 
-      private
-
-      def build_ios
-        update_progress(10, "配置 iOS 工程...")
-
-        # 获取 Bundle ID
-        mainapp_bundleid = @context[:bundle_id] || @build_config[:bundle_id]
-
-        unless mainapp_bundleid
-          raise "iOS Bundle ID 未指定"
+      # 标准化平台名称
+      def self.normalize_platform(platform)
+        platform_str = platform.to_s.downcase
+        case platform_str
+        when 'ios', 'ipa'
+          :ios
+        when 'android', 'apk', 'aab'
+          :android
+        when 'web', 'html', 'webgl'
+          :web
+        else
+          raise ArgumentError, "未知平台: #{platform}"
         end
+      end
 
-        update_progress(20, "准备编译参数...")
-
-        args_temp = []
-        args_temp << "--bundleid=#{mainapp_bundleid}"
-
-        # 不传递 upload 参数，只构建
-        if @context[:project_name]
-          args_temp << "--proj=#{@context[:project_name]}"
+      # 标准化构建模式
+      def self.normalize_mode(mode)
+        mode_str = mode.to_s.downcase
+        case mode_str
+        when 'dev', 'debug', 'development'
+          :dev
+        when 'adhoc', 'ad-hoc'
+          :adhoc
+        when 'release', 'production', 'deploy'
+          :release
+        else
+          raise ArgumentError, "未知构建模式: #{mode}"
         end
+      end
 
-        update_progress(30, "执行 iOS 构建...")
-
-        # 切换到 iOS 目录并执行构建
-        ios_dir = File.join(@project_path, "GoodPlatform", "iOS")
-        if File.directory?(ios_dir)
-          Dir.chdir(ios_dir) do
-            # 调用 iOS autobuild 命令（不包含上传）
-            require 'pindo/command/ios/autobuild'
-            Pindo::Command::Ios::Autobuild::run(args_temp)
-          end
+      # 创建 iOS 构建任务
+      def self.create_ios_task(mode, options)
+        require_relative 'build/ios_dev_build_task'
+        require_relative 'build/ios_adhoc_build_task'
+        require_relative 'build/ios_release_build_task'
+
+        case mode
+        when :dev
+          IosDevBuildTask.new(options)
+        when :adhoc
+          IosAdhocBuildTask.new(options)
+        when :release
+          IosReleaseBuildTask.new(options)
         else
-          # 如果没有 iOS 子目录，在当前目录执行
-          require 'pindo/command/ios/autobuild'
-          Pindo::Command::Ios::Autobuild::run(args_temp)
+          raise ArgumentError, "不支持的 iOS 构建模式: #{mode}"
         end
-
-        update_progress(90, "iOS 构建完成")
-
-        # TODO: 获取实际的输出路径
-        @output_path = find_ipa_output_path
-
-        update_progress(100, "IPA 构建成功")
-        {
-          success: true,
-          platform: 'ios',
-          output: @output_path
-        }
       end
 
-      def build_android
-        update_progress(10, "配置 Android 工程...")
-
-        # 获取 Bundle Name
-        bundle_name = @context[:bundle_name] || @build_config[:bundle_name]
-
-        update_progress(20, "准备编译参数...")
-
-        args_temp = []
-
-        if bundle_name
-          args_temp << "--bundle_name=#{bundle_name}"
-        end
+      # 创建 Android 构建任务
+      def self.create_android_task(mode, options)
+        require_relative 'build/android_dev_build_task'
+        require_relative 'build/android_release_build_task'
 
-        # 不传递 upload 参数，只构建
-        if @context[:project_name]
-          args_temp << "--proj=#{@context[:project_name]}"
+        case mode
+        when :dev, :debug
+          AndroidDevBuildTask.new(options)
+        when :release
+          AndroidReleaseBuildTask.new(options)
+        else
+          raise ArgumentError, "不支持的 Android 构建模式: #{mode}"
         end
+      end
 
-        update_progress(30, "执行 Android 构建...")
+      # 创建 Web 构建任务
+      def self.create_web_task(mode, options)
+        require_relative 'build/web_dev_build_task'
 
-        # 切换到 Android 目录并执行构建
-        android_dir = File.join(@project_path, "GoodPlatform", "Android")
-        if File.directory?(android_dir)
-          Dir.chdir(android_dir) do
-            # 调用 Android autobuild 命令（不包含上传）
-            require 'pindo/command/android/autobuild'
-            Pindo::Command::Android::Autobuild::run(args_temp)
-          end
+        case mode
+        when :dev, :debug, :release
+          # Web 目前只有一个构建任务类
+          WebDevBuildTask.new(options)
         else
-          # 如果没有 Android 子目录，在当前目录执行
-          require 'pindo/command/android/autobuild'
-          Pindo::Command::Android::Autobuild::run(args_temp)
+          raise ArgumentError, "不支持的 Web 构建模式: #{mode}"
         end
-
-        update_progress(90, "Android 构建完成")
-
-        # TODO: 获取实际的输出路径
-        @output_path = find_apk_output_path
-
-        update_progress(100, "APK 构建成功")
-        {
-          success: true,
-          platform: 'android',
-          output: @output_path
-        }
       end
 
-      def build_web
-        update_progress(10, "配置 Web 工程...")
-
-        # 获取 Bundle Name (Web 也可能需要)
-        bundle_name = @context[:bundle_name] || @build_config[:bundle_name]
+      # ========== 实例方法 ==========
 
-        update_progress(20, "准备编译参数...")
-
-        args_temp = []
+      def initialize(platform, mode, options = {})
+        @platform = platform
+        @mode = mode
+        @project_path = options[:project_path] || Dir.pwd
+        @output_path = nil
 
-        if bundle_name
-          args_temp << "--bundle_name=#{bundle_name}"
-        end
+        # 构建任务名称
+        name = build_task_name
 
-        # 不传递 upload 参数，只构建
-        if @context[:project_name]
-          args_temp << "--proj=#{@context[:project_name]}"
-        end
+        super(name, options)
+      end
 
-        update_progress(30, "执行 Web 构建...")
+      protected
 
-        # 切换到 Web 目录并执行构建
-        web_dir = File.join(@project_path, "GoodPlatform", "Web")
-        if File.directory?(web_dir)
-          Dir.chdir(web_dir) do
-            # TODO: 需要确认 Web autobuild 命令的正确模块
-            # 暂时使用 Android::Autobuild（根据原代码）
-            require 'pindo/command/android/autobuild'
-            Pindo::Command::Android::Autobuild::run(args_temp)
-          end
-        else
-          # 如果没有 Web 子目录，在当前目录执行
-          require 'pindo/command/android/autobuild'
-          Pindo::Command::Android::Autobuild::run(args_temp)
-        end
+      # 主执行流程
+      def do_work
+        # 准备构建
+        prepare_build
 
-        update_progress(90, "Web 构建完成")
+        # 执行构建
+        execute_build
 
-        # TODO: 获取实际的输出路径
-        @output_path = find_web_output_path
+        # 查找输出文件
+        @output_path = find_output
 
-        update_progress(100, "HTML 构建成功")
         {
           success: true,
-          platform: 'web',
+          platform: @platform,
           output: @output_path
         }
       end
 
-      # 查找 IPA 输出路径
-      def find_ipa_output_path
-        # 记录查找前的时间，用于过滤旧文件
-        start_time = @started_at || Time.now - 60
-
-        # 使用配置中的搜索路径
-        search_paths = TaskConfig::BUILD_OUTPUT_PATTERNS[:ipa].map do |pattern|
-          File.join(@project_path, pattern)
-        end
-
-        ipa_files = []
-        search_paths.each do |pattern|
-          files = Dir.glob(pattern)
-          # 过滤出在构建开始后创建或修改的文件
-          recent_files = files.select { |f| File.mtime(f) >= start_time }
-          ipa_files.concat(recent_files)
-        end
+      # ========== 子类必须实现的抽象方法 ==========
 
-        if ipa_files.empty?
-          # 如果没有找到新文件，查找最近的 IPA 文件
-          search_paths.each do |pattern|
-            ipa_files.concat(Dir.glob(pattern))
-          end
-        end
-
-        # 返回最新的 IPA 文件
-        if ipa_files.any?
-          latest_ipa = ipa_files.max_by { |f| File.mtime(f) }
-          puts "  找到 IPA 文件: #{latest_ipa}"
-          latest_ipa
-        else
-          puts "  警告: 未找到 IPA 文件"
-          nil
-        end
+      # 构建任务名称
+      def build_task_name
+        raise NotImplementedError, "子类必须实现 build_task_name 方法"
       end
 
-      # 查找 APK 输出路径
-      def find_apk_output_path
-        # 记录查找前的时间，用于过滤旧文件
-        start_time = @started_at || Time.now - 60
-
-        # 使用配置中的搜索路径
-        search_paths = []
-        search_paths.concat(TaskConfig::BUILD_OUTPUT_PATTERNS[:apk].map { |p| File.join(@project_path, p) })
-        search_paths.concat(TaskConfig::BUILD_OUTPUT_PATTERNS[:aab].map { |p| File.join(@project_path, p) })
-
-        package_files = []
-        search_paths.each do |pattern|
-          files = Dir.glob(pattern)
-          # 过滤出在构建开始后创建或修改的文件
-          recent_files = files.select { |f| File.mtime(f) >= start_time }
-          package_files.concat(recent_files)
-        end
-
-        if package_files.empty?
-          # 如果没有找到新文件，查找最近的包文件
-          search_paths.each do |pattern|
-            package_files.concat(Dir.glob(pattern))
-          end
-        end
-
-        # 过滤掉测试包和未签名包
-        package_files.reject! do |f|
-          basename = File.basename(f).downcase
-          TaskConfig::EXCLUDED_PATTERNS.any? { |pattern| basename.include?(pattern) }
-        end
-
-        # 返回最新的包文件（优先 AAB，其次 APK）
-        if package_files.any?
-          # 分类文件
-          aab_files = package_files.select { |f| f.end_with?(".aab") }
-          apk_files = package_files.select { |f| f.end_with?(".apk") }
-
-          # 优先返回 AAB 文件
-          latest_package = if aab_files.any?
-                            aab_files.max_by { |f| File.mtime(f) }
-                          elsif apk_files.any?
-                            apk_files.max_by { |f| File.mtime(f) }
-                          else
-                            package_files.max_by { |f| File.mtime(f) }
-                          end
-
-          puts "  找到 Android 包文件: #{latest_package}"
-          latest_package
-        else
-          puts "  警告: 未找到 APK/AAB 文件"
-          nil
-        end
+      # 准备构建环境
+      def prepare_build
+        raise NotImplementedError, "子类必须实现 prepare_build 方法"
       end
 
-      # 查找 Web 输出路径
-      def find_web_output_path
-        # 记录查找前的时间，用于过滤旧文件
-        start_time = @started_at || Time.now - 60
-
-        # 可能的 Web 构建输出位置（通常是文件夹）
-        search_paths = [
-          File.join(@project_path, "build", "web"),
-          File.join(@project_path, "build", "webgl"),
-          File.join(@project_path, "output", "web"),
-          File.join(@project_path, "output", "webgl"),
-          File.join(@project_path, "GoodPlatform", "Web"),
-          File.join(@project_path, "GoodPlatform", "WebGL"),
-          File.join(@project_path, "Build", "WebGL"),
-          File.join(@project_path, "dist"),
-          File.join(@project_path, "public")
-        ]
-
-        # 查找存在且最近修改的文件夹
-        web_dirs = search_paths.select do |path|
-          File.directory?(path) && File.mtime(path) >= start_time
-        end
-
-        if web_dirs.empty?
-          # 如果没有找到新文件夹，查找包含 index.html 的文件夹
-          web_dirs = search_paths.select do |path|
-            File.directory?(path) && File.exist?(File.join(path, "index.html"))
-          end
-        end
-
-        # 如果还是没找到，查找 zip 文件
-        if web_dirs.empty?
-          zip_patterns = [
-            File.join(@project_path, "build", "**", "*web*.zip"),
-            File.join(@project_path, "output", "**", "*web*.zip"),
-            File.join(@project_path, "**", "*webgl*.zip")
-          ]
-
-          zip_files = []
-          zip_patterns.each do |pattern|
-            files = Dir.glob(pattern)
-            recent_files = files.select { |f| File.mtime(f) >= start_time }
-            zip_files.concat(recent_files)
-          end
-
-          if zip_files.any?
-            latest_zip = zip_files.max_by { |f| File.mtime(f) }
-            puts "  找到 Web 压缩包: #{latest_zip}"
-            return latest_zip
-          end
-        end
+      # 执行构建
+      def execute_build
+        raise NotImplementedError, "子类必须实现 execute_build 方法"
+      end
 
-        # 返回最新的 Web 目录
-        if web_dirs.any?
-          latest_dir = web_dirs.max_by { |d| File.mtime(d) }
-          puts "  找到 Web 输出目录: #{latest_dir}"
-          latest_dir
-        else
-          puts "  警告: 未找到 Web 输出文件或目录"
-          nil
-        end
+      # 查找输出文件
+      def find_output
+        raise NotImplementedError, "子类必须实现 find_output 方法"
       end
     end
   end
-end
+end

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

@@ -0,0 +1,80 @@
+require_relative '../pindo_task'
+require 'pindo/module/build/git_repo_helper'
+
+module Pindo
+  module TaskSystem
+    # Git 标签任务
+    # 检查并创建 Git 标签
+    class GitTagTask < PindoTask
+      attr_reader :project_path
+
+      def self.task_type
+        :git_tag
+      end
+
+      # 重试配置
+      def self.default_retry_mode
+        RetryMode::IMMEDIATE  # 立即重试
+      end
+
+      def self.default_retry_count
+        2  # 可以重试 2 次
+      end
+
+      def self.default_retry_delay
+        5  # 默认延迟 5 秒
+      end
+
+      # 初始化 Git 标签任务
+      # @param project_path [String] 项目路径
+      # @param options [Hash] 选项
+      def initialize(project_path, options = {})
+        @project_path = project_path
+
+        super("Git 标签检查", options)
+      end
+
+      def validate
+        # 验证项目路径是否存在
+        unless @project_path && Dir.exist?(@project_path)
+          @error = "项目路径不存在：#{@project_path}"
+          return false
+        end
+
+        true
+      end
+
+      protected
+
+      def do_work
+        git_repo_helper = Pindo::GitRepoHelper.share_instance
+
+        # 检查是否需要打标签
+        is_need_add_tag, tag_action_params = git_repo_helper.check_is_need_add_tag?(@project_path)
+
+        if is_need_add_tag
+          # 直接调用 GitRepoHelper 创建标签
+          git_repo_helper.create_and_push_tag(
+            project_dir: @project_path,
+            mode: 'minor',
+            force_retag: tag_action_params&.include?('--retag') || false,
+            custom_tag: nil,
+            release_branch: 'master'
+          )
+
+          {
+            success: true,
+            tag_added: true,
+            tag_params: tag_action_params
+          }
+        else
+          {
+            success: true,
+            tag_added: false,
+            message: "无需添加 Git 标签"
+          }
+        end
+      end
+    end
+  end
+end