pindo 5.13.1 → 5.13.2

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

@@ -0,0 +1,210 @@
+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 AdHoc 模式构建任务
+    # 使用 Release 模式编译 Android 工程（AdHoc 版本）
+    class AndroidBuildAdhocTask < AndroidBuildTask
+      include Pindo::Githelper
+
+      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, :adhoc, options)
+      end
+
+      protected
+
+      def build_task_name
+        "构建 APK (AdHoc)"
+      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
+      end
+
+      def execute_build
+        build_android_project
+      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)
+      end
+    end
+  end
+end

data/lib/pindo/module/task/model/build/{android_dev_build_task.rb → android_build_dev_task.rb}

@@ -1,4 +1,4 @@
-require_relative '../build_task'
+require_relative 'android_build_task'
 require 'pindo/module/build/build_helper'
 require 'pindo/module/build/version_helper'
 require 'pindo/module/build/git_repo_helper'
@@ -11,7 +11,7 @@ module Pindo
   module TaskSystem
     # Android Dev 模式构建任务
     # 使用 Debug 模式编译 Android 工程
-    class AndroidDevBuildTask < BuildTask
+    class AndroidBuildDevTask < AndroidBuildTask
       include Pindo::Githelper
       def initialize(options = {})
         @bundle_name = options[:bundle_name]

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

@@ -0,0 +1,210 @@
+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 发布
+    class AndroidBuildGPlayTask < AndroidBuildTask
+      include Pindo::Githelper
+
+      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)
+      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
+      end
+
+      def execute_build
+        build_android_project
+      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)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+require_relative '../build_task'
+
+module Pindo
+  module TaskSystem
+    # Android 构建任务基类
+    # 所有 Android 平台构建任务的抽象基类
+    # 子类包括：AndroidBuildDevTask、AndroidBuildAdhocTask、AndroidBuildGPlayTask
+    class AndroidBuildTask < BuildTask
+      # 空基类，仅用于类型标识
+      # 所有具体实现由子类完成
+    end
+  end
+end

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

