pindo 5.11.4 → 5.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a75938a4d1faa0bfd2b4495da318e4eabda71704345a47af18fa252c0f8d78ca
-  data.tar.gz: 8cb15952591243cee1081720169bd5835626ac990cc3e91a1fac6964114e122e
+  metadata.gz: 6095e9d8ae3f34ca9e43e111344d3769c62e4d23b929ed2f8dcbab2288296107
+  data.tar.gz: 9c45c852836d6c9549d1625866fbee560dd38abb1b793401b80ff3c103e2f5a8
 SHA512:
-  metadata.gz: 11e4c1ba858176b538827aa9bed454f1d1294d10a90ea6f6c0f4665e12ed02e0a32ad33145dade2adda700b8e41098b79e4775e8fca71191c67cc85d7da26552
-  data.tar.gz: f50d76e666f5d061c41e89c23791aa347299e4c157a52eb5080c37f7bd750e58bb76f0ad6c3ddace280e7c64d69223ca61b152b1c0fd56b2c6a8d78dd5aa42f5
+  metadata.gz: 74666b706663478292b86f5caacd7c17846507ce8aef44b8b7481c73d84f89f9a766c425939c2b5954dc536b480e150d3fff174325683f2b44e5b5d067e8477d
+  data.tar.gz: ca31fa0a538fac32db28d7e657a04b0eb3c3304880e3dbb219c1787c26e4bf6f264e4b2e3181acb84378fdb48f4250a13bc6f719c3e30546ab848e271d090058

data/lib/pindo/base/githelper.rb

@@ -646,6 +646,22 @@ module Pindo
           new_tag
       end
 
