pindo 5.13.7 → 5.13.10

data/lib/pindo/module/task/model/build/android_build_gplay_task.rb

@@ -1,209 +1,35 @@
 require_relative 'android_build_task'
-require 'pindo/module/build/build_helper'
-require 'pindo/module/build/version_helper'
-require 'pindo/module/build/git_repo_helper'
-require 'pindo/module/android/android_config_helper'
-require 'pindo/module/android/android_build_helper'
-require 'pindo/module/pgyer/pgyerhelper'
-require 'pindo/base/githelper'
 
 module Pindo
   module TaskSystem
     # Android Google Play 模式构建任务
-    # 使用 Release 模式编译 Android 工程用于 Google Play 发布
+    # TODO: 待实现
     class AndroidBuildGPlayTask < AndroidBuildTask
-      include Pindo::Githelper
+      # 任务键
+      def self.task_key
+        :android_build_gplay
+      end
 
       def initialize(options = {})
-        @bundle_name = options[:bundle_name]
-        @proj_name = options[:proj_name]
-        @upload_flag = options[:upload] || false
-        @send_flag = options[:send] || false
-
-        # 接收外部传入的 JPS 配置
-        @app_info_obj = options[:app_info_obj]
-        @workflow_info = options[:workflow_info]
-
-        super(:android, :release, options)
+        options[:platform] = :android
+        options[:mode] = :release
+        super("构建 AAB (Google Play)", options)
       end
 
       protected
 
-      def build_task_name
-        "构建 APK (Release)"
-      end
-
       def prepare_build
-        # 校验必需的参数
-        Dir.chdir(@project_path)
-        validate_workflow_info
-        check_git_tag if @upload_flag
-        update_project_config
-        update_version_info
-        handle_bundle_name_config if @bundle_name
-        add_application_id_scheme
+        # TODO: 待实现
+        raise Informative, "AndroidBuildGPlayTask 暂未实现"
       end
 
       def execute_build
-        build_android_project
+        # TODO: 待实现
       end
 
       def find_output
-        # 搜索 APK 和 AAB 文件
-        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|
-          package_files.concat(Dir.glob(pattern))
-        end
-
-        # 过滤测试包和未签名包
-        package_files.reject! do |f|
-          basename = File.basename(f).downcase
-          TaskConfig::EXCLUDED_PATTERNS.any? { |pattern| basename.include?(pattern) }
-        end
-
-        if package_files.any?
-          # 优先返回 AAB，其次 APK
-          aab_files = package_files.select { |f| f.end_with?(".aab") }
-          apk_files = package_files.select { |f| f.end_with?(".apk") }
-
-          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
-      end
-
-      private
-
-      # 校验工作流信息
-      def validate_workflow_info
-        unless @workflow_info && @workflow_info[:package_name]
-          raise Informative, "未提供工作流信息，请在创建任务时传入 workflow_info 参数"
-        end
-      end
-
-      # Git 标签检查
-      def check_git_tag
-        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
-          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'
-          )
-        end
-      end
-
-      # 更新工程配置
-      def update_project_config
-        workflow_packname = @workflow_info[:package_name]
-
-        puts "\n使用工作流配置更新 Android 项目:"
-        puts "  Workflow Package Name: #{workflow_packname}"
-
-        # 更新 App Name、Application ID 和 URL Schemes
-        Pindo::AndroidConfigHelper.update_project_with_workflow(
-          project_dir: @project_path,
-          workflow_packname: workflow_packname
-        )
-
-        # 下载并替换 Icon
-        if @app_info_obj && @app_info_obj["projectIcon"] && !@app_info_obj["projectIcon"].empty?
-          icon_replace_success = Pindo::AndroidConfigHelper.download_and_replace_icon_from_url(
-            project_dir: @project_path,
-            icon_url: @app_info_obj["projectIcon"]
-          )
-
-          unless icon_replace_success
-            raise Informative, "Icon 下载或替换失败，请检查 Icon URL 是否有效: #{@app_info_obj["projectIcon"]}"
-          end
-        else
-          Funlog.warning("未配置 Icon URL，跳过 Icon 替换")
-        end
-      end
-
-      # 更新版本号
-      def update_version_info
-        version_helper = Pindo::VersionHelper.share_instance
-        version_info = version_helper.get_version_info(project_dir: @project_path)
-
-        if version_info[:is_git_repo]
-          Pindo::AndroidConfigHelper.update_android_project_version(
-            project_dir: @project_path,
-            version_name: version_info[:version],
-            version_code: version_info[:build_number]
-          )
-        else
-          Funlog.warning("非Git仓库，保持工程原有版本号")
-        end
-      end
-
-      # 处理 Bundle Name 特殊配置
-      def handle_bundle_name_config
-        return unless @bundle_name && !@bundle_name.empty?
-
-        puts "\n正在处理指定的 Bundle Name: #{@bundle_name}..."
-
-        # 检查是否为通配符
-        is_wildcard = @bundle_name.include?('*') ||
-                      @bundle_name.end_with?('.') ||
-                      ['com.test', 'com.example', 'com.demo'].include?(@bundle_name)
-
-        if is_wildcard
-          puts "  ⚠️  检测到通配符或通用 Bundle Name: #{@bundle_name}"
-          puts "  ⚠️  跳过 google-services.json 和 Application ID 更新"
-        else
-          # 拉取配置仓库
-          config_repo_dir = clong_buildconfig_repo(repo_name: @bundle_name)
-
-          if config_repo_dir && File.exist?(config_repo_dir)
-            # 拷贝 google-services.json
-            Pindo::AndroidConfigHelper.copy_google_services_from_config_repo(
-              config_repo_dir: config_repo_dir,
-              project_dir: @project_path
-            )
-
-            # 更新 Application ID
-            Pindo::AndroidConfigHelper.update_application_id(
-              project_dir: @project_path,
-              application_id: @bundle_name
-            )
-
-            puts "  ✓ Bundle Name 配置处理完成"
-          else
-            raise Informative, "无法获取配置仓库"
-          end
-        end
-      end
-
-      # 添加基于 Application ID 的 Scheme
-      def add_application_id_scheme
-        Pindo::AndroidConfigHelper.add_application_id_based_scheme(
-          project_dir: @project_path
-        )
-      end
-
-      # 构建 Android 工程
-      def build_android_project
-        android_build_helper = Pindo::AndroidBuildHelper.share_instance
-        # 第二个参数 false 表示 release 模式
-        android_build_helper.auto_build_apk(@project_path, false)
+        # TODO: 待实现
+        nil
       end
     end
   end

