kk-git 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ca69c20553ab35b3d5e5f2372902cbe391aa7c6cce9aa761a6eac5b25398179
-  data.tar.gz: dab4efe83a765c4904346fb1e1bdb1c2feed600831e997aea83b41a6e8c88094
+  metadata.gz: 4e2ef1f50e051f8167139fae0478f01da4a0cae6ea6401a73cdf67765ad13936
+  data.tar.gz: 71d53513506ebff53f091a7d10c9ab41e0e6b3b60e393d783061aa2f19072288
 SHA512:
-  metadata.gz: '008eb6e289dedb293bec81dd52c3fe9367d59276f51f6189f6d0988ac187a0a523981988fa4c0aee233244b7bd1613e6fd6303a86c4d9d868121744f095d321f'
-  data.tar.gz: 9f1cb69b654adcda6f5d6eb6cd8477cff12960334caeafa5276b10e4cf3ec4c505601c16845be20fd2329df22bcea5b05dc8c47111f9d7c66769b864f7e3de14
+  metadata.gz: c25c845bb90eae62b73feff52b0a0043e20004b20bec670460fa90ba6bb09e53fa468986c960305787a311622b30947eda805c1dc9395e7294a3bca663d877b5
+  data.tar.gz: 0534a91d78bef3ddbd34f85cdc5f7e9392a68d771a2c940a1d435151fe28910b925164c8277e08e2addfa5faf085af0fe27a0375e4900a1ea2f5468e8dd4f966

data/lib/kk/git/rake_tasks.rb

@@ -2,6 +2,8 @@
 
 require 'rake'
 require 'kk/git'
+require 'open3'
+require 'tempfile'
 
 module KKGit
   # Rake 集成：在任意项目的 Rakefile 中 `require 'kk/git/rake_tasks'` 即可注册任务。
@@ -10,6 +12,32 @@ module KKGit
   # - 这些任务**不会 exit/abort**，以便在其它 task 中被 invoke。
   # - 会把生成结果写入 `ENV['KK_GIT_COMMIT_MESSAGE']`，方便上层 task 复用。
   module RakeTasks
+    def self.run_cmd(*cmd)
+      stdout, stderr, status = Open3.capture3(*cmd)
+      [stdout.to_s, stderr.to_s, status.success?]
+    end
+
+    def self.ensure_ok!(ok, title, stdout: nil, stderr: nil)
+      return if ok
+
+      msg = +"#{title} 失败"
+      msg << "\n#{stderr}" unless stderr.to_s.strip.empty?
+      msg << "\n#{stdout}" unless stdout.to_s.strip.empty?
+      raise msg
+    end
+
+    def self.current_branch
+      out, err, ok = run_cmd('git', 'rev-parse', '--abbrev-ref', 'HEAD')
+      ensure_ok!(ok, '获取当前分支', stdout: out, stderr: err)
+      out.strip
+    end
+
+    def self.working_tree_clean?
+      out, err, ok = run_cmd('git', 'status', '--porcelain')
+      ensure_ok!(ok, '检查 git 状态', stdout: out, stderr: err)
+      out.strip.empty?
+    end
+
     def self.install!
       extend Rake::DSL
 
@@ -29,11 +57,58 @@ module KKGit
         end
 
         desc '合并暂存区+工作区变更生成 commit message'
-        task :commit_message_all do
+        task :auto_commit do
           msg = KKGit::CommitMessage.generate(mode: :all)
           ENV['KK_GIT_COMMIT_MESSAGE'] = msg.to_s
           puts msg if msg
         end
+
+        desc '自动 add/commit/pull/push（基于 git:auto_commit）'
+        task :auto_commit_push do
+          if working_tree_clean?
+            puts '没有变更需要提交'
+            next
+          end
+
+          remote = ENV.fetch('KK_GIT_REMOTE', 'origin')
+          branch = ENV.fetch('KK_GIT_BRANCH', current_branch)
+
+          # 1) add
+          out, err, ok = run_cmd('git', 'add', '.')
+          ensure_ok!(ok, 'git add', stdout: out, stderr: err)
+
+          # 2) 生成 commit message（允许重复 invoke）
+          Rake::Task['git:auto_commit'].reenable
+          Rake::Task['git:auto_commit'].invoke
+          commit_message = ENV['KK_GIT_COMMIT_MESSAGE'].to_s.strip
+          commit_message = "chore(repo): 更新项目文件\n\n#{Time.now}" if commit_message.empty?
+
+          # 3) commit（用临时文件避免转义问题）
+          Tempfile.create('commit_message') do |f|
+            f.write(commit_message)
+            f.flush
+            out, err, ok = run_cmd('git', 'commit', '-F', f.path)
+            # 没有 staged 变更时 git commit 会失败；这里给出更友好的提示
+            unless ok
+              if err.include?('nothing to commit') || out.include?('nothing to commit')
+                puts '没有暂存变更需要提交'
+                next
+              end
+            end
+            ensure_ok!(ok, 'git commit', stdout: out, stderr: err)
+          end
+
+          # 4) pull（默认使用 --ff-only，避免非交互环境进入合并流程）
+          pull_args = ENV.fetch('KK_GIT_PULL_ARGS', '--ff-only').split
+          out, err, ok = run_cmd('git', 'pull', *pull_args)
+          ensure_ok!(ok, 'git pull', stdout: out, stderr: err)
+
+          # 5) push
+          out, err, ok = run_cmd('git', 'push', remote, branch)
+          ensure_ok!(ok, 'git push', stdout: out, stderr: err)
+
+          puts "✅ 已推送: #{remote} #{branch}"
+        end
       end
     end
   end

data/lib/kk/git/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module KKGit
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kk-git
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - kk