textbringer 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 906c3f715935cd762c39a92b8d92a9a7021179b4
-  data.tar.gz: 5ba42d51b5af2086d2e9a839e07d4960f2f2f270
+  metadata.gz: df46cdf2ec8419a33fbfd4e23f41272bd4204ba2
+  data.tar.gz: 47179c38f72119aa5c4b96f01c80d28f10660531
 SHA512:
-  metadata.gz: 2fd110a1970b6d0237c36365f8d1ff7eac130e881d5adcb7f0c0a4132bc5cdece78208397c87de0808c24c5538fea5ae492431b75b3220a132eb60b47736c42b
-  data.tar.gz: e80b7040d0bcd2c7af8f166545f31f9c5573488fd8e5ad2c0d3d1ab838d2afcc9ed7bb7af44567e1806439e23ec9664c0280cd6b87f449f5830641386a4300a4
+  metadata.gz: b39cb72604f03c738a02b37fcc7c8d74bef47590ddde2293e6207f7be1147572395b760a02bcc74537872de3152967f447bcfb03b1fb83f447c274eff0322371
+  data.tar.gz: 864a8f20870885c9fb7c2252779cbe269f08ed34b1650b06233172fb69eac9fcdf76da5b6292150db4940ba7ce14b3f308b89c78084be811fd0f255553e8c720

data/.travis.yml

@@ -4,11 +4,11 @@ matrix:
     - os: linux
       dist: trusty
       sudo: false
-      rvm: 2.3.3
+      rvm: 2.3.4
     - os: linux
       dist: trusty
       sudo: false
-      rvm: 2.4.0
+      rvm: 2.4.1
     - os: linux
       dist: trusty
       sudo: false

data/CHANGES.md

@@ -1,3 +1,13 @@
+## 0.2.2
+
+* Rename read_char to read_event and add read_char as a new method.
+* Add next_tick and background for background threads.
+* Add the force: option to kill_buffer.
+* bind C-? ([delete] on Mac) to backward_delete_char.
+  Pull request #23 by moguno.
+* Make commands module_functions.
+* Use fiddley instead of ffi.
+
 ## 0.2.1
 
 * Add revert_buffer and revert_buffer_with_encoding.

data/exe/textbringer

@@ -16,40 +16,44 @@ end
 $VERBOSE = nil
 
 Controller.current = Controller.new
-Window.start do
-  begin
-    Plugin.load_plugins
-    load_user_config
-    ruby_mode
-    if ARGV.size > 0
-      ARGV.each do |arg|
-        find_file(arg)
+begin
+  Window.start do
+    begin
+      Plugin.load_plugins
+      load_user_config
+      ruby_mode
+      if ARGV.size > 0
+        ARGV.each do |arg|
+          find_file(arg)
+        end
       end
-    end
-    if Buffer.dumped_buffers_exist?(CONFIG[:buffer_dump_dir])
-      Window.redisplay
-      if yes_or_no?("Dumped buffers found; restore them?")
-        buffers = Buffer.load_dumped_buffers(CONFIG[:buffer_dump_dir])
-        switch_to_buffer(buffers.last)
+      if Buffer.dumped_buffers_exist?(CONFIG[:buffer_dump_dir])
+        Window.redisplay
+        if yes_or_no?("Dumped buffers found; restore them?")
+          buffers = Buffer.load_dumped_buffers(CONFIG[:buffer_dump_dir])
+          switch_to_buffer(buffers.last)
+        end
       end
+    rescue Exception => e
+      show_exception(e)
     end
-  rescue Exception => e
-    show_exception(e)
-  end
-  Window.redisplay
-  begin
-    trap(:CONT) { Window.redraw }
-  rescue ArgumentError
-  end
-  begin
-    loop do
-      Controller.current.command_loop(TOP_LEVEL_TAG)
-      Window.redisplay
+    Window.redisplay
+    begin
+      trap(:CONT) { Window.redraw }
+    rescue ArgumentError
     end
