textbringer 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df46cdf2ec8419a33fbfd4e23f41272bd4204ba2
-  data.tar.gz: 47179c38f72119aa5c4b96f01c80d28f10660531
+  metadata.gz: e327730f3f4d3b64bf57ce835400f4a44475c600
+  data.tar.gz: 3b9adf68d12de90e5d6106e4aa2f9e4cfd0a5599
 SHA512:
-  metadata.gz: b39cb72604f03c738a02b37fcc7c8d74bef47590ddde2293e6207f7be1147572395b760a02bcc74537872de3152967f447bcfb03b1fb83f447c274eff0322371
-  data.tar.gz: 864a8f20870885c9fb7c2252779cbe269f08ed34b1650b06233172fb69eac9fcdf76da5b6292150db4940ba7ce14b3f308b89c78084be811fd0f255553e8c720
+  metadata.gz: aef52effa70699fbc3a32d80354027caf1d606ecb31331c8adfb83a5649e66a444244c73985206249046da68c2c00cf0c753ffcb974e4ff157418d7a188c9a82
+  data.tar.gz: 65cfd1a1cdf62888061a3b40e0e9b7620b56374927c4e2844efba890707b567badfa5586205bc1d07cc3b596c5e31e058fb7a78bc1aed3503ce0f792431f5a33

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 0.2.3
+
+* Add the on_modified callback to Buffer.
+* Use Gem.find_latest_files to find plugins.
+* Turn off synatx highlighting when the buffer is binary.
+* Add define_local_command.
+
 ## 0.2.2
 
 * Rename read_char to read_event and add read_char as a new method.

data/appveyor.yml

@@ -4,7 +4,8 @@ install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - gem install bundler --no-document
   - bundle install
-  - ps: Invoke-WebRequest -Uri http://curl.haxx.se/ca/cacert.pem -OutFile C:\projects\textbringer\cacert.pem
+  - ps: '[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12'
+  - ps: Invoke-WebRequest -Uri https://curl.haxx.se/ca/cacert.pem -OutFile C:\projects\textbringer\cacert.pem
 build: off
 test_script:
   - rake

data/lib/textbringer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "textbringer/version"
 require_relative "textbringer/config"
 require_relative "textbringer/errors"

data/lib/textbringer/buffer.rb

@@ -12,7 +12,6 @@ module Textbringer
     attr_accessor :mode, :keymap
     attr_reader :name, :file_name, :file_encoding, :file_format, :point, :marks
     attr_reader :current_line, :current_column, :visible_mark
-    attr_writer :modified
 
     GAP_SIZE = 256
     UNDO_LIMIT = 1000
@@ -226,6 +225,7 @@ module Textbringer
       @match_offsets = []
       @visible_mark = nil
       @read_only = read_only
+      @on_modified_callbacks = []
     end
 
     def inspect
@@ -307,10 +307,21 @@ module Textbringer
       @@current == self
     end
 
+    def modified=(modified)
+      @modified = modified
+      if @composite_edit_level == 0 && modified
+        fire_on_modified_callbacks
+      end
+    end
+
     def modified?
       @modified
     end
 
+    def on_modified(&callback)
+      @on_modified_callbacks.push(callback)
+    end
+
     def [](name)
       if @attributes.key?(name)
         @attributes[name]
@@ -527,7 +538,7 @@ module Textbringer
           push_undo(InsertAction.new(self, pos, s))
         end
       end
-      @modified = true
+      self.modified = true
       @goal_column = nil
       self
     end
@@ -569,7 +580,7 @@ module Textbringer
           end
         end
         push_undo(DeleteAction.new(self, s, s, str))
-        @modified = true
+        self.modified = true
       elsif n < 0
         str = substring(pos, s)
         update_line_and_column(@point, pos)
@@ -584,7 +595,7 @@ module Textbringer
         end
         @point = @gap_start = pos
         push_undo(DeleteAction.new(self, s, pos, str))
-        @modified = true
+        self.modified = true
       end
       @goal_column = nil
     end
@@ -906,7 +917,7 @@ module Textbringer
           end
         end
         push_undo(DeleteAction.new(self, old_pos, s, str)) 
-        @modified = true
+        self.modified = true
       end
     end
 
@@ -920,7 +931,7 @@ module Textbringer
       @current_line = 1
       @current_column = 1
       @goal_column = nil
-      @modified = true
+      self.modified = true
       @undo_stack.clear
       @redo_stack.clear
     end
@@ -1202,6 +1213,7 @@ module Textbringer
           @composite_edit_actions.clear
         end
       end
+      fire_on_modified_callbacks
     end
 
     def apply_mode(mode_class)