@@ -0,0 +1,197 @@
+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/xcode/xcode_build_config'
+require 'pindo/module/xcode/xcode_build_helper'
+require 'pindo/module/pgyer/pgyerhelper'
+
+module Pindo
+  module TaskSystem
+    # iOS AdHoc 模式构建任务
+    # 使用 AdHoc 证书编译 iOS 工程
+    class IosBuildAdhocTask < IosBuildTask
+      def initialize(options = {})
+        @bundle_id = options[:bundle_id]
+        
+        @proj_name = options[:proj_name]
+
+        @upload_flag = options[:upload] || false
+        @send_flag = options[:send] || false
+        @macos_flag = false
+
+        # 接收外部传入的 JPS 配置
+        @app_info_obj = options[:app_info_obj]
+        @workflow_info = options[:workflow_info]
+
+        # 保存 Unity 根目录路径（用于查找 config.json）
+        @unity_root_path = options[:unity_root_path]
+
+        super(:ios, :adhoc, options)
+      end
+
+      protected
+
+      def build_task_name
+        "构建 IPA (AdHoc)"
+      end
+
+      def prepare_build
+
+        Dir.chdir(@project_path)
+        cleanup_firebase_shell
+        update_project_config
+        update_version_info
+        pull_config
+        handle_cocoapods
+      end
+
+      def execute_build
+        configure_certificate
+        update_url_schemes_final
+        build_ios_project
+      end
+
+      def find_output
+        build_path = File.join(@project_path, "build", "*.{ipa,app}")
+        ipa_files = Dir.glob(build_path)
+
+        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
+      end
+
+      private
+
+
+
+      # 清理 Firebase Shell Script
+      def cleanup_firebase_shell
+        project_fullname = Dir.glob(File.join(@project_path, "/*.xcodeproj")).max_by { |f| File.mtime(f) }
+        if !project_fullname.nil? && File.exist?(project_fullname)
+          Pindo::XcodeBuildHelper.delete_libtarget_firebase_shell(@project_path)
+        end
+      end
+
+      # 更新工程配置
+      def update_project_config
+
+
+      end
+
+      # 更新版本号
+      def update_version_info
+        
+      end
+
+      # 拉取配置
+      def pull_config
+        return unless @bundle_id
+
+        build_helper = Pindo::BuildHelper.share_instance
+        build_helper.pull_appconfig_with_reponame(
+          repo_name: @bundle_id,
+          target_dir: @project_path
+        )
+
+        # 重新加载配置到 IosConfigParser
+        config_file = File.join(@project_path, "config.json")
+        if File.exist?(config_file)
+          Pindo::IosConfigParser.instance.load_config(config_file: config_file)
+        else
+          raise Informative, "配置文件不存在: #{config_file}"
+        end
+      end
+
+
+      # 处理 CocoaPods
+      def handle_cocoapods
+        return unless File.exist?(File.join(@project_path, "Podfile"))
+
+        Dir.chdir(@project_path)
+        Pindo::Command::Ios::Podupdate::run([])
+
+        begin
+          # 清理现有 Pods
+          FileUtils.rm_rf(File.join(@project_path, "Podfile.lock")) if File.exist?(File.join(@project_path, "Podfile.lock"))
+          FileUtils.rm_rf(File.join(@project_path, "Pods")) if File.exist?(File.join(@project_path, "Pods"))
+
+          puts "正在执行 pod deintegrate..."
+          system 'pod deintegrate'
+
+          puts "正在执行 pod install..."
+          system 'pod install'
+        rescue => error
+          puts(error.to_s)
+          raise Informative, "pod install 失败！！先 pod install 完成后再编译！"
+        end
+
+        # 检查 pod install 是否成功
+        pod_lock_file = File.join(@project_path, "Podfile.lock")
+        unless File.exist?(pod_lock_file)
+          raise Informative, "pod install 失败！！先 pod install 完成后再编译！"
+        end
+      end
+
+      # 配置证书
+      def configure_certificate
+        detect_macos_platform
+
+        # 使用新的证书安装方法
+        # config.json 已经通过 pull_config 方法拉取到 @project_path 目录
+        require 'pindo/module/cert/xcode_cert_helper'
+        Pindo::XcodeCertHelper.install_and_config_certs(
+          build_type: 'adhoc',
+          platform_type: @macos_flag ? 'macos' : 'ios',
+          project_dir: @project_path
+        )
+      end
+
+      # 检测是否为 macOS 平台
+      def detect_macos_platform
+        project_fullname = Dir.glob(File.join(@project_path, "/*.xcodeproj")).max_by { |f| File.mtime(f) }
+        return if project_fullname.nil?
+
+        require 'xcodeproj'
+        project_obj = Xcodeproj::Project.open(project_fullname)
+        project_build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
+
+        if !project_build_platform.nil? && project_build_platform.eql?("macosx")
+          @macos_flag = true
+        end
+      end
+
+      # 更新 URL Schemes（基于最终 Bundle ID）
+      def update_url_schemes_final
+        workflow_packname = @workflow_info[:package_name]
+        Pindo::XcodeBuildConfig.update_url_schemes_with_bundleid(
+          project_dir: @project_path,
+          package_name: workflow_packname
+        )
+      end
+
+      # 编译 iOS 工程
+      def build_ios_project
+        Dir.chdir(@project_path)
+
+        # 使用 XcodeBuildHelper 进行构建
+        ipa_file = Pindo::XcodeBuildHelper.build_project(
+          project_dir: @project_path,
+          icloud_id: nil
+        )
+
+        if ipa_file.nil?
+          raise Informative, "构建失败：未生成 IPA 文件"
+        end
+
+        puts "构建成功：#{ipa_file}"
+        ipa_file
+      end
+    end
+  end
+end