-  rescue Exception => e
-    if !e.is_a?(SystemExit)
-      Buffer.dump_unsaved_buffers(CONFIG[:buffer_dump_dir])
+    begin
+      loop do
+        Controller.current.command_loop(TOP_LEVEL_TAG)
+        Window.redisplay
+      end
+    rescue Exception => e
+      if !e.is_a?(SystemExit)
+        Buffer.dump_unsaved_buffers(CONFIG[:buffer_dump_dir])
+      end
+      raise
     end
-    raise
   end
+ensure
+  Controller.current.close
 end

data/lib/textbringer/commands.rb

@@ -26,6 +26,7 @@ module Textbringer
     def define_command(name, doc: "No documentation", &block)
       name = name.intern
       Commands.send(:define_method, name, &block)
+      Commands.send(:module_function, name)
       Commands.command_table[name] = Command.new(name, block, doc)
       name
     end

data/lib/textbringer/commands/buffers.rb

@@ -171,7 +171,7 @@ module Textbringer
     define_command(:quoted_insert,
                    doc: "Read a character, and insert it.") do
       |n = number_prefix_arg|
-      c = Controller.current.read_char
+      c = Controller.current.read_event
       if !c.is_a?(String)
         raise EditorError, "Invalid key"
       end

data/lib/textbringer/commands/windows.rb

@@ -100,11 +100,12 @@ module Textbringer
     end
 
     define_command(:kill_buffer, doc: "Kill buffer.") do
-      |buffer = read_buffer("Kill buffer: ", default: Buffer.current.name)|
+      |buffer = read_buffer("Kill buffer: ", default: Buffer.current.name),
+        force: false|
       if buffer.is_a?(String)
         buffer = Buffer[buffer]
       end
-      if buffer.modified?
+      if !force && buffer.modified?
         next unless yes_or_no?("The last change is not saved; kill anyway?")
         message("Arioch! Arioch! Blood and souls for my Lord Arioch!")
       end
@@ -112,6 +113,11 @@ module Textbringer
       if Buffer.current.nil?
         switch_to_buffer(Buffer.other)
       end
+      Window.list(include_echo_area: true).each do |window|
+        if window.buffer == buffer
+          window.buffer = Buffer.current
+        end
+      end
     end
   end
 end

data/lib/textbringer/controller.rb

@@ -36,6 +36,14 @@ module Textbringer
       @recording_keyboard_macro = nil
       @last_keyboard_macro = nil
       @executing_keyboard_macro = nil
+      @next_tick_queue = []
+      @next_tick_queue_mutex = Mutex.new
+      @next_tick_input, @next_tick_output = IO.pipe
+    end
+
+    def close
+      @next_tick_input.close
+      @next_tick_output.close
     end
 
     def command_loop(tag)
@@ -43,7 +51,7 @@ module Textbringer
         loop do
           begin
             echo_input
-            c = read_char
+            c = read_event
             break if c.nil?
             Window.echo_area.clear_message
             @last_key = c
@@ -92,22 +100,56 @@ module Textbringer
     end
 
     def wait_input(msecs)
+      # TODO: Check @next_tick_queue
       if executing_keyboard_macro?
         return @executing_keyboard_macro.first
       end
       Window.current.wait_input(msecs)
     end
 
-    def read_char
-      read_char_with_keyboard_macro(:read_char)
+    def next_tick(&block)
+      @next_tick_queue_mutex.synchronize do
+        @next_tick_queue.push(block)
+      end
+      @next_tick_output.write("\n")
+    end
+
+    def read_event
+      event = read_event_nonblock
+      if event
+        return event
+      end
+      loop do
+        if Window.echo_area.active?
+          wait_files = [STDIN]
+        else
+          wait_files = [STDIN, @next_tick_input]
+        end
+        files, = IO.select(wait_files, [], [], 1)
+        # KEY_RESIZE may be returned even if STDIN is not included in files.
+        event = read_event_nonblock
+        if event
+          return event
+        end
+        if !Window.echo_area.active? && files&.include?(@next_tick_input)
+          c = @next_tick_input.read_nonblock(1, exception: false)
+          if !c.nil? && c != :wait_readable
+            block = @next_tick_queue_mutex.synchronize {
+              @next_tick_queue.shift
+            }
+            block.call
+            Window.redisplay
+          end
+        end
+      end
     end
 