@@ -1490,6 +1502,12 @@ module Textbringer
         raise ReadOnlyError, "Buffer is read only: #{self.inspect}"
       end
     end
+
+    def fire_on_modified_callbacks
+      @on_modified_callbacks.each do |callback|
+        callback.call(self)
+      end
+    end
   end
 
   class Mark

data/lib/textbringer/commands/misc.rb

@@ -16,7 +16,7 @@ module Textbringer
 
     define_command(:suspend_textbringer) do
       Curses.close_screen
-      Process.kill(:STOP, $$)
+      Process.kill(:STOP, 0)
     end
 
     define_command(:execute_command) do

data/lib/textbringer/controller.rb

@@ -115,6 +115,9 @@ module Textbringer
     end
 
     def read_event
+      if executing_keyboard_macro?
+        return @executing_keyboard_macro.shift
+      end
       event = read_event_nonblock
       if event
         return event
@@ -253,7 +256,7 @@ module Textbringer
     def read_event_with_keyboard_macro(read_event_method)
       if !executing_keyboard_macro?
         c = call_read_event_method(read_event_method)
-        if @recording_keyboard_macro
+        if c && @recording_keyboard_macro
           @recording_keyboard_macro.push(c)
         end
         c

data/lib/textbringer/keymap.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "curses"
-
 module Textbringer
   class Keymap
     include Enumerable

data/lib/textbringer/mode.rb

@@ -20,13 +20,13 @@ module Textbringer
       attr_reader :syntax_table
     end
 
-    def self.define_generic_command(name)
+    def self.define_generic_command(name, **options)
       command_name = (name.to_s + "_command").intern
-      define_command(command_name) do |*args|
+      define_command(command_name, **options) do |*args|
         begin
           Buffer.current.mode.send(name, *args)
         rescue NoMethodError => e
-          if e.receiver == Buffer.current.mode && e.name == name
+          if (e.receiver rescue nil) == Buffer.current.mode && e.name == name
             raise EditorError,
               "#{command_name} is not supported in the current mode"
           else
@@ -36,6 +36,12 @@ module Textbringer
       end
     end
 
+    def self.define_local_command(name, **options, &block)
+      define_generic_command(name, **options)
+      define_method(name, &block)
+      name
+    end
+
     def self.define_syntax(face_name, re)
       @syntax_table[face_name] = re
     end

data/lib/textbringer/modes/programming_mode.rb

@@ -74,12 +74,17 @@ module Textbringer
 
     def indent_region(s = @buffer.mark, e = @buffer.point)
       s, e = Buffer.region_boundaries(s, e)
-      @buffer.save_excursion do
-        @buffer.goto_char(s)
-        while @buffer.point < e
-          indent_line
-          @buffer.forward_line
+      end_mark = @buffer.new_mark(e)
+      begin
+        @buffer.save_excursion do
+          @buffer.goto_char(s)
+          until @buffer.end_of_buffer? || @buffer.point_after_mark?(end_mark)
+            indent_line
+            @buffer.forward_line
+          end
         end
+      ensure
+        end_mark.delete
       end
     end
 

data/lib/textbringer/plugin.rb

@@ -9,15 +9,8 @@ module Textbringer
     @directory = File.expand_path("~/.textbringer/plugins")
 
     def self.load_plugins
-      files = Gem.find_files("textbringer_plugin.rb").group_by { |file|
-        file.slice(/([^\/]+)-[\w.]+\/lib\/textbringer_plugin\.rb\z/, 1)
-      }.map { |gem, versions|
-        versions.sort_by { |version|
-          v = version.slice(/[^\/]+-([\w.]+)\/lib\/textbringer_plugin\.rb\z/,
-                            1)
-          Gem::Version.create(v)
-        }.last
-      } + Dir.glob(File.join(directory, "*/**/textbringer_plugin.rb"))
+      files = Gem.find_latest_files("textbringer_plugin.rb", false) +
+        Dir.glob(File.join(directory, "*/**/textbringer_plugin.rb"))
       files.each do |file|
         load(file)
       end

data/lib/textbringer/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Textbringer
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/textbringer/window.rb

@@ -2,45 +2,8 @@
 
 require "curses"
 require "unicode/display_width"
-require "fiddle/import"
 
 module Textbringer
