pindo 5.5.4 → 5.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9b78c1d33a386cb6ca94c86474093c790548e29964bc4a20eeb74e987ed8a66
-  data.tar.gz: 603656976a10b41c86d8f6c3a125601b8120cf9b0c064b3bbd66b1cc22dc0f4f
+  metadata.gz: 7936d0bbe9e0a98b963b3fab910bf6f14181cb42d2747dab85c7081dd13f7bb9
+  data.tar.gz: f0bf9f4c66846fce60e0095969e20acd9d44050e1b608a5437630ab287bed0b6
 SHA512:
-  metadata.gz: 7adaf27919be676327ad4942df3212bf67c18b5c3f550bb8ac70c15bd4d5b3167b0fc5372b5008edf74326af9a768227329634c6b427ece338cb0cc04d12ba69
-  data.tar.gz: 4b2256dd2a74d7bf251507a0a0335ca8528021f5471dbe27dd5afcb9c21c7b1c504724d633083b753c3c57a70b4cfcf6d968b84e7efb52989f9a9534ee8d66f4
+  metadata.gz: 00f7b89309f86b889ef3d4b1ebfcc3e0d6876a24d8587e8335d96c5271da7fa1bb8795183850809cda62d006c1b9af5e960828862c74c8b61d1c0f1652d97679
+  data.tar.gz: 00bb957cb9bc2f926534e5ee4b4c3af62d6170ca8ba78b28416364084abd0ec91e733c2b14b1f8d7a7eacae70fd91f061724ed92fc7b542d6b8670129e213c7e

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'
 
@@ -61,25 +65,16 @@ module Pindo
         def run
           package_dir = Dir.pwd
 
-          puts "=" * 60
-          puts "🚀 上传到 JPS Nuget 项目"
-          puts "=" * 60
           puts
+          puts "🚀 上传 Unity Package 到 JPS"
+          puts "━" * 40
 
           # 如果没有指定文件或文件不存在，则查找
           if @args_nupkg_file.nil? || !File.exist?(@args_nupkg_file)
             # 在当前目录查找 .nupkg 文件
             @args_nupkg_file = Pindo::Unity::NugetHelper.find_nupkg_file(package_dir)
 
-            # 如果找到文件，询问用户是否上传
-            if !@args_nupkg_file.nil?
-              answer = agree("需要上传的文件是: #{@args_nupkg_file} ?(Y/n)")
-              if !answer
-                @args_nupkg_file = nil
-              end
-            end
-
-            # 如果还是没有文件，让用户手动输入
+            # 如果没有找到文件，让用户手动输入
             if @args_nupkg_file.nil? || !File.exist?(@args_nupkg_file)
               @args_nupkg_file = ask('需要上传的文件:') || nil
               if @args_nupkg_file
@@ -93,19 +88,32 @@ module Pindo
             raise Informative, "未找到 .nupkg 文件"
           end
 
+          # 从 nuspec 文件或 package.json 获取包信息
+          package_info = get_package_info_for_upload(package_dir)
+
+          # 显示包信息并一次性确认
           puts
-          puts "上传文件："
-          puts "  #{File.basename(@args_nupkg_file)}"
+          puts "📦 包信息:"
+          puts
+          puts "  名称: #{package_info['displayName']}"
+          puts "  ID:   #{package_info['name']}"
+          puts "  版本: #{package_info['version']}"
+          puts "  文件: #{@args_nupkg_file}"
           puts "  大小: #{sprintf('%.2f', File.size(@args_nupkg_file) / 1024.0 / 1024.0)} MB"
           puts
 
+          # 一次性确认
+          answer = agree("确认上传？(Y/n)")
+          unless answer
+            puts "已取消上传"
+            return
+          end
+
           # 上传到 JPS
-          upload_to_jps_nuget(@args_nupkg_file)
+          upload_to_jps_nuget(@args_nupkg_file, package_info)
 
           puts
-          puts "=" * 60
           puts "✅ 上传完成！"
-          puts "=" * 60
           puts
 
           # 上传成功后自动打 tag
@@ -114,7 +122,7 @@ module Pindo
 
         private
 
