textbringer 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e9f67d3a60acc75b16f9f5ede7d7670068590b2331aa905b73d9fe09676e305
-  data.tar.gz: 388e2c7cdecee2292ea17167810944f1ccfc2f7ed0dfb48db9732e31c71b5818
+  metadata.gz: f10c30433280a10e91f251f04f68ddd5b2cf02347de8712a9828b4488d49f7b4
+  data.tar.gz: fced66d8271da69b0bc8425c00f8dade0e8f4ee842bd6454d3584455a4d9cc9d
 SHA512:
-  metadata.gz: f8973ef2ee4f24b829ebb505229ca45ee48a7f2d5fa21f20afb5bfce4c0b9df5333cbb5614ba1a48dcc1633e286edc2199d68b7fab347d090be94e43d376d205
-  data.tar.gz: e5847cd0e51bd26a8b4d38a5682ff9347d5886022e62b11a6e1b294dc78df455718e9be5319098050709545a98b75b41775db618562dd2bdee72a3e65baf91bd
+  metadata.gz: b69a7f035f1d502845d50ac578e25a02546207e0a7c3bc84ffd45c7bb1b2f8f58e833540c3b1f01e617923e1f74dc1fdd26ea4e1f7ad28d476ba198585ea05be
+  data.tar.gz: 98363d4a9d74c8b8ff785e244f07d982214a5fd40029c5cf634c48d6e214d084d4939bf58b5bd97008051771dd96522bc78e2bb981dcca611eeafc78d6713101

data/.github/workflows/macos.yml

@@ -3,14 +3,21 @@ name: macos
 on: [push]
 
 jobs:
-  build:
+  test:
     runs-on: macos-latest
+    strategy:
+      matrix:
+        ruby: [ head, 3.3 ]
     timeout-minutes: 10
+    env:
+      RUBYOPT: --enable-frozen-string-literal --debug-frozen-string-literal
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies
       run: |
-        gem install bundler --no-document
         bundle install
     - name: Run test
       run: bundle exec rake test

data/.github/workflows/ubuntu.yml

@@ -4,20 +4,21 @@ on: [push]
 
 jobs:
   test:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ head, 3.1, 3.0, 2.7 ]
-    runs-on: ubuntu-latest
+        ruby: [ head, 3.3, 3.2, 3.1 ]
     timeout-minutes: 10
+    env:
+      RUBYOPT: --enable-frozen-string-literal --debug-frozen-string-literal
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies
       run: |
         sudo apt install libncursesw5-dev
-        gem install bundler --no-document
         bundle install
     - name: Run test
       run: xvfb-run bundle exec rake test

data/.github/workflows/windows.yml

@@ -3,14 +3,16 @@ name: windows
 on: [push]
 
 jobs:
-  build:
+  test:
     runs-on: windows-latest
     strategy:
       matrix:
-        ruby: [ 'mingw', 'mswin', '3.0', '2.7' ]
+        ruby: [ 'mingw', 'mswin', '3.3' ]
     timeout-minutes: 10
+    env:
+      RUBYOPT: --enable-frozen-string-literal --debug-frozen-string-literal
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/CHANGES.md

@@ -1,3 +1,6 @@
+This file is no longer being updated after version 1.3.0.
+For changes since version 1.3.0, see <URL:https://github.com/shugo/textbringer/releases>.
+
 ## 1.3.0
 
 * Kernel#print etc. inserts the given string into the current buffer now.

data/README.ja.md

@@ -1,5 +1,6 @@
 # ![Textbringer](logo/logo.png)
 
