textbringer 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f61a01528e59c0b8185339a9120fd528602e4df0c8db6b859a3756043309ac2
-  data.tar.gz: cd1eef029b832c4fcdd9b7bdf709c29c3e60676d79f7084028ac2c683ca7ef82
+  metadata.gz: 501a7f57f239b45890a30564482e20d2f80d20b5b21719268f97d0f787600c77
+  data.tar.gz: 56ec3be0a84a84663542072d76d0bfd868e42144cab77d51439d3ba317fe6302
 SHA512:
-  metadata.gz: 501f358854f97ca17dafdbd3d908d1a29a2ea32f103a596958b48e1f11c7397178334e75dfa369ac779e7df77d92958632790c77d2ffd520e6959a6a071e32a6
-  data.tar.gz: d1c443c92cd12df433bdee6df2af8d211ebca023946c268386f813c3292bcc195f4f9cd2b6e17e010ff1d168e31d8ba3da92c75c181644585fe3fdb15d21b532
+  metadata.gz: fc8752782f2b63601fc382a88689b79d874d3deef1a829ef2efaa969ccfc43175b7d6f8ca2757dd345a88bb997cbc0e3b0aafaf4bcabafad478234e6e4ecd3af
+  data.tar.gz: 3d7ec2385be73f6d739e5fd0b547c28dc24001e58827d2d4ae15753d03d8d71e257a8f0efd50a9630ea169d3d2c58ade94104be772d9e0d91dfce08ea0b5f957

data/.editorconfig

@@ -2,8 +2,11 @@ root = true
 
 [*]
 end_of_line = lf
+insert_final_newline = true
 
 [*.rb]
 indent_style = space
 indent_size = 2
 
