pindo 5.19.1 → 5.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db02bf00df627b07423ebd53475c538b60a4d5d8d567b2bb81a61390aaae73bc
-  data.tar.gz: 5252fb968e7bde86a095a78dce92599c9614061c1da9666e8cf2bea03927c8c6
+  metadata.gz: 5a77caec349df71376df7ea433567423ae745f767297fb29377e265f123b63d8
+  data.tar.gz: 5f8040b7e13937405b635906ad34dcd4466af83292d65b823968d22fce9f3081
 SHA512:
-  metadata.gz: fa95f45065b4a8635c4d12c5a4c1d3a95e678df97724103857e055d9088d8f8613fddef8786229163bbd8ad01c87242e396e5b79e1c5f4d92411b61192e3bde1
-  data.tar.gz: 931bd858133452f7cc5a3edafc60cbe7c4f56b5d0f8da6d720f24c23f7974cfe2c823e0bbc7e1d1a04bc8f99faa581ef7c52ae99b0676ec6cfc4e407411e3e05
+  metadata.gz: 9fb90c4d057aab583df7780e4e8880c47507da9c64f9b05dfb48b778c87ae1695cf33711c6b777ad6540284f97a101ba5c28f10e8d6a91dfc6243b6a4a25843f
+  data.tar.gz: 57f746e6f8a01dcebab6615d1e30de5d7b6a1eb2b221bf8db50a10c66a0aab240279064b86f89bef7e0ccace8186eaf87da42a008a2f50f2a403f0d5ee5ec593

data/lib/pindo/base/git_handler.rb

@@ -216,12 +216,17 @@ module Pindo
       def remote_tag_commit(local_repo_dir: nil, tag_name: nil)
           return nil if local_repo_dir.nil? || !File.exist?(local_repo_dir)
           tag_ref = "refs/tags/#{tag_name}"
