pindo 5.18.12 → 5.18.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f12654249c9833d657aadadbc44e7e7b749dbd590018855ddc196776dd21d85
-  data.tar.gz: 0bc9ef08ddfaefeeca63cb52380eace72853a9201e1abd828e5100b5de12cba0
+  metadata.gz: 6c4f5555594146ac02e8057cc535c1233b2c81b5204e6807a021744e9eeafd8b
+  data.tar.gz: 1ad745131de6737f27c1c419253bf4dabc2c704cb2440f70ca7ad660d902b989
 SHA512:
-  metadata.gz: 3a70f8ef90da1b660e40c0c1d84a56c2701fc541e8c932ac5facf224f3df59b4902cb45e5af246dfa492b311e3aa65d9cd9265d741fd2e514933a97c3dffe125
-  data.tar.gz: 6b867becf5698dcfec5b87c4cf5cb302b3c3292a0abe8d5bd890f69e15dd00abb2c63de3d461d5ca9e2cc1cb953050a0bb37f1558c7b01de25793764dbea22c2
+  metadata.gz: 0c505ba3e2a3f0c7bb74e6f57e588eeca6ab50844104abb98c4f02e6e676e584069135841f0793c951a0cc47c218e0d4b791c116ac5bffb7cc76437df9947218
+  data.tar.gz: f0635784ade7e61a8b623238da8d60b04d221ceafb5312fea289063a065596db37aba8e6a67fe0210b4ece19e98d713d22fffd202805b4c530002f395265011c

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

@@ -110,19 +110,27 @@ module Pindo
 
       apk_path = nil
       begin
+        # PAD 必须在签名注入之前完成，保证：
+        # 1) Keystore 的 Gradle 快照登记时 launcher/build.gradle 已含 assetPacks；
+        # 2) restore_managed_signing_config! 构建结束后恢复的是"含 assetPacks、不含签名改动"的干净状态。
+        has_workflow = workflow_name && !workflow_name.to_s.empty?
+        pad_persist = pad_persist_enabled?
+
+        if has_workflow && pad_persist
+          # 永久 PAD：清理旧 *_pack 并从当前 assets 重建；无可拆分资源则仅幂等补写引用
+          setup_play_asset_delivery_persistent(project_dir)
+        elsif !has_workflow
+          # 兼容旧行为：非 workflow 场景仍在构建前做一次 PAD（永久写入）
+          setup_play_asset_delivery(project_dir)
+        end
+        # 注：has_workflow && !pad_persist（临时 PAD）由 injector.prepare!(enable_pad: true) 内部处理
+
         unless Pindo::KeystoreHelper.apply_keystore_config(project_dir, build_type, bundle_id: bundle_name)
           raise RuntimeError, "Keystore 签名配置失败"
         end
         puts "✓ Android 签名配置成功"
 
