pindo 5.5.1 → 5.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7216e7a8f2c6ecb513af66ce6c9af8243a0bf44bb8c30da88f72cf54071c045
-  data.tar.gz: 851f40c6daea10f4e900ff7e284d375841d9526ce62244bb5620eda7be188239
+  metadata.gz: 698722ba7d446bce8be6df5d15039b7c1528349d6d43ab95db8224a0baf2743c
+  data.tar.gz: 56f32768dfdde34bf203c2529a31bb2454e2612a29e2e9a1a165634d586157db
 SHA512:
-  metadata.gz: bf176d3955cf177f0e587792d12aaf48d886d4febf59a87fa194f01c07ebaece91834b3aece211eca8dde2351a354371dff2a0f1bf976060213b8153d1ecfb55
-  data.tar.gz: b57c2269d259384cccffd35be8b728e17bb52f8221b807148bbb3dfa29e4e381fdbd5c3caca3e3d68b3e512488c74d0566619421de2a689036028e6fe9a3f7ea
+  metadata.gz: 81add8a3f5b1fd16f6746bcea99e3ca2a7d6bb65c7d0f58b7eca0c03a9fc88a42adc8401dda0ffd7200a7daafab28aa4065c4e14447016861ae94f99da341e14
+  data.tar.gz: 20228ff9d9c68f846c442d35e7fc96e011f3e9c501ad95db2130c7212a624fe082c395a7f282b007eed88fcd5a9ee4300566fbbf579b1d6ecf3d451e1c679ce6

data/lib/pindo/base/pindocontext.rb

@@ -217,6 +217,20 @@ module Pindo
 
     private
 
+    # 递归将Hash的键从字符串转换为符号
+    def symbolize_keys(obj)
+      case obj
+      when Hash
+        obj.each_with_object({}) do |(key, value), result|
+          result[key.to_sym] = symbolize_keys(value)
+        end
+      when Array
+        obj.map { |item| symbolize_keys(item) }
+      else
+        obj
+      end
+    end
+
     # 确保缓存目录存在
     def ensure_cache_dir
       cache_dir = File.expand_path('~/.pindo/cache')
@@ -306,7 +320,7 @@ module Pindo
                 @memory_selections[proj_path][cmd] ||= {}
                 selections.each do |key, value|
                   symbol_key = key.to_sym
-                  @memory_selections[proj_path][cmd][symbol_key] = value
+                  @memory_selections[proj_path][cmd][symbol_key] = symbolize_keys(value)
                 end
               end
             end
@@ -332,7 +346,7 @@ module Pindo
               @memory_selections[proj_path][cmd] ||= {}
               selections.each do |key, value|
                 symbol_key = key.to_sym
-                @memory_selections[proj_path][cmd][symbol_key] = value
+                @memory_selections[proj_path][cmd][symbol_key] = symbolize_keys(value)
               end
             end
           end

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

@@ -133,7 +133,7 @@ module Pindo
           Funlog.instance.fancyinfo_start("开始合并到#{release_branch}分支")
           if !coding_branch.eql?(release_branch)
             coding_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{coding_branch})).strip
-            release_branch_commit_id = "111"
+            release_branch_commit_id = nil
             
             if remote_branch_exists?(local_repo_dir: current_project_dir, branch: release_branch)
               Funlog.instance.fancyinfo_update("存在#{release_branch}远程分支")
