textbringer 0.3.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2244343a4baaddd8efff307da619579a102c66d61c14f5dcebdba589b7f809ba
-  data.tar.gz: 0e59492b0f35673c3d0658d7c96c55288734017ace2edb1c58fddcdf22ca9976
+  metadata.gz: 670221472ba70164a2f44759e11011d8e70a5f467e067e4e400d732fe4082323
+  data.tar.gz: 26d15a0030cc1217f131ba761309b3d9bb17078fa5cfd1db24c651bdd5384fb1
 SHA512:
-  metadata.gz: 680ea08b6a0c55e0a514f8da5708cbbcde48efe50747b9f7fdf96ec39264619abfbfbab32a7ca03577885e8691c2d221e563d2fcd98c8bc3dd4e3cd9b647ac10
-  data.tar.gz: bac76f72017761cb3c46ff83a0d3f0dee86e811940dc97bd79c6665231f621989c262be1c17ca70d75eb5f1885fd55190062240e5b6d886c29894172a2c3c39c
+  metadata.gz: 000e800e06a430312b133dce7017c560723a473866cbb2c82754ac6af1da6f398be2cdf17b9708f20109784b698b70bb073c744afa4d7f7cc0e086b51db17ffc
+  data.tar.gz: ccb23431483eabe736e285d9ee72a17f7cb4f72be07fd049ec091f727a5671cd396e30504cd725d0938614a0fd58a56b8c5547a9e4d1275fd8faf8b654c6b25d

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 1.0.0
+
+* Add mark_whole_buffer.
+* Add zap_to_char.
+* Exit on SIGTERM, SIGHUP etc.
+
 ## 0.3.2
 
 * Drop Ruby 2.3 support.

data/README.md