-    def read_char_nonblock
-      read_char_with_keyboard_macro(:read_char_nonblock)
+    def read_event_nonblock
+      read_event_with_keyboard_macro(:read_event_nonblock)
     end
 
     def received_keyboard_quit?
-      while key = read_char_nonblock
+      while key = read_event_nonblock
         if GLOBAL_MAP.lookup([key]) == :keyboard_quit
           return true
         end
@@ -208,9 +250,9 @@ module Textbringer
 
     private
 
-    def read_char_with_keyboard_macro(read_char_method)
+    def read_event_with_keyboard_macro(read_event_method)
       if !executing_keyboard_macro?
-        c = call_read_char_method(read_char_method)
+        c = call_read_event_method(read_event_method)
         if @recording_keyboard_macro
           @recording_keyboard_macro.push(c)
         end
@@ -220,8 +262,8 @@ module Textbringer
       end
     end
 
-    def call_read_char_method(read_char_method)
-      Window.current.send(read_char_method)
+    def call_read_event_method(read_event_method)
+      Window.current.send(read_event_method)
     end
   end
 end

data/lib/textbringer/keymap.rb

@@ -109,6 +109,7 @@ module Textbringer
   GLOBAL_MAP.define_key(?\C-d, :delete_char)
   GLOBAL_MAP.define_key(:backspace, :backward_delete_char)
   GLOBAL_MAP.define_key(?\C-h, :backward_delete_char)
+  GLOBAL_MAP.define_key(?\C-?, :backward_delete_char)
   GLOBAL_MAP.define_key(?\C-a, :beginning_of_line)
   GLOBAL_MAP.define_key(:home, :beginning_of_line)
   GLOBAL_MAP.define_key(?\C-e, :end_of_line)

data/lib/textbringer/modes/c_mode.rb

@@ -78,8 +78,8 @@ module Textbringer
   (?<singleline_comment> \/\/ .*(?:\\\n.*)*(?<!\\)\n )
 ) |
 (?<partial_comment>
-  (?<multiline_comment> \/\* (?:.|\n)* ) |
-  (?<singleline_comment> \/\/ .*? \\\n (?:.|\n)* )
+  (?<partial_multiline_comment> \/\* (?:.|\n)* ) |
+  (?<partial_singleline_comment> \/\/ .*? \\\n (?:.|\n)* )
 ) |
 (?<keyword>
   (?: #{KEYWORDS.join("|")} ) \b
@@ -177,10 +177,9 @@ module Textbringer
 
     def lex(s)
       tokens = []
-      pos = 0
       line = 1
       column = 0
-      while pos < s.size && s.index(TOKEN_REGEXP, pos)
+      s.scan(TOKEN_REGEXP) do
         text = $&
         token_name = TOKEN_NAMES.find { |name| $~[name] }
         if text.empty?
@@ -194,7 +193,6 @@ module Textbringer
         else
           column += text.size
         end
-        pos += text.size
       end
       tokens
     end

data/lib/textbringer/plugin.rb

@@ -2,9 +2,14 @@
 
 module Textbringer
   module Plugin
+    class << self
+      attr_accessor :directory
+    end
+
+    @directory = File.expand_path("~/.textbringer/plugins")
+
     def self.load_plugins
-      files = Gem.find_files("textbringer_plugin.rb")
-      files.group_by { |file|
+      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|
@@ -12,10 +17,10 @@ module Textbringer
                             1)
           Gem::Version.create(v)
         }.last
-      }.each do |file|
+      } + Dir.glob(File.join(directory, "*/**/textbringer_plugin.rb"))
+      files.each do |file|
         load(file)
       end
     end
   end
 end
