pindo 5.5.4 → 5.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9b78c1d33a386cb6ca94c86474093c790548e29964bc4a20eeb74e987ed8a66
-  data.tar.gz: 603656976a10b41c86d8f6c3a125601b8120cf9b0c064b3bbd66b1cc22dc0f4f
+  metadata.gz: c3c6d7ad7866c8d8f92e5a817db829bf51daf67408a0876b83687b25826c1fcb
+  data.tar.gz: 974a6c7c9be87170be834820ead3344e2c59ead93c63d832401ed80412f6353d
 SHA512:
-  metadata.gz: 7adaf27919be676327ad4942df3212bf67c18b5c3f550bb8ac70c15bd4d5b3167b0fc5372b5008edf74326af9a768227329634c6b427ece338cb0cc04d12ba69
-  data.tar.gz: 4b2256dd2a74d7bf251507a0a0335ca8528021f5471dbe27dd5afcb9c21c7b1c504724d633083b753c3c57a70b4cfcf6d968b84e7efb52989f9a9534ee8d66f4
+  metadata.gz: 416e9a546f37f30a966db52da1b4922f75ece53e67b52f33085d3723d543f82abdedeffe025d637fc455d9766e387c0f10d6fd5a9a83e4077c9aff794b235710
+  data.tar.gz: ac874183dbc82659b9bf653d28e8456edffc8fa61cb42d4abfd9c98a84f516ad3fe5dc7f5130b68dc36734210ac5fbf90d27f35634214e981964221203edfb78

data/lib/pindo/base/githelper.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'pindo/base/executable'
 require 'etc'
+require 'claide'
 
 module Pindo    
     module Githelper
@@ -487,12 +488,27 @@ module Pindo
         private
  
         def display_file_status(branch, files)
-            puts "========================================"
-            puts "\n当前所在分支:#{branch}有下面这些文件没有提交："
+            puts "═" * 60
+            puts "⚠️  警告：检测到未提交的文件".red
+            puts "═" * 60
             puts
-            puts "\n#{files}\n"
+            puts "当前所在分支: #{branch}".red
+            puts "以下文件尚未提交到 Git:".red
             puts
-            puts "========================================"
+
+            # 将文件列表分行并用红色显示
+            if files.is_a?(String)
+                files.split("\n").each do |file|
+                    puts "  • #{file}".red unless file.empty?
+                end
+            else
+                files.each do |file|
+                    puts "  • #{file}".red unless file.empty?
+                end
+            end
+
+            puts
+            puts "═" * 60
         end
 
         def process_user_choice(project_dir, branch)
@@ -501,8 +517,8 @@ module Pindo
             menu_choice = "None"
             
             cli.choose do |menu|
-                menu.header = "对以上未提交的文件, 有下列处理方式"
-                menu.prompt = "请选择如何处理(1/2/3...):"
+                menu.header = "对以上未提交的文件, 有下列处理方式".red
+                menu.prompt = "请选择如何处理(1/2/3...):".yellow
                 process_types.each do |item|
                     menu.choice(item) { |choice| menu_choice = choice }
                 end

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

@@ -11,7 +11,7 @@ module Pindo
         # 命令的详细说明,包含用法示例
         self.description = <<-DESC
             发布代码,添加tag,添加发布信息,并合并到发布分支。
-            
+
             支持功能:
 
                 * 处理未提交的文件
@@ -28,6 +28,8 @@ module Pindo
 
                 $ pindo dev tag --mode=patch        # 使用patch模式创建tag
 
+                $ pindo dev tag --tag=1.1.3         # 直接指定版本号创建tag（会自动添加v前缀）
+
                 $ pindo dev tag --retag             # 强制重新打tag
         DESC
 

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

@@ -2,12 +2,16 @@ require 'highline/import'
 require 'fileutils'
 require 'json'
 require 'jpsclient'
+require 'claide'
 require 'pindo/module/unity/nugethelper'
 
 module Pindo
   class Command
     class Unity < Command
       class Upload < Unity
+        include Pindo::Githelper
+        extend Pindo::Executable
+        executable :git
 
         self.summary = '上传 NuGet 包到 JPS'
 
