textbringer-auto-revert 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b9c293b790a5a977dad299b00b2fefe137f781e2afe8b139170f9b370d931dd
-  data.tar.gz: d430d791ddc748a74ba7c5d9bca93fbf99a5433c7f34400dbb9ee0ea50e53ced
+  metadata.gz: 137a99232e6d6bd8f23d3e035cd68ace1382d4e1eb0e87380c0d9bc0f4d52c89
+  data.tar.gz: 0bb993643ed5eb0d8c15013f6e78a0c768c507dcdfba95f72c6a22865c86bf08
 SHA512:
-  metadata.gz: eb4563e64fd3d7a3082968d0263a7f4bb79d2b662f77cde07a25454754bdf71cdbf1d8fb85a551664800a1ce656b249954dd178a6d1dd2ed869f9b96a49938a0
-  data.tar.gz: f5d6bb33ebf2309d917913ba4cedce9c55c55db1859f93af1cd871e9e5512438183aa9db5caffbc3320df0c833d4445e294158c1f67b15696d033e94f3cc6dc7
+  metadata.gz: 92d0bdc9e312cb32c756ba91f04c0827f3242851bfa3d24bcf8346b13e30756e083834d82ec4476e1100b05b3b2bed277b160ec857a0698f944e695abbf3381a
+  data.tar.gz: fc2050a3539f319f1bfeecb52667a06854467287ed4d03fa65469c67705f7c0926243d3043c7b3377e6b6c7052ec07d30fb5dbddffec247a6699796bd12bab4c

data/lib/textbringer/auto-revert/version.rb

@@ -2,6 +2,6 @@
 
 module Textbringer
   module AutoRevert
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/textbringer/auto-revert.rb

@@ -5,77 +5,29 @@ require_relative "auto-revert/version"
 module Textbringer
   CONFIG[:auto_revert_verbose] = true
 
-  module AutoRevert
-    @global_mode = false
-
-    class << self
-      attr_accessor :global_mode
-    end
-
+  class GlobalAutoRevertMode < GlobalMinorMode
     POST_COMMAND_HOOK = -> {
-      return unless AutoRevert.should_check?
-
       buffer = Buffer.current
-      return unless AutoRevert.buffer_eligible?(buffer)
+      return unless buffer.file_name && !buffer.name.start_with?("*")
       return unless buffer.file_modified?
 
-      # バッファが未変更なら自動revert
       if !buffer.modified?
         buffer.revert
-        Textbringer.message("Reverted buffer from file") if CONFIG[:auto_revert_verbose]
+        message("Reverted buffer from file") if CONFIG[:auto_revert_verbose]
       else
-        Textbringer.message("Buffer has unsaved changes; file changed on disk")
+        message("Buffer has unsaved changes; file changed on disk")
       end
     }
 
-    def self.should_check?
-      @global_mode || Buffer.current[:auto_revert_mode]
+    def self.enable
+      add_hook(:post_command_hook, POST_COMMAND_HOOK)
+      message("Global auto-revert mode enabled")
     end
 
-    def self.buffer_eligible?(buffer)
-      buffer.file_name && !buffer.name.start_with?("*")
-    end
-
-    def self.enable_global
-      @global_mode = true
-      Textbringer.add_hook(:post_command_hook, POST_COMMAND_HOOK)
-      Textbringer.message("Global auto-revert mode enabled")
-    end
-
-    def self.disable_global
-      @global_mode = false
-      # ローカルモードが有効なバッファがなければフック削除
-      unless Buffer.list.any? { |b| b[:auto_revert_mode] }
-        Textbringer.remove_hook(:post_command_hook, POST_COMMAND_HOOK)
-      end
-      Textbringer.message("Global auto-revert mode disabled")
+    def self.disable
+      remove_hook(:post_command_hook, POST_COMMAND_HOOK)
+      message("Global auto-revert mode disabled")
     end
   end
 
-  module Commands
-    define_command(:auto_revert_mode,
-      doc: "Toggle auto-revert mode for the current buffer.") do
-      buffer = Buffer.current
-      if buffer[:auto_revert_mode]
-        buffer[:auto_revert_mode] = false
-        Textbringer.message("Auto-revert mode disabled in this buffer")
-      else
-        buffer[:auto_revert_mode] = true
-        # フックがなければ追加
-        unless HOOKS[:post_command_hook].include?(AutoRevert::POST_COMMAND_HOOK)
-          Textbringer.add_hook(:post_command_hook, AutoRevert::POST_COMMAND_HOOK)
-        end
-        Textbringer.message("Auto-revert mode enabled in this buffer")
-      end
-    end
-
-    define_command(:global_auto_revert_mode,
-      doc: "Toggle global auto-revert mode for all buffers.") do
-      if AutoRevert.global_mode
-        AutoRevert.disable_global
-      else
-        AutoRevert.enable_global
-      end
-    end
-  end
 end

data/test/test_helper.rb

@@ -81,6 +81,20 @@ module Textbringer
       module_function(name)
     end
   end
+
+  class GlobalMinorMode
+    def self.add_hook(name, hook)
+      Textbringer.add_hook(name, hook)
+    end
+
+    def self.remove_hook(name, hook)
+      Textbringer.remove_hook(name, hook)
+    end
+
+    def self.message(msg)
+      Textbringer.message(msg)
+    end
+  end
 end
 
 require "textbringer/auto-revert"

data/test/textbringer_auto_revert_test.rb

@@ -2,7 +2,7 @@
 
 require "test_helper"
 