+[![LatestVer](https://badgen.net/badge/latestver/0.1)](https://latestver.org/)
 [![Gem Version](https://badge.fury.io/rb/textbringer.svg)](https://badge.fury.io/rb/textbringer)
 [![ubuntu](https://github.com/shugo/textbringer/workflows/ubuntu/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Aubuntu)
 [![windows](https://github.com/shugo/textbringer/workflows/windows/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Awindows)
@@ -92,7 +93,7 @@ xterm、 mlterm、screenにはそれぞれ独自の設定項目があります
 
 ## プラグイン
 
-* [Mournmamil](https://github.com/shugo/mournmail): 電子メールクライアント
+* [Mournmail](https://github.com/shugo/mournmail): 電子メールクライアント
 * [MedicineShield](https://github.com/shugo/medicine_shield): Mastodonクライアント
 * [textbringer-presentation](https://github.com/shugo/textbringer-presentation): プレゼンテーションツール
 * [textbringer-ghost_text](https://github.com/shugo/textbringer-ghost_text): [GhostText](https://github.com/fregante/GhostText)プラグイン

data/README.md

@@ -1,11 +1,12 @@
 # ![Textbringer](logo/logo.png)
 
+[![LatestVer](https://badgen.net/badge/latestver/0.1)](https://latestver.org/)
 [![Gem Version](https://badge.fury.io/rb/textbringer.svg)](https://badge.fury.io/rb/textbringer)
 [![ubuntu](https://github.com/shugo/textbringer/workflows/ubuntu/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Aubuntu)
 [![windows](https://github.com/shugo/textbringer/workflows/windows/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Awindows)
 [![macos](https://github.com/shugo/textbringer/workflows/macos/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Amacos)
 
-* [日本語版](README.ja.md)
+* [Japanese version](README.ja.md)
 
 Textbringer is an Emacs-like text editor written in Ruby.
 It is extensible by Ruby instead of Lisp.
@@ -97,7 +98,7 @@ Add the following line to ~/.screenrc.
 
 ## Plugins
 
-* [Mournmamil](https://github.com/shugo/mournmail): a mail user agent
+* [Mournmail](https://github.com/shugo/mournmail): a mail user agent
 * [MedicineShield](https://github.com/shugo/medicine_shield): a Mastodon client
 * [textbringer-presentation](https://github.com/shugo/textbringer-presentation): a presentation tool
 * [textbringer-ghost_text](https://github.com/shugo/textbringer-ghost_text): a [GhostText](https://github.com/fregante/GhostText) plugin

data/exe/txtb

@@ -4,6 +4,7 @@ require "warning"
 
 Warning.ignore(/already initialized constant /)
 Warning.ignore(/previous definition of /)
+Warning.ignore(/not part of the default gems/)
 
 require "textbringer"
 

data/lib/textbringer/buffer.rb

@@ -44,7 +44,11 @@ module Textbringer
       e = NKF.guess(s)
       case e
       when Encoding::US_ASCII
-        Encoding::UTF_8
+        if s.ascii_only?
+          Encoding::UTF_8
+        else
+          Encoding::ASCII_8BIT
+        end
       when Encoding::ASCII_8BIT
         s.force_encoding(Encoding::UTF_8)
         if s.valid_encoding?
@@ -58,7 +62,14 @@ module Textbringer
       end
     }
 
-    STRING_HAS_BYTE_BASED_METHODS = String.instance_methods.include?(:bytesplice)
+    HAS_BYTEINDEX = String.instance_methods.include?(:byteindex)
+    HAS_BYTESPLICE = String.instance_methods.include?(:bytesplice)
+    BYTESPLICE_SUPPORTS_PARTIAL_COPY =
+      begin
+        (+"foo").bytesplice(0, 2, "bar", 1, 2) == "aro"
+      rescue NoMethodError, ArgumentError
+        false
+      end
 
     if !defined?(@@detect_encoding_proc)
       @@detect_encoding_proc = DEFAULT_DETECT_ENCODING
@@ -271,13 +282,6 @@ module Textbringer
     def file_encoding=(enc)
       @file_encoding = Encoding.find(enc)
       @binary = @file_encoding == Encoding::ASCII_8BIT
-      if STRING_HAS_BYTE_BASED_METHODS
-        if @binary
-          @contents.force_encoding(Encoding::ASCII_8BIT)
-        else
-          @contents.force_encoding(Encoding::UTF_8)
-        end
-      end
     end
 
     def binary?
@@ -448,7 +452,7 @@ module Textbringer
     def to_s
       result = @contents.byteslice(0...@gap_start) +
         @contents.byteslice(@gap_end..-1)
-      if !@binary && !STRING_HAS_BYTE_BASED_METHODS
+      if !@binary
         result.force_encoding(Encoding::UTF_8)
       end
       result
@@ -463,7 +467,7 @@ module Textbringer
           @contents.byteslice(user_to_gap(s), len) +
             @contents.byteslice(@gap_end, e - s - len)
         end
-      if !@binary && !STRING_HAS_BYTE_BASED_METHODS
+      if !@binary
         result.force_encoding(Encoding::UTF_8)
       end
       result
@@ -525,7 +529,7 @@ module Textbringer
       if pos == point_min
         column = 1
       else
-        if STRING_HAS_BYTE_BASED_METHODS
+        if HAS_BYTEINDEX
           begin
             i = @contents.byterindex("\n", user_to_gap(get_pos(pos, -1)))
           rescue RangeError
@@ -562,7 +566,7 @@ module Textbringer
       pos = point_min
       i = 1
       while i < n && pos < @contents.bytesize
-        if STRING_HAS_BYTE_BASED_METHODS
+        if HAS_BYTEINDEX
           pos = @contents.byteindex("\n", pos)
         else
           pos = @contents.index("\n", pos)
@@ -586,7 +590,7 @@ module Textbringer
       pos = @point
       size = s.bytesize
       adjust_gap(size)
-      splice_contents(@point, size, STRING_HAS_BYTE_BASED_METHODS ? s : s.b)
+      splice_contents(@point, size, s.b)
       @marks.each do |m|
         if m.location > @point
           m.location += size
@@ -995,10 +999,7 @@ module Textbringer
 
     def clear
       check_read_only_flag
-      @contents = +""
-      if binary? || !STRING_HAS_BYTE_BASED_METHODS
-        @contents.force_encoding(Encoding::ASCII_8BIT)
-      end
+      @contents = String.new
       @point = @gap_start = @gap_end = 0
       @marks.each do |m|
         m.location = 0
@@ -1158,7 +1159,7 @@ module Textbringer
       byteindex(true, r, @point) == @point
     end
 
-    if STRING_HAS_BYTE_BASED_METHODS
+    if HAS_BYTEINDEX
       def byteindex(forward, re, pos)
         @match_offsets = []
         method = forward ? :byteindex : :byterindex
@@ -1480,9 +1481,7 @@ module Textbringer
       else
         @contents = s.encode(Encoding::UTF_8)
       end
-      if !STRING_HAS_BYTE_BASED_METHODS
-        @contents.force_encoding(Encoding::ASCII_8BIT)
-      end
+      @contents.force_encoding(Encoding::ASCII_8BIT)
       self.file_encoding = enc
       begin
         case @contents
@@ -1502,7 +1501,7 @@ module Textbringer
       end
     end
 
-    if STRING_HAS_BYTE_BASED_METHODS
+    if HAS_BYTESPLICE
       def splice_contents(*args)
         @contents.bytesplice(*args)
       end
@@ -1515,37 +1514,37 @@ module Textbringer
     def adjust_gap(min_size = 0, pos = @point)
       if @gap_start < pos
         len = user_to_gap(pos) - @gap_end
-        s = @contents.byteslice(@gap_end, len)
         new_gap_start = @gap_start + len
         new_gap_end = @gap_end + len
         nul_filling_start = new_gap_start > @gap_end ? new_gap_start : @gap_end
-        unless @binary
-          # find the character boundary
-          while nul_filling_start > @gap_end &&
-              @contents.byteslice(nul_filling_start)&.b&.match?(/[\x80-\xbf]/n)
-            nul_filling_start -= 1
-          end
+        if BYTESPLICE_SUPPORTS_PARTIAL_COPY
+          @contents.bytesplice(@gap_start, len,
+                               @contents, @gap_end, len)
+          @contents.bytesplice(nul_filling_start...new_gap_end,
+                               "\0" * (new_gap_end - nul_filling_start))
+        else
+          s = @contents.byteslice(@gap_end, len)
+          splice_contents(nul_filling_start...new_gap_end,
+                          "\0" * (new_gap_end - nul_filling_start))
+          splice_contents(@gap_start...new_gap_start, s)
         end
-        splice_contents(nul_filling_start...new_gap_end,
-                        "\0" * (new_gap_end - nul_filling_start))
-        splice_contents(@gap_start...new_gap_start, s)
         @gap_start = new_gap_start
         @gap_end = new_gap_end
       elsif @gap_start > pos
         len = @gap_start - pos
-        s = @contents.byteslice(pos, len)
         new_gap_start = @gap_start - len
         new_gap_end = @gap_end - len
         nul_filling_end = new_gap_end < @gap_start ? new_gap_end : @gap_start
-        unless @binary
-          # find the character boundary
-          while nul_filling_end < @gap_start &&
-              @contents.byteslice(nul_filling_end)&.b&.match?(/[\x80-\xbf]/n)
-            nul_filling_end += 1
-          end
+        if BYTESPLICE_SUPPORTS_PARTIAL_COPY
+          @contents.bytesplice(new_gap_end, len,
+                               @contents, pos, len)
+          @contents.bytesplice(pos...nul_filling_end,
+                               "\0" * (nul_filling_end - pos))
+        else
+          s = @contents.byteslice(pos, len)
+          splice_contents(pos...nul_filling_end, "\0" * (nul_filling_end - pos))
+          splice_contents(new_gap_end...@gap_end, s)
         end
-        splice_contents(pos...nul_filling_end, "\0" * (nul_filling_end - pos))
-        splice_contents(new_gap_end...@gap_end, s)
         @gap_start = new_gap_start
         @gap_end = new_gap_end
       end
@@ -1619,7 +1618,7 @@ module Textbringer
           @current_column += substring(pos, new_pos).size
         else
           @current_line += n
-          if STRING_HAS_BYTE_BASED_METHODS
+          if HAS_BYTEINDEX
             begin
               i = @contents.byterindex("\n", user_to_gap(get_pos(new_pos, -1)))
             rescue RangeError
@@ -1641,7 +1640,7 @@ module Textbringer
           @current_column -= substring(new_pos, pos).size
         else
           @current_line -= n
-          if STRING_HAS_BYTE_BASED_METHODS
+          if HAS_BYTEINDEX
             begin
               i = @contents.byterindex("\n", user_to_gap(get_pos(new_pos, - 1)))
             rescue RangeError
@@ -1687,9 +1686,7 @@ module Textbringer
         @contents.byteslice(0...@gap_start),
         @contents.byteslice(@gap_end..-1)
       ].each do |s|
-        if !STRING_HAS_BYTE_BASED_METHODS
-          s.force_encoding(Encoding::UTF_8) unless @binary
-        end
+        s.force_encoding(Encoding::UTF_8) unless @binary
         case @file_format
         when :dos
           s.gsub!(/\n/, "\r\n")

data/lib/textbringer/commands/clipboard.rb

@@ -7,8 +7,7 @@ require "clipboard"
 module Textbringer
   module Commands
     CLIPBOARD_AVAILABLE =
-      Clipboard.implementation.name != "Clipboard::Linux" ||
-      (ENV["DISPLAY"] && system("which xclip > /dev/null 2>&1"))
+      Clipboard.implementation.name != "Clipboard::File"
 
     if CLIPBOARD_AVAILABLE
       GLOBAL_MAP.define_key("\M-w", :clipboard_copy_region)

data/lib/textbringer/commands/help.rb

@@ -41,7 +41,7 @@ module Textbringer
     define_command(:describe_bindings,
                    doc: "Display the key bindings.") do
       show_help do |help|
-        s = ""
+        s = +""
         if Controller.current.overriding_map
           s << "Overriding Bindings:\n"
           s << keymap_bindings(Controller.current.overriding_map)

data/lib/textbringer/commands/misc.rb

@@ -243,6 +243,9 @@ module Textbringer
         mark = yield(global_mark_ring)
       end
       if mark.detached?
+        unless mark.file_name
+          raise EditorError, "The buffer has gone"
+        end
         find_file(mark.file_name)
         goto_char(mark.location)
       else

data/lib/textbringer/input_methods/t_code_input_method.rb

@@ -57,7 +57,11 @@ module Textbringer
       end
       if key_index.nil?
         @prev_key_index = nil
-        return event
+        if event.is_a?(String) && /\A[A-Z]\z/.match?(event)
+          return event.downcase
+        else
+          return event
+        end
       end
       if @prev_key_index.nil?
         @prev_key_index = key_index

data/lib/textbringer/keymap.rb

@@ -153,6 +153,7 @@ module Textbringer
   GLOBAL_MAP.define_key(?\C-_, :undo)
   GLOBAL_MAP.define_key("\C-xu", :undo)
   GLOBAL_MAP.define_key("\C-x\C-_", :redo_command)
+  GLOBAL_MAP.define_key("\M-\C-_", :redo_command)
   GLOBAL_MAP.define_key("\C-t", :transpose_chars)
   GLOBAL_MAP.define_key("\C-j", :newline)
   GLOBAL_MAP.define_key("\C-m", :newline)

data/lib/textbringer/utils.rb

@@ -325,9 +325,22 @@ module Textbringer
       end
     end
 
+    if defined?(IRB::RegexpCompletor)
+      EXPRESSION_COMPLETOR = IRB::RegexpCompletor.new
+      EXPRESSION_COMPLETOR_OPTIONS = {
+        bind: TOPLEVEL_BINDING,
+        doc_namespace: false
+      }
+    else
+      EXPRESSION_COMPLETOR = IRB::InputCompletor
+      EXPRESSION_COMPLETOR_OPTIONS = {
+        bind: TOPLEVEL_BINDING
+      }
+    end
+
     def read_expression(prompt = "Expression: ")
       f = ->(s) {
-        IRB::InputCompletor.retrieve_completion_data(s, bind: TOPLEVEL_BINDING).compact
+        EXPRESSION_COMPLETOR.retrieve_completion_data(s, **EXPRESSION_COMPLETOR_OPTIONS).compact
       }
       read_from_minibuffer(prompt, completion_proc: f)
     end

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/lib/textbringer/window.rb

@@ -1,5 +1,4 @@
 require "curses"
-require "unicode/display_width"
 
 module Textbringer
   class Window

data/textbringer.gemspec

@@ -19,8 +19,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.1'
 
+  spec.add_runtime_dependency "nkf"
+  spec.add_runtime_dependency "drb"
   spec.add_runtime_dependency "curses", ">= 1.2.7"
   spec.add_runtime_dependency "unicode-display_width", ">= 1.1"
   spec.add_runtime_dependency "clipboard", ">= 1.1"

metadata

@@ -1,15 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Shugo Maeda
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-12 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nkf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: drb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: curses
   requirement: !ruby/object:Gem::Requirement
@@ -245,7 +272,6 @@ homepage: https://github.com/shugo/textbringer
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -253,15 +279,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
-signing_key:
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: An Emacs-like text editor
 test_files: []