@@ -229,6 +233,12 @@ module Pindo
         def create_git_tag_from_nuspec(package_dir)
           puts "🏷️  创建 Git Tag..."
 
+          # 检查并更新 .gitignore 文件
+          ensure_build_directory_ignored(package_dir)
+
+          # 检查是否有未提交的文件
+          check_uncommitted_files(package_dir)
+
           # 获取 .nuspec 文件并解析版本
           nuspec_file = Pindo::Unity::NugetHelper.find_nuspec_file(package_dir)
           unless nuspec_file
@@ -257,6 +267,94 @@ module Pindo
           end
         end
 
+        def check_uncommitted_files(package_dir)
+          # 获取未跟踪和已修改的文件
+          untracked_files = git!(%W(-C #{package_dir} ls-files --others --exclude-standard)).strip
+          modified_files = git!(%W(-C #{package_dir} diff --name-only)).strip
+          staged_files = git!(%W(-C #{package_dir} diff --cached --name-only)).strip
+
+          all_uncommitted = []
+          all_uncommitted += untracked_files.split("\n").reject(&:empty?) if !untracked_files.empty?
+          all_uncommitted += modified_files.split("\n").reject(&:empty?) if !modified_files.empty?
+          all_uncommitted += staged_files.split("\n").reject(&:empty?) if !staged_files.empty?
+
+          # 过滤掉 build 相关目录
+          all_uncommitted = all_uncommitted.reject do |file|
+            file.start_with?('build/') || file.start_with?('Build/') ||
+            file.start_with?('/build/') || file.start_with?('/Build/')
+          end
+
+          if all_uncommitted.any?
+            puts
+            puts "═" * 60
+            puts "⚠️  警告：检测到未提交的文件".red
+            puts "═" * 60
+            puts
+            puts "以下文件尚未提交到 Git:".red
+            puts
+            all_uncommitted.each do |file|
+              puts "  • #{file}".red
+            end
+            puts
+            puts "═" * 60
+            puts "建议先提交这些文件，或将它们添加到 .gitignore 中".red
+            puts "═" * 60
+            puts
+          end
+        end
+
+        def ensure_build_directory_ignored(package_dir)
+          gitignore_path = File.join(package_dir, '.gitignore')
+
+          # 要忽略的目录
+          build_patterns = [
+            'build/',
+            '/build/',
+            'Build/',
+            '/Build/'
+          ]
+
+          # 读取现有的 .gitignore 内容
+          existing_patterns = []
+          if File.exist?(gitignore_path)
+            existing_patterns = File.readlines(gitignore_path).map(&:strip).reject(&:empty?)
+          end
+
+          # 检查是否已经包含 build 目录的忽略规则
+          has_build_ignore = existing_patterns.any? do |pattern|
+            pattern = pattern.strip
+            # 检查是否匹配 build 目录的各种形式
+            build_patterns.any? { |bp| pattern == bp || pattern == bp.chomp('/') }
+          end
+
+          # 如果没有包含 build 目录，则添加
+          unless has_build_ignore
+            puts "📝 更新 .gitignore 文件，添加 build/ 目录..."
+
+            # 追加 build 目录到 .gitignore
+            File.open(gitignore_path, 'a') do |file|
+              # 如果文件不为空且最后没有换行，添加换行
+              file.puts if existing_patterns.any? && !File.read(gitignore_path).end_with?("\n")
+              file.puts "# Unity build output"
+              file.puts "build/"
+              file.puts "Build/"
+            end
+
+            puts "✅ 已将 build 目录添加到 .gitignore"
+
+            # 提交 .gitignore 的更改
+            begin
+              git!(%W(-C #{package_dir} add .gitignore))
+              git!(%W(-C #{package_dir} commit -m "chore: 添加 build 目录到 .gitignore"))
+              puts "✅ 已提交 .gitignore 更改"
+            rescue => e
+              puts "⚠️  提交 .gitignore 失败: #{e.message}"
+            end
+          else
+            puts "✅ .gitignore 已包含 build 目录规则"
+          end
+        end
+
       end
     end
   end

data/lib/pindo/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.5.4
+  version: 5.5.5
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-09-28 00:00:00.000000000 Z
+date: 2025-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide