mui-git 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f65a509ed569794ac6dbf4870c84e64683fb9a298f6d775b6fdd0bf18d7426e5
-  data.tar.gz: 70f1650ec729b6d33e09e9631f6dd9e80ad639e2139c8d5035a67934b30cff6d
+  metadata.gz: 0f08ae825a65cf8338058df7cea4da1d44c19222bdc6647f70d089f845dcde4d
+  data.tar.gz: 3edc2df456a50a90aff4f2dd7a0fd3951015fe22c00b07207b15b46b2de5bdd1
 SHA512:
-  metadata.gz: 34f184cb80f5b402926b9627b6823ec8c1c3e1a941055c4c6640f55f1a95b555ebbd06f9d7efeffe931c12c579f91fea152e4fb6aa26c96ba8b87441022cb785
-  data.tar.gz: 6e73af2750dc349d17d5daa7516e8ed28e493381cc53d246bcceea1badf7a9cc63be030fde6426b168b8a8500a222209efb6f821c732e2014d69e9718047e0f5
+  metadata.gz: f9b6d4dfe853feaee9dc5c5893294b9899723d942b05f60a348bb01bbff78613a0c52ce8417c4a07b1b184fe74b436476556a3fa950f59ba0118cc8755587e26
+  data.tar.gz: cd8553bffc5d215798c0eac3a17af3c1622bedc24e34b2cee9ce28e5dd7a000f17888d004a3d6672ee2106221c5b8851fe60e8130dbc34970825762d7eaaf086

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## [Unreleased]
 
+## [0.2.0] 2025-12-15
+
+### Changed
+- Use `<Leader>` prefix for plugin keymaps to avoid conflicts with Mui core keybindings
+  - `q` → `<Leader>q` for closing git buffers
+  - `dv` → `<Leader>d` for vertical diff split
+  - `cc` → `<Leader>c` for opening commit message buffer
+  - `Enter` → `<Leader>r` for showing commit diff in Log/Blame buffers
+
+### Fixed
+- Fix `handle_quit` to use `close_current_window` method
+
+## [0.1.0] 2025-12-11
+
 ### Added
 - Initial release
 - Interactive git status buffer (`:Git` or `:Git status`)

data/README.md

@@ -42,25 +42,25 @@ gem install mui-git
 | `s` | Stage file under cursor |
 | `u` | Unstage file under cursor |
 | `-` | Toggle stage/unstage |
-| `dv` | Open diff in vertical split |
-| `cc` | Open commit message buffer |
-| `q` | Close buffer |
+| `<Leader>d` | Open diff in vertical split |
+| `<Leader>c` | Open commit message buffer |
+| `<Leader>q` | Close buffer |
 | `R` | Refresh status |
 
 ## Keymaps (Log/Blame Buffer)
 
 | Key | Description |
 |-----|-------------|
-| `Enter` | Show commit diff in vertical split |
-| `q` | Close buffer |
+| `<Leader>r` | Show commit diff in vertical split |
+| `<Leader>q` | Close buffer |
 
-In the log buffer (`:Git log`), pressing `Enter` on a commit line opens the full commit diff with syntax highlighting.
+In the log buffer (`:Git log`), pressing `<Leader>r` on a commit line opens the full commit diff with syntax highlighting.
 
-In the blame buffer (`:Git blame`), pressing `Enter` on any line shows the diff for that line's commit. Uncommitted changes (shown as `00000000`) are skipped.
+In the blame buffer (`:Git blame`), pressing `<Leader>r` on any line shows the diff for that line's commit. Uncommitted changes (shown as `00000000`) are skipped.
 
 ## Commit Message Buffer
 
-When you press `cc` in the status buffer, a commit message editor opens:
+When you press `<Leader>c` in the status buffer, a commit message editor opens:
 
 1. Write your commit message at the top of the buffer
 2. Lines starting with `#` are comments and will be ignored

data/lib/mui/git/buffers/base.rb

@@ -6,12 +6,9 @@ module Mui
       # Base class for Git buffers (inherits from Mui::Buffer)
       # Provides common functionality for git-related buffers
       class Base < Mui::Buffer
-        attr_accessor :pending_key
-
         def initialize(name)
           super(name)
           @readonly = true
-          @pending_key = nil
         end
 
         # Update buffer content (works even for readonly buffers)
@@ -20,16 +17,6 @@ module Mui
           @lines = [""] if @lines.empty?
           @modified = false
         end
-
-        # Set pending key for multi-key sequences (like dv, cc)
-        def set_pending(key)
-          @pending_key = key
-        end
-
-        # Clear pending key
-        def clear_pending
-          @pending_key = nil
-        end
       end
     end
   end

data/lib/mui/git/buffers/status_buffer.rb

@@ -118,7 +118,7 @@ module Mui
           end
 
           lines << ""
-          lines << "Press: s=stage, u=unstage, -=toggle, dv=diff, cc=commit, q=quit, R=refresh"
+          lines << "Press: s=stage, u=unstage, -=toggle, \\d=diff, \\c=commit, \\q=quit, R=refresh"
 
           lines.join("\n")
         end

data/lib/mui/git/plugin.rb

@@ -10,6 +10,8 @@ module Mui
       def setup
         register_commands
         register_keymaps
+        # Debug: keymaps registered to config
+        File.write("/tmp/mui-git-setup.log", "config.keymaps[:normal].keys: #{Mui.config.keymaps[:normal]&.keys}\n", mode: "a")
       end
 
       private
@@ -52,39 +54,24 @@ module Mui
           true
         end
 
-        # Diff (first key of 'dv')
-        keymap(:normal, "d") do |ctx|
+        # Diff vertical split (<Leader>d)
+        keymap(:normal, "<Leader>d") do |ctx|
           next unless git_buffer?(ctx.buffer)
 
-          ctx.buffer.set_pending("d")
-          true
-        end
-
-        # Diff vertical split (when 'v' pressed after 'd')
-        keymap(:normal, "v") do |ctx|
-          next unless git_buffer?(ctx.buffer)
-          next unless ctx.buffer.pending_key == "d"
-
-          ctx.buffer.clear_pending
           handle_diff_vertical(ctx)
           true
         end
 
-        # Commit (first key of 'cc')
-        keymap(:normal, "c") do |ctx|
+        # Commit (<Leader>c)
+        keymap(:normal, "<Leader>c") do |ctx|
           next unless status_buffer?(ctx.buffer)
 
-          if ctx.buffer.pending_key == "c"
-            ctx.buffer.clear_pending
-            handle_commit(ctx)
-          else
-            ctx.buffer.set_pending("c")
-          end
+          handle_commit(ctx)
           true
         end
 
         # Quit buffer
-        keymap(:normal, "q") do |ctx|
+        keymap(:normal, "<Leader>q") do |ctx|
           next unless git_buffer?(ctx.buffer)
 
           handle_quit(ctx)
@@ -102,7 +89,7 @@ module Mui
 
       def register_log_blame_keymaps
         # Enter key to show commit diff in Log/Blame buffers
-        keymap(:normal, "\r") do |ctx|
+        keymap(:normal, "<Leader>r") do |ctx|
           next unless log_buffer?(ctx.buffer) || blame_buffer?(ctx.buffer)
 
           handle_show_commit(ctx)
@@ -222,7 +209,7 @@ module Mui
       end
 
       def handle_quit(ctx)
-        ctx.editor.window_manager.close_window(ctx.window)
+        ctx.editor.window_manager.close_current_window
       end
 
       def handle_refresh(ctx)

data/lib/mui/git/version.rb

@@ -2,6 +2,6 @@
 
 module Mui
   module Git
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mui-git
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - S-H-GAMELINKS
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.0.beta2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Git integration plugin for Mui editor (fugitive.vim-like)
 test_files: []