pindo 5.13.1 → 5.13.3

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

@@ -0,0 +1,342 @@
+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/xcode/xcode_app_config'
+require 'pindo/module/xcode/cocoapods_helper'
+require 'pindo/module/xcode/applovin_xcode_helper'
+require 'pindo/module/cert/xcode_cert_helper'
+require 'pindo/module/pgyer/pgyerhelper'
+require 'pindo/config/ios_config_parser'
+
+module Pindo
+  module TaskSystem
+    # iOS AdHoc 模式构建任务
+    # 使用 AdHoc 证书编译 iOS 工程
+    # 包含 AdHoc 特有的准备工作（版本号增加、Tag 创建、Quark/Swark 处理等）
+    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
+
+        # 保存 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)
+
+        # 0. 清理 Firebase Shell Script
+        cleanup_firebase_shell
+
+        # 1. 加载配置到 IosConfigParser 单例
+        load_ios_config
+
+        # 2. 自动增加版本号
+        auto_increase_buildnumber
+
+        # 3. 检查代码版本
+        check_code_version
+
+        # 4. 配置 Xcode 项目
+        configure_xcode_project
+
+        # 5. Quark/Swark 处理
+        handle_quswark_processing
+
+        # 6. 使用 adhoc cert 命令
+        configure_adhoc_certificate
+
+        # 7. Applovin 处理
+        handle_applovin_processing
+      end
+
+      def execute_build
+        handle_cocoapods
+        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
+
+      # 加载 iOS 配置
+      def load_ios_config
+        # 直接使用 IosConfigParser 单例中已加载的配置
+        config_parser = Pindo::IosConfigParser.instance
+        if config_parser.config_json.nil?
+          # 如果单例中没有配置，说明命令层未正确初始化
+          raise Informative, "配置未加载，请确保在命令层（如 pindo adhoc autobuild）已正确加载 config.json"
+        else
+          puts "  使用已加载的配置..."
+        end
+      end
+
+      # 自动增加版本号
+      def auto_increase_buildnumber
+        config_parser = Pindo::IosConfigParser.instance
+        config_json = config_parser.config_json
+        return unless config_json
+
+        # 从全局配置获取 deploy_identifier
+        deploy_identifier = config_json.dig('project_info', 'deploy_identifier')
+        return unless deploy_identifier
+
+        puts "  自动增加版本号..."
+
+        # 从全局配置获取 pindo_dir
+        pindo_dir = File.expand_path(config_parser.pindo_dir)
+        app_config_repo_dir = File.join(pindo_dir, deploy_identifier)
+
+        # 增加项目目录的版本号
+        project_config_file = File.join(@project_path, "config.json")
+        if File.exist?(project_config_file)
+          increase_buildnumber_in_file(project_config_file)
+        end
+
+        # 增加配置仓库的版本号
+        app_config_file = File.join(app_config_repo_dir, "config.json")
+        if File.exist?(app_config_file)
+          increase_buildnumber_in_file(app_config_file)
+
+          # 提交到配置仓库
+          require 'pindo/module/build/git_repo_helper'
+          git_helper = Pindo::GitRepoHelper.share_instance
+          git_helper.git_addpush_repo(
+            path: app_config_repo_dir,
+            message: "increate build number",
+            commit_file_params: ["config.json"]
+          )
+        end
+      end
+
+      # 增加配置文件中的版本号
+      def increase_buildnumber_in_file(config_file)
+        config_json = JSON.parse(File.read(config_file))
+
+        if config_json["app_info"] && config_json["app_info"]["app_version"]
+          version_parts = config_json["app_info"]["app_version"].split(".")
+          if version_parts.length >= 3
+            build_number = version_parts[2].to_i + 1
+            version_parts[2] = build_number.to_s
+            config_json["app_info"]["app_version"] = version_parts.join(".")
+
+            File.write(config_file, JSON.pretty_generate(config_json))
+            puts "    ✓ 版本号: #{config_json["app_info"]["app_version"]}"
+          end
+        end
+      end
+
+      # 检查代码版本
+      def check_code_version
+        config_parser = Pindo::IosConfigParser.instance
+        config_json = config_parser.config_json
+        return unless config_json
+
+        deploy_identifier = config_json.dig('project_info', 'deploy_identifier')
+        return unless deploy_identifier
+
+        puts "  检查代码版本..."
+
+        pindo_dir = File.expand_path(config_parser.pindo_dir)
+        app_config_dir = File.join(pindo_dir, deploy_identifier)
+        build_verify_file = File.join(app_config_dir, "build_verify.json")
+
+        build_verify_json = nil
+        begin
+          build_verify_json = JSON.parse(File.read(build_verify_file)) if File.exist?(build_verify_file)
+        rescue => error
+          build_verify_json = nil
+        end
+
+        require 'pindo/module/build/git_repo_helper'
+        git_helper = Pindo::GitRepoHelper.share_instance
+        release_code_commit = git_helper.git_latest_commit_id(local_repo_dir: @project_path)
+
+        if !release_code_commit.nil? && !build_verify_json.nil? && !build_verify_json["output_code_commit"].nil?
+          output_code_commit = build_verify_json["output_code_commit"]
+          if !release_code_commit.eql?(output_code_commit)
+            puts
+            puts "  ⚠ 不是最新代码，请更新代码！"
+            puts "  当前 commit: #{release_code_commit}"
+            puts "  期望 commit: #{output_code_commit}"
+            puts
+
+            require 'highline/import'
+            answer = agree("  请确认要用当前代码编译: (Y/n)")
+            unless answer
+              raise Informative, "请更新代码重新打包！"
+            end
+          end
+        end
+      end
+
+      # 配置 Xcode 项目
+      def configure_xcode_project
+        puts "  配置 Xcode 项目..."
+        Pindo::XcodeBuildConfig.configure_xcode_project(project_dir: @project_path)
+      end
+
+      # 处理 Quark/Swark
+      def handle_quswark_processing
+        config_parser = Pindo::IosConfigParser.instance
+        config_json = config_parser.config_json
+        return unless config_json
+
+        # 从 config_json 中判断是否需要处理 Quark/Swark
+        xcode_build_type = config_json.dig('project_info', 'xcode_build_type')
+        return unless xcode_build_type
+
+        build_type_array = xcode_build_type.split("_") || []
+        return unless build_type_array.include?("quark") || build_type_array.include?("swark")
+
+        puts "  处理 Quark/Swark..."
+
+        require 'pindo/module/xcode/xcode_swark_helper'
+        Dir.chdir(@project_path)
+
+        if xcode_build_type.include?("quark")
+          Pindo::XcodeSwarkHelper.quark_run(
+            project_dir: @project_path,
+            config_json: config_json,
+            build_type: 'adhoc'
+          )
+        else
+          Pindo::XcodeSwarkHelper.swark_run(
+            project_dir: @project_path,
+            config_json: config_json,
+            build_type: 'adhoc'
+          )
+        end
+      end
+
+      # 配置 AdHoc 证书
+      def configure_adhoc_certificate
+        puts "  配置 AdHoc 证书..."
+
+        # 检测平台类型
+        detect_macos_platform
+        platform_type = @macos_flag ? 'macos' : 'ios'
+
+        # 使用 XcodeCertHelper 安装和配置证书
+        Pindo::XcodeCertHelper.install_and_config_certs(
+          build_type: 'adhoc',
+          platform_type: platform_type,
+          project_dir: @project_path
+        )
+      end
+
+      # # 创建发布 tag
+      # def create_release_tag_for_adhoc
+      #   puts "  创建发布 Tag..."
+      #
+      #   config_parser = Pindo::IosConfigParser.instance
+      #   config_json = config_parser.config_json
+      #   bundle_id = config_parser.bundle_id
+      #
+      #   tag_helper = Object.new
+      #   tag_helper.extend(Pindo::XcodeAppConfig)
+      #   tag_helper.create_release_tag(
+      #     project_dir: @project_path,
+      #     config_json: config_json,
+      #     bundle_id: bundle_id
+      #   )
+      # end
+
+      # 处理 Applovin
+      def handle_applovin_processing
+        return unless File.exist?(File.join(@project_path, "Podfile.lock"))
+
+        begin
+          # 检查是否使用了 FancyAD 或 AppLovinSDK
+          if Pindo::CocoaPodsHelper.using_pods?(@project_path, ["FancyAD", "AppLovinSDK"])
+            puts
+            puts "  运行 Applovin Script..."
+
+            Pindo::ApplovinXcodeHelper.update_applovin_config(
+              project_dir: @project_path,
+              appstore_mode: false,
+              install_script: true,
+              upload_config: false
+            )
+          end
+        rescue => e
+          puts "  ⚠ Applovin 处理失败: #{e.message}"
+        end
+      end
+
+
+      # 处理 CocoaPods
+      def handle_cocoapods
+        return unless File.exist?(File.join(@project_path, "Podfile"))
+
+        # 1. 更新私有索引库
+        Pindo::CocoaPodsHelper.update_pod_repo(
+          install: false,
+          project_dir: @project_path
+        )
+
+        # 2. 清理并重新安装
+        Pindo::CocoaPodsHelper.deintegrate_and_install(@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
+
+      # 编译 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

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

@@ -0,0 +1,341 @@
+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/xcode/xcode_app_config'
+require 'pindo/module/xcode/cocoapods_helper'
+require 'pindo/module/xcode/applovin_xcode_helper'
+require 'pindo/module/cert/xcode_cert_helper'
+require 'pindo/module/pgyer/pgyerhelper'
+require 'pindo/config/ios_config_parser'
+
+module Pindo
+  module TaskSystem
+    # iOS AppStore 模式构建任务
+    # 使用 Distribution/App Store 证书编译 iOS 工程
+    # 包含 AppStore 特有的准备工作（版本号增加、Tag 创建、Quark/Swark 处理等）
+    class IosBuildAppStoreTask < 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
+
+        # 保存 Unity 根目录路径（用于查找 config.json）
+        @unity_root_path = options[:unity_root_path]
+
+        super(:ios, :release, options)
+      end
+
+      protected
+
+      def build_task_name
+        "构建 IPA (Release)"
+      end
+
+      #准备构建
+      def prepare_build
+        Dir.chdir(@project_path)
+
+        # 0. 清理 Firebase Shell Script
+        cleanup_firebase_shell
+
+        # 1. 加载配置到 IosConfigParser 单例
+        load_ios_config
+
+        # 2. 自动增加版本号
+        auto_increase_buildnumber
+
+        # 3. 检查代码版本
+        check_code_version
+
+        # 4. 配置 Xcode 项目
+        configure_xcode_project
+
+        # 5. Quark/Swark 处理
+        handle_quswark_processing
+
+        # 6. 使用 appstore cert 命令
+        configure_appstore_certificate
+
+        # 7. Applovin 处理
+        handle_applovin_processing
+      end
+
+      def execute_build
+        handle_cocoapods
+        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
+
+      # 加载 iOS 配置
+      def load_ios_config
+        # 直接使用 IosConfigParser 单例中已加载的配置
+        config_parser = Pindo::IosConfigParser.instance
+        if config_parser.config_json.nil?
+          # 如果单例中没有配置，说明命令层未正确初始化
+          raise Informative, "配置未加载，请确保在命令层（如 pindo appstore autobuild）已正确加载 config.json"
+        else
+          puts "  使用已加载的配置..."
+        end
+      end
+
+      # 自动增加版本号
+      def auto_increase_buildnumber
+        config_parser = Pindo::IosConfigParser.instance
+        config_json = config_parser.config_json
+        return unless config_json
+
+        # 从全局配置获取 deploy_identifier
+        deploy_identifier = config_json.dig('project_info', 'deploy_identifier')
+        return unless deploy_identifier
+
+        puts "  自动增加版本号..."
+
+        # 从全局配置获取 pindo_dir
+        pindo_dir = File.expand_path(config_parser.pindo_dir)
+        app_config_repo_dir = File.join(pindo_dir, deploy_identifier)
+
+        # 增加项目目录的版本号
+        project_config_file = File.join(@project_path, "config.json")
+        if File.exist?(project_config_file)
+          increase_buildnumber_in_file(project_config_file)
+        end
+
+        # 增加配置仓库的版本号
+        app_config_file = File.join(app_config_repo_dir, "config.json")
+        if File.exist?(app_config_file)
+          increase_buildnumber_in_file(app_config_file)
+
+          # 提交到配置仓库
+          require 'pindo/module/build/git_repo_helper'
+          git_helper = Pindo::GitRepoHelper.share_instance
+          git_helper.git_addpush_repo(
+            path: app_config_repo_dir,
+            message: "increate build number",
+            commit_file_params: ["config.json"]
+          )
+        end
+      end
+
+      # 增加配置文件中的版本号
+      def increase_buildnumber_in_file(config_file)
+        config_json = JSON.parse(File.read(config_file))
+
+        if config_json["app_info"] && config_json["app_info"]["app_version"]
+          version_parts = config_json["app_info"]["app_version"].split(".")
+          if version_parts.length >= 3
+            build_number = version_parts[2].to_i + 1
+            version_parts[2] = build_number.to_s
+            config_json["app_info"]["app_version"] = version_parts.join(".")
+
+            File.write(config_file, JSON.pretty_generate(config_json))
+            puts "    ✓ 版本号: #{config_json["app_info"]["app_version"]}"
+          end
+        end
+      end
+
+      # 检查代码版本
+      def check_code_version
+        config_parser = Pindo::IosConfigParser.instance
+        config_json = config_parser.config_json
+        return unless config_json
+
+        deploy_identifier = config_json.dig('project_info', 'deploy_identifier')
+        return unless deploy_identifier
+
+        puts "  检查代码版本..."
+
+        pindo_dir = File.expand_path(config_parser.pindo_dir)
+        app_config_dir = File.join(pindo_dir, deploy_identifier)
+        build_verify_file = File.join(app_config_dir, "build_verify.json")
+
+        build_verify_json = nil
+        begin
+          build_verify_json = JSON.parse(File.read(build_verify_file)) if File.exist?(build_verify_file)
+        rescue => error
+          build_verify_json = nil
+        end
+
+        require 'pindo/module/build/git_repo_helper'
+        git_helper = Pindo::GitRepoHelper.share_instance
+        release_code_commit = git_helper.git_latest_commit_id(local_repo_dir: @project_path)
+
+        if !release_code_commit.nil? && !build_verify_json.nil? && !build_verify_json["output_code_commit"].nil?
+          output_code_commit = build_verify_json["output_code_commit"]
+          if !release_code_commit.eql?(output_code_commit)
+            puts
+            puts "  ⚠ 不是最新代码，请更新代码！"
+            puts "  当前 commit: #{release_code_commit}"
+            puts "  期望 commit: #{output_code_commit}"
+            puts
+
+            require 'highline/import'
+            answer = agree("  请确认要用当前代码编译: (Y/n)")
+            unless answer
+              raise Informative, "请更新代码重新打包！"
+            end
+          end
+        end
+      end
+
+      # 配置 Xcode 项目
+      def configure_xcode_project
+        puts "  配置 Xcode 项目..."
+        Pindo::XcodeBuildConfig.configure_xcode_project(project_dir: @project_path)
+      end
+
+      # 处理 Quark/Swark
+      def handle_quswark_processing
+        config_parser = Pindo::IosConfigParser.instance
+        config_json = config_parser.config_json
+        return unless config_json
+
+        # 从 config_json 中判断是否需要处理 Quark/Swark
+        xcode_build_type = config_json.dig('project_info', 'xcode_build_type')
+        return unless xcode_build_type
+
+        build_type_array = xcode_build_type.split("_") || []
+        return unless build_type_array.include?("quark") || build_type_array.include?("swark")
+
+        puts "  处理 Quark/Swark..."
+
+        require 'pindo/module/xcode/xcode_swark_helper'
+        Dir.chdir(@project_path)
+
+        if xcode_build_type.include?("quark")
+          Pindo::XcodeSwarkHelper.quark_run(
+            project_dir: @project_path,
+            config_json: config_json,
+            build_type: 'release'
+          )
+        else
+          Pindo::XcodeSwarkHelper.swark_run(
+            project_dir: @project_path,
+            config_json: config_json,
+            build_type: 'release'
+          )
+        end
+      end
+
+      # 配置 AppStore 证书
+      def configure_appstore_certificate
+        puts "  配置 AppStore 证书..."
+
+        # 检测平台类型
+        detect_macos_platform
+        platform_type = @macos_flag ? 'macos' : 'ios'
+
+        # 使用 XcodeCertHelper 安装和配置证书
+        Pindo::XcodeCertHelper.install_and_config_certs(
+          build_type: 'appstore',
+          platform_type: platform_type,
+          project_dir: @project_path
+        )
+      end
+
+      # # 创建发布 tag
+      # def create_release_tag_for_appstore
+      #   puts "  创建发布 Tag..."
+
+      #   config_parser = Pindo::IosConfigParser.instance
+      #   config_json = config_parser.config_json
+      #   bundle_id = config_parser.bundle_id
+
+      #   tag_helper = Object.new
+      #   tag_helper.extend(Pindo::XcodeAppConfig)
+      #   tag_helper.create_release_tag(
+      #     project_dir: @project_path,
+      #     config_json: config_json,
+      #     bundle_id: bundle_id
+      #   )
+      # end
+
+      # 处理 Applovin
+      def handle_applovin_processing
+        return unless File.exist?(File.join(@project_path, "Podfile.lock"))
+
+        begin
+          # 检查是否使用了 FancyAD 或 AppLovinSDK
+          if Pindo::CocoaPodsHelper.using_pods?(@project_path, ["FancyAD", "AppLovinSDK"])
+            puts
+            puts "  运行 Applovin Script..."
+
+            Pindo::ApplovinXcodeHelper.update_applovin_config(
+              project_dir: @project_path,
+              appstore_mode: true,
+              install_script: true,
+              upload_config: false
+            )
+          end
+        rescue => e
+          puts "  ⚠ Applovin 处理失败: #{e.message}"
+        end
+      end
+
+      # 处理 CocoaPods
+      def handle_cocoapods
+        return unless File.exist?(File.join(@project_path, "Podfile"))
+
+        # 1. 更新私有索引库
+        Pindo::CocoaPodsHelper.update_pod_repo(
+          install: false,
+          project_dir: @project_path
+        )
+
+        # 2. 清理并重新安装
+        Pindo::CocoaPodsHelper.deintegrate_and_install(@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
+
+      # 编译 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