-  # These features should be provided by curses.gem.
-  module PDCurses
-    KEY_OFFSET = 0xec00
-    ALT_0 = KEY_OFFSET + 0x97
-    ALT_9 = KEY_OFFSET + 0xa0
-    ALT_A = KEY_OFFSET + 0xa1
-    ALT_Z = KEY_OFFSET + 0xba
-    ALT_NUMBER_BASE = ALT_0 - ?0.ord
-    ALT_ALPHA_BASE = ALT_A - ?a.ord
-
-    KEY_MODIFIER_SHIFT   = 1
-    KEY_MODIFIER_CONTROL = 2
-    KEY_MODIFIER_ALT     = 4
-    KEY_MODIFIER_NUMLOCK = 8
-
-    @dll_loaded = false
-
-    class << self
-      attr_writer :dll_loaded
-
-      def dll_loaded?
-        @dll_loaded
-      end
-    end
-
-    begin
-      extend Fiddle::Importer
-      dlload "pdcurses.dll"
-      extern "unsigned long PDC_get_key_modifiers(void)"
-      extern "int PDC_save_key_modifiers(unsigned char)"
-      extern "int PDC_return_key_modifiers(unsigned char)"
-      @dll_loaded = true
-    rescue Fiddle::DLError
-    end
-  end
-
   class Window
     KEY_NAMES = {}
     Curses.constants.grep(/\AKEY_/).each do |name|
@@ -48,6 +11,12 @@ module Textbringer
         name.slice(/\AKEY_(.*)/, 1).downcase.intern
     end
 
+    HAVE_GET_KEY_MODIFIERS = defined?(Curses.get_key_modifiers)
+    if HAVE_GET_KEY_MODIFIERS
+      ALT_NUMBER_BASE = Curses::ALT_0 - ?0.ord
+      ALT_ALPHA_BASE = Curses::ALT_A - ?a.ord
+    end
+
     @@started = false
     @@list = []
     @@current = nil
@@ -325,12 +294,12 @@ module Textbringer
     def read_event
       key = get_char
       if key.is_a?(Integer)
-        if PDCurses.dll_loaded?
-          if PDCurses::ALT_0 <= key && key <= PDCurses::ALT_9
-            @key_buffer.push((key - PDCurses::ALT_NUMBER_BASE).chr)
+        if HAVE_GET_KEY_MODIFIERS
+          if Curses::ALT_0 <= key && key <= Curses::ALT_9
+            @key_buffer.push((key - ALT_NUMBER_BASE).chr)
             return "\e"
-          elsif PDCurses::ALT_A <= key && key <= PDCurses::ALT_Z
-            @key_buffer.push((key - PDCurses::ALT_ALPHA_BASE).chr)
+          elsif Curses::ALT_A <= key && key <= Curses::ALT_Z
+            @key_buffer.push((key - ALT_ALPHA_BASE).chr)
             return "\e"
           end
         end
@@ -384,7 +353,7 @@ module Textbringer
     def highlight
       @highlight_on = {}
       @highlight_off = {}
-      return if !@@has_colors || !CONFIG[:syntax_highlight]
+      return if !@@has_colors || !CONFIG[:syntax_highlight] || @buffer.binary?
       syntax_table = @buffer.mode.syntax_table
       return if syntax_table.empty?
       if @buffer.bytesize < CONFIG[:highlight_buffer_size_limit]
@@ -780,7 +749,7 @@ module Textbringer
 
     def get_char
       if @key_buffer.empty?
-        PDCurses.PDC_save_key_modifiers(1) if PDCurses.dll_loaded?
+        Curses.save_key_modifiers(true) if HAVE_GET_KEY_MODIFIERS
         begin
           need_retry = false
           if @raw_key_buffer.empty?
@@ -788,13 +757,13 @@ module Textbringer
           else
             key = @raw_key_buffer.shift
           end
-          if PDCurses.dll_loaded?
-            mods = PDCurses.PDC_get_key_modifiers
+          if HAVE_GET_KEY_MODIFIERS
+            mods = Curses.get_key_modifiers
             if key.is_a?(String) && key.ascii_only?
-              if (mods & PDCurses::KEY_MODIFIER_CONTROL) != 0
+              if (mods & Curses::PDC_KEY_MODIFIER_CONTROL) != 0
                 key = key == ?? ? "\x7f" : (key.ord & 0x9f).chr
               end
-              if (mods & PDCurses::KEY_MODIFIER_ALT) != 0
+              if (mods & Curses::PDC_KEY_MODIFIER_ALT) != 0
                 if key == "\0"
                   # Alt + `, Alt + < etc. return NUL, so ignore it.
                   need_retry = true

data/textbringer.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_runtime_dependency "curses", "~> 1.2"
+  spec.add_runtime_dependency "curses", ">= 1.2.2"
   spec.add_runtime_dependency "unicode-display_width", "~> 1.1"
   spec.add_runtime_dependency "clipboard", "~> 1.1"
   spec.add_runtime_dependency "fiddley", ">= 0.0.5"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: An Emacs-like text editor