pindo 5.5.0 → 5.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d82f581545a6d50b91407f6108f8e15685e8936b4895c3a8fec46976fed550b
-  data.tar.gz: 70c45cb83b96f356cd2fd19b0de9f7802642785ef80ee93cc41bd4e6bd6bddb5
+  metadata.gz: 8fc0da63e03341f38c7ab8ba1978d58d6777e81150487c11bce90a15cced9115
+  data.tar.gz: 14497a37c91a7dd3203c1a67ab9e21b771b4e1d1803fda9ea4236e0838f502e1
 SHA512:
-  metadata.gz: '089690f061917d3c9ebc07e19643c166c407900359e958474fa698bda6c02ea70d05b615efd4165f9f883d712a4c488870322a4aefb9607da1d46f4990e350c6'
-  data.tar.gz: bcadc0aa51c54a38d2297befe0e358e384a7789603b4a072c350ff4e3968cad1ea7db16b6b2c54c4665bc7adc95d2f36fa548dcf5af0cb1e2ce9e020f90ff614
+  metadata.gz: d6e87f354dfa085b2469505bf593e753036ad889bd5f78c4e2014fd0e5ece208c92fdec1c5f2cd74e7533351216f26b13e6070ff7943a9667ab6f2c9b3628025
+  data.tar.gz: 947663c7599d2f4a866632cf3102f4414863c41e70feb7a8994b20002b269faa929c77399c11ac7a3239b8b231a9f3cb50860b996495bb5073bc4328f2e3b091

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,7 +138,7 @@ 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 = []

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.5.0"
+  VERSION = "5.5.2"
 
   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.0
+  version: 5.5.2
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-09-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -115,20 +115,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
@@ -475,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 3
 summary: easy work
 test_files: []