data/lib/pindo/module/task/model/build/ios_build_adhoc_task.rb

@@ -1,6 +1,6 @@
 require_relative 'ios_build_task'
 require 'pindo/module/build/build_helper'
-require 'pindo/module/build/version_helper'
+require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/xcode/xcode_build_config'
 require 'pindo/module/xcode/xcode_build_helper'
@@ -17,6 +17,11 @@ module Pindo
     # 使用 AdHoc 证书编译 iOS 工程
     # 包含 AdHoc 特有的准备工作（版本号增加、Tag 创建、Quark/Swark 处理等）
     class IosBuildAdhocTask < IosBuildTask
+      # 任务键
+      def self.task_key
+        :ios_build_adhoc
+      end
+
       def initialize(options = {})
         @bundle_id = options[:bundle_id]
         @proj_name = options[:proj_name]
@@ -27,15 +32,13 @@ module Pindo
         # 保存 Unity 根目录路径（用于查找 config.json）
         @unity_root_path = options[:unity_root_path]
 
-        super(:ios, :adhoc, options)
+        options[:platform] = :ios
+        options[:mode] = :adhoc
+        super("构建 IPA (AdHoc)", options)
       end
 
       protected
 
-      def build_task_name
-        "构建 IPA (AdHoc)"
-      end
-
       #准备构建
       def prepare_build
         Dir.chdir(@project_path)

data/lib/pindo/module/task/model/build/ios_build_appstore_task.rb

@@ -1,6 +1,6 @@
 require_relative 'ios_build_task'
 require 'pindo/module/build/build_helper'
-require 'pindo/module/build/version_helper'
+require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/xcode/xcode_build_config'
 require 'pindo/module/xcode/xcode_build_helper'
@@ -17,6 +17,11 @@ module Pindo
     # 使用 Distribution/App Store 证书编译 iOS 工程
     # 包含 AppStore 特有的准备工作（版本号增加、Tag 创建、Quark/Swark 处理等）
     class IosBuildAppStoreTask < IosBuildTask
+      # 任务键
+      def self.task_key
+        :ios_build_appstore
+      end
+
       def initialize(options = {})
         @bundle_id = options[:bundle_id]
         @proj_name = options[:proj_name]
@@ -27,15 +32,13 @@ module Pindo
         # 保存 Unity 根目录路径（用于查找 config.json）
         @unity_root_path = options[:unity_root_path]
 
-        super(:ios, :release, options)
+        options[:platform] = :ios
+        options[:mode] = :release
+        super("构建 IPA (AppStore)", options)
       end
 
       protected
 
-      def build_task_name
-        "构建 IPA (Release)"
-      end
-
       #准备构建
       def prepare_build
         Dir.chdir(@project_path)

data/lib/pindo/module/task/model/build/ios_build_dev_task.rb

@@ -1,6 +1,6 @@
 require_relative 'ios_build_task'
 require 'pindo/module/build/build_helper'
-require 'pindo/module/build/version_helper'
+require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/xcode/xcode_build_config'
 require 'pindo/module/xcode/xcode_build_helper'
@@ -12,6 +12,11 @@ module Pindo
     # iOS Dev 模式构建任务
     # 使用 Development 证书编译 iOS 工程
     class IosBuildDevTask < IosBuildTask
+      # 任务键
+      def self.task_key
+        :ios_build_dev
+      end
+
       def initialize(options = {})
         @bundle_id = options[:bundle_id]
         @proj_name = options[:proj_name]
@@ -26,27 +31,29 @@ module Pindo
         # 保存 Unity 根目录路径（用于查找 config.json）
         @unity_root_path = options[:unity_root_path]
 
-        super(:ios, :dev, options)
+        # Git 版本控制参数（与 GitOptions 一致）
+        @ver_inc = options[:ver_inc] || Pindo::VersionIncreaseType::MINI
+        @tag_type = options[:tag_type] || Pindo::CreateTagType::NEW
+        @tag_pre = options[:tag_pre] || 'v'
+
+        options[:platform] = :ios
+        options[:mode] = :dev
+        super("构建 IPA (Dev)", options)
       end
 
       protected
 
-      def build_task_name
-        "构建 IPA (Dev)"
-      end
-
       def prepare_build
         # 校验必需的参数
         validate_workflow_info
 
         Dir.chdir(@project_path)
-        check_git_tag if @upload_flag
         cleanup_firebase_shell
         update_project_config
         update_version_info
         pull_config
         update_entitlements
-        
+
       end
 
       def execute_build
@@ -95,21 +102,6 @@ module Pindo
 
       private
 
-      # Git 标签检查
-      def check_git_tag
-        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
-          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'
-          )
-        end
-      end
-
       # 校验工作流信息
       def validate_workflow_info
         unless @workflow_info && @workflow_info[:package_name]
@@ -149,18 +141,31 @@ module Pindo
 
       # 更新版本号
       def update_version_info
-        version_helper = Pindo::VersionHelper.share_instance
-        version_info = version_helper.get_version_info(project_dir: @project_path)
+        git_repo_helper = Pindo::GitRepoHelper.share_instance
 
-        if version_info[:is_git_repo]
-          Pindo::XcodeBuildConfig.update_ios_project_version(
-            project_dir: @project_path,
-            version: version_info[:version],
-            build_number: version_info[:build_number]
-          )
-        else
+        # 检查是否是 Git 仓库
+        git_root = Pindo::GitHandler.git_root_directory(local_repo_dir: @project_path)
+        unless git_root
           Funlog.warning("非Git仓库，保持工程原有版本号")
+          return
         end
+
+        # 获取 build_number（从 commit hash 计算）
+        build_number = git_repo_helper.get_build_number_from_commit(project_dir: @project_path)
+
+        # 计算 build_version
+        build_version = git_repo_helper.calculate_build_version(
+          project_dir: @project_path,
+          tag_prefix: @tag_pre,
+          create_tag_type: @tag_type,
+          version_increase_type: @ver_inc
+        )
+
+        Pindo::XcodeBuildConfig.update_ios_project_version(
+          project_dir: @project_path,
+          version: build_version,
+          build_number: build_number
+        )
       end
 
       # 检查配置

data/lib/pindo/module/task/model/build/web_build_dev_task.rb

@@ -6,16 +6,18 @@ module Pindo
     # Web 平台不需要编译，Unity 导出后即为最终产物
     # 此任务只检查构建产物是否存在
     class WebBuildDevTask < BuildTask
+      def self.task_key
+        :web_build_dev
+      end
+
       def initialize(options = {})
-        super(:web, :dev, options)
+        options[:platform] = :web
+        options[:mode] = :dev
+        super("构建 WebGL", options)
       end
 
       protected
 
-      def build_task_name
-        "构建 WebGL"
-      end
-
       def prepare_build
         # Web 不需要准备，Unity 导出后即完成
       end

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

@@ -13,6 +13,11 @@ module Pindo
         :build
       end
 
+      # 任务类型显示名称
+      def self.task_type_name
+        "编译构建"
+      end
+
       # 重试配置
       def self.default_retry_mode
         RetryMode::DELAYED
@@ -130,15 +135,12 @@ module Pindo
 
       # ========== 实例方法 ==========
 
-      def initialize(platform, mode, options = {})
-        @platform = platform
-        @mode = mode
+      def initialize(name, options = {})
+        @platform = options[:platform]
+        @mode = options[:mode]
         @project_path = options[:project_path] || Dir.pwd
         @output_path = nil
 
-        # 构建任务名称
-        name = build_task_name
-
         super(name, options)
       end
 