-

data/lib/textbringer/utils.rb

@@ -49,8 +49,32 @@ module Textbringer
       sleep(secs)
     end
 
+    def background
+      Thread.start do
+        begin
+          yield
+        rescue Exception => e
+          next_tick do
+            raise e
+          end
+        end
+      end
+    end
+
+    def next_tick(*args, &block)
+      Controller.current.next_tick(*args, &block)
+    end
+
+    def read_event
+      Controller.current.read_event
+    end
+
     def read_char
-      Controller.current.read_char
+      event = Controller.current.read_event
+      if !event.is_a?(String)
+        raise EditorError, "Non character event: #{event.inspect}"
+      end
+      event
     end
 
     def received_keyboard_quit?

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/textbringer/window.rb

@@ -322,7 +322,7 @@ module Textbringer
       self == @@current
     end
 
-    def read_char
+    def read_event
       key = get_char
       if key.is_a?(Integer)
         if PDCurses.dll_loaded?
@@ -340,10 +340,10 @@ module Textbringer
       end
     end
 
-    def read_char_nonblock
+    def read_event_nonblock
       @window.nodelay = true
       begin
-        read_char
+        read_event
       ensure
         @window.nodelay = false
       end
@@ -553,7 +553,7 @@ module Textbringer
 
     def scroll_up
       if @bottom_of_window.location == @buffer.point_max
-        raise EditorError, "End of buffer"
+        raise RangeError, "End of buffer"
       end
       @buffer.point_to_mark(@bottom_of_window)
       @buffer.previous_line
@@ -563,7 +563,7 @@ module Textbringer
 
     def scroll_down
       if @top_of_window.location == @buffer.point_min
-        raise EditorError, "Beginning of buffer"
+        raise RangeError, "Beginning of buffer"
       end
       @buffer.point_to_mark(@top_of_window)
       @buffer.next_line
@@ -928,7 +928,8 @@ module Textbringer
           if width > max_width
             @buffer.forward_char
             break
-          elsif width == max_width || @buffer.beginning_of_line?
+          elsif width == max_width || @buffer.beginning_of_line? ||
+              @buffer.point_at_mark?(@top_of_window)
             break
           end
           @buffer.backward_char

data/textbringer.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "curses", "~> 1.2"
   spec.add_runtime_dependency "unicode-display_width", "~> 1.1"
   spec.add_runtime_dependency "clipboard", "~> 1.1"
-  spec.add_runtime_dependency "ffi"
+  spec.add_runtime_dependency "fiddley", ">= 0.0.5"
   spec.add_runtime_dependency "editorconfig"
 
   spec.add_development_dependency "bundler", "~> 1.14"
@@ -33,7 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "codecov"
   spec.add_development_dependency "bundler-audit"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-shell"
   spec.add_development_dependency "ripper-tags"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: fiddley
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: editorconfig
   requirement: !ruby/object:Gem::Requirement
@@ -164,34 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-shell
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: ripper-tags
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +193,6 @@ files:
 - ".travis.yml"
 - CHANGES.md
 - Gemfile
-- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile

data/Guardfile

@@ -1,22 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-## Uncomment and set this to only include directories you want to watch
-# directories %w(app lib config test spec features) \
-#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
-
-## Note: if you are using the `directories` clause above and you are not
-## watching the project directory ('.'), then you will want to move
-## the Guardfile to a watched dir and symlink it back, e.g.
-#
-#  $ mkdir config
-#  $ mv Guardfile config/
-#  $ ln -s config/Guardfile .
-#
-# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
-
-guard :shell do
-  watch(%r'^(lib|test)/.+\.rb$') do
-    `bundle exec tbtags -R`
-  end
-end