+      # 检查仓库是否有未提交的更改（包括未暂存和已暂存的更改）
+      # @param git_root_dir [String] 项目目录路径
+      # @return [Boolean] 如果有未提交的更改返回true，否则返回false
+      def has_uncommitted_changes?(git_root_dir:nil)
+          return false if git_root_dir.nil?
+
+          begin
+              # 使用 git status --porcelain 检查是否有更改
+              # 如果输出不为空，说明有未提交的更改
+              status_output = git!(%W(-C #{git_root_dir} status --porcelain)).strip
+              !status_output.empty?
+          rescue StandardError => e
+              false
+          end
+      end
+
       # 检查tag是否在指定的commit上
       # @param git_root_dir [String] 项目目录路径
       # @param tag_name [String] 标签名称

data/lib/pindo/base/pindocontext.rb

@@ -109,13 +109,19 @@ module Pindo
       # 初始化三级结构（总是保存到内存，不管是否启用缓存）
       @memory_selections[project_path] ||= {}
       @memory_selections[project_path][root_command] ||= {}
-      @memory_selections[project_path][root_command][key] = value
+
+      # 如果值为 nil，则删除该键而不是保存 nil
+      if value.nil?
+        @memory_selections[project_path][root_command].delete(key)
+        puts "[PindoContext] 从内存删除: [#{project_path}][#{root_command}][#{key}]" if verbose?
+      else
+        @memory_selections[project_path][root_command][key] = value
+        puts "[PindoContext] 保存到内存: [#{project_path}][#{root_command}][#{key}] = #{value.inspect}" if verbose?
+      end
 
       # 更新该命令组的最后修改时间
       @memory_selections[project_path][root_command]['__last_modified__'] = Time.now.to_i
 
-      puts "[PindoContext] 保存到内存: [#{project_path}][#{root_command}][#{key}] = #{value.inspect}" if verbose?
-
       # 仅在启用缓存时保存到文件
       if @cache_enabled
         save_file_cache
@@ -306,6 +312,8 @@ module Pindo
           commands.each do |command, selections|
             file_cache[project_path][command] ||= {}
             selections.each do |key, value|
+              # 跳过 nil 值，不保存到文件
+              next if value.nil?
               # 将符号键转换为字符串
               string_key = key.to_s
               file_cache[project_path][command][string_key] = value
@@ -503,8 +511,9 @@ module Pindo
       puts "────────────────────────────────────────"
 
       cached_selections.each do |key, value|
-        # 跳过内部字段
+        # 跳过内部字段和 nil 值
         next if key.to_s.start_with?('__')
+        next if value.nil?
 
         case key.to_s
         when 'bundle_id'

data/lib/pindo/command/android/autobuild.rb

@@ -5,6 +5,11 @@ require 'pindo/module/build/build_helper'
 require 'pindo/module/build/version_helper'
 require 'pindo/module/android/android_build_helper'
 require 'pindo/module/android/android_config_helper'
+require 'pindo/module/task/task_manager'
+require 'pindo/module/task/model/git_tag_task'
+require 'pindo/module/task/model/unity_export_task'
+require 'pindo/module/task/model/build_task'
+require 'pindo/module/task/model/upload_task'
 
 module Pindo
   class Command
@@ -85,214 +90,132 @@ module Pindo
           # 确认并应用缓存（如果有）
           context.confirm_and_apply_cache
 
+          # 准备配置
+          config = prepare_android_config(pindo_project_dir)
 
-          @main_bundle_name = nil
-          if @args_bundle_name
-              @main_bundle_name = @args_bundle_name
-          else
-              @main_bundle_name = get_selected_dev_bundle_name()
-          end
-
+          # 创建并执行任务
+          tasks = make_build_task(config)
 
-          build_helper = Pindo::BuildHelper.share_instance
-          project_type = build_helper.project_type(pindo_project_dir)
-
-          args_temp = []
-          args_temp << "--proj=#{@args_proj_name}" if @args_proj_name
-          args_temp << "--bundle_name=#{@main_bundle_name}" if @main_bundle_name
-          args_temp << "--upload" if @args_upload_flag
-          args_temp << "--send" if @args_send_flag
+          # 添加到任务管理器并执行
+          task_manager = Pindo::TaskSystem::TaskManager.instance
+          task_manager.clear_all
+          tasks.each { |task| task_manager.add_task(task) }
+          task_manager.start
 
-          case project_type
-          when :ios
-            puts "iOS 工程， 请使用 pindo ios build"
-          when :android
-            android_autobuild
-          when :unity
-            Pindo::Command::Unity::Apk::run(args_temp)
-          else
-            raise Informative, "当前目录不是工程目录，不能编译"
-          end
+          system "open #{pindo_project_dir}"
         end
 
         private
 
-        def android_autobuild
-          # 记录构建开始时间
-          build_start_time = Time.now
-
-          pindo_project_dir = Dir.pwd
+        # 准备 Android 配置
+        def prepare_android_config(pindo_project_dir)
+          # 获取 Bundle Name
+          bundle_name = @args_bundle_name || get_selected_dev_bundle_name()
 
-          build_helper = Pindo::BuildHelper.share_instance
-          if @args_upload_flag
-            is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
-            if is_need_add_tag
-                Pindo::Command::Utils::Tag::run(tag_action_parms)
-            end
-          end
-
-
-
-          app_info_obj = nil
-          workflow_info = nil
-          proj_name = @args_proj_name
-          # 传入 package_type 获取 workflow_info
+          # 获取 JPS 配置
           app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
-            working_directory: Dir.pwd,
-            proj_name: proj_name,
+            working_directory: pindo_project_dir,
+            proj_name: @args_proj_name,
             package_type: 'apk'
           )
 
-          # ===== 使用 workflow 配置更新 Android 项目 =====
-          if workflow_info && workflow_info[:package_name]
-            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: pindo_project_dir,
-              workflow_packname: workflow_packname
-            )
-          else
-            raise Informative, "未获取到工作流信息"
-          end
+          {
+            project_path: pindo_project_dir,
+            bundle_name: bundle_name,
+            app_info_obj: app_info_obj,
+            workflow_info: workflow_info
+          }
+        end
 
-          # ===== 从 JPS 下载并替换项目 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: pindo_project_dir,
-              icon_url: app_info_obj["projectIcon"]
-            )
+        # 创建构建任务
+        def make_build_task(config)
+          # 检测项目类型
+          build_helper = Pindo::BuildHelper.share_instance
+          project_type = build_helper.project_type(config[:project_path])
 