@@ -141,7 +141,6 @@ module Pindo
                 Funlog.instance.fancyinfo_update("存在#{release_branch}本地分支")
                 git!(%W(-C #{current_project_dir} checkout #{release_branch}))
               else
-                Funlog.instance.fancyinfo_update("存在#{release_branch}远程分支")
                 Funlog.instance.fancyinfo_update("不存在#{release_branch}本地分支")
                 git!(%W(-C #{current_project_dir} checkout -b #{release_branch} origin/#{release_branch}))
               end
@@ -150,8 +149,10 @@ module Pindo
               git!(%W(-C #{current_project_dir} fetch origin #{release_branch}))
               git!(%W(-C #{current_project_dir} merge origin/#{release_branch}))
 
-              res_data = Executable.capture_command('git', %W(merge #{coding_branch}), :capture => :out)
+              # 执行合并操作，捕获输出以便后续检查冲突
+              stdout, exit_status = Executable.capture_command('git', %W(-C #{current_project_dir} merge #{coding_branch}), :capture => :out)
 
+              # 检查是否有冲突（git merge 在有冲突时返回非0状态）
               conflict_filelist = git!(%W(-C #{current_project_dir} diff --name-only --diff-filter=U --relative))
               if !conflict_filelist.nil? && conflict_filelist.size > 0
                 puts "合并代码冲突， 冲突文件如下："
@@ -159,7 +160,14 @@ module Pindo
               else
                 git!(%W(-C #{current_project_dir} push))
                 Funlog.instance.fancyinfo_success("代码已经合并到#{release_branch}分支")
-                release_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{release_branch})).strip
+                # 获取 release_branch 的 commit ID（处理空分支情况）
+                begin
+                  release_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{release_branch})).strip
+                rescue => e
+                  # 分支可能存在但没有提交（空分支），此时使用 coding_branch 的 commit
+                  Funlog.instance.fancyinfo_update("#{release_branch}分支为空或获取commit失败，将使用当前分支commit")
+                  release_branch_commit_id = coding_branch_commit_id
+                end
               end
 
             else
@@ -180,14 +188,22 @@ module Pindo
               git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{release_branch} #{release_branch}))
 
               Funlog.instance.fancyinfo_success("代码已经合并到#{release_branch}分支")
-              release_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{release_branch})).strip
+              # 获取 release_branch 的 commit ID（处理空分支情况）
+              begin
+                release_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{release_branch})).strip
+              rescue => e
+                # 新创建的分支，commit ID 应该与 coding_branch 相同
+                release_branch_commit_id = coding_branch_commit_id
+              end
             end
 
             git!(%W(-C #{current_project_dir} checkout #{coding_branch}))
-            if !release_branch_commit_id.eql?(coding_branch_commit_id)
+            if release_branch_commit_id && !release_branch_commit_id.eql?(coding_branch_commit_id)
               git!(%W(-C #{current_project_dir} merge #{release_branch}))
               Funlog.instance.fancyinfo_success("已将#{release_branch}合并到#{coding_branch}")
             end
+            git!(%W(-C #{current_project_dir} push origin #{coding_branch}))
+            Funlog.instance.fancyinfo_success("已推送#{coding_branch}分支到远程")
           else
             Funlog.instance.fancyinfo_success("代码处于#{coding_branch}分支,无需合并")
           end

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

@@ -138,20 +138,24 @@ 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)
-              if auto_mode || !$stdin.tty?
+              if auto_mode 
                 # 在自动化模式或没有交互式终端时，默认选择新增版本号打新Tag
                 puts "检测到当前代码没有打Tag，在自动模式下将自动新增版本号并打新Tag"
                 tag_action_parms = []
-                is_need_add_tag = false
+                is_need_add_tag = true  # 自动模式下需要打tag
               else
                 # 检查是否已有用户选择
                 context = PindoContext.instance
                 build_helper = BuildHelper.share_instance
                 # 优先从持久化缓存读取，如果没有则从内存临时缓存读取
-                cached_decision = context.get_selection(PindoContext::SelectionKey::TAG_DECISION) ||
-                                 build_helper.temp_tag_decision
+                cached_decision = context.get_selection(PindoContext::SelectionKey::TAG_DECISION)
 
-                if cached_decision
+                # 只有当持久化缓存中确实不存在该键时，才从临时缓存读取
+                if cached_decision.nil? && !context.has_selection?(PindoContext::SelectionKey::TAG_DECISION)
+                  cached_decision = build_helper.temp_tag_decision
+                end
+
+                if cached_decision && cached_decision.is_a?(Hash)
                   # 使用之前的选择
                   puts "\n使用之前的选择：#{cached_decision[:description]}"
                   tag_action_parms = cached_decision[:tag_action_parms]
@@ -172,6 +176,7 @@ module Pindo
                       tag_action_parms = []
                       selected_action = :new_tag
                       selected_description = "新增版本号,打新Tag"
+                      is_need_add_tag = true  # 明确设置需要打tag
                       :new_tag
                     },
                     "将上次的Tag删除重新打Tag" => -> {
@@ -179,17 +184,22 @@ module Pindo
                       tag_action_parms << "--retag"
                       selected_action = :recreate_tag
                       selected_description = "将上次的Tag删除重新打Tag"
+                      is_need_add_tag = true  # 明确设置需要打tag
                       :recreate_tag
                     },
                     "不需要Tag继续编译且上传，手动修改上传备注" => -> {
                       puts ""
+                      tag_action_parms = nil  # 明确设置为nil
                       selected_action = :continue_without_tag
                       selected_description = "不需要Tag继续编译且上传"
+                      is_need_add_tag = false  # 明确设置不需要打tag
                       :continue_without_tag
                     },
                     "终止退出编译" => -> {
+                      tag_action_parms = nil  # 明确设置为nil
                       selected_action = :exit
                       selected_description = "终止退出编译"
+                      is_need_add_tag = false  # 明确设置不需要打tag
                       raise Informative, "终止退出编译!"
                       :exit
                     }
@@ -203,7 +213,7 @@ module Pindo
                     end
                   end
 
-                  is_need_add_tag = !tag_action_parms.nil?
+                  # is_need_add_tag 已在各个选项中明确设置，无需重新计算
 
                   # 保存用户选择
                   build_helper = BuildHelper.share_instance

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.5.1"
+  VERSION = "5.5.3"
 
   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.1
+  version: 5.5.3
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-09-23 00:00:00.000000000 Z
+date: 2025-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide