pindo 5.12.2 → 5.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6095e9d8ae3f34ca9e43e111344d3769c62e4d23b929ed2f8dcbab2288296107
-  data.tar.gz: 9c45c852836d6c9549d1625866fbee560dd38abb1b793401b80ff3c103e2f5a8
+  metadata.gz: ce0a5c40dcd8dbdcef15ad36aebc63fa189108aa38e05923e81662830a4a2996
+  data.tar.gz: c05cd7079948fa242597eceaccb3cab522035fad0a63b53a3e9a0af6296309f9
 SHA512:
-  metadata.gz: 74666b706663478292b86f5caacd7c17846507ce8aef44b8b7481c73d84f89f9a766c425939c2b5954dc536b480e150d3fff174325683f2b44e5b5d067e8477d
-  data.tar.gz: ca31fa0a538fac32db28d7e657a04b0eb3c3304880e3dbb219c1787c26e4bf6f264e4b2e3181acb84378fdb48f4250a13bc6f719c3e30546ab848e271d090058
+  metadata.gz: f7f88c219338108d5107f7b3436763a93186e91bebc5b27d608f9ae1f2e7d01185ea0727aa1162357ae07fd8aae682d883b3c57a676e328d096b04ce7bebbb08
+  data.tar.gz: 22cc175b1716238b98613116c9103d4b2324e3e3394f2f965a8d76c99144e3c197793ccdfefa733aea0d3e516340582b938a3b3ea533e150baa9a18d3406049a

data/lib/pindo/command/android.rb

@@ -1,7 +1,6 @@
 
 require 'pindo/command/android/autobuild'
 require 'pindo/command/android/autoresign'
-require 'pindo/command/android/build'
 require 'pindo/command/android/keystore'
 
 

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

@@ -104,7 +104,7 @@ module Pindo
                     when :android
                         puts "Android工程, 请使用 pindo and autobuild"
                     when :unity
-                        raise Informative, "Unity工程, 请使用 pindo unity ipa 或者pindo unity apk"
+                        raise Informative, "Unity工程, 请使用 pindo unity autobuild --types=ipa,apk"
                     else
                         raise Informative, "当前目录不是工程目录，不能编译"
                     end

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

@@ -82,7 +82,7 @@ module Pindo
                         puts "Android 工程， 请使用 pindo and build"
                         Pindo::Command::Android::Build::run(args_temp)
                     when :unity
-                        raise Informative, "Unity 工程， 请使用 pindo unity ipa 或者pindo unity apk"
+                        raise Informative, "Unity 工程， 请使用 pindo unity autobuild --types=ipa,apk"
                     else
                         raise Informative, "当前目录不是工程目录，不能编译"
                     end

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

@@ -91,7 +91,7 @@ module Pindo
                     when :android
                         raise Informative,  "Android 工程， 请使用 pindo and build"
                     when :unity
-                        raise Informative,  "Unity 工程， 请使用 pindo unity ipa"
+                        raise Informative,  "Unity 工程， 请使用 pindo unity autobuild --types=ipa"
                     else
                         raise Informative, "当前目录不是工程目录，不能编译"
                     end

data/lib/pindo/module/android/android_build_helper.rb

@@ -97,6 +97,9 @@ module Pindo
         puts "⚠ Keystore 签名配置跳过（使用工程原有配置）"
       end
 
+      # 处理 Play Asset Delivery 配置（如果存在）
+      setup_play_asset_delivery(project_dir)
+
       # 构建 APK
       build_apk(project_dir, debug)
     end
@@ -298,6 +301,113 @@ module Pindo
       end
     end
 