-            # 如果 projectIcon 不为空且下载失败，抛出异常终止执行
-            unless icon_replace_success
-              raise Informative, "Icon 下载或替换失败，请检查 Icon URL 是否有效: #{app_info_obj["projectIcon"]}"
+          case project_type
+          when :ios
+            raise Informative, "iOS 工程， 请使用 pindo ios build"
+          when :android, :unity
+            # 判断是否是 Unity 工程
+            is_unity = (project_type == :unity)
+
+            tasks = []
+
+            # 1. Git 标签任务（所有编译场景都需要打 Tag）
+            git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
+            tasks << git_tag_task
+
+            # 2. Unity 导出任务（仅 Unity 工程）
+            if is_unity
+              # 确定 Android 导出路径
+              base_android_path = File.join(config[:project_path], "GoodPlatform", "BaseAndroid")
+              android_path = File.join(config[:project_path], "GoodPlatform", "Android")
+              android_export_path = File.exist?(base_android_path) ? base_android_path : android_path
+
+              unity_context = {}
+              unity_context[:project_name] = @args_proj_name if @args_proj_name
+
+              unity_task = Pindo::TaskSystem::UnityExportTask.new(
+                'android',
+                project_path: config[:project_path],
+                export_path: android_export_path,
+                context: unity_context
+              )
+              unity_task.dependencies << git_tag_task.id
+              tasks << unity_task
             end
-          else
-            Funlog.warning("未配置 Icon URL，跳过 Icon 替换")
-          end
-
-          # ===== 更新版本号和Build号（仅在Git仓库中）=====
-          version_helper = Pindo::VersionHelper.share_instance
-          version_info = version_helper.get_version_info(project_dir: pindo_project_dir)
-
-          if version_info[:is_git_repo]
-            # 更新Android工程版本
-            Pindo::AndroidConfigHelper.update_android_project_version(
-              project_dir: pindo_project_dir,
-              version_name: version_info[:version],
-              version_code: version_info[:build_number]
-            )
-          else
-            Funlog.warning("非Git仓库，保持工程原有版本号")
-          end
 
+            # 3. 构建任务
+            build_mode = @args_release_flag ? :release : :dev
 
-          # ===== 如果指定了 bundle_name，覆盖 Application ID 和 google-services.json =====
-          # 注意：这必须在 update_project_with_workflow 之后，以覆盖工作流的默认配置
-          if @main_bundle_name && !@main_bundle_name.empty?
-            puts "\n正在处理指定的 Bundle Name: #{@main_bundle_name}..."
-
-            # 检查是否为通配符或通用 bundle_name
-            # 如果是 com.test.* 或 com.test 这样的通配符，跳过配置更新
-            is_wildcard = @main_bundle_name.include?('*') ||
-                         @main_bundle_name.end_with?('.') ||
-                         ['com.test', 'com.example', 'com.demo'].include?(@main_bundle_name)
-
-            if is_wildcard
-              puts "  ⚠️  检测到通配符或通用 Bundle Name: #{@main_bundle_name}"
-              puts "  ⚠️  跳过 google-services.json 和 Application ID 更新"
+            # 确定 Android 项目路径
+            if is_unity
+              android_project_path = android_export_path
             else
-              # 只有具体的 bundle_name 才执行配置更新
-              # 直接使用 clong_buildconfig_repo 拉取配置仓库
-              config_repo_dir = clong_buildconfig_repo(repo_name: @main_bundle_name)
-
-              if config_repo_dir && File.exist?(config_repo_dir)
-                # 1. 拷贝 google-services.json 到 launcher 目录
-                Pindo::AndroidConfigHelper.copy_google_services_from_config_repo(
-                  config_repo_dir: config_repo_dir,
-                  project_dir: pindo_project_dir
-                )
-
-                # 2. 更新 Application ID 为指定的 bundle_name（覆盖工作流设置）
-                Pindo::AndroidConfigHelper.update_application_id(
-                  project_dir: pindo_project_dir,
-                  application_id: @main_bundle_name
-                )
-
-                puts "  ✓ Bundle Name 配置处理完成"
-              else
-                raise Informative, "无法获取配置仓库"
-              end
+              android_project_path = config[:project_path]
             end
-          end
 
