textbringer 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a50dd7957ac593c31d5f1f0102d2240b277f419cd7ea431af422afe53cb3746b
-  data.tar.gz: 7c4ad8bca8b8ec2ca21bea0a855872f4de39f7e18e22c64e072a4723fbf8a029
+  metadata.gz: 1cadae924b2e85758480d58a7f4ba6ff48fc6ac1971039159a8b81a1a0bbbd29
+  data.tar.gz: cb981c7fb394e1c4683cd1365f5da1ed1f372c4254d3e9d8ca5782cad18cf167
 SHA512:
-  metadata.gz: 96b9ca053d2efeef296ff47db39aa1ef8d345456a5bd3a762025a4928ffb63dc8a3f63cdab5c60e6280a1cf47d56eedfa7734ddd0a23d0bd368fece0e58a96a3
-  data.tar.gz: 1cbe3d4cc148f6d837913c5080199bff92417a584fd6b9a452d2f414e1b9e3a09259ce16cc7bfd5a05c2987ac2bc4a55f1d417d42314c59155100d5d0c98764c
+  metadata.gz: a57df2132fc40661649106e25f523e7f866ae469020fb33b687d1bf05921f0b4f17915271df4745035737b3be0c65d34650ae55af3ca10d4f677d7c2ac4d7715
+  data.tar.gz: fd5081ffaa6a8f42466fdc9fd82d6acd4a732941c66d5e2d37fd1c2a66cafba947de668a08ea60ac87f171306aadcaeca6e815991666bcac47ac376a8cd16d73

data/.github/workflows/ubuntu.yml

@@ -3,15 +3,14 @@ name: ubuntu
 on: [push]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  test:
     strategy:
       matrix:
-        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
+        ruby: [ head, 2.7, 2.6, 2.5, 2.4 ]
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
-    - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies

data/.github/workflows/windows.yml

@@ -7,16 +7,13 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
+        ruby: [ 'mingw', 'mswin', '2.7', '2.6', '2.5' ]
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v2
     - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Set up Bundler
-      run: gem install bundler --no-document
-    - name: Install dependencies
-      run: bundle install
+        bundler-cache: true
     - name: Run test
       run: bundle exec rake test

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 1.0.4
+
+* Support Ruby 3.0.
+* Do not record backtrace of Quit (C-g).
+
 ## 1.0.3
 
 * Fix indentation bugs.

data/README.md

