textbringer 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 670221472ba70164a2f44759e11011d8e70a5f467e067e4e400d732fe4082323
-  data.tar.gz: 26d15a0030cc1217f131ba761309b3d9bb17078fa5cfd1db24c651bdd5384fb1
+  metadata.gz: '009c68bcdc928faff20b7ca1b75f92b21641dc6d29e392a05a279267418983d1'
+  data.tar.gz: cad85dfebd2dc1b70cdbf9212bcda296bcde8204e529b0d82ce1663434a05d4b
 SHA512:
-  metadata.gz: 000e800e06a430312b133dce7017c560723a473866cbb2c82754ac6af1da6f398be2cdf17b9708f20109784b698b70bb073c744afa4d7f7cc0e086b51db17ffc
-  data.tar.gz: ccb23431483eabe736e285d9ee72a17f7cb4f72be07fd049ec091f727a5671cd396e30504cd725d0938614a0fd58a56b8c5547a9e4d1275fd8faf8b654c6b25d
+  metadata.gz: 4923385439037b9ce5aa099a029f9ca6a3bc87205f85a74febaf165c3e512501303ad25c86cdc73191bf1fcd9cf9faa15b9633996bd1efdc69bb231fba781afe
+  data.tar.gz: 9a624d55143b47100a6fc9a538d29c9f1151d7c6c38d3fdb4865739fd8d2b7a9c76bda2f8a29a6921ddc9e9e8cd8e5c73f1c25031fc9244e81da3547946559a4

data/.gitattributes

@@ -0,0 +1 @@
+*.rb diff=ruby

data/.github/workflows/macos.yml

@@ -0,0 +1,15 @@
+name: macos
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Install dependencies
+      run: |
+        gem install bundler --no-document
+        bundle install
+    - name: Run test
+      run: bundle exec rake test

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

@@ -0,0 +1,30 @@
+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}}

data/.github/workflows/ubuntu.yml

@@ -0,0 +1,26 @@
+name: ubuntu
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby
+      uses: actions/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
+      env:
+       UPLOAD_TO_CODECOV: 1
+       CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}

data/.github/workflows/windows.yml

@@ -0,0 +1,22 @@
+name: windows
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Set up Bundler
+      run: gem install bundler --no-document
+    - name: Install dependencies
+      run: bundle install
+    - name: Run test
+      run: bundle exec rake test

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 1.0.1
+
+* Support pattern matching in the Ruby mode.
+* Bug fixes.
+
 ## 1.0.0
 
 * Add mark_whole_buffer.

data/README.md

@@ -1,8 +1,10 @@
 # ![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)