-        if workflow_name && !workflow_name.to_s.empty?
-          pad_persist = pad_persist_enabled?
-
-          # 永久 PAD：每次构建前清理旧的 *_pack，并从当前导出产物重新生成
-          # 注意：PAD 会移动 unityLibrary/src/main/assets 下的目录到 *_pack；
-          # 因此要保证在此之前已经把 Unity/ 导出产物同步回主工程（Unity as lib 分支已同步）。
-          setup_play_asset_delivery_persistent(project_dir) if pad_persist
-
+        if has_workflow
           injector = Pindo::Android::WorkflowGradleInjector.new
           ctx = injector.prepare!(
             project_dir: project_dir,
@@ -136,8 +144,6 @@ module Pindo
             Pindo::Android::WorkflowGradleInjector.remove_project_pindo_tmp_dir!(project_dir)
           end
         else
-          # 兼容旧行为：仍会永久写入 PAD 相关变更（如需临时恢复，请传 workflow_name 走注入管线）
-          setup_play_asset_delivery(project_dir)
           apk_path = build_apk(project_dir, debug)
         end
       ensure
@@ -163,17 +169,43 @@ module Pindo
       true
     end
 
-    # 永久 PAD：先清理旧的 *_pack，再从当前 assets 生成新的 pack
+    # 永久 PAD：仅当 assets 中存在可拆分资源时，才清理旧 *_pack 并重新生成；
+    # 若无可拆分资源但工程已有 *_pack 模块，则幂等补写 settings.gradle / launcher/build.gradle 的引用，
+    # 避免 Unity 重新导出覆盖 launcher/build.gradle 导致 assetPacks 丢失。
     private def setup_play_asset_delivery_persistent(project_dir)
-      # 仅 Unity 导出工程才有 unityLibrary/src/main/assets
       unity_assets = File.join(project_dir, "unityLibrary", "src", "main", "assets")
       return unless File.directory?(unity_assets)
 
-      # 清理旧 pack：避免 assets 内容变化后残留旧 pack 目录导致重复/脏数据
+      splittable = Dir.glob(File.join(unity_assets, "*")).select { |p| File.directory?(p) }
+      splittable.reject! { |p| File.basename(p).downcase == "bin" }
+      splittable.reject! { |p| Dir.glob(File.join(p, "*")).empty? }
+
+      if splittable.empty?
+        existing_packs = Dir.glob(File.join(project_dir, "*_pack")).select do |dir|
+          next false unless File.directory?(dir)
+
+          gradle = File.join(dir, "build.gradle")
+          next false unless File.file?(gradle)
+
+          File.read(gradle).include?("com.android.asset-pack")
+        end
+
+        if existing_packs.empty?
+          puts "unityLibrary assets 下无可拆分资源，且工程无 *_pack 模块，跳过 PAD"
+          return
+        end
+
+        pack_module_refs = existing_packs.map { |dir| ":#{File.basename(dir)}" }
+        puts "unityLibrary assets 下无可拆分资源，复用已有 *_pack 模块：#{pack_module_refs.join(', ')}"
+        GradleHelper.update_settings_gradle(project_dir, pack_module_refs)
+        GradleHelper.update_launcher_build_gradle(project_dir, pack_module_refs)
+        return
+      end
+
+      # 有新资源可拆分，先清理旧 pack 再重建，避免残留脏数据
       Dir.glob(File.join(project_dir, "*_pack")).each do |dir|
         next unless File.directory?(dir)
 
-        # 尽量只删除我们生成的模块：要求 build.gradle 存在且包含 asset-pack 插件
         gradle = File.join(dir, "build.gradle")
         next unless File.file?(gradle)
         content = File.read(gradle)
@@ -529,7 +561,30 @@ module Pindo
       asset_subdirs = Dir.glob(File.join(assets_path, "*")).select { |path| File.directory?(path) }
       
       if asset_subdirs.empty?
-        puts "未找到 assets 下的子目录，跳过 Play Asset Delivery 设置"
+        # 重要：assets 为空并不代表不需要 PAD。
+        # 很多工程会在首次分包后把资源移动到 *_pack，从而 assets 留空；
+        # 此时仍需要确保 settings.gradle / launcher/build.gradle 中的 include/assetPacks 引用存在，
+        # 否则会出现 `assetPacks = [":yoo_pack"]` 未写入/被外部基线覆盖的问题。
+        existing_pack_modules = Dir.glob(File.join(project_dir, "*_pack")).filter_map do |dir|
+          next unless File.directory?(dir)
+
+          gradle = File.join(dir, "build.gradle")
+          next unless File.file?(gradle)
+
+          content = File.read(gradle)
+          next unless content.include?("com.android.asset-pack")
+
+          ":#{File.basename(dir)}"
+        end.uniq
+
+        if existing_pack_modules.any?
+          puts "assets 下无可拆分资源，检测到已存在的 Asset Pack 模块，将确保工程引用完整..."
+          GradleHelper.update_settings_gradle(project_dir, existing_pack_modules)
+          GradleHelper.update_launcher_build_gradle(project_dir, existing_pack_modules)
+          puts "✓ 已同步现存 Asset Pack 引用：#{existing_pack_modules.join(', ')}"
+        else
+          puts "未找到 assets 下的子目录，且工程中不存在 *_pack 模块，跳过 Play Asset Delivery 设置"
+        end
         return
       end
 

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

@@ -646,13 +646,24 @@ module Pindo
         return
       end
 
+      pack_modules = Array(pack_modules).compact.map(&:to_s).reject(&:empty?).uniq
+      if pack_modules.empty?
+        puts "✓ 未检测到需要写入的 Asset Pack 模块，跳过更新 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}")
+        # 合并现有的 assetPacks 配置（不要覆盖用户已有项）
+        content.gsub!(/assetPacks\s*=\s*\[([^\]]*)\]/m) do
+          raw_items = Regexp.last_match(1).to_s
+          existing = raw_items.scan(/["']([^"']+)["']/).flatten.map(&:to_s).reject(&:empty?)
+          merged = (existing + pack_modules).uniq
+          "assetPacks = #{merged.inspect}"
+        end
       else
         # 在 android 块中添加 assetPacks 配置
         android_block_pattern = /(android\s*\{)/

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

@@ -98,6 +98,16 @@ module Pindo
           if enable_pad
             pad_backup!(context)
             run_pad!(context)
+
+            # 临时 PAD 默认会在 cleanup! 中恢复备份并删除 created_dirs（即 *_pack），以实现回滚。
+            # 但某些工程会在构建结束后用“基线文件/外部备份”覆盖当前 build.gradle，
+            # 若该基线不包含 assetPacks/include，会导致引用丢失。
+            #
+            # 当显式开启 PINDO_PAD_KEEP_REFS=1 时：
+            # - 将 PAD 写入后的 settings.gradle / launcher/build.gradle 同步进备份快照，
+            #   以确保 cleanup! 恢复后仍保留 assetPacks/include；
+            # - 同时 cleanup! 将跳过删除 created_dirs，保留 *_pack 目录，保持工程可 sync。
+            sync_pad_refs_to_backups!(context) if pad_keep_refs_enabled?
           end
 
           # 2) 注入 buildType/signingConfig（对所有 Android modules）
@@ -242,15 +252,26 @@ module Pindo
         backups.each do |item|
           path = File.join(project_dir, item.fetch("path"))
           backup_path = File.join(project_dir, item.fetch("backup_path"))
-          next unless File.file?(backup_path)
 
-          FileUtils.mkdir_p(File.dirname(path))
-          bin_copy(backup_path, path)
+          if item["type"] == "dir"
+            next unless File.directory?(backup_path)
+            FileUtils.rm_rf(path) if File.exist?(path)
+            FileUtils.mkdir_p(File.dirname(path))
+            FileUtils.cp_r(backup_path, path)
+          else
+            next unless File.file?(backup_path)
+            FileUtils.mkdir_p(File.dirname(path))
+            bin_copy(backup_path, path)
+          end
         end
 
-        (data["created_dirs"] || []).each do |rel|
-          abs = File.join(project_dir, rel)
-          FileUtils.rm_rf(abs) if abs.start_with?(project_dir.to_s)
+        # 临时 PAD 默认会清理 created_dirs（通常是 *_pack）。
+        # 若显式开启 PINDO_PAD_KEEP_REFS=1，则保留 pack 目录与引用，避免构建结束后被外部基线覆盖而丢引用。
+        unless ENV.fetch("PINDO_PAD_KEEP_REFS", "").to_s.strip.downcase.match?(/\A(1|true|yes|on)\z/)
+          (data["created_dirs"] || []).each do |rel|
+            abs = File.join(project_dir, rel)
+            FileUtils.rm_rf(abs) if abs.start_with?(project_dir.to_s)
+          end
         end
       end
 
@@ -529,7 +550,6 @@ module Pindo
       def groovy_signing_config_entry(workflow_name:, workflow_build_type:, signing_config_name:)
         lines = []
         lines << "// #{MARK_BEGIN}"
-        lines << "// workflowName=#{workflow_name.inspect}"
         lines << "#{signing_config_name} {"
         lines << "    def signingEnvVars = #{RELEASE_SIGNING_ENV_VARS.inspect}"
         lines << "    def hasCompleteReleaseSigningEnv = signingEnvVars.every { System.getenv(it) }"
@@ -553,7 +573,6 @@ module Pindo
       def kts_signing_config_entry(workflow_name:, workflow_build_type:, signing_config_name:)
         lines = []
         lines << "// #{MARK_BEGIN}"
-        lines << "// workflowName=#{workflow_name.inspect}"
         lines << "create(\"#{signing_config_name}\") {"
         lines << "    val signingEnvVars = listOf("
         RELEASE_SIGNING_ENV_VARS.each_with_index do |v, idx|
@@ -582,7 +601,6 @@ module Pindo
       def groovy_build_type_entry(workflow_name:, workflow_build_type:, signing_config_name:, is_main_module:)
         lines = []
         lines << "// #{MARK_BEGIN}"
-        lines << "// workflowName=#{workflow_name.inspect}"
         lines << "#{workflow_build_type} {"
         lines << "    minifyEnabled false"
         if is_main_module
@@ -597,7 +615,6 @@ module Pindo
       def kts_build_type_entry(workflow_name:, workflow_build_type:, signing_config_name:, is_main_module:)
         lines = []
         lines << "// #{MARK_BEGIN}"
-        lines << "// workflowName=#{workflow_name.inspect}"
         lines << "create(\"#{workflow_build_type}\") {"
         lines << "    isMinifyEnabled = false"
         if is_main_module
@@ -743,7 +760,7 @@ module Pindo
         end.join
       end
 
-      def backup_file!(context, abs_path)
+      def backup_file!(context, abs_path, force: false)
         project_dir = context[:project_dir]
         return unless abs_path && File.file?(abs_path)
         return unless abs_path.start_with?(project_dir.to_s)
@@ -751,7 +768,10 @@ module Pindo
         rel = abs_path.delete_prefix("#{project_dir}/")
 
         # 已备份过就跳过
-        return if context[:backups].any? { |b| b["path"] == rel && b["type"] == "file" }
+        if (existing = context[:backups].find { |b| b["path"] == rel && b["type"] == "file" })
+          return unless force
+          context[:backups].delete(existing)
+        end
 
         backup_path = File.join(context[:backup_dir], rel)
         FileUtils.mkdir_p(File.dirname(backup_path))
@@ -765,6 +785,22 @@ module Pindo
         }
       end
 