@@ -4,7 +4,6 @@
 [![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)
-[![ruby-head](https://github.com/shugo/textbringer/workflows/ruby-head/badge.svg)](https://github.com/shugo/textbringer/actions?query=workflow%3Aruby-head)
 [![codecov](https://codecov.io/gh/shugo/textbringer/branch/master/graph/badge.svg)](https://codecov.io/gh/shugo/textbringer)
 
 Textbringer is a member of a demon race that takes on the form of an Emacs-like

data/lib/textbringer/commands/files.rb

@@ -3,7 +3,7 @@
 module Textbringer
   module Commands
     define_command(:find_file, doc: "Open or create a file.") do
-      |file_name = read_file_name("Find file: ")|
+      |file_name = read_file_name("Find file: ", default: (Buffer.current.file_name ? File.dirname(Buffer.current.file_name) : Dir.pwd) + "/")|
       config = EditorConfig.load_file(file_name)
       buffer = Buffer.find_file(file_name)
       if buffer.new_file?
@@ -86,12 +86,13 @@ module Commands
 
     define_command(:write_file,
                    doc: "Save the current buffer as the specified file.") do
-      |file_name = read_file_name("Write file: ")|
+      |file_name = read_file_name("Write file: ",
+                                  default: Buffer.current.file_name)|
       if File.directory?(file_name)
         file_name = File.expand_path(Buffer.current.name, file_name)
       end
       if File.exist?(file_name)
-        unless y_or_n?("File `#{file_name}' exists; overwrite?")
+        unless y_or_n?("File exists; overwrite?")
           message("Cancelled")
           next
         end

data/lib/textbringer/commands/help.rb

@@ -21,27 +21,36 @@ def show_help
     end
     private :show_help
 
+    def keymap_bindings(keymap)
+      s = format("%-16s  %s\n", "Key", "Binding")
+      s << format("%-16s  %s\n", "---", "-------")
+      s << "\n"
+      keymap.each do |key_sequence, command|
+        if command != :self_insert
+          s << format("%-16s  [%s]\n",
+                      Keymap.key_sequence_string(key_sequence),
+                      command)
+        end
+      end
+      s
+    end
+
     define_command(:describe_bindings,
                    doc: "Display the key bindings.") do
       show_help do |help|
-        s = format("%-16s  %s\n", "Key", "Binding")
-        s << format("%-16s  %s\n", "---", "-------")
-        s << "\n"
-        bindings = {}
-        [
-          GLOBAL_MAP,
-          Buffer.current.keymap,
-          Controller.current.overriding_map
-        ].each do |map|
-          map&.each do |key_sequence, command|
-            bindings[key_sequence] = command
-          end
+        s = ""
+        if Controller.current.overriding_map
+          s << "Overriding Bindings:\n"
+          s << keymap_bindings(Controller.current.overriding_map)
+          s << "\n"
         end
-        bindings.each do |key_sequence, command|
-          s << format("%-16s  [%s]\n",
-                      Keymap.key_sequence_string(key_sequence),
-                      command)
+        if Buffer.current.keymap
+          s << "Current Buffer Bindings:\n"
+          s << keymap_bindings(Buffer.current.keymap)
+          s << "\n"
         end
+        s << "Global Bindings:\n"
+        s << keymap_bindings(GLOBAL_MAP)
         help.insert(s)
       end
       push_help_command([:describe_bindings])

data/lib/textbringer/commands/misc.rb

@@ -276,7 +276,7 @@ def goto_global_mark
       Window.redisplay
       signals = [:INT, :TERM, :KILL]
       begin
-        opts = /mswin32|mingw32/ =~ RUBY_PLATFORM ? {} : {pgroup: true}
+        opts = /mswin|mingw/ =~ RUBY_PLATFORM ? {} : {pgroup: true}
         if CONFIG[:shell_file_name]
           cmd = [CONFIG[:shell_file_name], CONFIG[:shell_command_switch], cmd]
         end

data/lib/textbringer/utils.rb

@@ -108,7 +108,7 @@ def show_exception(e)
       if e.is_a?(SystemExit) || e.is_a?(SignalException)
         raise
       end
-      if Buffer.current&.name != "*Backtrace*"
+      if !e.is_a?(Quit) && Buffer.current&.name != "*Backtrace*"
         buffer = Buffer.find_or_new("*Backtrace*", undo_limit: 0)
         if !buffer.mode.is_a?(BacktraceMode)
           buffer.apply_mode(BacktraceMode)
@@ -316,8 +316,8 @@ def read_key_sequence(prompt)
 
     HOOKS = Hash.new { |h, k| h[k] = [] }
 
-    def add_hook(name, func = Proc.new)
-      HOOKS[name].unshift(func)
+    def add_hook(name, func = nil, &block)
+      HOOKS[name].unshift(func || block)
     end
 
     def remove_hook(name, func)

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/lib/textbringer/window.rb

@@ -455,7 +455,11 @@ def redisplay
               end
             end
           end
-          @window.addstr(c)
+          if c == "\uFEFF"
+            # ncurses on macOS prints U+FEFF as space, so ignore it
+          else
+            @window.addstr(c)
+          end
           break if newx == columns && cury == lines - 2
           @buffer.forward_char
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Shugo Maeda
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -178,7 +178,6 @@ files:
 - ".editorconfig"
 - ".gitattributes"
 - ".github/workflows/macos.yml"
-- ".github/workflows/ruby-head.yml"
 - ".github/workflows/ubuntu.yml"
 - ".github/workflows/windows.yml"
 - ".gitignore"
@@ -238,7 +237,7 @@ homepage: https://github.com/shugo/textbringer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -253,8 +252,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.pre1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: An Emacs-like text editor
 test_files: []

data/.github/workflows/ruby-head.yml

@@ -1,30 +0,0 @@
-name: ruby-head
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@master
-    - name: Set up RVM
-      run: |
-        curl -sSL https://get.rvm.io | bash
-    - name: Set up Ruby
-      run: |
-        source $HOME/.rvm/scripts/rvm
-        rvm install ruby-head --binary
-        rvm --default use ruby-head
-    - name: Install dependencies
-      run: |
-        source $HOME/.rvm/scripts/rvm
-        sudo apt install libncursesw5-dev
-        gem install bundler --no-document
-        bundle install
-    - name: Run test
-      run: |
-        source $HOME/.rvm/scripts/rvm
-        xvfb-run bundle exec rake test
-      env:
-       UPLOAD_TO_CODECOV: 1
-       CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}