-          # 添加基于 Application ID 的 Scheme
-          # 无论是使用 workflow 的默认 Application ID，还是通过 bundle_name 覆盖的，都需要添加对应的 Scheme
-          Pindo::AndroidConfigHelper.add_application_id_based_scheme(
-            project_dir: pindo_project_dir
-          )
-
-          begin
-            android_build_helper = Pindo::AndroidBuildHelper.share_instance
-            apk_path = android_build_helper.auto_build_apk(pindo_project_dir, !@args_release_flag)
-            ipa_file_upload = Dir.glob(apk_path).max_by {|f| File.mtime(f)}
-
-            if !ipa_file_upload.nil? && !app_info_obj.nil?  && @args_upload_flag
-                description = nil
-                result_data = PgyerHelper.share_instace.start_upload(
-                    app_info_obj: app_info_obj,
-                    ipa_file_upload: ipa_file_upload,
-                    description: description,
-                    workflow_info: workflow_info
-                )
-                if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
-                    PgyerHelper.share_instace.print_app_version_info(
-                        app_info_obj: app_info_obj,
-                        app_version_info_obj: result_data["data"]
-                    )
-                    # 始终发送给自己
-                    PgyerHelper.share_instace.send_apptest_msg(
-                        app_info_obj: app_info_obj,
-                        app_version_info_obj: result_data["data"],
-                        receiveType: "self"
-                    )
-
-                    # 如果有 --send 参数，额外发送到测试群
-                    if @args_send_flag
-                        PgyerHelper.share_instace.send_apptest_msg(
-                            app_info_obj: app_info_obj,
-                            app_version_info_obj: result_data["data"],
-                            chatEnv: "DevTest",
-                            receiveType: "chat"
-                        )
-                    end
-                end
+            build_options = {
+              project_path: android_project_path,
+              bundle_name: config[:bundle_name],
+              proj_name: @args_proj_name,
+              upload: @args_upload_flag,
+              send: @args_send_flag,
+              app_info_obj: config[:app_info_obj],
+              workflow_info: config[:workflow_info]
+            }
+            build_options[:unity_root_path] = config[:project_path] if is_unity
+
+            build_task = Pindo::TaskSystem::BuildTask.create_task(
+              platform: :android,
+              mode: build_mode,
+              options: build_options
+            )
+            build_task.dependencies << tasks.last.id if tasks.any?
+            tasks << build_task
+
+            # 4. 上传任务（如果需要）
+            if @args_upload_flag
+              upload_task = Pindo::TaskSystem::UploadTask.new(
+                'apk',
+                File.join(android_project_path, 'build'),
+                nil,
+                app_info_obj: config[:app_info_obj],
+                workflow_info: config[:workflow_info],
+                project_name: @args_proj_name,
+                context: {
+                  send_to_chat: @args_send_flag
+                },
+                dependencies: [build_task.id]
+              )
+              tasks << upload_task
             end
 
-            # 计算并显示总耗时
-            total_time = Time.now - build_start_time
-            minutes = (total_time / 60).to_i
-            seconds = (total_time % 60).to_i
-            
-            if minutes > 0
-              puts "\e[32m构建完成！总耗时: #{minutes}分#{seconds}秒\e[0m"
-            else
-              puts "\e[32m构建完成！总耗时: #{seconds}秒\e[0m"
-            end
-            
-            puts "\e[32m正在打开目标文件夹...\e[0m"
-            system "open #{pindo_project_dir}"
-            
-          rescue => e
-            puts "\e[31m构建失败: #{e.message}\e[0m"
-            puts "\e[33m正在打开项目文件夹以便检查错误...\e[0m"
-            system "open #{pindo_project_dir}"
-            raise e
+            tasks
+          else
+            raise Informative, "当前目录不是工程目录，不能编译"
           end
-
         end
       end
     end

data/lib/pindo/command/android/build.rb

@@ -2,6 +2,7 @@ require 'highline/import'
 require 'fileutils'
 require 'json'
 require 'pindo/module/build/build_helper'
+require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/android/android_build_helper'
 
 module Pindo
@@ -82,9 +83,16 @@ module Pindo
           pindo_project_dir = Dir.pwd
           build_helper = Pindo::BuildHelper.share_instance
           if @args_upload_flag
-            is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
+            git_repo_helper = Pindo::GitRepoHelper.share_instance
+            is_need_add_tag, tag_action_parms = git_repo_helper.check_is_need_add_tag?(pindo_project_dir)
             if is_need_add_tag
-                Pindo::Command::Utils::Tag::run(tag_action_parms)
+              git_repo_helper.create_and_push_tag(
+                project_dir: pindo_project_dir,
+                mode: 'minor',
+                force_retag: tag_action_parms&.include?('--retag') || false,
+                custom_tag: nil,
+                release_branch: 'master'
+              )
             end
           end