+      def pad_keep_refs_enabled?
+        ENV.fetch("PINDO_PAD_KEEP_REFS", "").to_s.strip.downcase.match?(/\A(1|true|yes|on)\z/)
+      end
+
+      def sync_pad_refs_to_backups!(context)
+        project_dir = context[:project_dir]
+
+        settings = find_settings_gradle(project_dir)
+        backup_file!(context, settings, force: true) if settings
+
+        launcher_groovy = File.join(project_dir, "launcher", "build.gradle")
+        launcher_kts = File.join(project_dir, "launcher", "build.gradle.kts")
+        backup_file!(context, launcher_kts, force: true) if File.file?(launcher_kts)
+        backup_file!(context, launcher_groovy, force: true) if File.file?(launcher_groovy)
+      end
+
       def self.bin_copy(src, dst)
         File.open(src, "rb") do |r|
           File.open(dst, "wb") do |w|

data/lib/pindo/module/task/model/git/git_commit_task.rb

@@ -107,8 +107,22 @@ module Pindo
         if @process_type == Pindo::UncommittedFilesProcessType::SKIP_WITHOUT_TAG
           coding_branch = get_current_branch_name
           @build_number, @commit_hash = git_repo_helper.get_build_number_from_commit(project_dir: root_dir)
-          @build_version = "0.0.0"
+
+          # 版本号仍按正常优先级计算，仅"不打 tag / 不升版本"，避免硬编码 0.0.0 污染 build.gradle 与下游上传参数
+          if @fixed_version && !@fixed_version.empty?
+            @build_version = @fixed_version
+          else
+            @build_version = git_repo_helper.calculate_build_version(
+              project_dir: root_dir,
+              tag_prefix: @tag_pre,
+              create_tag_type: Pindo::CreateTagType::NONE,
+              version_increase_type: @ver_inc
+            )
+          end
+
+          commit_short = @commit_hash ? @commit_hash[0..7] : "unknown"
           Funlog.instance.fancyinfo_warning("skip_without_tag 模式：跳过分支合并和 tag 创建")