+[lib/**.rb]
+trim_trailing_whitespace = true

data/.travis.yml

@@ -4,28 +4,28 @@ matrix:
     - os: linux
       dist: trusty
       sudo: false
-      rvm: 2.3.5
+      rvm: 2.4.5
     - os: linux
       dist: trusty
       sudo: false
-      rvm: 2.4.3
+      rvm: 2.5.2
     - os: linux
       dist: trusty
       sudo: false
-      rvm: 2.5.0
+      rvm: 2.6.0
     - os: linux
       dist: trusty
       sudo: false
       rvm: ruby-head
     - os: osx
       osx_image: xcode8.2
-      rvm: 2.3.5
+      rvm: 2.4.5
     - os: osx
       osx_image: xcode8.2
-      rvm: 2.4.3
+      rvm: 2.5.2
     - os: osx
       osx_image: xcode8.2
-      rvm: 2.5.0
+      rvm: 2.6.0
     - os: osx
       osx_image: xcode8.2
       rvm: ruby-head

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.3.1
+
+* Depend on curses 1.2.6 or later for mingw.
+
 ## 0.3.0
 
 * toggle_test_command supports RSpec now.

data/exe/tbclient

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+require "drb"
+require "optparse"
+
+eval = false
+wait = true
+uri = "drbunix:" + File.expand_path("server.sock", "~/.textbringer")
+
+opt = OptionParser.new
+opt.banner = "Usage: tbclient [OPTIONS] FILE"
+opt.on("--uri URI", "Specify the URI of the server") do |val|
+  uri = val
+end
+opt.on("-e", "--eval", "Evaluate FILE as a Ruby expression") do
+  eval = true
+end
+opt.on("-n", "--no-wait", "Don't wait for the server") do
+  wait = false
+end
+args = ARGV.dup
+opt.parse!(args)
+if args.empty?
+  STDERR.puts(opt.help)
+  exit 1
+end
+arg = args.first
+tb = DRbObject.new_with_uri(uri)
+if eval
+  puts tb.eval(arg)
+else
+  tb.visit_file(File.expand_path(arg), wait: wait)
+end
+

data/lib/textbringer.rb

@@ -23,6 +23,7 @@ require_relative "textbringer/commands/clipboard"
 require_relative "textbringer/commands/register"
 require_relative "textbringer/commands/keyboard_macro"
 require_relative "textbringer/commands/fill"
+require_relative "textbringer/commands/server"
 require_relative "textbringer/commands/help"
 require_relative "textbringer/mode"
 require_relative "textbringer/modes/fundamental_mode"

data/lib/textbringer/buffer.rb

@@ -4,6 +4,7 @@ require "nkf"
 require "unicode/display_width"
 require "json"
 require "fileutils"
+require "editorconfig"
 
 module Textbringer
   class Buffer
@@ -398,6 +399,13 @@ module Textbringer
         raise EditorError, "File name is not set"
       end
       file_name = File.expand_path(file_name)
+      config = EditorConfig.load_file(file_name)
+      if config["trim_trailing_whitespace"]
+        trim_trailing_whitespace
+      end
+      if config["insert_final_newline"]
+        insert_final_newline
+      end
       begin
         File.open(file_name, "w",
                   external_encoding: @file_encoding, binmode: true) do |f|
@@ -666,7 +674,7 @@ module Textbringer
         end
       end
     end
-    
+
     def forward_line(n = 1)
       if n > 0
         n.times do
@@ -683,7 +691,7 @@ module Textbringer
         end
       end
     end
-    
+
     def backward_line(n = 1)
       forward_line(-n)
     end
@@ -941,7 +949,7 @@ module Textbringer
             m.location = s
           end
         end
-        push_undo(DeleteAction.new(self, old_pos, s, str)) 
+        push_undo(DeleteAction.new(self, old_pos, s, str))
         self.modified = true
       end
     end
@@ -1328,7 +1336,15 @@ module Textbringer
     end
 
     def gsub(*args, &block)
-      s = to_s.gsub(*args, &block)
+      if block
+        s = to_s.gsub(*args) { |*params|
+          set_block_backref(block, $~)
+          block.call(*params)
+        }
+      else
+        s = to_s.gsub(*args)
+      end
+
       composite_edit do
         delete_region(point_min, point_max)
         insert(s)
@@ -1336,6 +1352,26 @@ module Textbringer
       self
     end
 
+    def trim_trailing_whitespace
+      save_excursion do
+        beginning_of_buffer
+        composite_edit do
+          while re_search_forward(/[ \t]+$/, raise_error: false)
+            replace_match("")
+          end
+        end
+      end
+    end
+
+    def insert_final_newline
+      save_excursion do
+        end_of_buffer
+        if char_before != "\n"
+          insert("\n")
+        end
+      end
+    end
+
     private
 
     def set_contents(s, enc)
@@ -1348,7 +1384,7 @@ module Textbringer
       @contents.force_encoding(Encoding::ASCII_8BIT)
       self.file_encoding = enc
       case @contents
-      when /(?<!\r)\n/ 
+      when /(?<!\r)\n/
         @file_format = :unix
       when /\r(?!\n)/
         @file_format = :mac
@@ -1391,7 +1427,7 @@ module Textbringer
       if pos <= @gap_start
         pos
       else
-        gap_size + pos 
+        gap_size + pos
       end
     end
 
@@ -1540,6 +1576,17 @@ module Textbringer
         callback.call(self)
       end
     end
+
+    def set_block_backref(block, backref)
+      Thread.current[:__textbringer_backref] = backref
+      begin
+        block.binding.eval(<<-EOC)
+          $~ = Thread.current[:__textbringer_backref]
+        EOC
+      ensure
+        Thread.current[:__textbringer_backref] = nil
+      end
+    end
   end
 
   class Mark

data/lib/textbringer/commands/buffers.rb

@@ -7,7 +7,7 @@ module Textbringer
       |n = number_prefix_arg|
       Buffer.current.forward_char(n)
     end
-    
+
     define_command(:backward_char,
                    doc: "Move point n characters backward.") do
       |n = number_prefix_arg|
@@ -25,26 +25,25 @@ module Textbringer
       |n = number_prefix_arg|
       Buffer.current.backward_word(n)
     end
-    
 
     define_command(:next_line,
                    doc: "Move point n lines forward.") do
       |n = number_prefix_arg|
       Buffer.current.next_line(n)
     end
-    
+
     define_command(:previous_line,
                    doc: "Move point n lines backward.") do
       |n = number_prefix_arg|
       Buffer.current.previous_line(n)
     end
-    
+
     define_command(:delete_char,
                    doc: "Delete n characters forward.") do
       |n = number_prefix_arg|
       Buffer.current.delete_char(n)
     end
-    
+
     define_command(:backward_delete_char,
                    doc: "Delete n characters backward.") do
       |n = number_prefix_arg|

data/lib/textbringer/commands/files.rb

@@ -122,7 +122,7 @@ module Textbringer
 
     define_command(:chdir, doc: "Change the current working directory.") do
       |dir_name = read_file_name("Change directory: ",
-                                 default: Buffer.current.file_name && 
+                                 default: Buffer.current.file_name &&
                                  File.dirname(Buffer.current.file_name))|
       Dir.chdir(dir_name)
     end

data/lib/textbringer/commands/fill.rb

@@ -20,7 +20,7 @@ module Textbringer
         while !beginning_of_buffer? &&
             !looking_at?(/^[ \t]*$/)
           backward_line
-        end 
+        end
         while looking_at?(/^[ \t]*$/)
           forward_line
         end

data/lib/textbringer/commands/isearch.rb

@@ -8,7 +8,7 @@ module Textbringer
     end
     ISEARCH_MODE_MAP.define_key(?\t, :isearch_printing_char)
     ISEARCH_MODE_MAP.handle_undefined_key do |key|
-      if key.is_a?(String) && /[\0-\x7f]/ !~ key 
+      if key.is_a?(String) && /[\0-\x7f]/ !~ key
         :isearch_printing_char
       else
         nil
@@ -21,7 +21,7 @@ module Textbringer
     ISEARCH_MODE_MAP.define_key(?\C-w, :isearch_yank_word_or_char)
     ISEARCH_MODE_MAP.define_key(?\C-m, :isearch_exit)
     ISEARCH_MODE_MAP.define_key(?\C-g, :isearch_abort)
-    
+
     ISEARCH_STATUS = {
       forward: true,
       string: "",

data/lib/textbringer/commands/register.rb

@@ -4,7 +4,7 @@ module Textbringer
   module Commands
     class BufferPosition
       attr_reader :buffer, :mark
-      
+
       def initialize(buffer, mark)
         @buffer = buffer
         @mark = mark
@@ -118,7 +118,7 @@ module Textbringer
       when Integer
         REGISTERS[register] = i + prefix_numeric_value(n)
       when String
-        append_to_register(register, 
+        append_to_register(register,
                            Buffer.current.mark, Buffer.current.point, n)
       else
         raise ArgumentError, "Register doesn't contain a number or text"

data/lib/textbringer/commands/server.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require "drb"
+
+module Textbringer
+  module Commands
+    define_command(:server_start,
+                   doc: "Start Textbringer server.") do
+      uri = CONFIG[:server_uri] ||
+        "drbunix:" + File.expand_path("server.sock", "~/.textbringer")
+      options = CONFIG[:server_options] || { UNIXFileMode: 0600 }
+      DRb.start_service(uri, Server.new, options)
+    end
+
+    define_command(:server_kill,
+                   doc: "Kill Textbringer server.") do
+      DRb.stop_service
+    end
+
+    define_command(:server_edit_done,
+                   doc: "Finish server edit.") do
+      queue = Buffer.current[:client_wait_queue]
+      if queue.nil?
+        raise EditorError, "No waiting clients"
+      end
+      if Buffer.current.modified? &&
+          y_or_n?("Save file #{Buffer.current.file_name}?")
+        save_buffer
+      end
+      kill_buffer(Buffer.current, force: true)
+      queue.push(:done)
+    end
+  end
+
+  class Server
+    def eval(s)
+      redisplay do
+        Controller.current.instance_eval(s).inspect
+      end
+    end
+
+    def visit_file(filename, wait: true)
+      queue = Queue.new if wait
+      redisplay do
+        find_file(filename)
+        Buffer.current[:client_wait_queue] = queue if wait
+      end
+      queue.deq if wait
+    end
+
+    private
+
+    def redisplay
+      foreground! do
+        begin
+          yield
+        ensure
+          Window.redisplay
+        end
+      end
+    end
+  end
+end

data/lib/textbringer/keymap.rb

@@ -191,8 +191,9 @@ module Textbringer
   GLOBAL_MAP.define_key([:f1, "b"], :describe_bindings)
   GLOBAL_MAP.define_key([:f1, "f"], :describe_command)
   GLOBAL_MAP.define_key([:f1, "k"], :describe_key)
+  GLOBAL_MAP.define_key("\C-x#", :server_edit_done)
   GLOBAL_MAP.handle_undefined_key do |key|
-    if key.is_a?(String) && /[\0-\x7f]/ !~ key 
+    if key.is_a?(String) && /[\0-\x7f]/ !~ key
       :self_insert
     else
       nil

data/lib/textbringer/mode.rb

@@ -4,13 +4,13 @@ module Textbringer
   class Mode
     extend Commands
     include Commands
-    
+
     @@mode_list = []
 
     DEFAULT_SYNTAX_TABLE = {
       control: /[\0-\t\v-\x1f\x7f\u{3000}]+/
     }
-    
+
     def self.list
       @@mode_list
     end

data/lib/textbringer/modes/c_mode.rb

@@ -35,7 +35,7 @@ module Textbringer
       (?: " (?: [^\\"] | \\ (?:.|\n)  )* " ) |
       (?: ' (?: [^\\'] | \\ (?:.|\n)  )* ' )
     /x
-    
+
     def initialize(buffer)
       super(buffer)
       @buffer[:indent_level] = CONFIG[:c_indent_level]
@@ -68,7 +68,7 @@ module Textbringer
       :partial_comment,
       :unknown
     ]
-    
+
     TOKEN_REGEXP = /\G(?:
 (?<preprocessing_directive>
   ^[ \t\f\v]*(?:\#|%:).*(?:\\\n.*)*[^\\]\n

data/lib/textbringer/modes/ruby_mode.rb

@@ -259,7 +259,7 @@ module Textbringer
         indentation
       end
     end
-    
+
     BLOCK_END = {
       "{" => "}",
       "(" => ")",
@@ -334,7 +334,7 @@ module Textbringer
       end
       nil
     end
-    
+
     class PartialLiteralAnalyzer < Ripper
       def self.in_literal?(src)
         new(src).in_literal?

data/lib/textbringer/utils.rb

@@ -54,20 +54,22 @@ module Textbringer
         begin
           yield
         rescue Exception => e
-          next_tick do
+          foreground do
             raise e
           end
         end
       end
     end
 
-    def next_tick(&block)
+    def foreground(&block)
       Controller.current.next_tick(&block)
     end
 
-    def next_tick!
+    alias next_tick foreground
+
+    def foreground!
       q = Queue.new
-      next_tick do
+      foreground do
         begin
           result = yield
           q.push([:ok, result])
@@ -77,12 +79,14 @@ module Textbringer
       end
       status, value = q.pop
       if status == :error
-        raise value 
+        raise value
       else
         value
       end
     end
 
+    alias next_tick! foreground!
+
     def read_event
       Controller.current.read_event
     end

data/lib/textbringer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Textbringer
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/textbringer/window.rb

@@ -479,7 +479,7 @@ module Textbringer
         @window.noutrefresh
       end
     end
-    
+
     def redraw
       @window.redraw
       @mode_line.redraw

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.2"
+  spec.add_runtime_dependency "curses", ">= 1.2.6"
   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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.2.6
 - !ruby/object:Gem::Dependency
   name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +183,7 @@ description: Textbringer is a member of a demon race that takes on the form of a
 email:
 - shugo@ruby-lang.org
 executables:
+- tbclient
 - tbtags
 - textbringer
 extensions: []
@@ -198,6 +199,7 @@ files:
 - Rakefile
 - appveyor.yml
 - bin/console
+- exe/tbclient
 - exe/tbtags
 - exe/textbringer
 - lib/textbringer.rb
@@ -216,6 +218,7 @@ files:
 - lib/textbringer/commands/misc.rb
 - lib/textbringer/commands/register.rb
 - lib/textbringer/commands/replace.rb
+- lib/textbringer/commands/server.rb
 - lib/textbringer/commands/windows.rb
 - lib/textbringer/config.rb
 - lib/textbringer/controller.rb