-class Textbringer::AutoRevertTest < Test::Unit::TestCase
+class Textbringer::GlobalAutoRevertModeTest < Test::Unit::TestCase
   include Textbringer
 
   def setup
@@ -11,7 +11,6 @@ class Textbringer::AutoRevertTest < Test::Unit::TestCase
     Textbringer::Buffer.list = [@buffer]
     Textbringer.messages = []
     Textbringer::HOOKS.clear
-    Textbringer::AutoRevert.global_mode = false
   end
 
   test "VERSION is defined" do
@@ -20,77 +19,51 @@ class Textbringer::AutoRevertTest < Test::Unit::TestCase
     end
   end
 
-  test "global_auto_revert_mode enables global mode" do
-    assert_equal false, Textbringer::AutoRevert.global_mode
+  test "enable adds hook and shows message" do
+    Textbringer::GlobalAutoRevertMode.enable
 
-    Textbringer::Commands.global_auto_revert_mode
-
-    assert_equal true, Textbringer::AutoRevert.global_mode
-    assert_includes Textbringer::HOOKS[:post_command_hook],
-                    Textbringer::AutoRevert::POST_COMMAND_HOOK
-  end
-
-  test "global_auto_revert_mode toggles off" do
-    Textbringer::Commands.global_auto_revert_mode  # enable
-    Textbringer::Commands.global_auto_revert_mode  # disable
-
-    assert_equal false, Textbringer::AutoRevert.global_mode
-  end
-
-  test "auto_revert_mode enables local mode for current buffer" do
-    assert_nil @buffer[:auto_revert_mode]
-
-    Textbringer::Commands.auto_revert_mode
-
-    assert_equal true, @buffer[:auto_revert_mode]
     assert_includes Textbringer::HOOKS[:post_command_hook],
-                    Textbringer::AutoRevert::POST_COMMAND_HOOK
+                    Textbringer::GlobalAutoRevertMode::POST_COMMAND_HOOK
+    assert_includes Textbringer.messages, "Global auto-revert mode enabled"
   end
 
-  test "auto_revert_mode toggles off" do
-    Textbringer::Commands.auto_revert_mode  # enable
-    Textbringer::Commands.auto_revert_mode  # disable
+  test "disable removes hook and shows message" do
+    Textbringer::GlobalAutoRevertMode.enable
+    Textbringer::GlobalAutoRevertMode.disable
 
-    assert_equal false, @buffer[:auto_revert_mode]
+    refute_includes Textbringer::HOOKS[:post_command_hook],
+                    Textbringer::GlobalAutoRevertMode::POST_COMMAND_HOOK
+    assert_includes Textbringer.messages, "Global auto-revert mode disabled"
   end
 
   test "reverts buffer when file is modified and buffer is not modified" do
-    Textbringer::Commands.global_auto_revert_mode
+    Textbringer::GlobalAutoRevertMode.enable
     @buffer.file_modified = true
     @buffer.modified = false
 
-    Textbringer::AutoRevert::POST_COMMAND_HOOK.call
+    Textbringer::GlobalAutoRevertMode::POST_COMMAND_HOOK.call
 
     assert_equal true, @buffer.reverted
     assert_includes Textbringer.messages, "Reverted buffer from file"
   end
 
   test "does not revert buffer when buffer has unsaved changes" do
-    Textbringer::Commands.global_auto_revert_mode
+    Textbringer::GlobalAutoRevertMode.enable
     @buffer.file_modified = true
     @buffer.modified = true
 
-    Textbringer::AutoRevert::POST_COMMAND_HOOK.call
+    Textbringer::GlobalAutoRevertMode::POST_COMMAND_HOOK.call
 
     assert_equal false, @buffer.reverted
     assert_includes Textbringer.messages, "Buffer has unsaved changes; file changed on disk"
   end
 
   test "does not revert when file is not modified" do
-    Textbringer::Commands.global_auto_revert_mode
+    Textbringer::GlobalAutoRevertMode.enable
     @buffer.file_modified = false
     @buffer.modified = false
 
-    Textbringer::AutoRevert::POST_COMMAND_HOOK.call
-
-    assert_equal false, @buffer.reverted
-  end
-
-  test "does not check when neither global nor local mode is enabled" do
-    @buffer.file_modified = true
-    @buffer.modified = false
-
-    Textbringer::AutoRevert::POST_COMMAND_HOOK.call
+    Textbringer::GlobalAutoRevertMode::POST_COMMAND_HOOK.call
 
     assert_equal false, @buffer.reverted
   end
@@ -98,9 +71,9 @@ class Textbringer::AutoRevertTest < Test::Unit::TestCase
   test "skips special buffers starting with *" do
     @buffer.name = "*scratch*"
     @buffer.file_modified = true
-    Textbringer::Commands.global_auto_revert_mode
+    Textbringer::GlobalAutoRevertMode.enable
 
-    Textbringer::AutoRevert::POST_COMMAND_HOOK.call
+    Textbringer::GlobalAutoRevertMode::POST_COMMAND_HOOK.call
 
     assert_equal false, @buffer.reverted
   end
@@ -108,9 +81,9 @@ class Textbringer::AutoRevertTest < Test::Unit::TestCase
   test "skips buffers without file_name" do
     @buffer.file_name = nil
     @buffer.file_modified = true
-    Textbringer::Commands.global_auto_revert_mode
+    Textbringer::GlobalAutoRevertMode.enable
 
-    Textbringer::AutoRevert::POST_COMMAND_HOOK.call
+    Textbringer::GlobalAutoRevertMode::POST_COMMAND_HOOK.call
 
     assert_equal false, @buffer.reverted
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textbringer-auto-revert
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - yancya