textbringer 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 501a7f57f239b45890a30564482e20d2f80d20b5b21719268f97d0f787600c77
-  data.tar.gz: 56ec3be0a84a84663542072d76d0bfd868e42144cab77d51439d3ba317fe6302
+  metadata.gz: 2244343a4baaddd8efff307da619579a102c66d61c14f5dcebdba589b7f809ba
+  data.tar.gz: 0e59492b0f35673c3d0658d7c96c55288734017ace2edb1c58fddcdf22ca9976
 SHA512:
-  metadata.gz: fc8752782f2b63601fc382a88689b79d874d3deef1a829ef2efaa969ccfc43175b7d6f8ca2757dd345a88bb997cbc0e3b0aafaf4bcabafad478234e6e4ecd3af
-  data.tar.gz: 3d7ec2385be73f6d739e5fd0b547c28dc24001e58827d2d4ae15753d03d8d71e257a8f0efd50a9630ea169d3d2c58ade94104be772d9e0d91dfce08ea0b5f957
+  metadata.gz: 680ea08b6a0c55e0a514f8da5708cbbcde48efe50747b9f7fdf96ec39264619abfbfbab32a7ca03577885e8691c2d221e563d2fcd98c8bc3dd4e3cd9b647ac10
+  data.tar.gz: bac76f72017761cb3c46ff83a0d3f0dee86e811940dc97bd79c6665231f621989c262be1c17ca70d75eb5f1885fd55190062240e5b6d886c29894172a2c3c39c

data/.editorconfig

@@ -2,7 +2,6 @@ root = true
 
 [*]
 end_of_line = lf
-insert_final_newline = true
 
 [*.rb]
 indent_style = space
