textbringer 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42dc4dbbf6e190e38d32657942af39c2bf5afec5035a6674d54a7d621c755086
-  data.tar.gz: dbaa67ad2fca2b24d661610e7467b94022da87928473a2a37a7169deda7a27ac
+  metadata.gz: '0950d5d14bd72c43ec2270cbb545c0dc464b66662f85099ec5eed8dc3a5a56db'
+  data.tar.gz: 1874b1aa43e1ba76fc2d1c9c74f9351a3dc28a15b85c7d6a085cd8d5b669adb3
 SHA512:
-  metadata.gz: c765b54dc47b490c8fe9d53b84b00734281a1d5e5e22714eaba7c9a69c71480271fb0b34a2883fed4f7ad4be1fc2933871e1c0fe5585e16e12b87f569a8ee662
-  data.tar.gz: '0684345317fcf495d5cf0f7951e120f88f24f025f8c14960dac33874c131f70f2c6a24e1ee6b8b8774783deea8b80c9047a063a8f0fe79666824578e5e54f5dc'
+  metadata.gz: 63431a1a5a0425007e119cf3573b86d61d3a1df8cca7c8658ee5fd479201696adfeddb80c2a085fca1df89fa16862d47664a5f85ae31fd09fd4f36ce73058d71
+  data.tar.gz: 95876e6af0b0be40b684ac3b0703aaa08370b23647f50b4231d61bd5c8e9411ad0798107cc77f4cb67bcf06fbcbfdaaaf47074322933052783b29a7722d2ffed

data/.github/workflows/ubuntu.yml

@@ -20,6 +20,3 @@ jobs:
         bundle install
     - name: Run test
       run: xvfb-run bundle exec rake test
-      env:
-       UPLOAD_TO_CODECOV: 1
-       CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 1.1.0
+
+* Show unsaved buffers on exit
+* Bug fixes.
+
 ## 1.0.9
 
 * Remove mazegaki.dic and bushu.rev

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)
-[![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
 text editor.

data/bin/merge_mazegaki_dic

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+# Usage: merge_mazegaki_dic /path/to/mazegaki.dic /path/to/skkdic/SKK-JISYO.* > ~/.textbringer/tcode/mazegaki.dic
+
 MAZEGAKI_DIC = Hash.new([])
 
 ARGF.each_line do |line|

data/exe/textbringer

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$VERBOSE = nil
+
 require "textbringer"
 
 include Textbringer
@@ -13,8 +15,6 @@ def load_user_config(path)
   end
 end
 
-$VERBOSE = nil
-
 unless STDIN.tty?
   STDERR.puts("textbringer: standard input is not a tty")
   exit 1

data/lib/textbringer/buffer.rb

@@ -1587,15 +1587,15 @@ def write_to_file(f)
 
     def push_undo(action)
       return if @undoing || @undo_limit == 0
+      if !modified?
+        action.version = @version
+      end
       if @composite_edit_level > 0
         @composite_edit_actions.push(action)
       else
         if @undo_stack.size >= @undo_limit
           @undo_stack[0, @undo_stack.size + 1 - @undo_limit] = []
         end
-        if !modified?
-          action.version = @version
-        end
         @undo_stack.push(action)
         @redo_stack.clear
       end

data/lib/textbringer/commands/misc.rb

@@ -6,7 +6,12 @@ module Commands
     end
 
     define_command(:exit_textbringer) do |status = 0|
-      if Buffer.any? { |buffer| /\A\*/ !~ buffer.name && buffer.modified? }
+      unsaved_buffers = Buffer.filter { |buffer|
+        /\A\*/ !~ buffer.name && buffer.modified?
+      }
+      if !unsaved_buffers.empty?
+        list_buffers(unsaved_buffers)
+        Window.redisplay
         return unless yes_or_no?("Unsaved buffers exist; exit anyway?")
       end
       exit(status)

data/lib/textbringer/commands/windows.rb

@@ -84,7 +84,7 @@ module Commands
       end
     end
 
-    define_command(:list_buffers, doc: <<~EOD) do
+    define_command(:list_buffers, doc: <<~EOD) do |buffers = Buffer.list|
         List the existing buffers.
       EOD
       buffer = Buffer.find_or_new("*Buffer List*",
@@ -92,7 +92,7 @@ module Commands
       buffer.apply_mode(BufferListMode)
       buffer.read_only_edit do
         buffer.clear
-        buffer.insert(Buffer.list.map(&:name).join("\n"))
+        buffer.insert(buffers.map(&:name).join("\n"))
         buffer.beginning_of_buffer
       end
       switch_to_buffer(buffer)

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "1.0.9"
+  VERSION = "1.1.0"
 end

data/textbringer.gemspec

@@ -22,15 +22,14 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 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 "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"
-  spec.add_development_dependency "rake", "~> 12.0"
+  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 "ripper-tags"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -28,28 +28,28 @@ dependencies:
   name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
@@ -98,14 +98,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
@@ -136,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: codecov
-  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