pindo 5.13.2 → 5.13.3

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

@@ -4,26 +4,26 @@ 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
 
-        # 接收外部传入的 JPS 配置
-        @app_info_obj = options[:app_info_obj]
-        @workflow_info = options[:workflow_info]
-
         # 保存 Unity 根目录路径（用于查找 config.json）
         @unity_root_path = options[:unity_root_path]
 
@@ -36,19 +36,37 @@ module Pindo
         "构建 IPA (AdHoc)"
       end
 
+      #准备构建
       def prepare_build
-
         Dir.chdir(@project_path)
+
+        # 0. 清理 Firebase Shell Script
         cleanup_firebase_shell
-        update_project_config
-        update_version_info
-        pull_config
-        handle_cocoapods
+
+        # 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
-        configure_certificate
-        update_url_schemes_final
+        handle_cocoapods
         build_ios_project
       end
 
@@ -68,88 +86,224 @@ module Pindo
 
       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
 
-      # 清理 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)
+        # 从全局配置获取 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 update_project_config
+      # 增加配置文件中的版本号
+      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 update_version_info
-        
-      end
+      # 检查代码版本
+      def check_code_version
+        config_parser = Pindo::IosConfigParser.instance
+        config_json = config_parser.config_json
+        return unless config_json
 
-      # 拉取配置
-      def pull_config
-        return unless @bundle_id
+        deploy_identifier = config_json.dig('project_info', 'deploy_identifier')
+        return unless deploy_identifier
 
-        build_helper = Pindo::BuildHelper.share_instance
-        build_helper.pull_appconfig_with_reponame(
-          repo_name: @bundle_id,
-          target_dir: @project_path
-        )
+        puts "  检查代码版本..."
 
-        # 重新加载配置到 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}"
+        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
 
-      # 处理 CocoaPods
-      def handle_cocoapods
-        return unless File.exist?(File.join(@project_path, "Podfile"))
+      # 处理 Quark/Swark
+      def handle_quswark_processing
+        config_parser = Pindo::IosConfigParser.instance
+        config_json = config_parser.config_json
+        return unless config_json
 
-        Dir.chdir(@project_path)
-        Pindo::Command::Ios::Podupdate::run([])
+        # 从 config_json 中判断是否需要处理 Quark/Swark
+        xcode_build_type = config_json.dig('project_info', 'xcode_build_type')
+        return unless xcode_build_type
 
-        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"))
+        build_type_array = xcode_build_type.split("_") || []
+        return unless build_type_array.include?("quark") || build_type_array.include?("swark")
 
-          puts "正在执行 pod deintegrate..."
-          system 'pod deintegrate'
+        puts "  处理 Quark/Swark..."
 
-          puts "正在执行 pod install..."
-          system 'pod install'
-        rescue => error
-          puts(error.to_s)
-          raise Informative, "pod install 失败！！先 pod install 完成后再编译！"
-        end
+        require 'pindo/module/xcode/xcode_swark_helper'
+        Dir.chdir(@project_path)
 
-        # 检查 pod install 是否成功
-        pod_lock_file = File.join(@project_path, "Podfile.lock")
-        unless File.exist?(pod_lock_file)
-          raise Informative, "pod install 失败！！先 pod install 完成后再编译！"
+        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
 
-      # 配置证书
-      def configure_certificate
+      # 配置 AdHoc 证书
+      def configure_adhoc_certificate
+        puts "  配置 AdHoc 证书..."
+
+        # 检测平台类型
         detect_macos_platform
+        platform_type = @macos_flag ? 'macos' : 'ios'
 
-        # 使用新的证书安装方法
-        # config.json 已经通过 pull_config 方法拉取到 @project_path 目录
-        require 'pindo/module/cert/xcode_cert_helper'
+        # 使用 XcodeCertHelper 安装和配置证书
         Pindo::XcodeCertHelper.install_and_config_certs(
           build_type: 'adhoc',
-          platform_type: @macos_flag ? 'macos' : 'ios',
+          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 平台
@@ -166,15 +320,6 @@ module Pindo
         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)

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

@@ -5,6 +5,9 @@ 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'
 
@@ -21,16 +24,9 @@ module Pindo
         @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]
 