@@ -164,11 +166,6 @@ module Pindo
 
       # ========== 子类必须实现的抽象方法 ==========
 
-      # 构建任务名称
-      def build_task_name
-        raise NotImplementedError, "子类必须实现 build_task_name 方法"
-      end
-
       # 准备构建环境
       def prepare_build
         raise NotImplementedError, "子类必须实现 prepare_build 方法"

data/lib/pindo/module/task/model/git/git_commit_task.rb

@@ -0,0 +1,118 @@
+require 'pindo/module/task/model/git_task'
+require 'pindo/base/git_handler'
+require 'pindo/module/build/git_repo_helper'
+
+module Pindo
+  module TaskSystem
+    # Git 提交任务
+    # 负责检查并提交仓库的未提交修改
+    class GitCommitTask < GitTask
+      attr_reader :release_branch, :ver_inc, :tag_type, :tag_pre
+      attr_reader :build_version, :build_number
+
+      # 任务键
+      def self.task_key
+        :git_commit
+      end
+
+      # 重试配置：失败后重试 1 次
+      def self.default_retry_count
+        2
+      end
+
+      # 初始化 Git 提交任务
+      # @param project_path [String] 项目路径
+      # @param options [Hash] 选项（与 GitOptions 参数名一致）
+      #   - release_branch: 发布分支名称，默认 'master'
+      #   - ver_inc: 版本号增加类型，默认 :mini
+      #   - tag_type: 创建tag类型，默认 :new
+      #   - tag_pre: tag前缀，默认 'v'
+      #   - fixed_version: 外部指定的固定版本号，如果设置则跳过版本号计算
+      def initialize(project_path, options = {})
+        @release_branch = options[:release_branch] || 'master'
+        @ver_inc = options[:ver_inc] || Pindo::VersionIncreaseType::MINI
+        @tag_type = options[:tag_type] || Pindo::CreateTagType::NEW
+        @tag_pre = options[:tag_pre] || 'v'
+        @fixed_version = options[:fixed_version]  # 外部指定的固定版本号
+
+        @build_version = nil
+        @build_number = nil
+        options[:project_path] = project_path
+
+        super("Git仓库文件提交检查", options)
+      end
+
+      def validate
+        super
+        # 不再验证是否为 Git 仓库，由 do_work 中处理
+        # 非 Git 仓库目录会跳过检查并成功返回
+        true
+      end
+
+      protected
+
+      def do_work
+        # 检查是否为 Git 仓库，如果不是则直接成功返回
+        unless valid_git_repository?
+          Funlog.instance.fancyinfo_warning("当前目录不是Git仓库，跳过Git提交检查")
+          return {
+            success: true,
+            is_git_repo: false,
+            message: "当前目录不是Git仓库，已跳过Git提交检查"
+          }
+        end
+
+        # 使用基类的 git_root_path 属性
+        root_dir = @git_root_path
+        git_repo_helper = Pindo::GitRepoHelper.share_instance
+
+        # 1. 检查并修复 .gitignore
+        git_repo_helper.check_gitignore(root_dir)
+
+        # 2. 检查并处理未提交的文件（使用 GitHandler）
+        begin
+          Pindo::GitHandler.check_uncommitted_files(project_dir: root_dir)
+        rescue Informative => e
+          # 用户选择手动处理时，不需要重试
+          if e.message.include?("请手动处理")
+            @retry_count = 0
+          end
+          raise
+        end
+
+        # 3. 获取当前分支
+        coding_branch = get_current_branch_name
+
+        # 4. 检查并推送本地提交到远程
+        Pindo::GitHandler.check_unpushed_commits(project_dir: root_dir, branch: coding_branch)
+
+        # 5. 计算 build_version
+        # 如果指定了固定版本号，使用它；否则计算版本号
+        if @fixed_version && !@fixed_version.empty?
+          @build_version = @fixed_version
+          @build_number = nil
+          Funlog.instance.fancyinfo_success("版本号: #{@build_version}")
+        else
+          @build_number = git_repo_helper.get_build_number_from_commit(project_dir: root_dir)
+          @build_version = git_repo_helper.calculate_build_version(
+            project_dir: root_dir,
+            tag_prefix: @tag_pre,
+            create_tag_type: @tag_type,
+            version_increase_type: @ver_inc
+          )
+          Funlog.instance.fancyinfo_success("版本号: #{@build_version}, Build: #{@build_number}")
+        end
+
+        {
+          success: true,
+          root_dir: root_dir,
+          current_branch: coding_branch,
+          release_branch: @release_branch,
+          build_version: @build_version,
+          build_number: @build_number,
+          tag_pre: @tag_pre
+        }
+      end
+    end
+  end
+end