-          res_data = git_remote!(local_repo_dir, %W(-C #{local_repo_dir} ls-remote --tags origin #{tag_ref}))
-          lines = res_data.to_s.lines.map(&:strip).reject(&:empty?)
-          return nil if lines.empty?
-          # annotated tag 的 ^{} 解引用行才是真实 commit，优先取它
-          deref = lines.find { |l| l.include?("^{}") }
-          (deref || lines.first).split(/\s+/).first
+          peeled_ref = "#{tag_ref}^{}"
+          # annotated tag 需要 ^{} 解引用行才能拿到真实 commit；但只传 tag_ref 精确过滤时，
+          # git ls-remote 不会附带 ^{} 行，必须显式把 peeled_ref 一起传入才能拿到它
+          res_data = git_remote!(local_repo_dir, %W(-C #{local_repo_dir} ls-remote --tags origin #{tag_ref} #{peeled_ref}))
+          entries = res_data.to_s.lines.map { |l| l.strip.split(/\s+/, 2) }
+                            .select { |sha, ref| sha && ref }
+          return nil if entries.empty?
+          # 优先取 ^{} 行（annotated tag 的真实 commit）；lightweight tag 只有 tag_ref 行且本身即 commit
+          peeled = entries.find { |_sha, ref| ref == peeled_ref }
+          plain  = entries.find { |_sha, ref| ref == tag_ref }
+          (peeled || plain)&.first
       end
 
       def remote_tag_exists?(local_repo_dir: nil, tag_name: nil)

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

@@ -98,7 +98,7 @@ module Pindo
           @option_items ||= Pindo::Options::OptionGroup.merge(
             Pindo::Options::BuildOptions.select(:bundle_name, :release),
             Pindo::Options::JPSOptions.select(:conf, :upload, :media, :bind, :send),
-            Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
+            Pindo::Options::UnityOptions.select(:skiplib, :skipyoo, :kill_unity),
             Pindo::Options::UnityOptions.select_with_defaults(skipmacro: true),
             Pindo::Options::TaskOptions.select(:multi),
             Pindo::Options::GitOptions.all
@@ -130,6 +130,7 @@ module Pindo
           # Unity 参数
           @args_skip_lib = @options[:skiplib] || false
           @args_skip_yoo = @options[:skipyoo] || false
+          @args_kill_unity = @options[:kill_unity] || false
 
           # Task 参数
           @args_multi_flag = @options[:multi] || false
@@ -313,7 +314,8 @@ module Pindo
               # 2.1 Unity 更新必备库任务（可选）
               unless @args_skip_lib
                 unity_update_task = Pindo::TaskSystem::UnityUpdateTask.new(
-                  project_path: config[:project_path]
+                  project_path: config[:project_path],
+                  auto_kill: @args_kill_unity
                 )
                 unity_update_task.dependencies << last_task.id
                 tasks << unity_update_task
@@ -324,7 +326,8 @@ module Pindo
               unless @args_skip_yoo
                 unity_yoo_task = Pindo::TaskSystem::UnityYooAssetTask.new(
                   'android',
-                  project_path: config[:project_path]
+                  project_path: config[:project_path],
+                  auto_kill: @args_kill_unity
                 )
                 unity_yoo_task.dependencies << last_task.id
                 tasks << unity_yoo_task
@@ -339,7 +342,8 @@ module Pindo
                 'android',
                 project_path: config[:project_path],
                 export_path: android_export_path,
-                context: unity_context
+                context: unity_context,
+                auto_kill: @args_kill_unity
               )
               unity_export_task.dependencies << last_task.id
               tasks << unity_export_task

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

@@ -101,7 +101,7 @@ module Pindo
                     @option_items ||= Pindo::Options::OptionGroup.merge(
                         Pindo::Options::BuildOptions.select(:bundleid, :build_type),
                         Pindo::Options::JPSOptions.select(:conf, :upload, :media, :bind, :send),
-                        Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
+                        Pindo::Options::UnityOptions.select(:skiplib, :skipyoo, :kill_unity),
                         Pindo::Options::UnityOptions.select_with_defaults(skipmacro: true),
                         Pindo::Options::TaskOptions.select(:multi),
                         Pindo::Options::GitOptions.all
@@ -141,6 +141,7 @@ module Pindo
                     # Unity 参数
                     @args_skip_lib = @options[:skiplib] || false
                     @args_skip_yoo = @options[:skipyoo] || false
+                    @args_kill_unity = @options[:kill_unity] || false
 
                     # Task 参数
                     @args_multi_flag = @options[:multi] || false
@@ -282,7 +283,8 @@ module Pindo
                             # 2.1 Unity 更新必备库任务（可选）
                             unless @args_skip_lib
                                 unity_update_task = Pindo::TaskSystem::UnityUpdateTask.new(
-                                    project_path: config[:project_path]
+                                    project_path: config[:project_path],
+                                    auto_kill: @args_kill_unity
                                 )
                                 unity_update_task.dependencies << last_task.id
                                 tasks << unity_update_task
@@ -293,7 +295,8 @@ module Pindo
                             unless @args_skip_yoo
                                 unity_yoo_task = Pindo::TaskSystem::UnityYooAssetTask.new(
                                     'ios',
-                                    project_path: config[:project_path]
+                                    project_path: config[:project_path],
+                                    auto_kill: @args_kill_unity
                                 )
                                 unity_yoo_task.dependencies << last_task.id
                                 tasks << unity_yoo_task
@@ -309,7 +312,8 @@ module Pindo
                                 project_path: config[:project_path],
                                 export_path: ios_export_path,
                                 deploy_mode: @build_type,  # 根据 build_type 传递部署模式
-                                context: unity_context
+                                context: unity_context,
+                                auto_kill: @args_kill_unity
                             )
                             unity_export_task.dependencies << last_task.id
                             tasks << unity_export_task

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

@@ -90,7 +90,7 @@ module Pindo
 
                         $ pindo unity autobuild --multi                # 使用并发模式执行
 
-                        $ pindo unity autobuild --kill-unity           # 自动关闭 Unity 进程（不询问确认）
+                        $ pindo unity autobuild --kill_unity           # 自动关闭 Unity 进程（不询问确认）
                 DESC
 
                 # 命令参数

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

@@ -38,6 +38,11 @@ module Pindo
 
                 $ pindo unity packbuild --ver-inc=patch       # 打包并增加修订版本号
 
+                $ pindo unity packbuild --force               # 非交互：自动确认版本号（CI 用）
+
+                # 等价于 --force，便于 CI 环境变量注入
+                $ PINDO_AUTO_CONFIRM=1 pindo unity packbuild
+
         DESC
 
         def self.arguments
@@ -46,7 +51,10 @@ module Pindo
 
         # 定义此命令使用的参数项
         def self.option_items
-          @option_items ||= Pindo::Options::GitOptions.all
+          @option_items ||= Pindo::Options::OptionGroup.merge(
+            Pindo::Options::GitOptions.all,
+            Pindo::Options::CommonOptions.select(:force)
+          )
         end
 
         def self.options
@@ -55,20 +63,24 @@ module Pindo
 
         def initialize(argv)
             @options = initialize_options(argv)
-            
+
             # Git 参数
             @args_release_branch = @options[:release_branch] || 'master'
             @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc])
             @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type])
             @args_tag_pre = @options[:tag_pre] || 'v'
 