+    # 设置 Play Asset Delivery：直接扫描导出工程中的资源目录，按照 Android 原生方式创建 .androidpack 目录
+    def setup_play_asset_delivery(project_dir)
+      # 获取 unityLibrary 路径
+      unity_library_path = File.join(project_dir, "unityLibrary", "src", "main")
+      unless File.directory?(unity_library_path)
+        puts "警告：Unity Library 目录不存在: #{unity_library_path}"
+        return
+      end
+
+      # 扫描 assets 目录下的资源（Unity 构建时会将 StreamingAssets 复制到这里）
+      assets_path = File.join(unity_library_path, "assets")
+      unless File.directory?(assets_path)
+        puts "未找到 assets 目录，跳过 Play Asset Delivery 设置"
+        return
+      end
+
+      # 扫描 assets 目录下的所有一级子目录
+      # 这些目录对应 StreamingAssets/{DefaultYooFolderName} 下的资源包
+      asset_subdirs = Dir.glob(File.join(assets_path, "*")).select { |path| File.directory?(path) }
+      
+      if asset_subdirs.empty?
+        puts "未找到 assets 下的子目录，跳过 Play Asset Delivery 设置"
+        return
+      end
+
+      puts "检测到 #{asset_subdirs.length} 个 assets 子目录，开始设置 Play Asset Delivery..."
+
+      begin
+        # 收集所有创建的 asset pack 模块名
+        created_pack_modules = []
+
+        # 扫描每个子目录，为每个子目录创建一个 asset pack 模块
+        asset_subdirs.each do |subdir|
+          original_pack_name = File.basename(subdir)
+          if original_pack_name.downcase == 'bin'
+            puts "跳过 bin 目录，保持在 base 模块中"
+            next
+          end
+          sanitized_pack_name = sanitize_pack_name(original_pack_name)
+          module_name = "#{sanitized_pack_name}_pack"
+
+          # 检查目录是否为空
+          if Dir.glob(File.join(subdir, "*")).empty?
+            puts "警告：跳过空的 Asset Pack 目录: #{subdir}"
+            next
+          end
+
+          # 创建模块目录（在项目顶级目录，与 launcher、unityLibrary 同级）
+          android_pack_dir = File.join(project_dir, module_name)
+          FileUtils.rm_rf(android_pack_dir) if File.directory?(android_pack_dir)
+          FileUtils.mkdir_p(android_pack_dir)
+
+          # 在 asset pack 模块中创建 src/main/assets 目录
+          module_assets_dir = File.join(android_pack_dir, "src", "main", "assets")
+          FileUtils.mkdir_p(module_assets_dir)
+
+          # 复制整个子目录到模块的 assets 下，保留原始目录名
+          FileUtils.cp_r(subdir, module_assets_dir)
+
+          # 从 assets 目录中删除资源，避免被打包到 base 模块
+          puts "  从 assets 目录移除资源 #{subdir}，避免重复打包到 base 模块..."
+          FileUtils.rm_rf(subdir)
+
+          # 创建 build.gradle 文件（默认使用 install-time delivery mode）
+          build_gradle_content = <<~GRADLE
+            plugins {
+                id 'com.android.asset-pack'
+            }
+
+            assetPack {
+                packName = "#{module_name}"
+                dynamicDelivery {
+                    deliveryType = "install-time"
+                }
+            }
+          GRADLE
+
+          build_gradle_path = File.join(android_pack_dir, "build.gradle")
+          File.write(build_gradle_path, build_gradle_content)
+
+          # 记录模块名（项目顶级目录下的简单模块名）
+          created_pack_modules << ":#{module_name}"
+
+          puts "✓ 已创建 Asset Pack: #{module_name} -> #{android_pack_dir}"
+        end
+
+        # 更新 settings.gradle 文件，注册 asset pack 模块
+        if created_pack_modules.any?
+          GradleHelper.update_settings_gradle(project_dir, created_pack_modules)
+          # 更新 launcher/build.gradle 文件，添加 assetPacks 配置
+          GradleHelper.update_launcher_build_gradle(project_dir, created_pack_modules)
+          puts "✓ Play Asset Delivery 设置完成，共创建 #{created_pack_modules.length} 个 Asset Pack"
+        else
+          puts "未找到有效的 Asset Pack 目录"
+        end
+      rescue => e
+        puts "警告：设置 Play Asset Delivery 失败: #{e.message}"
+        puts e.backtrace.first(5).join("\n")
+      end
+    end
+
+    def sanitize_pack_name(name)
+      sanitized = name.to_s.gsub(/[^A-Za-z0-9_]/, '_')
+      sanitized = "p_#{sanitized}" unless sanitized.match?(/^[A-Za-z]/)
+      sanitized = sanitized.gsub(/__+/, '_')
+      sanitized.empty? ? "pack" : sanitized
+    end
 
   end
 end