-        # AppStore 特有参数（可选）
-        @enable_appstore_prepare = options[:enable_appstore_prepare] || false
-
         super(:ios, :release, options)
       end
 
@@ -42,37 +38,11 @@ module Pindo
 
       #准备构建
       def prepare_build
-        # 如果启用 AppStore 准备，执行 AppStore 特有的准备工作
-        if @enable_appstore_prepare
-          prepare_appstore_specific
-        end
-      end
-
-      def execute_build
-        configure_certificate
-        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
-
-      # AppStore 特有的准备工作
-      def prepare_appstore_specific
         Dir.chdir(@project_path)
 
+        # 0. 清理 Firebase Shell Script
+        cleanup_firebase_shell
+
         # 1. 加载配置到 IosConfigParser 单例
         load_ios_config
 
@@ -91,26 +61,38 @@ module Pindo
         # 6. 使用 appstore cert 命令
         configure_appstore_certificate
 
-        # 7. 创建发布 tag
-        create_release_tag_for_appstore
-
-        # 8. Applovin 处理
+        # 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 是否已经加载了配置
+        # 直接使用 IosConfigParser 单例中已加载的配置
         config_parser = Pindo::IosConfigParser.instance
         if config_parser.config_json.nil?
-          # 如果没有加载，尝试从项目目录加载
-          config_file = File.join(@project_path, "config.json")
-          if File.exist?(config_file)
-            puts "  加载 iOS 配置..."
-            config_parser.load_config(config_file: config_file)
-          else
-            raise Informative, "配置文件不存在: #{config_file}"
-          end
+          # 如果单例中没有配置，说明命令层未正确初始化
+          raise Informative, "配置未加载，请确保在命令层（如 pindo appstore autobuild）已正确加载 config.json"
         else
           puts "  使用已加载的配置..."
         end
@@ -257,60 +239,72 @@ module Pindo
       # 配置 AppStore 证书
       def configure_appstore_certificate
         puts "  配置 AppStore 证书..."
-        Dir.chdir(@project_path)
 
-        # 使用 appstore cert 命令
-        Pindo::Command::Appstore::Cert.run([])
+        # 检测平台类型
+        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..."
+      # # 创建发布 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
+      #   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
+      #   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
-        pod_lock_file = File.join(@project_path, "Podfile.lock")
-        return unless File.exist?(pod_lock_file)
+        return unless File.exist?(File.join(@project_path, "Podfile.lock"))
 
         begin
-          require 'cocoapods'
-          pod_lock_json = Pod::YAMLHelper.load_file(pod_lock_file)
-          pods_array = []
-
-          if !pod_lock_json["SPEC REPOS"].nil?
-            pod_lock_json["SPEC REPOS"].each do |source, pod_items|
-              pods_array += pod_items
-            end
-          end
-
-          if pods_array.include?("FancyAD") || pods_array.include?("AppLovinSDK")
+          # 检查是否使用了 FancyAD 或 AppLovinSDK
+          if Pindo::CocoaPodsHelper.using_pods?(@project_path, ["FancyAD", "AppLovinSDK"])
             puts
             puts "  运行 Applovin Script..."
-            Dir.chdir(@project_path)
 
-            applovin_args = []
-            applovin_args << "--appstore"
-            applovin_args << "--install"
-            Pindo::Command::Ios::Applovin.run(applovin_args)
+            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) }
@@ -325,26 +319,6 @@ module Pindo
         end
       end
 
-      # 配置证书
-      def configure_certificate
-        detect_macos_platform
-
-        # 如果启用了 AppStore 准备，证书配置在 configure_appstore_certificate 中完成
-        if @enable_appstore_prepare
-          # 证书已在 configure_appstore_certificate 中配置
-          return
-        end
-
-        # 使用新的证书安装方法
-        # config.json 已经通过 pull_config 方法拉取到 @project_path 目录
-        require 'pindo/module/cert/xcode_cert_helper'
-        Pindo::XcodeCertHelper.install_and_config_certs(
-          build_type: 'release',
-          platform_type: @macos_flag ? 'macos' : 'ios',
-          project_dir: @project_path
-        )
-      end
-
       # 编译 iOS 工程
       def build_ios_project
         Dir.chdir(@project_path)