@@ -10,3 +9,4 @@ indent_size = 2
 
 [lib/**.rb]
 trim_trailing_whitespace = true
+insert_final_newline = true

data/.travis.yml

@@ -34,14 +34,15 @@ matrix:
     - rvm: ruby-head
   fast_finish: true
 cache: bundler
-before_install: gem update --system
+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
-  - bundle exec bundle-audit check --update
 env:
   global:
     UPLOAD_TO_CODECOV: 1

data/CHANGES.md

@@ -1,6 +1,12 @@
+## 0.3.2
+
+* Drop Ruby 2.3 support.
+* Support C-x u.
+
 ## 0.3.1
 
 * Depend on curses 1.2.6 or later for mingw.
+* Add tbclient.
 
 ## 0.3.0
 

data/appveyor.yml

@@ -13,5 +13,7 @@ environment:
   UPLOAD_TO_CODECOV: 1
   SSL_CERT_FILE: C:\projects\textbringer\cacert.pem
   matrix:
-    - ruby_version: "23"
-    - ruby_version: "23-x64"
+    - ruby_version: "24"
+    - ruby_version: "24-x64"
+    - ruby_version: "25"
+    - ruby_version: "25-x64"

data/exe/tbclient

@@ -31,4 +31,3 @@ if eval
 else
   tb.visit_file(File.expand_path(arg), wait: wait)
 end
-

data/lib/textbringer/buffer.rb

@@ -412,8 +412,8 @@ module Textbringer
           f.flock(File::LOCK_EX)
           write_to_file(f)
           f.flush
-          @file_mtime = f.mtime
         end
+        @file_mtime = File.mtime(file_name)
       rescue Errno::EISDIR
         if @name
           file_name = File.expand_path(@name, file_name)
@@ -524,7 +524,7 @@ module Textbringer
       if pos < 0 || pos > size
         raise RangeError, "Out of buffer"
       end
-      if !@binary && /[\x80-\xbf]/n =~ byte_after(pos)
+      if !@binary && /[\x80-\xbf]/n.match?(byte_after(pos))
         raise ArgumentError, "Position is in the middle of a character"
       end
       @goal_column = nil
@@ -578,12 +578,12 @@ module Textbringer
 
     def newline
       indentation = save_point { |saved|
-        if /[ \t]/ =~ char_after
+        if /[ \t]/.match?(char_after)
           next ""
         end
         beginning_of_line
         s = @point
-        while /[ \t]/ =~ char_after
+        while /[ \t]/.match?(char_after)
           forward_char
         end
         str = substring(s, @point)

data/lib/textbringer/commands/fill.rb

@@ -44,7 +44,7 @@ module Textbringer
         while c = input.getc
           if c == "\n"
             if column < fill_column && !input.eof?
-              if /(?=[\u{0000}-\u{00FF}])[[:graph:]]/ =~ prev_c
+              if /(?=[\u{0000}-\u{00FF}])[[:graph:]]/.match?(prev_c)
                 column = insert_space_between_words(input, output, column)
               end
               next
@@ -53,7 +53,7 @@ module Textbringer
           else
             w = Buffer.display_width(c)
             if column + w > fill_column || column >= fill_column
-              if /\w/ =~ prev_c && /\w/ =~ c
+              if /\w/.match?(prev_c) && /\w/.match?(c)
                 column = insert_newline_before_word(output, column)
               else
                 column = insert_newline(output)
@@ -69,7 +69,7 @@ module Textbringer
       def insert_space_between_words(input, output, column)
         c = input.getc
         input.ungetc(c)
-        if /(?=[\u{0000}-\u{00FF}])[[:graph:]]/ =~ c
+        if /(?=[\u{0000}-\u{00FF}])[[:graph:]]/.match?(c)
           output << " "
           column + 1
         else
@@ -93,7 +93,7 @@ module Textbringer
       end
 
       def insert_char(output, column, c, w)
-        if column == 0 && /[ \t]/ =~ c
+        if column == 0 && /[ \t]/.match?(c)
           column
         else
           output << c

data/lib/textbringer/commands/isearch.rb

@@ -118,7 +118,7 @@ module Textbringer
 
     def isearch_search
       forward = ISEARCH_STATUS[:forward]
-      options = if /\A[A-Z]/ =~ ISEARCH_STATUS[:string]
+      options = if /\A[A-Z]/.match?(ISEARCH_STATUS[:string])
                   nil
                 else
                   Regexp::IGNORECASE

data/lib/textbringer/commands/server.rb

@@ -34,14 +34,14 @@ module Textbringer
 
   class Server
     def eval(s)
-      redisplay do
+      with_redisplay do
         Controller.current.instance_eval(s).inspect
       end
     end
 
     def visit_file(filename, wait: true)
       queue = Queue.new if wait
-      redisplay do
+      with_redisplay do
         find_file(filename)
         Buffer.current[:client_wait_queue] = queue if wait
       end
@@ -50,7 +50,7 @@ module Textbringer
 
     private
 
-    def redisplay
+    def with_redisplay
       foreground! do
         begin
           yield

data/lib/textbringer/keymap.rb

@@ -136,6 +136,7 @@ module Textbringer
   GLOBAL_MAP.define_key(?\C-y, :yank)
   GLOBAL_MAP.define_key("\ey", :yank_pop)
   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("\C-t", :transpose_chars)
   GLOBAL_MAP.define_key("\C-j", :newline)

data/lib/textbringer/modes/programming_mode.rb

@@ -63,7 +63,7 @@ module Textbringer
         @buffer.save_excursion do
           pos = @buffer.point
           @buffer.beginning_of_line
-          if /\A[ \t]+\z/ =~ @buffer.substring(@buffer.point, pos)
+          if /\A[ \t]+\z/.match?(@buffer.substring(@buffer.point, pos))
             @buffer.delete_region(@buffer.point, pos)
           end
         end

data/lib/textbringer/modes/ruby_mode.rb

@@ -277,7 +277,7 @@ module Textbringer
           case text
           when "class", "module", "def", "if", "unless", "case",
             "do", "for", "while", "until", "begin"
-            if /\A(if|unless|while|until)\z/ =~ text
+            if /\A(if|unless|while|until)\z/.match?(text)
               ts = tokens[0...i].reverse_each.take_while { |(l,_),| l == line }
               t = ts.find { |_, e| e != :on_sp }
               next if t && !(t[1] == :on_op && t[2] == "=")

data/lib/textbringer/version.rb

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

data/textbringer.gemspec

@@ -19,19 +19,18 @@ 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.3'
+  spec.required_ruby_version = '>= 2.4'
 
-  spec.add_runtime_dependency "curses", ">= 1.2.6"
+  spec.add_runtime_dependency "curses", ">= 1.2.7"
   spec.add_runtime_dependency "unicode-display_width", "~> 1.1"
   spec.add_runtime_dependency "clipboard", "~> 1.1"
   spec.add_runtime_dependency "fiddley", ">= 0.0.5"
   spec.add_runtime_dependency "editorconfig"
 
-  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "test-unit"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "codecov"
-  spec.add_development_dependency "bundler-audit"
   spec.add_development_dependency "ripper-tags"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-02-08 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.6
+        version: 1.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler-audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: ripper-tags
   requirement: !ruby/object:Gem::Requirement
@@ -255,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -263,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.0.beta3
 signing_key: 
 specification_version: 4
 summary: An Emacs-like text editor