+          Funlog.instance.fancyinfo_success("Version: #{@build_version}, Build: #{@build_number}, Commit: #{commit_short}")
 
           # 显示 commit 信息后直接返回
           display_all_repos_commit_info(root_dir)

data/lib/pindo/module/utils/git_repo_helper.rb

@@ -224,41 +224,29 @@ module Pindo
       end
     end
 
-    # 获取Build号（从commit hash转换而来）
+    # 获取Build号（基于 git 提交总数，单调递增）
+    # 对标 fastlane number_of_commits：versionCode = git rev-list --count HEAD
     # @param project_dir [String] 项目目录路径
-    # @return [Integer, String] 返回 build_number 和 commit_hash
-    #   - build_number: Build号（commit hash前6位16进制转10进制）
-    #   - commit_hash: 完整的commit hash（40位）
+    # @return [Array(Integer, String)] build_number 和完整 commit_hash
+    #   - build_number: 当前 HEAD 的 commit 总数（最小为 1）
+    #   - commit_hash: 完整的 commit hash（40位）
     def get_build_number_from_commit(project_dir: nil)
       raise ArgumentError, "项目目录不能为空" if project_dir.nil?
 
-      # 获取git根目录
       git_root = Pindo::GitHandler.git_root_directory(local_repo_dir: project_dir)
