pindo 5.1.4 → 5.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eda913afe12b6e589a0ac3981040fe27b575045a488afb373f1825e548fb53d
-  data.tar.gz: 660bfab7bec17ed41564c2d925d7fb7014754e421a2db9cc5cf77369a0b41db3
+  metadata.gz: eeb5144aeaf56d2e5bafd3484f8217e9e4ce46a54485eb9b2b5d454cfe3c34fe
+  data.tar.gz: abf8c96e71101c513b825593aa6627e5252770a31d144afe6803bec6b030cda0
 SHA512:
-  metadata.gz: b3712e5cc54bae69dd86d022f1ba73c6e8a1848beb4c09d420e4dd94ce5b9a9d5b96a88acc723525bfb4b3fa3b0bf1ecfa6b7c0567ea6f08fbfd4392c8e554fd
-  data.tar.gz: 4c8cc257d0ccc1fc5cc475421ab805d98f159a645c88feb81ca8559ebe519fe57ae83f63e152cb1ef46ea057ed325b0f0a671f1caa29e426e9a1f01c04872988
+  metadata.gz: 7b01b26770891a88284b6e2c63ed10f9fc22cb13f17038a648655ea856eb6fc9eaf3392032faf991662e2d2ac1c20a3ebe59aa439a339150c8d96f5a0fceda53
+  data.tar.gz: 0ddad442cb9c1973230a91931f3d38f4ed6089aab55c65f07661d600ccc9f91dba7950a70ac3ed144af1a7f1f71a80ef5a52c9eaa50301d81f7914efd763d53a

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

@@ -88,7 +88,7 @@ module Pindo
 
           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)
+            is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir, auto_mode: true)
             if is_need_add_tag
                 Pindo::Command::Dev::Tag::run(tag_action_parms)
             end

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

@@ -108,7 +108,7 @@ 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)
+                      is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir, auto_mode: true)
                       if is_need_add_tag
                           Pindo::Command::Dev::Tag::run(tag_action_parms)
                       end

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

@@ -214,12 +214,15 @@ module Pindo
                       info_plist_dict = Xcodeproj::Plist.read_from_path(info_plist_path)
                       info_plist_dict["CFBundleURLTypes"] = info_plist_dict["CFBundleURLTypes"] || []
                       # info_plist_dict["CFBundleURLTypes"] 中不存在CFBundleURLName为bundleid的item
-                      if !bundleid_scheme_name.nil? || bundleid_scheme_name.empty? || !info_plist_dict["CFBundleURLTypes"].any? { |item| item["CFBundleURLName"] == bundleid_scheme_name }
+                      #bundle id去除. 特殊字符串，保留全小写
+                      bundleid_scheme_valeu = bundleid_scheme_name.gsub(/[^\w\s]/, '').downcase
+
+                      if !bundleid_scheme_name.nil? || bundleid_scheme_name.empty? || !info_plist_dict["CFBundleURLTypes"].any? { |item| item["CFBundleURLName"] == bundleid_scheme_valeu }
                         item0 = {}
                         item0["CFBundleTypeRole"] = "Editor"
-                        item0["CFBundleURLName"] = bundleid_scheme_name
+                        item0["CFBundleURLName"] = bundleid_scheme_valeu
                         item0["CFBundleURLSchemes"] = []
-                        item0["CFBundleURLSchemes"] << bundleid_scheme_name
+                        item0["CFBundleURLSchemes"] << bundleid_scheme_valeu
                         info_plist_dict["CFBundleURLTypes"] << item0
                       end
                       Xcodeproj::Plist.write_to_path(info_plist_dict, info_plist_path)

data/lib/pindo/command/pgyer/upload.rb

@@ -108,6 +108,7 @@ module Pindo
                     build_helper = Pindo::BuildHelper.share_instance
 
                     Dir.chdir(current_project_dir)
+                    is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(current_project_dir)
                     if is_need_add_tag
                         Pindo::Command::Dev::Tag::run(tag_action_parms) 
                     end

