kk-git 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d9014b93ea9dd165e25f518850042be4d5fc9db34ae9dfef0c58ad6048f7854
-  data.tar.gz: 74c6a6322b0750892c0d3368822906449c484423a053b1eb20735e8081fc79f5
+  metadata.gz: 12e086855631f99aae0e8a8aafcf859ffeae6a95713fbd20ef581bfd0c51f476
+  data.tar.gz: 7f9d679f4f1c02d6aac412ea5f444bbd4175feb382e2ece08a5fa99e20f190b6
 SHA512:
-  metadata.gz: c722139e54af3754afa25b7301ab7b5dcf2a9a0e864d8e97345e18ab632e300b7dc74e3814b7e8a80f21935cf296925d5cbac0fd51393af95662dca6c71c7fa1
-  data.tar.gz: ac29d630884974c8b857c858fd04cfe62570eabaf09bdd02b237cdcf78c46e7d076d7a34fdc02397dce099006759457f2b314e2fe07f7dc28cbbf49833638c85
+  metadata.gz: 8ca699fd9ac5d5632ccbfd50e5b49d65de882cc9abb0cdd59af5941fcaa46433c6db5703ac8a86ced40a3f44704775e3e14f1e78ab37406afce0bedff12a287a
+  data.tar.gz: a42a83b7ff556d866d26c630ecf8b11331d3b1ffb7621ecdff43b52eba25f951c0012c7cc918096707eefa6df3f24749ef9c1d2dfb22122b97c2e51ca53623aa

data/lib/kk/git/rake_tasks.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+require 'rake'
+require 'kk/git'
+require 'open3'
+require 'tempfile'
+
+module KKGit
+  # Rake 集成：在任意项目的 Rakefile 中 `require 'kk/git/rake_tasks'` 即可注册任务。
+  #
+  # 说明：
+  # - 这些任务**不会 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
+
+      namespace :git do
+        desc '根据暂存区变更生成 commit message（Conventional Commits）'
+        task :commit_message do
+          msg = KKGit::CommitMessage.generate(mode: :staged)
+          ENV['KK_GIT_COMMIT_MESSAGE'] = msg.to_s
+          puts msg if msg
+        end
+
+        desc '根据工作区变更生成 commit message（含 untracked）'
+        task :commit_message_worktree do
+          msg = KKGit::CommitMessage.generate(mode: :worktree)
+          ENV['KK_GIT_COMMIT_MESSAGE'] = msg.to_s
+          puts msg if msg
+        end
+
+        desc '合并暂存区+工作区变更生成 commit message'
+        task :commit_message_all 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:commit_message_all）'
+        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:commit_message_all'].reenable
+          Rake::Task['git:commit_message_all'].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
+end
+
+KKGit::RakeTasks.install!
+

data/lib/kk/git/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kk-git
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - kk
@@ -22,6 +22,7 @@ files:
 - exe/kk-git
 - lib/kk/git.rb
 - lib/kk/git/commit_message.rb
+- lib/kk/git/rake_tasks.rb
 - lib/kk/git/version.rb
 homepage: ''
 licenses: