pindo 5.13.1 → 5.13.2

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

@@ -0,0 +1,367 @@
+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/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
+
+        # 接收外部传入的 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
+
+      protected
+
+      def build_task_name
+        "构建 IPA (Release)"
+      end
+
+      #准备构建
+      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)
+
+        # 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. 创建发布 tag
+        create_release_tag_for_appstore
+
+        # 8. Applovin 处理
+        handle_applovin_processing
+      end
+
+      # 加载 iOS 配置
+      def load_ios_config
+        # 检查 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
+        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 证书..."
+        Dir.chdir(@project_path)
+
+        # 使用 appstore cert 命令
+        Pindo::Command::Appstore::Cert.run([])
+      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
+        pod_lock_file = File.join(@project_path, "Podfile.lock")
+        return unless File.exist?(pod_lock_file)
+
+        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")
+            puts
+            puts "  运行 Applovin Script..."
+            Dir.chdir(@project_path)
+
+            applovin_args = []
+            applovin_args << "--appstore"
+            applovin_args << "--install"
+            Pindo::Command::Ios::Applovin.run(applovin_args)
+          end
+        rescue => e
+          puts "  ⚠ Applovin 处理失败: #{e.message}"
+        end
+      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
+
+      # 配置证书
+      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)
+
+        # 使用 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_dev_build_task.rb → ios_build_dev_task.rb}

@@ -1,4 +1,4 @@
-require_relative '../build_task'
+require_relative 'ios_build_task'
 require 'pindo/module/build/build_helper'
 require 'pindo/module/build/version_helper'
 require 'pindo/module/build/git_repo_helper'
@@ -10,7 +10,7 @@ module Pindo
   module TaskSystem
     # iOS Dev 模式构建任务
     # 使用 Development 证书编译 iOS 工程
-    class IosDevBuildTask < BuildTask
+    class IosBuildDevTask < IosBuildTask
       def initialize(options = {})
         @bundle_id = options[:bundle_id]
         @proj_name = options[:proj_name]
@@ -148,17 +148,27 @@ module Pindo
 
       # 拉取配置
       def pull_config
-        args_temp = []
-        args_temp << @bundle_id if @bundle_id
-        Pindo::Command::Deploy::Pullconfig::run(args_temp)
+        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
 
       # 更新 Entitlements
       def update_entitlements
-        config_json_file = File.join(@project_path, "config.json")
         Pindo::XcodeBuildConfig.update_entitlements_config(
-          project_dir: @project_path,
-          config_file: config_json_file
+          project_dir: @project_path
         )
       end
 
@@ -196,22 +206,14 @@ module Pindo
         # 检查是否是 macOS 工程
         detect_macos_platform
 
-        args_temp = ['--dev']
-        args_temp << '--macos' if @macos_flag
-
-        # 如果有 Unity 根目录路径，需要从那里读取 config.json
-        if @unity_root_path
-          # 临时切换到 Unity 根目录读取 config.json
-          config_path = File.join(@unity_root_path, 'config.json')
-          if File.exist?(config_path)
-            args_temp << config_path
-          end
-        end
-
-        # 切换到 iOS 工程目录，确保 Cert::run 能找到 xcodeproj
-        Dir.chdir(@project_path) do
-          Pindo::Command::Deploy::Cert::run(args_temp)
-        end
+        # 使用新的证书安装方法
+        # config.json 已经通过 pull_config 方法拉取到 @project_path 目录
+        require 'pindo/module/cert/xcode_cert_helper'
+        Pindo::XcodeCertHelper.install_and_config_certs(
+          build_type: 'dev',
+          platform_type: @macos_flag ? 'macos' : 'ios',
+          project_dir: @project_path
+        )
       end
 
       # 检测是否为 macOS 平台
@@ -241,10 +243,18 @@ module Pindo
       def build_ios_project
         Dir.chdir(@project_path)
 
-        args_temp = ['--dev']
-        args_temp << '--macos' if @macos_flag
+        # 使用 XcodeBuildHelper 进行构建
+        ipa_file = Pindo::XcodeBuildHelper.build_project(
+          project_dir: @project_path,
+          icloud_id: nil
+        )
+
+        if ipa_file.nil?
+          raise Informative, "构建失败：未生成 IPA 文件"
+        end
 
-        Pindo::Command::Deploy::Build::run(args_temp)
+        puts "构建成功：#{ipa_file}"
+        ipa_file
       end
     end
   end

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

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

data/lib/pindo/module/task/model/build/{web_dev_build_task.rb → web_build_dev_task.rb}

@@ -5,7 +5,7 @@ module Pindo
     # Web 构建任务
     # Web 平台不需要编译，Unity 导出后即为最终产物
     # 此任务只检查构建产物是否存在
-    class WebDevBuildTask < BuildTask
+    class WebBuildDevTask < BuildTask
       def initialize(options = {})
         super(:web, :dev, options)
       end

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

@@ -81,17 +81,17 @@ module Pindo
 
       # 创建 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'
+        require_relative 'build/ios_build_dev_task'
+        require_relative 'build/ios_build_adhoc_task'
+        require_relative 'build/ios_build_appstore_task'
 
         case mode
         when :dev
-          IosDevBuildTask.new(options)
+          IosBuildDevTask.new(options)
         when :adhoc
-          IosAdhocBuildTask.new(options)
+          IosBuildAdhocTask.new(options)
         when :release
-          IosReleaseBuildTask.new(options)
+          IosBuildAppStoreTask.new(options)
         else
           raise ArgumentError, "不支持的 iOS 构建模式: #{mode}"
         end
@@ -99,14 +99,17 @@ module Pindo
 
       # 创建 Android 构建任务
       def self.create_android_task(mode, options)
-        require_relative 'build/android_dev_build_task'
-        require_relative 'build/android_release_build_task'
+        require_relative 'build/android_build_dev_task'
+        require_relative 'build/android_build_adhoc_task'
+        require_relative 'build/android_build_gplay_task'
 
         case mode
         when :dev, :debug
-          AndroidDevBuildTask.new(options)
+          AndroidBuildDevTask.new(options)
+        when :adhoc
+          AndroidBuildAdhocTask.new(options)
         when :release
-          AndroidReleaseBuildTask.new(options)
+          AndroidBuildGPlayTask.new(options)
         else
           raise ArgumentError, "不支持的 Android 构建模式: #{mode}"
         end
@@ -114,12 +117,12 @@ module Pindo
 
       # 创建 Web 构建任务
       def self.create_web_task(mode, options)
-        require_relative 'build/web_dev_build_task'
+        require_relative 'build/web_build_dev_task'
 
         case mode
         when :dev, :debug, :release
           # Web 目前只有一个构建任务类
-          WebDevBuildTask.new(options)
+          WebBuildDevTask.new(options)
         else
           raise ArgumentError, "不支持的 Web 构建模式: #{mode}"
         end