-      return 1, nil unless git_root
-
-      begin
-        # 获取当前HEAD的完整commit hash
-        full_commit_hash = Pindo::GitHandler.git!(%W(-C #{git_root} rev-parse HEAD)).strip
-
-        # 取前6位计算build_number
-        short_hash = full_commit_hash[0..5]
+      raise Pindo::Informative, "非 Git 仓库，无法计算 versionCode: #{project_dir}" unless git_root
 
-        # 将16进制转换为10进制
-        build_number = short_hash.to_i(16)
-
-        # 确保在Android versionCode安全范围内（最大值为2^31-1）
-        max_value = 2**31 - 1
-        build_number = build_number % max_value if build_number > max_value
+      # shallow clone 下 rev-list --count 结果不完整，必须先 unshallow
+      shallow = Pindo::GitHandler.git!(%W(-C #{git_root} rev-parse --is-shallow-repository)).strip
+      if shallow == "true"
+        raise Pindo::Informative, "shallow clone 无法计算 versionCode，请执行 git fetch --unshallow 后重试"
+      end
 
-        # 确保build_number不为0
-        build_number = 1 if build_number == 0
+      count = Pindo::GitHandler.git!(%W(-C #{git_root} rev-list --count HEAD)).strip.to_i
+      full_commit_hash = Pindo::GitHandler.git!(%W(-C #{git_root} rev-parse HEAD)).strip
 
-        return build_number, full_commit_hash
-      rescue StandardError => e
-        Funlog.instance.fancyinfo_error("获取commit hash失败: #{e.message}")
-        # 如果获取失败，返回基于时间戳的默认值
-        return Time.now.to_i % 1000000 + 1, nil
-      end
+      build_number = count < 1 ? 1 : count
+      [build_number, full_commit_hash]
     end
 
   

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.18.12"
+  VERSION = "5.18.17"
 
   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.18.12
+  version: 5.18.17
 platform: ruby
 authors:
 - wade
@@ -526,7 +526,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.0.0
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: easy work
 test_files: []