+            # 非交互：--force 或 PINDO_AUTO_CONFIRM 时自动确认版本号，不弹询问
+            @force_flag = @options[:force] || false
+
             super
         end
 
         def run
           package_dir = Dir.pwd
           # 1. Git 提交任务 (确保工作区干净，或提交预构建更改)
-          # 默认自动提交（packbuild 场景需要确保代码已提交）
+          # packbuild 会自动生成 Release Notes 并需提交，因此始终非交互、默认强制提交（不弹菜单）；
+          # 选非 commit 会导致生成的 Release Notes 不被提交、tag 与内容不一致，故不开放交互菜单。
           git_commit_opt = Pindo::Options::GitOptions.parse_git_commit_type(@options[:git_commit]) || Pindo::UncommittedFilesProcessType::COMMIT
 
           process_type = Pindo::GitHandler.get_uncommitted_files_process_type(
@@ -117,7 +129,10 @@ module Pindo
             # Tag 不存在或不在 HEAD，需要用户确认
             puts ""
             puts "即将编译 NuGet Package 的版本是 #{q.yellow}"
-            if agree("确认是否继续? (Y/n)")
+            if non_interactive?
+              puts "自动确认版本号: #{q.yellow}（--force / PINDO_AUTO_CONFIRM）"
+              confirmed_version = q
+            elsif agree("确认是否继续? (Y/n)")
               confirmed_version = q
             else
               puts ""
@@ -208,6 +223,13 @@ module Pindo
           end
         end
 
+        private
+
+        # 是否非交互模式：--force 参数或 PINDO_AUTO_CONFIRM 环境变量
+        def non_interactive?
+          @force_flag || (ENV['PINDO_AUTO_CONFIRM'] && !ENV['PINDO_AUTO_CONFIRM'].empty?)
+        end
+
       end
     end
   end

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

@@ -40,6 +40,9 @@ module Pindo
 
                 # 批量上传（Shell 脚本）
                 $ for file in *.nupkg; do pindo unity packpush --force "$file"; done
+
+                # 等价于 --force，便于 CI 环境变量注入
+                $ PINDO_AUTO_CONFIRM=1 pindo unity packpush
         DESC
 
         def self.arguments
@@ -90,7 +93,8 @@ module Pindo
             @args_nupkg_file = Pindo::Unity::NugetHelper.find_nupkg_file(package_dir)
 
             # 如果没有找到文件，让用户手动输入
-            if @args_nupkg_file.nil? || !File.exist?(@args_nupkg_file)
+            # 非交互（--force / PINDO_AUTO_CONFIRM）时不询问，直接进入后续报错，避免 CI 卡住
+            if !non_interactive? && (@args_nupkg_file.nil? || !File.exist?(@args_nupkg_file))
               @args_nupkg_file = ask('需要上传的文件:') || nil
               if @args_nupkg_file
                 @args_nupkg_file = @args_nupkg_file.strip.gsub(/\\ /, ' ')
@@ -126,14 +130,12 @@ module Pindo
           # 检查是否需要跳过确认
           # 支持两种方式：
           # 1. --force 参数
-          # 2. NUGET_UPLOAD_FORCE 环境变量
-          force_upload = @force_flag || (ENV['NUGET_UPLOAD_FORCE'] && !ENV['NUGET_UPLOAD_FORCE'].empty?)
-
-          if force_upload
+          # 2. PINDO_AUTO_CONFIRM 环境变量
+          if non_interactive?
             if @force_flag
               puts "🚀 检测到 --force 参数，跳过确认直接上传..."
             else
-              puts "🚀 检测到 NUGET_UPLOAD_FORCE 环境变量，跳过确认直接上传..."
+              puts "🚀 检测到 PINDO_AUTO_CONFIRM 环境变量，跳过确认直接上传..."
             end
           else
             # 确认上传
@@ -165,6 +167,11 @@ module Pindo
 
         private
 
+        # 是否非交互模式：--force 参数或 PINDO_AUTO_CONFIRM 环境变量
+        def non_interactive?
+          @force_flag || (ENV['PINDO_AUTO_CONFIRM'] && !ENV['PINDO_AUTO_CONFIRM'].empty?)
+        end
+
         # 获取包信息（用于确认显示）
         def get_package_info_for_upload(package_dir)
           # 优先从 .nuspec 文件读取

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

@@ -94,7 +94,7 @@ module Pindo
                     @option_items ||= Pindo::Options::OptionGroup.merge(
                         Pindo::Options::BuildOptions.select(:bundleid),
                         Pindo::Options::JPSOptions.select(:conf, :upload, :send, :media, :bind),
-                        Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
+                        Pindo::Options::UnityOptions.select(:skiplib, :skipyoo, :kill_unity),
                         Pindo::Options::UnityOptions.select_with_defaults(skipmacro: true),
                         Pindo::Options::TaskOptions.select(:multi),
                         Pindo::Options::UtilsOptions.select(:run),
@@ -128,6 +128,7 @@ module Pindo
                     # Unity 参数
                     @args_skip_lib = @options[:skiplib] || false
                     @args_skip_yoo = @options[:skipyoo] || false
+                    @args_kill_unity = @options[:kill_unity] || false
 
                     # Task 参数
                     @args_multi_flag = @options[:multi] || false
@@ -283,7 +284,8 @@ module Pindo
                     # 3. Unity 更新必备库任务（可选）
                     unless @args_skip_lib
                       unity_update_task = Pindo::TaskSystem::UnityUpdateTask.new(
-                        project_path: config[:project_path]
+                        project_path: config[:project_path],
+                        auto_kill: @args_kill_unity
                       )
                       unity_update_task.dependencies << last_task.id if last_task
                       tasks << unity_update_task
@@ -294,7 +296,8 @@ module Pindo
                     unless @args_skip_yoo
                       unity_yoo_task = Pindo::TaskSystem::UnityYooAssetTask.new(
                         'web',
-                        project_path: config[:project_path]
+                        project_path: config[:project_path],
+                        auto_kill: @args_kill_unity
                       )
                       unity_yoo_task.dependencies << last_task.id if last_task
                       tasks << unity_yoo_task
@@ -313,7 +316,8 @@ module Pindo
                       'web',
                       project_path: config[:project_path],
                       export_path: web_export_path,
-                      context: unity_context
+                      context: unity_context,
+                      auto_kill: @args_kill_unity
                     )
                     unity_export_task.dependencies << last_task.id if last_task
                     tasks << unity_export_task

data/lib/pindo/options/groups/unity_options.rb

@@ -51,7 +51,7 @@ module Pindo
             env_name: 'PINDO_KILL_UNITY',
             default_value: false,
             optional: true,
-            example: 'pindo unity autobuild --kill-unity'
+            example: 'pindo unity autobuild --kill_unity'
           )
         }
       end

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.19.1"
+  VERSION = "5.19.3"
 
   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.19.1
+  version: 5.19.3
 platform: ruby
 authors:
 - wade