-[![Build status](https://ci.appveyor.com/api/projects/status/n20vtpfgcgii5jtc?svg=true)](https://ci.appveyor.com/project/shugo31737/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)
+[![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
@@ -107,8 +109,3 @@ 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/lib/textbringer.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative "textbringer/version"
 require_relative "textbringer/config"
 require_relative "textbringer/errors"

data/lib/textbringer/buffer.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "nkf"
 require "unicode/display_width"
 require "json"
@@ -524,7 +522,7 @@ def goto_char(pos)
       if pos < 0 || pos > size
         raise RangeError, "Out of buffer"
       end
-      if !@binary && /[\x80-\xbf]/n.match?(byte_after(pos))
+      if !@binary && byte_after(pos)&.match?(/[\x80-\xbf]/n)
         raise ArgumentError, "Position is in the middle of a character"
       end
       @goal_column = nil
@@ -578,12 +576,12 @@ def insert(x, merge_undo = false)
 
     def newline
       indentation = save_point { |saved|
-        if /[ \t]/.match?(char_after)
+        if char_after&.match?(/[ \t]/)
           next ""
         end
         beginning_of_line
         s = @point
-        while /[ \t]/.match?(char_after)
+        while char_after&.match?(/[ \t]/)
           forward_char
         end
         str = substring(s, @point)
@@ -1247,7 +1245,7 @@ def transpose_chars
     end
 
     def gap_filled_with_nul?
-      /\A\0*\z/.match?(@contents[@gap_start...@gap_end])
+      @contents[@gap_start...@gap_end]&.match?(/\A\0*\z/)
     end
 
     def composite_edit

data/lib/textbringer/color.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "curses"
 
 module Textbringer

data/lib/textbringer/commands.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "open3"
 require "io/wait"
 

data/lib/textbringer/commands/buffers.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     define_command(:forward_char,

data/lib/textbringer/commands/clipboard.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Clipboard
   @implementation = nil
 end

data/lib/textbringer/commands/ctags.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     CTAGS = {

data/lib/textbringer/commands/dabbrev.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module DabbrevExtension
     refine Buffer do

data/lib/textbringer/commands/files.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "editorconfig"
 
 module Textbringer

data/lib/textbringer/commands/fill.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+require "stringio"
 
 module Textbringer
   module FillExtension

data/lib/textbringer/commands/help.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     HELP_RING = Ring.new

data/lib/textbringer/commands/isearch.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     ISEARCH_MODE_MAP = Keymap.new

data/lib/textbringer/commands/keyboard_macro.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     KEYBOARD_MACROS = {}

data/lib/textbringer/commands/misc.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     define_command(:version) do

data/lib/textbringer/commands/register.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     class BufferPosition

data/lib/textbringer/commands/replace.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     RE_SEARCH_STATUS = {

data/lib/textbringer/commands/server.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "drb"
 
 module Textbringer

data/lib/textbringer/commands/windows.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Commands
     define_command(:resize_window,

data/lib/textbringer/config.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   CONFIG = {
     east_asian_ambiguous_width: 1,

data/lib/textbringer/controller.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   TOP_LEVEL_TAG = Object.new
   RECURSIVE_EDIT_TAG = Object.new

data/lib/textbringer/errors.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class EditorError < StandardError
   end

data/lib/textbringer/face.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "curses"
 
 module Textbringer

data/lib/textbringer/faces/basic.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   Face.define :mode_line, reverse: true
   Face.define :link, foreground: "blue", bold: true

data/lib/textbringer/faces/programming.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   Face.define :comment, foreground: "yellow"
   Face.define :preprocessing_directive, foreground: "green"

data/lib/textbringer/keymap.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class Keymap
     include Enumerable

data/lib/textbringer/mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class Mode
     extend Commands

data/lib/textbringer/modes/backtrace_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class BacktraceMode < Mode
     define_generic_command :jump_to_source_location

data/lib/textbringer/modes/buffer_list_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class BufferListMode < Mode
     BUFFER_LIST_MODE_MAP = Keymap.new

data/lib/textbringer/modes/c_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   CONFIG[:c_indent_level] = 4
   CONFIG[:c_indent_tabs_mode] = true

data/lib/textbringer/modes/completion_list_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class CompletionListMode < Mode
     define_generic_command :choose_completion

data/lib/textbringer/modes/fundamental_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class FundamentalMode < Mode
     def symbol_pattern

data/lib/textbringer/modes/help_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class HelpMode < Mode
     define_generic_command :jump_to_link

data/lib/textbringer/modes/programming_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class ProgrammingMode < FundamentalMode
     # abstract mode
@@ -32,7 +30,7 @@ def initialize(buffer)
     def indent_line
       result = false
       level = calculate_indentation
-      return result if level.nil?
+      return result if level.nil? || level < 0
       @buffer.save_excursion do
         @buffer.beginning_of_line
         @buffer.composite_edit do

data/lib/textbringer/modes/ruby_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "ripper"
 
 module Textbringer
@@ -175,7 +173,7 @@ def toggle_test
 
     private
 
-    INDENT_BEG_RE = /^([ \t]*)((class|module|def|if|unless|case|while|until|for|begin|end)\b|\})/
+    INDENT_BEG_RE = /^([ \t]*)(class|module|def|if|unless|case|while|until|for|begin|end)\b/
 
     def space_width(s)
       s.gsub(/\t/, " " * @buffer[:tab_width]).size
@@ -209,6 +207,9 @@ def calculate_indentation
         start_line = @buffer.current_line
         tokens = Ripper.lex(@buffer.substring(start_pos, bol_pos))
         _, event, text = tokens.last
+        if event == :on_nl
+          _, event, text = tokens[-2]
+        end
         if event == :on_tstring_beg ||
             event == :on_heredoc_beg ||
             event == :on_regexp_beg ||
@@ -243,7 +244,7 @@ def calculate_indentation
         else
           indentation = base_indentation + @buffer[:indent_level]
         end
-        if @buffer.looking_at?(/[ \t]*([}\])]|(end|else|elsif|when|rescue|ensure)\b)/)
+        if @buffer.looking_at?(/[ \t]*([}\])]|(end|else|elsif|when|in|rescue|ensure)\b)/)
           indentation -= @buffer[:indent_level]
         end
         _, last_event, last_text = tokens.reverse_each.find { |_, e, _|

data/lib/textbringer/plugin.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   module Plugin
     class << self

data/lib/textbringer/ring.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Textbringer
   class Ring
     include Enumerable

data/lib/textbringer/utils.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "rbconfig"
 
 module Textbringer

data/lib/textbringer/version.rb

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

data/lib/textbringer/window.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "curses"
 require "unicode/display_width"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -176,14 +176,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".gitattributes"
+- ".github/workflows/macos.yml"
+- ".github/workflows/ruby-head.yml"
+- ".github/workflows/ubuntu.yml"
+- ".github/workflows/windows.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- appveyor.yml
 - bin/console
 - exe/tbclient
 - exe/tbtags
@@ -250,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.0.pre1
+rubygems_version: 3.1.0.pre2
 signing_key: 
 specification_version: 4
 summary: An Emacs-like text editor

data/.travis.yml

@@ -1,56 +0,0 @@
-language: ruby
-matrix:
-  include:
-    - os: linux
-      dist: trusty
-      sudo: false
-      rvm: 2.4.5
-    - os: linux
-      dist: trusty
-      sudo: false
-      rvm: 2.5.2
-    - os: linux
-      dist: trusty
-      sudo: false
-      rvm: 2.6.0
-    - os: linux
-      dist: trusty
-      sudo: false
-      rvm: ruby-head
-    - os: osx
-      osx_image: xcode8.2
-      rvm: 2.4.5
-    - os: osx
-      osx_image: xcode8.2
-      rvm: 2.5.2
-    - os: osx
-      osx_image: xcode8.2
-      rvm: 2.6.0
-    - os: osx
-      osx_image: xcode8.2
-      rvm: ruby-head
-  allow_failures:
-    - os: osx
-    - rvm: ruby-head
-  fast_finish: true
-cache: bundler
-before_install:
-  - gem update --system
-  - gem install bundler-audit
-script:
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-        xvfb-run bundle exec rake test;
-    else
-        bundle exec rake test;
-    fi
-env:
-  global:
-    UPLOAD_TO_CODECOV: 1
-notifications:
-  email:
-    on_success: never
-    on_failure: always
-addons:
-  apt:
-    packages:
-      - xclip

data/appveyor.yml

@@ -1,19 +0,0 @@
----
-clone_depth: 10
-install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - bundle install
-  - ps: '[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12'
-  - ps: Invoke-WebRequest -Uri https://curl.haxx.se/ca/cacert.pem -OutFile C:\projects\textbringer\cacert.pem
-build: off
-test_script:
-  - rake
-deploy: off
-environment:
-  UPLOAD_TO_CODECOV: 1
-  SSL_CERT_FILE: C:\projects\textbringer\cacert.pem
-  matrix:
-    - ruby_version: "24"
-    - ruby_version: "24-x64"
-    - ruby_version: "25"
-    - ruby_version: "25-x64"