-        def upload_to_jps_nuget(nupkg_file)
+        def upload_to_jps_nuget(nupkg_file, package_info)
           # 1. 登录 JPS
           config_file = File.join(
             Pindoconfig.instance.pindo_common_configdir,
@@ -156,9 +164,6 @@ module Pindo
           # 4. 提交到 JPS 项目
           puts "📋 提交到 JPS 项目..."
 
-          # 读取 package.json 获取包信息
-          package_info = JSON.parse(File.read(File.join(Dir.pwd, "package.json")))
-
           result = jps_client.upload_project_package(
             projectId: nuget_project['id'],
             params: {
@@ -211,24 +216,48 @@ module Pindo
         end
 
         def print_upload_result(result, package_info)
-          puts
-          puts "━" * 60
-          puts "📦 上传信息"
-          puts "━" * 60
-          puts "包名称: #{package_info['displayName']}"
-          puts "包ID: #{package_info['name']}"
-          puts "版本: #{package_info['version']}"
-
           if result['data'] && result['data']['id']
-            puts "JPS ID: #{result['data']['id']}"
+            puts "  JPS ID: #{result['data']['id']}"
           end
+        end
 
-          puts "━" * 60
+        def get_package_info_for_upload(package_dir)
+          # 优先尝试从 nuspec 文件读取
+          nuspec_file = Pindo::Unity::NugetHelper.find_nuspec_file(package_dir)
+
+          if nuspec_file && File.exist?(nuspec_file)
+            nuspec_info = Pindo::Unity::NugetHelper.parse_nuspec(nuspec_file)
+
+            # 转换为统一的格式（与 package.json 兼容）
+            # 注意：保持 nuspec 中 ID 的原始格式（驼峰）
+            return {
+              'name' => nuspec_info['id'],  # 保持原始的驼峰格式
+              'version' => nuspec_info['version'],
+              'displayName' => nuspec_info['title'] || nuspec_info['id'],
+              'description' => nuspec_info['description']
+            }
+          end
+
+          # 如果没有 nuspec 文件，尝试从 package.json 读取
+          package_json_path = File.join(package_dir, "package.json")
+
+          if File.exist?(package_json_path)
+            return JSON.parse(File.read(package_json_path))
+          end
+
+          # 如果都没有，抛出错误
+          raise Informative, "未找到 .nuspec 或 package.json 文件，无法获取包信息"
         end
 
         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 +286,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/module/unity/nugethelper.rb

@@ -76,6 +76,15 @@ module Pindo
         package_info['name'] = to_lowercase_id(package_info['name'])
         update_package_json_name(package_dir, package_info['name'])
 
+        # 检查 README.md 是否存在
+        readme_path = File.join(package_dir, "README.md")
+        unless File.exist?(readme_path)
+          puts "⚠️  警告: 未找到 README.md 文件"
+          puts "   README.md 是 NuGet 包的必需文件"
+          puts "   请创建 README.md 文件后再运行此命令"
+          puts
+        end
+
         nuspec_path = File.join(package_dir, "#{package_info['displayName']}.nuspec")
 
         # 生成 .nuspec，ID 使用驼峰格式
@@ -85,6 +94,11 @@ module Pindo
         puts "✅ 根据 package.json 创建了 #{package_info['displayName']}.nuspec"
         puts "   package.json name: #{package_info['name']} (全小写)"
         puts "   .nuspec id: #{nuspec_id} (驼峰)"
+
+        unless File.exist?(readme_path)
+          puts
+          puts "⚠️  重要提示: 打包前请确保创建 README.md 文件！"
+        end
       end
 
       # 情况B：只有 .nuspec，创建 package.json
@@ -191,8 +205,8 @@ module Pindo
           conflicts << "版本不一致: package.json(#{package_info['version']}) vs .nuspec(#{nuspec_info['version']})"
         end
 
-        # displayName/title 对比
-        if package_info['displayName'] != nuspec_info['title']
+        # displayName/title 对比（title 是可选字段）
+        if nuspec_info['title'] && package_info['displayName'] != nuspec_info['title']
           conflicts << "标题不一致: package.json displayName(#{package_info['displayName']}) vs .nuspec title(#{nuspec_info['title']})"
         end
 
@@ -218,7 +232,7 @@ module Pindo
 
       # 验证 .nuspec
       def self.validate_nuspec(nuspec_info)
-        required_fields = ['id', 'version', 'title', 'description', 'releaseNotes', 'readme', 'projectUrl']
+        required_fields = ['id', 'version', 'description', 'releaseNotes', 'readme', 'projectUrl']
         missing = required_fields.select { |field| nuspec_info[field].nil? || nuspec_info[field].empty? }
 
         unless missing.empty?
@@ -245,23 +259,44 @@ module Pindo
         description = package_info['description'] || package_info['displayName'] || 'Unity Package'
         release_notes = package_info['releaseNotes'] || package_info['changelogUrl'] || 'No release notes'
 
+        # 构建基础的 metadata 内容
+        metadata_content = []
+        metadata_content << "      <id>#{nuspec_id}</id>"
+        metadata_content << "      <version>#{package_info['version']}</version>"
+        # title 是可选字段，只有 displayName 存在时才添加
+        if package_info['displayName'] && !package_info['displayName'].empty?
+          metadata_content << "      <title>#{package_info['displayName']}</title>"
+        end
+        metadata_content << "      <authors>#{package_info['author'] || 'Unity Package'}</authors>"
+        metadata_content << "      <requireLicenseAcceptance>false</requireLicenseAcceptance>"
+        metadata_content << "      <license type=\"expression\">MIT</license>"
+        metadata_content << "      <projectUrl>#{project_url}</projectUrl>"
+        metadata_content << "      <description>#{description}</description>"
+        metadata_content << "      <releaseNotes>#{release_notes}</releaseNotes>"
+
+        # README.md 是必需的，总是添加 readme 标签
+        metadata_content << "      <readme>README.md</readme>"
+
+        # 检查 README.md 是否存在，用于 files 部分的处理
+        readme_path = File.join(File.dirname(nuspec_path), "README.md")
+
+        # 构建 files 部分，如果有 README.md 需要特殊处理
+        files_content = []
+        if File.exist?(readme_path)
+          files_content << '    <file src="README.md" target="" />'
+          files_content << '    <file src="**" exclude="build/**;.git/**;*.nuspec;*.nupkg;README.md" target="content" />'
+        else
+          files_content << '    <file src="**" exclude="build/**;.git/**;*.nuspec;*.nupkg" target="content" />'
+        end
+
         nuspec_content = <<~XML
           <?xml version="1.0" encoding="utf-8"?>
           <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
             <metadata>
-              <id>#{nuspec_id}</id>
-              <version>#{package_info['version']}</version>
-              <title>#{package_info['displayName']}</title>
-              <authors>#{package_info['author'] || 'Unity Package'}</authors>
-              <requireLicenseAcceptance>false</requireLicenseAcceptance>
-              <license type="expression">MIT</license>
-              <projectUrl>#{project_url}</projectUrl>
-              <description>#{description}</description>
-              <releaseNotes>#{release_notes}</releaseNotes>
-              <readme>README.md</readme>
+          #{metadata_content.join("\n")}
             </metadata>
             <files>
-              <file src="**" exclude="build/**;.git/**;*.nuspec;*.nupkg" target="content" />
+          #{files_content.join("\n")}
             </files>
           </package>
         XML
@@ -274,7 +309,7 @@ module Pindo
         package_content = {
           "name" => package_json_name,
           "version" => nuspec_info['version'],
-          "displayName" => nuspec_info['title'],
+          "displayName" => nuspec_info['title'] || package_json_name,  # 如果没有 title，使用 name 作为 displayName
           "description" => nuspec_info['description'],
           "unity" => "2020.3",
           "releaseNotes" => nuspec_info['releaseNotes']
@@ -301,7 +336,8 @@ module Pindo
         # 更新关键字段
         package_info['name'] = to_lowercase_id(nuspec_info['id'])
         package_info['version'] = nuspec_info['version']
-        package_info['displayName'] = nuspec_info['title']
+        # 如果 nuspec 有 title 字段才更新，否则保留原有的 displayName
+        package_info['displayName'] = nuspec_info['title'] if nuspec_info['title']
         package_info['description'] = nuspec_info['description']
         package_info['releaseNotes'] = nuspec_info['releaseNotes']
 

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.5.4"
+  VERSION = "5.5.7"
 
   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.7
 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