data/lib/pindo/command/unity/apk.rb

@@ -78,7 +78,7 @@ module Pindo
                     end
                     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)
+                      is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir, auto_mode: true)
                       if is_need_add_tag
                           Pindo::Command::Dev::Tag::run(tag_action_parms)
                       end

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

@@ -78,9 +78,9 @@ module Pindo
 
                     if @args_upload_flag
                         build_helper = Pindo::BuildHelper.share_instance
-                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
+                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir, auto_mode: true)
                         if is_need_add_tag
-                            Pindo::Command::Dev::Tag::run(tag_action_parms) 
+                            Pindo::Command::Dev::Tag::run(tag_action_parms)
                         end
                     end
 

data/lib/pindo/command/unity/ipa.rb

@@ -88,7 +88,7 @@ module Pindo
                     
                     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)
+                      is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir, auto_mode: true)
                       if is_need_add_tag
                           Pindo::Command::Dev::Tag::run(tag_action_parms)
                       end

data/lib/pindo/command/unity/web.rb

@@ -87,9 +87,9 @@ module Pindo
 
                     if @args_upload_flag
                         build_helper = Pindo::BuildHelper.share_instance
-                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
+                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir, auto_mode: true)
                         if is_need_add_tag
-                            Pindo::Command::Dev::Tag::run(tag_action_parms) 
+                            Pindo::Command::Dev::Tag::run(tag_action_parms)
                         end
                     end
 

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

@@ -110,9 +110,9 @@ module Pindo
                     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)
+                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir, auto_mode: true)
                         if is_need_add_tag
-                            Pindo::Command::Dev::Tag::run(tag_action_parms) 
+                            Pindo::Command::Dev::Tag::run(tag_action_parms)
                         end
                     end
 

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

@@ -43,15 +43,43 @@ module Pindo
         raise RuntimeError, "找不到 AAB 文件: #{paths[:bundle]}"
       end
 
-      puts "解析 keystore 配置"
+      # --- AAB 包体积检测 ---
+      aab_size = File.size(paths[:bundle])
+      aab_size_mb = (aab_size.to_f / 1024 / 1024).round(2)
+      base_size = 0
+      base_size_mb = 0
+      base_percent = 0
+      base_limit_bytes = 194615705 # 185MB
+      base_limit_mb = 185
+      begin
+        # 用 unzip -v 统计 base/ 文件夹压缩体积
+        unzip_out = `unzip -v "#{paths[:bundle]}"`
+        base_lines = unzip_out.lines.select { |l| l.include?(" base/") }
+        base_size = base_lines.map { |l| l.split[2].to_i }.sum
+        base_size_mb = (base_size.to_f / 1024 / 1024).round(2)
+        base_percent = aab_size > 0 ? ((base_size.to_f * 100) / aab_size).round(2) : 0
+      rescue => e
+        puts "\e[31mAAB base 文件夹体积检测失败: #{e.message}\e[0m"
+      end
+      puts "\e[36mAAB 包体积: #{aab_size_mb} MB\e[0m"
+      puts "\e[36mbase 文件夹压缩体积: #{base_size_mb} MB (占比 #{base_percent}%)\e[0m"
+      if base_size > base_limit_bytes
+        puts "\e[41;97m警告: base 文件夹已超出 Google Play 限制（#{base_limit_mb}MB），请优化资源或分包！\e[0m"
+        puts "\e[31mAAB 包体积不符合 Google Play 提交标准，需要缩减包体积才能提交！！！\e[0m"
+      else
+        puts "\e[32mAAB 包体积符合 Google Play 提交标准，可以正常提交\e[0m"
+      end
+      # --- END ---
+
+      # puts "解析 keystore 配置"
       ks = keystore_config[:store_file]
-      puts "读取 keystore path = #{ks}"
+      # puts "读取 keystore path = #{ks}"
       ks_pass = keystore_config[:store_password]
-      puts "读取 keystore pass = #{ks_pass}"
+      # puts "读取 keystore pass = #{ks_pass}"
       key_alias = keystore_config[:key_alias]
-      puts "读取 key alias = #{key_alias}"
+      # puts "读取 key alias = #{key_alias}"
       key_pass = keystore_config[:key_password]
-      puts "读取 key pass = #{key_pass}"
+      # puts "读取 key pass = #{key_pass}"
 
       # 构建 APK
       bundletool_cmd = [

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

@@ -67,17 +67,34 @@ module Pindo
 
     def get_main_module(project_path)
       settings_gradle_path = File.join(project_path, "settings.gradle")
-      return nil unless File.exist?(settings_gradle_path)
+      settings_gradle_kts_path = File.join(project_path, "settings.gradle.kts")
+      
+      # 优先使用 settings.gradle.kts，如果不存在则使用 settings.gradle
+      if File.exist?(settings_gradle_kts_path)
+        settings_gradle_path = settings_gradle_kts_path
+      elsif !File.exist?(settings_gradle_path)
+        return nil
+      end
 
       content = File.read(settings_gradle_path)
-      modules = content.scan(/include\s+['"]([^'"]+)['"]/).flatten
+      # 兼容 include ':app' 和 include(":app")
+      modules = content.scan(/include\s*\(?\s*['\"]?([:\w\-]+)['\"]?\s*\)?/).flatten
 
       main_module = modules.find do |m|
         module_name = m.split(':').last
         gradle_path = File.join(project_path, module_name, "build.gradle")
+        gradle_kts_path = File.join(project_path, module_name, "build.gradle.kts")
+        
+        # 优先使用 build.gradle.kts，如果不存在则使用 build.gradle
+        if File.exist?(gradle_kts_path)
+          gradle_path = gradle_kts_path
+        end
+        
         if File.exist?(gradle_path)
-          File.read(gradle_path).include?("apply plugin: 'com.android.application'") ||
-            File.read(gradle_path).include?("id 'com.android.application'")
+          gradle_content = File.read(gradle_path)
+          gradle_content.include?("apply plugin: 'com.android.application") ||
+            gradle_content.include?("id 'com.android.application") ||
+            (gradle_content.include?("plugins {") && gradle_content.include?("com.android.application"))
         end
       end
       return nil unless main_module
@@ -90,153 +107,225 @@ module Pindo
       main_module = get_main_module(project_path)
       return nil unless main_module
 
-      gradle_path = File.join(main_module, "build.gradle")
-      return nil unless File.exist?(gradle_path)
+      gradle_kts_path = File.join(main_module, "build.gradle.kts")
+      gradle_path     = File.join(main_module, "build.gradle")
+
+      if File.exist?(gradle_kts_path)
+        puts "KTS 项目，读取 #{File.basename(gradle_kts_path)} 文件"
+        get_keystore_config_kts(gradle_kts_path, project_path, debug)
+      elsif File.exist?(gradle_path)
+        puts "Groovy 项目，读取 #{File.basename(gradle_path)} 文件"
+        get_keystore_config_groovy(gradle_path, project_path, debug)
+      else
+        puts "未找到 build.gradle 或 build.gradle.kts 文件"
+        nil
+      end
+    end
+
+    # 处理 Kotlin DSL (build.gradle.kts)
+    def get_keystore_config_kts(gradle_kts_path, project_path, debug)
+      content = File.read(gradle_kts_path)
+      puts "读取 #{File.basename(gradle_kts_path)} 文件"
+      signing_configs_block = extract_signing_configs_kts(content)
+      # puts "==== signingConfigs block ===="
+      # puts signing_configs_block
+      # puts "==============================" if signing_configs_block
+      return nil unless signing_configs_block
+
+      config_type = debug ? 'debug' : 'release'
+      config_block = extract_config_block_kts(signing_configs_block, config_type)
+      # puts "==== config_block ===="
+      # puts config_block
+      # puts "=====================" if config_block
+      return nil unless config_block
+
+      config_block = remove_kts_comments(config_block)
+      ext_values = get_ext_values(project_path)
+      store_file, store_password, key_alias, key_password = extract_keystore_fields_kts(config_block, ext_values)
+      store_file = fix_store_file_path(store_file, project_path)
+      keystore_config = {
+        store_file: store_file,
+        store_password: store_password,
+        key_alias: key_alias,
+        key_password: key_password
+      }
+      if keystore_config.values.any?(&:nil?)
+        puts "警告: 部分 keystore 配置为 nil: #{keystore_config}"
+      end
+      keystore_config
+    end
 
+    # 处理 Groovy DSL (build.gradle)
+    def get_keystore_config_groovy(gradle_path, project_path, debug)
       content = File.read(gradle_path)
+      puts "读取 #{File.basename(gradle_path)} 文件"
+      signing_configs_block = extract_signing_configs_groovy(content)
+      # puts "==== signingConfigs block ===="
+      # puts signing_configs_block
+      # puts "==============================" if signing_configs_block
+      return nil unless signing_configs_block
 
-      # 直接读取整个文件内容，不使用正则表达式截取 android 块
-      puts "读取 build.gradle 文件"
+      config_type = debug ? 'debug' : 'release'
+      config_block = extract_config_block_groovy(signing_configs_block, config_type)
+      # puts "==== config_block ===="
+      # puts config_block
+      # puts "=====================" if config_block
+      return nil unless config_block
+
+      config_block = remove_groovy_comments(config_block)
+      ext_values = get_ext_values(project_path)
+      store_file, store_password, key_alias, key_password = extract_keystore_fields_groovy(config_block, ext_values)
+      store_file = fix_store_file_path(store_file, project_path)
+      keystore_config = {
+        store_file: store_file,
+        store_password: store_password,
+        key_alias: key_alias,
+        key_password: key_password
+      }
+      if keystore_config.values.any?(&:nil?)
+        puts "警告: 部分 keystore 配置为 nil: #{keystore_config}"
+      end
+      keystore_config
+    end
 
-      # 查找 signingConfigs 块的开始和结束位置
-      signing_configs_start = content.index(/signingConfigs\s*\{/)
-      return nil unless signing_configs_start
+    # --- 工具方法 ---
+    def extract_signing_configs_kts(content)
+      # 提取 signingConfigs { ... }，支持多层嵌套
+      match = content.match(/signingConfigs\s*\{([\s\S]*?)^\}/m)
+      match ? match[1] : nil
+    end
 
-      # 从开始位置查找匹配的闭合大括号
-      open_braces = 0
-      signing_configs_end = nil
+    def extract_signing_configs_groovy(content)
+      # 提取 signingConfigs { ... }，支持多层嵌套
+      match = content.match(/signingConfigs\s*\{([\s\S]*?)^\}/m)
+      match ? match[1] : nil
+    end
 
-      content[signing_configs_start..-1].each_char.with_index do |char, i|
-        if char == '{'
-          open_braces += 1
-        elsif char == '}'
-          open_braces -= 1
-          if open_braces == 0
-            signing_configs_end = signing_configs_start + i
+    def extract_config_block_kts(signing_configs_block, config_type)
+      # 支持 create("xxx") { ... }
+      all_blocks = signing_configs_block.scan(/create\(["']?([A-Za-z0-9_]+)["']?\)\s*\{([\s\S]*?)^\s*\}/m)
+      # 优先 release/debug/Android_Sign/自定义名
+      priority_names = [config_type, "Android_Sign", "release", "debug"]
+      config_block = nil
+      priority_names.each do |name|
+        block = all_blocks.find { |n, b| n == name && b.include?("storeFile") }
+        if block
+          config_block = block[1]
+          break
+        end
+      end
+      # 没找到就取第一个有 storeFile 的块
+      if config_block.nil?
+        all_blocks.each do |name, block|
+          if block.include?("storeFile")
+            config_block = block
             break
           end
         end
       end
+      config_block
+    end
 
-      return nil unless signing_configs_end
-
-      # 提取完整的 signingConfigs 块
-      signing_configs_block = content[signing_configs_start..signing_configs_end]
-
-
-      # 查找配置名称，如 Android_Sign
-      config_name_match = signing_configs_block.match(/signingConfigs\s*\{\s*(\w+)\s*\{/)
-      config_name = config_name_match ? config_name_match[1] : nil
-      return nil unless config_name
-
-      # 检查 buildTypes 中使用的签名配置
-      config_type = debug ? 'debug' : 'release'
-      build_type_match = content.match(/buildTypes\s*\{.*?#{config_type}\s*\{(.*?)}/m)
-      if build_type_match && build_type_match[1] =~ /signingConfig\s+signingConfigs\.(\w+)/
-        config_name = $1
+    def extract_config_block_groovy(signing_configs_block, config_type)
+      # 支持 xxx { ... }
+      all_blocks = signing_configs_block.scan(/([A-Za-z0-9_]+)\s*\{([\s\S]*?)^\s*\}/m)
+      priority_names = [config_type, "Android_Sign", "release", "debug"]
+      config_block = nil
+      priority_names.each do |name|
+        block = all_blocks.find { |n, b| n == name && b.include?("storeFile") }
+        if block
+          config_block = block[1]
+          break
+        end
       end
-
-      # 提取特定配置块的内容
-      config_start = signing_configs_block.index(/#{config_name}\s*\{/)
-      return nil unless config_start
-
-      # 从配置开始位置查找匹配的闭合大括号
-      open_braces = 0
-      config_end = nil
-
-      signing_configs_block[config_start..-1].each_char.with_index do |char, i|
-        if char == '{'
-          open_braces += 1
-        elsif char == '}'
-          open_braces -= 1
-          if open_braces == 0
-            config_end = config_start + i
+      if config_block.nil?
+        all_blocks.each do |name, block|
+          if block.include?("storeFile")
+            config_block = block
             break
           end
         end
       end
+      config_block
+    end
 
-      return nil unless config_end
-
-      # 提取完整的配置块
-      config_block = signing_configs_block[config_start..config_end]
-
-      puts "解析 signing config:"
-      puts "=" * 50
-      puts config_block
-      puts "=" * 50
-
-      # 从配置块中提取各项参数
-      store_file_match = config_block.match(/storeFile\s+file\(["']?\${([^}]+)}["']?\)/m)
-      store_password_match = config_block.match(/storePassword\s+["']?\${([^}]+)}["']?/m)
-      key_alias_match = config_block.match(/keyAlias\s+["']?\${([^}]+)}["']?/m)
-      key_password_match = config_block.match(/keyPassword\s+["']?\${([^}]+)}["']?/m)
-
-      # 如果使用了外部变量，尝试从 ext_signing.gradle 或其他配置文件中获取实际值
-      if store_file_match || store_password_match || key_alias_match || key_password_match
-        ext_values = get_ext_values(project_path)
-        puts "尝试从 ext values 中获取"
-
-        # 获取 store_file 并处理 $rootDir 路径
-        store_file = store_file_match ? ext_values[store_file_match[1]] : nil
-        if store_file && store_file.include?('$rootDir')
-          # 替换 $rootDir 为项目根目录的绝对路径
-          # 查找项目根目录（包含settings.gradle的目录）
-          root_dir = project_path
-          while root_dir && !File.exist?(File.join(root_dir, "settings.gradle"))
-            parent_dir = File.dirname(root_dir)
-            # 防止无限循环
-            break if parent_dir == root_dir
-            root_dir = parent_dir
-          end
+    def remove_kts_comments(block)
+      # 去除 // 注释
+      block.lines.reject { |line| line.strip.start_with?("//") }.join
+    end
 
-          store_file = store_file.gsub('$rootDir', root_dir)
-          puts "处理后的 store_file 路径: #{store_file}"
-        end
+    def remove_groovy_comments(block)
+      # 去除 // 和 /* ... */ 注释
+      block = block.gsub(/\/\*[\s\S]*?\*\//, "")
+      block.lines.reject { |line| line.strip.start_with?("//") }.join
+    end
 
-        keystore_config = {
-          store_file: store_file,
-          store_password: store_password_match ? ext_values[store_password_match[1]] : nil,
-          key_alias: key_alias_match ? ext_values[key_alias_match[1]] : nil,
-          key_password: key_password_match ? ext_values[key_password_match[1]] : nil
-        }
+    # 通用字段递归解析
+    def extract_keystore_fields_common(fields, ext_values)
+      fields.map { |val| extract_var_or_value(val, ext_values) }
+    end
 
-        # 确保所有值都不为 nil
-        if keystore_config.values.any?(&:nil?)
-          puts "警告: 部分 keystore 配置为 nil: #{keystore_config}"
-        end
+    def extract_keystore_fields_groovy(config_block, ext_values)
+      # 只处理 groovy 语法
+      store_file = config_block[/storeFile\s+file\(["']?([^\)"']+)["']?\)/, 1]
+      store_password = config_block[/storePassword\s+["']?([^\)"']+)["']?/, 1]
+      key_alias = config_block[/keyAlias\s+["']?([^\)"']+)["']?/, 1]
+      key_password = config_block[/keyPassword\s+["']?([^\)"']+)["']?/, 1]
+      extract_keystore_fields_common([store_file, store_password, key_alias, key_password], ext_values)
+    end
 
-        return keystore_config
+    def extract_keystore_fields_kts(config_block, ext_values)
+      # 只处理 kts 语法
+      store_file = config_block[/storeFile\s*=\s*file\(["']?([^\)"']+)["']?\)/, 1] ||
+                   config_block[/storeFile\s*=\s*rootProject\.file\(["']?([^\)"']+)["']?\)/, 1]
+      store_password = config_block[/storePassword\s*=\s*["']?([^\)"']+)["']?/, 1]
+      key_alias = config_block[/keyAlias\s*=\s*["']?([^\)"']+)["']?/, 1]
+      key_password = config_block[/keyPassword\s*=\s*["']?([^\)"']+)["']?/, 1]
+      extract_keystore_fields_common([store_file, store_password, key_alias, key_password], ext_values)
+    end
+
+    def extract_var_or_value(val, ext_values, depth=0)
+      return nil if val.nil? || val.empty? || depth > 5
+      # 匹配 ${KEY}、$KEY、"${KEY}"、'${KEY}'
+      if val =~ /^\$\{?([A-Za-z0-9_]+)\}?$/
+        key = $1
+        v = ext_values[key]
+        v ? extract_var_or_value(v, ext_values, depth+1) : nil
+      elsif val =~ /^"?\$\{([A-Za-z0-9_]+)\}"?$/
+        key = $1
+        v = ext_values[key]
+        v ? extract_var_or_value(v, ext_values, depth+1) : nil
       else
-        # 直接从配置块中提取硬编码的值
-        store_file = config_block.match(/storeFile\s+file\(['"]([^'"]+)['"]\)/m)&.[](1)
-        store_password = config_block.match(/storePassword\s+['"]([^'"]+)['"]/m)&.[](1)
-        key_alias = config_block.match(/keyAlias\s+['"]([^'"]+)['"]/m)&.[](1)
-        key_password = config_block.match(/keyPassword\s+['"]([^'"]+)['"]/m)&.[](1)
-
-        keystore_config = {
-          store_file: store_file,
-          store_password: store_password,
-          key_alias: key_alias,
-          key_password: key_password
-        }
-
-        # 确保所有值都不为 nil
-        if keystore_config.values.any?(&:nil?)
-          puts "警告: 部分 keystore 配置为 nil: #{keystore_config}"
-        end
+        val
+      end
+    end
 
-        return keystore_config
+    def resolve_var(val, ext_values, depth=0)
+      return val if val.nil? || depth > 5
+      if ext_values[val]
+        resolve_var(ext_values[val], ext_values, depth+1)
+      else
+        val
       end
     end
 
+    def fix_store_file_path(store_file, project_path)
+      return nil if store_file.nil? || store_file.empty?
+      # 兼容 $rootDir、${rootDir}、project.rootDir、rootProject.file
+      store_file = store_file.gsub(/^\$?\{?rootDir\}?\/?/, project_path + "/")
+      store_file = store_file.gsub(/^project\.rootDir\/?/, project_path + "/")
+      store_file = store_file.gsub(/^rootProject\.file\(['"](.+?)['"]\)/, project_path + '/\\1')
+      store_file = File.expand_path(store_file, project_path) unless File.exist?(store_file)
+      store_file
+    end
+
     # 新增方法：从 ext 配置文件中获取变量值
     def get_ext_values(project_path)
       ext_values = {}
 
-      # 查找可能的 ext 配置文件
       ext_files = [
         File.join(project_path, "buildScripts/cfg/ext_signing.gradle"),
+        File.join(project_path, "buildScripts/cfg/ext_signing.gradle.kts"),
         File.join(project_path, "gradle.properties"),
         File.join(project_path, "local.properties")
       ]
@@ -246,13 +335,18 @@ module Pindo
 
         content = File.read(file_path)
 
-        # 解析 ext.KEY = "VALUE" 格式
+        # 支持 ext.KEY = "VALUE"
         content.scan(/ext\.(\w+)\s*=\s*["']([^"']+)["']/m).each do |key, value|
           ext_values[key] = value
         end
 
-        # 解析 KEY=VALUE 格式
-        content.scan(/^(\w+)\s*=\s*["']?([^"'\n]+)["']?/m).each do |key, value|
+        # 支持 ext["KEY"] = "VALUE"
+        content.scan(/ext\[\s*["'](\w+)["']\s*\]\s*=\s*["']([^"']+)["']/m).each do |key, value|
+          ext_values[key] = value
+        end
+
+        # 支持 KEY = "VALUE"
+        content.scan(/^(\w+)\s*=\s*["']([^"']+)["']/m).each do |key, value|
           ext_values[key] = value
         end
       end
@@ -265,9 +359,14 @@ module Pindo
       unity_library_path = File.join(project_path, "unityLibrary")
       return false unless File.directory?(unity_library_path)
 
-      # 检查 unityLibrary 的 build.gradle 是否存在
+      # 检查 unityLibrary 的 build.gradle 或 build.gradle.kts 是否存在
       unity_gradle_path = File.join(unity_library_path, "build.gradle")
-      return false unless File.exist?(unity_gradle_path)
+      unity_gradle_kts_path = File.join(unity_library_path, "build.gradle.kts")    
+      if File.exist?(unity_gradle_kts_path)
+        unity_gradle_path = unity_gradle_kts_path
+      elsif !File.exist?(unity_gradle_path)
+        return false
+      end
 
       # 检查 build.gradle 中是否包含 Unity 特有的配置
       content = File.read(unity_gradle_path)

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

@@ -153,13 +153,13 @@ module Pindo
       keystore_config = get_keystore_config(project_path, debug)
 
       ks = keystore_config[:store_file]
-      puts "读取 keystore path = #{ks}"
+      # puts "读取 keystore path = #{ks}"
       ks_pass = keystore_config[:store_password]
-      puts "读取 keystore pass = #{ks_pass}"
+      # puts "读取 keystore pass = #{ks_pass}"
       key_alias = keystore_config[:key_alias]
-      puts "读取 key alias = #{key_alias}"
+      # puts "读取 key alias = #{key_alias}"
       key_pass = keystore_config[:key_password]
-      puts "读取 key pass = #{key_pass}"
+      # puts "读取 key pass = #{key_pass}"
     end
 
     private

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

@@ -28,8 +28,17 @@ module Pindo
     end
 
     def update_build_gradle(project_path)
-      # 更新build.gradle
+      # 更新build.gradle 或 build.gradle.kts
       build_gradle_path = File.join(project_path, "build.gradle")
+      build_gradle_kts_path = File.join(project_path, "build.gradle.kts")
+      
+      # 优先使用 build.gradle.kts，如果不存在则使用 build.gradle
+      if File.exist?(build_gradle_kts_path)
+        build_gradle_path = build_gradle_kts_path
+      elsif !File.exist?(build_gradle_path)
+        return
+      end
+      
       content = File.read(build_gradle_path)
       content.gsub!("classpath 'com.android.tools.build:gradle:4.0.1'",
                     "classpath 'com.android.tools.build:gradle:4.2.2'")

data/lib/pindo/module/build/buildhelper.rb

@@ -124,7 +124,7 @@ module Pindo
         end
 
 
-        def check_is_need_add_tag?(project_path)
+        def check_is_need_add_tag?(project_path, auto_mode: false)
           tag_action_parms = nil
           is_need_add_tag = false
 
@@ -133,36 +133,43 @@ module Pindo
             latest_tag = get_latest_version_tag(project_dir: current_git_root_path)
 
             unless is_tag_at_head?(git_root_dir: current_git_root_path, tag_name: latest_tag)
-              cli = HighLine.new
-              menu_options = {
-                "新增版本号,打新Tag" => -> {
-                  tag_action_parms = []
-                  :new_tag
-                },
-                "将上次的Tag删除重新打Tag" => -> {
-                  tag_action_parms = []
-                  tag_action_parms << "--retag"
-                  :recreate_tag
-                },
-                "不需要Tag继续编译且上传，手动修改上传备注" => -> {
-                  puts ""
-                  :continue_without_tag
-                },
-                "终止退出编译" => -> {
-                  raise Informative, "终止退出编译!"
-                  :exit
+              if auto_mode || !$stdin.tty?
+                # 在自动化模式或没有交互式终端时，默认选择新增版本号打新Tag
+                puts "检测到当前代码没有打Tag，在自动模式下将自动新增版本号并打新Tag"
+                tag_action_parms = []
+                is_need_add_tag = false
+              else
+                cli = HighLine.new
+                menu_options = {
+                  "新增版本号,打新Tag" => -> {
+                    tag_action_parms = []
+                    :new_tag
+                  },
+                  "将上次的Tag删除重新打Tag" => -> {
+                    tag_action_parms = []
+                    tag_action_parms << "--retag"
+                    :recreate_tag
+                  },
+                  "不需要Tag继续编译且上传，手动修改上传备注" => -> {
+                    puts ""
+                    :continue_without_tag
+                  },
+                  "终止退出编译" => -> {
+                    raise Informative, "终止退出编译!"
+                    :exit
+                  }
                 }
-              }
 
-              result = cli.choose do |menu|
-                menu.header = "当前代码并没有打Tag,上传的Changelog需要Tag"
-                menu.prompt = "请选中打Tag的方式, 请输入选项(1/2/3...):"
-                menu_options.each do |option, action|
-                  menu.choice(option) { action.call }
+                result = cli.choose do |menu|
+                  menu.header = "当前代码并没有打Tag,上传的Changelog需要Tag"
+                  menu.prompt = "请选中打Tag的方式, 请输入选项(1/2/3...):"
+                  menu_options.each do |option, action|
+                    menu.choice(option) { action.call }
+                  end
                 end
-              end
 
-              is_need_add_tag = !tag_action_parms.nil?
+                is_need_add_tag = !tag_action_parms.nil?
+              end
             end
           end
 

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "5.1.4"
+  	VERSION = "5.1.6"
 
   	class VersionCheck
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.1.6
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-06-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -453,7 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 3
 summary: easy work
 test_files: []