pindo 5.14.8 → 5.15.1

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

@@ -52,14 +52,15 @@ module Pindo
         root_dir = @git_root_path
         git_repo_helper = Pindo::GitRepoHelper.share_instance
         stash_saved = false
+        stash_name = "pindo_stash_#{Time.now.strftime('%Y%m%d%H%M%S')}_#{rand(1000)}"
         coding_branch = Pindo::GitHandler.git!(%W(-C #{root_dir} rev-parse --abbrev-ref HEAD)).strip
 
         begin
           # 1. 检查工作目录，不干净则 stash
           status = Pindo::GitHandler.git!(%W(-C #{root_dir} status --porcelain)).strip
           unless status.empty?
-            Funlog.instance.fancyinfo_update("工作目录有未提交更改，暂存到 stash")
-            Pindo::GitHandler.git!(%W(-C #{root_dir} stash -u))
+            Funlog.instance.fancyinfo_update("工作目录有未提交更改，暂存到 stash: #{stash_name}")
+            Pindo::GitHandler.git!(%W(-C #{root_dir} stash push -u -m #{stash_name}))
             stash_saved = true
           end
 
@@ -109,13 +110,22 @@ module Pindo
 
         ensure
           # 5. 还原 stash
+
           if stash_saved
             begin
-              # 先应用 stash（不删除）
-              Pindo::GitHandler.git!(%W(-C #{root_dir} stash apply))
-              # 应用成功后再删除 stash
-              Pindo::GitHandler.git!(%W(-C #{root_dir} stash drop))
-              Funlog.instance.fancyinfo_success("已还原 stash")
+              # 查找指定名字的 stash
+              stash_list = Pindo::GitHandler.git!(%W(-C #{root_dir} stash list)).strip
+              matched_line = stash_list.lines.find { |l| l.include?(stash_name) }
+
+              if matched_line && (stash_id = matched_line.match(/(stash@\{\d+\})/)&.[](1))
+                # 先应用 stash（不删除）
+                Pindo::GitHandler.git!(%W(-C #{root_dir} stash apply #{stash_id}))
+                # 应用成功后再删除 stash
+                Pindo::GitHandler.git!(%W(-C #{root_dir} stash drop #{stash_id}))
+                Funlog.instance.fancyinfo_success("已还原 stash: #{stash_name} (#{stash_id})")
+              else
+                Funlog.instance.fancyinfo_warning("未找到名为 #{stash_name} 的 stash，请手动检查")
+              end
             rescue => e
               # 如果应用失败（通常是有冲突），stash 仍然保留，用户可以手动处理
               Funlog.instance.fancyinfo_warning("stash 还原时发生冲突: #{e.message}")

data/lib/pindo/module/task/model/jps/jps_upload_media_task.rb

@@ -294,7 +294,7 @@ module Pindo
             FileUtils.mkdir_p(backup_dir) unless Dir.exist?(backup_dir)
 
             # 移动文件
-            file_name = File.basename(file_path)
+            file_name = File.basename(file_path).force_encoding('UTF-8').scrub('')
             dest_path = File.join(backup_dir, file_name)
 
             # 如果目标文件已存在，添加序号避免覆盖
@@ -391,11 +391,12 @@ module Pindo
         puts ""
         files.each_with_index do |file, index|
           size_str = format_file_size(File.size(file))
-          file_name = File.basename(file)
+          file_name = File.basename(file).force_encoding('UTF-8').scrub('')
           # 对齐：序号（3位） + 文件名（左对齐） + 大小（右对齐）
           puts "     \e[90m#{(index + 1).to_s.rjust(2)}.\e[0m  %-40s  \e[33m%8s\e[0m" % [file_name, size_str]
           if debug_mode
-            puts "          \e[90m路径: #{file}\e[0m"
+            safe_path = file.force_encoding('UTF-8').scrub('')
+            puts "          \e[90m路径: #{safe_path}\e[0m"
           end
         end
         puts ""
@@ -422,7 +423,7 @@ module Pindo
         failed_files = []
 
         files.each_with_index do |file, index|
-          file_name = File.basename(file)
+          file_name = File.basename(file).force_encoding('UTF-8').scrub('')
 
           # 显示进度（简洁模式）
           progress = "#{index + 1}/#{files.size}"
@@ -433,7 +434,10 @@ module Pindo
             # MacCompressCliTool 的 -f 参数需要一个包含文件路径列表的文本文件
             file_list_path = File.join(compress_dir, "file_list_#{index}.txt")
             File.open(file_list_path, 'w:UTF-8') do |f|
-              f.puts(file)
+              # 强制将文件路径转换为 UTF-8 编码，处理无效字符
+              # 避免 "incompatible character encodings: UTF-8 and BINARY" 错误
+              safe_path = file.force_encoding('UTF-8').scrub('')
+              f.puts(safe_path)
             end
 
             # 调用压缩工具: compress-cli -s -f file_list.txt -o output_dir/
@@ -444,7 +448,8 @@ module Pindo
 
             if debug_mode
               puts ""
-              puts "          \e[90m完整路径: #{file}\e[0m"
+              safe_file = file.force_encoding('UTF-8').scrub('')
+              puts "          \e[90m完整路径: #{safe_file}\e[0m"
               puts "          \e[90m文件列表: #{file_list_path}\e[0m"
               puts "          \e[90m执行命令: #{cmd}\e[0m"
               print "     "
@@ -497,7 +502,7 @@ module Pindo
               if all_files.empty?
                 puts "     \e[90m（目录为空）\e[0m"
               else
-                all_files.each { |f| puts "     \e[90m- #{File.basename(f)}\e[0m" }
+                all_files.each { |f| puts "     \e[90m- #{File.basename(f).force_encoding('UTF-8').scrub('')}\e[0m" }
               end
             else
               puts "     \e[90m（目录不存在）\e[0m"
@@ -532,7 +537,7 @@ module Pindo
           puts ""
           puts "     \e[31m失败文件 (#{failed_files.size}):\e[0m"
           failed_files.each do |f|
-            puts "       \e[31m✗\e[0m #{File.basename(f)}"
+            puts "       \e[31m✗\e[0m #{File.basename(f).force_encoding('UTF-8').scrub('')}"
           end
         end
 

data/lib/pindo/module/task/model/resign/ipa_local_resign_task.rb

@@ -13,6 +13,11 @@ module Pindo
         :resign
       end
 
+      # 任务键
+      def self.task_key
+        :ipa_local_resign
+      end
+
       # 任务类型显示名称
       def self.task_type_name
         "重签名"

data/lib/pindo/options/core/option_item.rb

@@ -154,11 +154,10 @@ module Pindo
 
       # 构建描述文本（描述 + 环境变量）
       def build_description_text
-        if @env_name
-          "#{@description} (环境变量: #{@env_name})"
-        else
-          @description
-        end
+        desc = @description.dup
+        desc += " (环境变量: #{@env_name})" if @env_name
+        desc += " 示例: #{@example}" if @example && !@example.to_s.strip.empty?
+        desc
       end
 
       # 类型转换为提示字符串

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

@@ -1,5 +1,6 @@
 require 'pindo/options/core/option_item'
 require 'pindo/options/groups/option_group'
+require 'pindo/options/helpers/git_constants'
 
 module Pindo
   module Options
@@ -75,6 +76,24 @@ module Pindo
             optional: true,
             cacheable: true,  # 存入文件缓存
             example: 'pindo ios autobuild --release_branch=main'
+          ),
+
+          git_commit: OptionItem.new(
+            key: :git_commit,
+            name: 'Git 未提交处理方式',
+            description: '处理未提交文件的方式: commit/skip/reset/stash/exit',
+            type: String,
+            env_name: 'PINDO_GIT_COMMIT',
+            default_value: nil,
+            optional: true,
+            cacheable: false,
+            verify_block: proc do |value|
+              allowed = %w[commit skip reset delete stash exit resetde discard]
+              unless allowed.include?(value.to_s.downcase)
+                raise "git_commit 值错误: #{value}, 必须是 #{allowed.join(', ')} 之一"
+              end
+            end,
+            example: 'pindo unity autobuild --git-commit=skip'
           )
         }
       end
@@ -95,6 +114,27 @@ module Pindo
         end
       end
 
+      # 解析 --git-commit 参数并转换为枚举常量
+      # @param value [String] 命令行参数值
+      # @return [Symbol, nil] UncommittedFilesProcessType 常量或 nil
+      def self.parse_git_commit_type(value)
+        return nil if value.nil?
+        case value.to_s.downcase
+        when 'commit', 'comm'
+          Pindo::UncommittedFilesProcessType::COMMIT
+        when 'skip', 'none', 'dont'
+          Pindo::UncommittedFilesProcessType::SKIP
+        when 'reset', 'delete', 'resetde', 'discard'
+          Pindo::UncommittedFilesProcessType::RESET
+        when 'stash'
+          Pindo::UncommittedFilesProcessType::STASH
+        when 'exit'
+          Pindo::UncommittedFilesProcessType::EXIT
+        else
+          nil
+        end
+      end
+
       # 将命令行参数值转换为 CreateTagType 常量
       # @param value [String] 命令行参数值 (new/recreate/none)
       # @return [Symbol] CreateTagType 常量值

data/lib/pindo/options/helpers/git_constants.rb

@@ -0,0 +1,28 @@
+module Pindo
+  # Git 版本号增加类型枚举
+  # 用于控制版本号自动增长规则
+  module VersionIncreaseType
+    MAIN = :main   # 大版本号增加1 (x.0.0)
+    MINI = :mini   # 小版本号增加1 (0.x.0)
+    PATCH = :patch # 补丁版本号增加1 (0.0.x)
+  end
+
+  # Git Tag 创建类型枚举
+  # 用于控制标签创建行为
+  module CreateTagType
+    NEW = :new           # 创建新的 tag，生成新版本号
+    RECREATE = :recreate # 重新创建当前版本号的 tag
+    NONE = :none         # 不创建 tag
+  end
+
+  # Git 未提交文件处理类型枚举
+  # 用于控制构建前未提交文件的处理方式
+  module UncommittedFilesProcessType
+    COMMIT = :commit # 自动提交所有更改
+    SKIP = :skip     # 跳过处理，继续执行
+    RESET = :reset   # 丢弃所有更改，重置到远程
+    STASH = :stash   # 保存到 stash 区域
+    EXIT = :exit     # 退出程序，要求手动处理
+    NONE = :none     # 没有需要提交的内容
+  end
+end

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.14.8"
+  VERSION = "5.15.1"
 
   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.14.8
+  version: 5.15.1
 platform: ruby
 authors:
 - wade
@@ -55,20 +55,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.220'
+        version: '2.230'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.220.0
+        version: 2.230.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.220'
+        version: '2.230'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.220.0
+        version: 2.230.0
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
@@ -340,6 +340,7 @@ files:
 - lib/pindo/command/repo/create.rb
 - lib/pindo/command/repo/login.rb
 - lib/pindo/command/repo/search.rb
+- lib/pindo/command/repo/subgit.rb
 - lib/pindo/command/setup.rb
 - lib/pindo/command/unity.rb
 - lib/pindo/command/unity/autobuild.rb
@@ -481,6 +482,7 @@ files:
 - lib/pindo/options/groups/task_options.rb
 - lib/pindo/options/groups/unity_options.rb
 - lib/pindo/options/helpers/bundleid_selector.rb
+- lib/pindo/options/helpers/git_constants.rb
 - lib/pindo/options/options.rb
 - lib/pindo/version.rb
 homepage: https://gitee.com/test/pindo.git