@@ -1,4 +1,4 @@
-# Textbringer
+# ![Textbringer](logo/logo.png)
 
 [![Gem Version](https://badge.fury.io/rb/textbringer.svg)](https://badge.fury.io/rb/textbringer)
 [![Build Status](https://travis-ci.org/shugo/textbringer.svg?branch=master)](https://travis-ci.org/shugo/textbringer)
@@ -18,14 +18,6 @@ text editor.
 * Ruby Programming: https://asciinema.org/a/100156
 * Japanese Text Editing: https://asciinema.org/a/100166
 
-## WARNING
-
-Textbringer is beta software, and you may lose your text.  Unsaved buffers will
-be dumped in ~/.textbringer/buffer_dump on crash.
-
-APIs are undocumented and unstable.  There is no compatibility even in the same
-minor versions.
-
 ## Installation
 
     $ gem install textbringer
@@ -115,3 +107,8 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/shugo/
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+
+
+## Credit
+
+Logo made with [DesignEvo](https://www.designevo.com/en/).

data/exe/textbringer

@@ -15,6 +15,11 @@ end
 
 $VERBOSE = nil
 
+unless STDIN.tty?
+  STDERR.puts("textbringer: standard input is not a tty")
+  exit 1
+end
+
 Controller.current = Controller.new
 begin
   Window.start do

data/lib/textbringer/buffer.rb

@@ -205,7 +205,7 @@ module Textbringer
     end
 
     # s might not be copied.
-    def initialize(s = String.new, name: nil,
+    def initialize(s = +"", name: nil,
                    file_name: nil,
                    file_encoding: CONFIG[:default_file_encoding],
                    file_mtime: nil, new_file: true, undo_limit: UNDO_LIMIT,
@@ -964,7 +964,7 @@ module Textbringer
 
     def clear
       check_read_only_flag
-      @contents = String.new
+      @contents = +""
       @point = @gap_start = @gap_end = 0
       @marks.each do |m|
         m.location = 0
@@ -1065,40 +1065,54 @@ module Textbringer
       end
     end
 
-    def re_search_forward(s, raise_error: true)
+    def re_search_forward(s, raise_error: true, count: 1)
+      if count < 0
+        return re_search_backward(s, raise_error: raise_error, count: -count)
+      end
       re = new_regexp(s)
-      i = byteindex(true, re, @point)
-      if i.nil?
-        if raise_error
-          raise SearchError, "Search failed"
-        else
-          return nil
+      pos = @point
+      count.times do
+        i = byteindex(true, re, pos)
+        if i.nil?
+          if raise_error
+            raise SearchError, "Search failed"
+          else
+            return nil
+          end
         end
+        pos = match_end(0)
       end
-      goto_char(match_end(0))
+      goto_char(pos)
     end
 
-    def re_search_backward(s, raise_error: true)
+    def re_search_backward(s, raise_error: true, count: 1)
+      if count < 0
+        return re_search_forward(s, raise_error: raise_error, count: -count)
+      end
       re = new_regexp(s)
       pos = @point
-      begin
-        i = byteindex(false, re, pos)
-        if i.nil?
+      count.times do
+        p = pos
+        begin
+          i = byteindex(false, re, p)
+          if i.nil?
+            if raise_error
+              raise SearchError, "Search failed"
+            else
+              return nil
+            end
+          end
+          p = get_pos(p, -1)
+        rescue RangeError
           if raise_error
             raise SearchError, "Search failed"
           else
             return nil
           end
-        end
-        pos = get_pos(pos, -1)
-      rescue RangeError
-        if raise_error
-          raise SearchError, "Search failed"
-        else
-          return nil
-        end
-      end while match_end(0) > @point
-      goto_char(match_beginning(0))
+        end while match_end(0) > pos
+        pos = match_beginning(0)
+      end
+      goto_char(pos)
     end
 
     def looking_at?(re)
@@ -1233,7 +1247,7 @@ module Textbringer
     end
 
     def gap_filled_with_nul?
-      /\A\0*\z/ =~ @contents[@gap_start...@gap_end] ? true : false
+      /\A\0*\z/.match?(@contents[@gap_start...@gap_end])
     end
 
     def composite_edit
@@ -1338,7 +1352,7 @@ module Textbringer
     def gsub(*args, &block)
       if block
         s = to_s.gsub(*args) { |*params|
-          set_block_backref(block, $~)
+          block.binding.eval('->(backref) { $~ = backref }').call($~)
           block.call(*params)
         }
       else
@@ -1576,17 +1590,6 @@ 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

@@ -244,5 +244,27 @@ module Textbringer
       buffer.insert(" ")
       buffer.backward_char
     end
+
+    define_command(:mark_whole_buffer,
+                   doc: <<~EOD) do
+        Put point at beginning and mark at end of buffer.
+      EOD
+      buffer = Buffer.current
+      buffer.push_mark
+      buffer.push_mark(buffer.point_max)
+      buffer.beginning_of_buffer
+    end
+
+    define_command(:zap_to_char,
+                   doc: <<~EOD) do
+        Kill up to and including count-th occurrence of char.
+      EOD
+      |char = read_char, count: number_prefix_arg|
+
+      buffer = Buffer.current
+      s = buffer.point
+      e = buffer.re_search_forward(Regexp.quote(char), count: count)
+      buffer.kill_region(s, e)
+    end
   end
 end

data/lib/textbringer/commands/fill.rb

@@ -38,7 +38,7 @@ module Textbringer
 
       def fill_string(str, column)
         input = StringIO.new(str)
-        output = String.new
+        output = +""
         fill_column = CONFIG[:fill_column]
         prev_c = nil
         while c = input.getc

data/lib/textbringer/commands/isearch.rb

@@ -43,7 +43,7 @@ module Textbringer
 
     def isearch_mode(forward, recursive_edit: false)
       ISEARCH_STATUS[:forward] = forward
-      ISEARCH_STATUS[:string] = String.new
+      ISEARCH_STATUS[:string] = +""
       ISEARCH_STATUS[:recursive_edit] = recursive_edit
       Controller.current.overriding_map = ISEARCH_MODE_MAP
       run_hooks(:isearch_mode_hook)

data/lib/textbringer/commands/misc.rb

@@ -282,31 +282,35 @@ module Textbringer
         if CONFIG[:shell_file_name]
           cmd = [CONFIG[:shell_file_name], CONFIG[:shell_command_switch], cmd]
         end
-        Open3.popen2e(*cmd, opts) do |input, output, wait_thread|
+        Open3.popen3(*cmd, opts) do |input, output, error, wait_thread|
           input.close
-          loop do
-            status = output.wait_readable(0.5)
-            if status
-              begin
-                s = output.read_nonblock(1024).force_encoding("utf-8").
-                  scrub("\u{3013}").gsub(/\r\n/, "\n")
-                buffer.insert(s)
-                Window.redisplay
-              rescue EOFError
-                break
-              rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-                next
+          catch(:finish) do
+            loop do
+              rs, = IO.select([output, error], nil, nil, 0.5)
+              Window.redisplay
+              rs&.each do |r|
+                begin
+                  s = r.read_nonblock(1024).force_encoding("utf-8").
+                    scrub("\u{3013}").gsub(/\r\n/, "\n")
+                  buffer.insert(s)
+                  Window.redisplay
+                rescue EOFError
+                  throw(:finish)
+                rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+                  Window.redisplay
+                  next
+                end
               end
-            end
-            if received_keyboard_quit?
-              if signals.empty?
-                keyboard_quit
-              else
-                sig = signals.shift
-                pid = wait_thread.pid
-                pid = -pid if /mswin32|mingw32/ !~ RUBY_PLATFORM
-                message("Send #{sig} to #{pid}")
-                Process.kill(sig, pid)
+              if received_keyboard_quit?
+                if signals.empty?
+                  keyboard_quit
+                else
+                  sig = signals.shift
+                  pid = wait_thread.pid
+                  pid = -pid if /mswin32|mingw32/ !~ RUBY_PLATFORM
+                  message("Send #{sig} to #{pid}")
+                  Process.kill(sig, pid)
+                end
               end
             end
           end

data/lib/textbringer/controller.rb

@@ -128,7 +128,7 @@ module Textbringer
         else
           wait_files = [STDIN, @next_tick_input]
         end
-        files, = IO.select(wait_files, [], [], 1)
+        files, = IO.select(wait_files, nil, nil, 1)
         # KEY_RESIZE may be returned even if STDIN is not included in files.
         event = read_event_nonblock
         if event
@@ -178,7 +178,7 @@ module Textbringer
           return if wait_input(1000)
         end
         @echo_immediately = true
-        s = String.new
+        s = +""
         if @prefix_arg
           s << "C-u"
           if @prefix_arg != [4]

data/lib/textbringer/keymap.rb

@@ -144,6 +144,8 @@ module Textbringer
   GLOBAL_MAP.define_key("\C-o", :open_line)
   GLOBAL_MAP.define_key("\em", :back_to_indentation)
   GLOBAL_MAP.define_key("\e^", :delete_indentation)
+  GLOBAL_MAP.define_key("\C-xh", :mark_whole_buffer)
+  GLOBAL_MAP.define_key("\ez", :zap_to_char)
   GLOBAL_MAP.define_key("\C-l", :recenter)
   GLOBAL_MAP.define_key("\C-v", :scroll_up)
   GLOBAL_MAP.define_key(:npage, :scroll_up)

data/lib/textbringer/utils.rb

@@ -104,7 +104,7 @@ module Textbringer
     end
 
     def show_exception(e)
-      if e.is_a?(SystemExit)
+      if e.is_a?(SystemExit) || e.is_a?(SignalException)
         raise
       end
       if Buffer.current&.name != "*Backtrace*"

data/lib/textbringer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2019-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -227,6 +227,8 @@ files:
 - lib/textbringer/utils.rb
 - lib/textbringer/version.rb
 - lib/textbringer/window.rb
+- logo/logo.jpg
+- logo/logo.png
 - screenshot.png
 - textbringer.gemspec
 homepage: https://github.com/shugo/textbringer
@@ -248,8 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 3.0.0.beta3
+rubygems_version: 3.1.0.pre1
 signing_key: 
 specification_version: 4
 summary: An Emacs-like text editor