data/lib/pindo/module/android/gradle_helper.rb

@@ -559,7 +559,95 @@ module Pindo
         end
       rescue => e
         false
+      end
+
+    end
+
+    # =================== Play Asset Delivery 相关方法 ===================
+
+    # 更新 settings.gradle 文件，注册 asset pack 模块
+    def self.update_settings_gradle(project_dir, pack_modules)
+      settings_gradle_path = File.join(project_dir, "settings.gradle")
+      settings_gradle_kts_path = File.join(project_dir, "settings.gradle.kts")
+
+      # 优先使用 settings.gradle.kts，否则使用 settings.gradle
+      settings_file = File.exist?(settings_gradle_kts_path) ? settings_gradle_kts_path : settings_gradle_path
+
+      unless File.exist?(settings_file)
+        puts "警告：未找到 settings.gradle 或 settings.gradle.kts 文件"
+        return
+      end
+
+      content = File.read(settings_file)
+      original_content = content.dup
+
+      # 模块名已经是正确的格式（如 :FGUI.androidpack）
+      pack_module_names = pack_modules
+
+      # 移除已存在的 asset pack 模块引用（避免重复）
+      pack_module_names.each do |module_name|
+        # 移除可能存在的旧引用
+        content.gsub!(/^\s*include\s+['"]#{Regexp.escape(module_name)}['"]\s*$/, '')
+        content.gsub!(/,\s*['"]#{Regexp.escape(module_name)}['"]/, '')
+      end
+
+      # 查找 include 语句的位置
+      include_pattern = /include\s+(['"]:launcher['"],\s*['"]:unityLibrary['"])/
+      if content.match(include_pattern)
+        # 在现有的 include 语句中添加 asset pack 模块
+        pack_includes = pack_module_names.map { |m| "'#{m}'" }.join(', ')
+        content.gsub!(include_pattern, "include \\1, #{pack_includes}")
+      else
+        # 如果没有找到标准格式，尝试在文件末尾添加
+        pack_includes = pack_module_names.map { |m| "'#{m}'" }.join(', ')
+        content += "\ninclude #{pack_includes}\n" unless content.include?(pack_includes)
+      end
+
+      # 只有当内容发生变化时才写入
+      if content != original_content
+        File.write(settings_file, content)
+        puts "✓ 已更新 #{File.basename(settings_file)}，注册 #{pack_modules.length} 个 Asset Pack 模块"
+        puts "  模块: #{pack_module_names.join(', ')}"
+      else
+        puts "✓ #{File.basename(settings_file)} 已包含 Asset Pack 模块引用"
+      end
+    end
+
+    # 更新 launcher/build.gradle 文件，添加 assetPacks 配置
+    def self.update_launcher_build_gradle(project_dir, pack_modules)
+      launcher_build_gradle_path = File.join(project_dir, "launcher", "build.gradle")
+      unless File.exist?(launcher_build_gradle_path)
+        puts "警告：未找到 launcher/build.gradle 文件"
+        return
+      end
+
+      content = File.read(launcher_build_gradle_path)
+      original_content = content.dup
+
+      # 检查是否已有 assetPacks 配置
+      if content.match(/assetPacks\s*=\s*\[/)
+        # 更新现有的 assetPacks 配置
+        content.gsub!(/assetPacks\s*=\s*\[[^\]]*\]/, "assetPacks = #{pack_modules.inspect}")
+      else
+        # 在 android 块中添加 assetPacks 配置
+        android_block_pattern = /(android\s*\{)/
+        if content.match(android_block_pattern)
+          # 在 android { 后添加 assetPacks 配置
+          content.gsub!(android_block_pattern, "\\1\n    assetPacks = #{pack_modules.inspect}")
+        else
+          puts "警告：未找到 android 块，无法添加 assetPacks 配置"
+          return
         end
       end
+
+      # 只有当内容发生变化时才写入
+      if content != original_content
+        File.write(launcher_build_gradle_path, content)
+        puts "✓ 已更新 launcher/build.gradle，添加 assetPacks 配置"
+      else
+        puts "✓ launcher/build.gradle 已包含 assetPacks 配置"
+      end
+    end
+
   end
 end

data/lib/pindo/module/task/pindo_task.rb

@@ -36,7 +36,7 @@ module Pindo
       attr_accessor :context, :metadata
       attr_reader :created_at, :started_at, :finished_at
       attr_accessor :retry_count  # 剩余重试次数
-      attr_reader :retry_mode, :retry_delay
+      attr_reader :retry_mode, :retry_delay, :max_retry_count  # max_retry_count: 初始最大重试次数
       attr_accessor :callbacks_setup  # 标记回调是否已经设置
 
       def initialize(name, options = {})
@@ -64,6 +64,7 @@ module Pindo
         # 重试配置
         @retry_mode = options[:retry_mode] || self.class.default_retry_mode
         @retry_count = options[:retry_count] || self.class.default_retry_count
+        @max_retry_count = @retry_count  # 保存初始最大重试次数
         @retry_delay = options[:retry_delay] || self.class.default_retry_delay
       end
 
@@ -220,10 +221,16 @@ module Pindo
         end
       end
 
+      # 计算当前重试次数
+      def current_retry_attempt
+        @max_retry_count - @retry_count + 1
+      end
+
       # 立即重试
       def handle_immediate_retry
-        puts "⚠️  任务失败，立即重试 (剩余#{@retry_count}次)".yellow if defined?(String.yellow)
-        puts "  错误: #{@error.message}"
+        attempt = current_retry_attempt
+        Funlog.warning("任务 [#{@name}] 失败，立即重试 (第#{attempt}次/共#{@max_retry_count}次)")
+        Funlog.warning("  错误: #{@error.message}")
 
         before_retry
         reset_for_retry
@@ -232,9 +239,10 @@ module Pindo
 
       # 延迟重试
       def handle_delayed_retry
-        puts "⚠️  任务失败，延迟重试 (剩余#{@retry_count}次)".yellow if defined?(String.yellow)
-        puts "  错误: #{@error.message}"
-        puts "  延迟: #{@retry_delay}秒"
+        attempt = current_retry_attempt
+        Funlog.warning("任务 [#{@name}] 失败，延迟重试 (第#{attempt}次/共#{@max_retry_count}次)")
+        Funlog.warning("  错误: #{@error.message}")
+        Funlog.warning("  延迟: #{@retry_delay}秒")
 
         before_retry
         sleep(@retry_delay) if @retry_delay > 0
@@ -245,8 +253,9 @@ module Pindo
 
       # 下个任务重试
       def handle_next_task_retry
-        puts "⚠️  任务失败，下个任务重试 (剩余#{@retry_count}次)".yellow if defined?(String.yellow)
-        puts "  错误: #{@error.message}"
+        attempt = current_retry_attempt
+        Funlog.warning("任务 [#{@name}] 失败，下个任务重试 (第#{attempt}次/共#{@max_retry_count}次)")
+        Funlog.warning("  错误: #{@error.message}")
 
         before_retry
         @status = TaskStatus::FAILED
@@ -258,8 +267,8 @@ module Pindo
       def finalize_failure
         @status = TaskStatus::FAILED
 
-        puts "[Task] #{@name} 最终失败".red if defined?(String.red)
-        puts "  错误: #{@error.message}".red if defined?(String.red)
+        Funlog.instance.fancyinfo_error("[Task] #{@name} 最终失败")
+        Funlog.instance.fancyinfo_error("  错误: #{@error.message}")
 
         run_callbacks(:on_failure)
         raise @error if should_raise_on_failure?

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.12.2"
+  VERSION = "5.13.1"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.12.2
+  version: 5.13.1
 platform: ruby
 authors:
 - wade
@@ -315,7 +315,6 @@ files:
 - lib/pindo/command/android.rb
 - lib/pindo/command/android/autobuild.rb
 - lib/pindo/command/android/autoresign.rb
-- lib/pindo/command/android/build.rb
 - lib/pindo/command/android/keystore.rb
 - lib/pindo/command/appstore.rb
 - lib/pindo/command/appstore/adhocbuild.rb

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

@@ -1,186 +0,0 @@
-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
-  class Command
-    class Android < Command
-      class Build < Android
-
-        self.summary = '只编译APK不修改工程'
-        self.description = <<-DESC
-            只编译APK不修改工程
-
-            支持功能:
-
-                * 编译Android工程
-
-                * 生成APK文件
-
-                * 支持上传到JPS测试平台
-
-                * 支持发送测试通知
-
-            使用示例:
-
-                $ pindo android build                    # 编译APK
-
-                $ pindo android build --upload           # 编译并上传到JPS
-
-                $ pindo android build --send             # 编译、上传并发送通知
-
-                $ pindo android build --proj="My App"    # 指定项目名称
-        DESC
-
-        def self.options
-          [
-            ['--proj', '指定上传到测试平台的项目名称'],
-            ['--upload', '上传编译后的apk到测试平台'],
-            ['--send', '上传成功后发送测试通知'],
-          ].concat(super)
-        end
-
-        def initialize(argv)
-          @args_upload_flag = argv.flag?('upload', false)
-          @args_send_flag = argv.flag?('send', false)
-          @args_proj_name = argv.option('proj')
-
-          if @args_send_flag
-            @args_upload_flag = true
-          end
-
-          super
-          @additional_args = argv.remainder!
-        end
-
-        def run
-
-          pindo_project_dir = Dir.pwd
-
-          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 << "--upload" if @args_upload_flag
-          args_temp << "--send" if @args_send_flag
-          case project_type
-          when :ios
-            raise Informative,  "iOS 工程， 请使用 pindo ios build"
-          when :android
-            android_build
-          when :unity
-              raise Informative,  "Unity 工程， 请使用 pindo unity apk"
-          else
-              raise Informative, "当前目录不是工程目录，不能编译"
-          end
-        end
-
-        def android_build
-          pindo_project_dir = Dir.pwd
-          build_helper = Pindo::BuildHelper.share_instance
-          if @args_upload_flag
-            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
-              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
-          
-          app_info_obj = nil
-          workflow_info = nil
-          if @args_upload_flag
-              proj_name = @args_proj_name
-              # 传入 package_type 获取 workflow_info
-              app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
-                working_directory: Dir.pwd,
-                proj_name: 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
-                )
-
-                # 添加基于 Application ID 的 Scheme（在 workflow 设置完成后）
-                Pindo::AndroidConfigHelper.add_application_id_based_scheme(
-                  project_dir: pindo_project_dir
-                )
-              else
-                raise Informative, "未获取到工作流信息"
-              end
-          end
-
-
-          android_build_helper = Pindo::AndroidBuildHelper.share_instance
-          
-          begin
-            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?
-
-                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"]
-                    )
-                    if @args_send_flag
-                        # 始终发送给自己
-                        PgyerHelper.share_instace.send_apptest_msg(
-                            app_info_obj: app_info_obj,
-                            app_version_info_obj: result_data["data"],
-                            receiveType: "self"
-                        )
-
-                        # 额外发送到测试群
-                        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
-            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
-          end
-        end
-      end
-    end
-  end
-end