textbringer 0.1.4 → 0.1.5

data/lib/textbringer/errors.rb

@@ -9,4 +9,10 @@ module Textbringer
 
   class ReadOnlyError < EditorError
   end
+
+  class Quit < EditorError
+    def initialize
+      super("Quit")
+    end
+  end
 end

data/lib/textbringer/modes/ruby_mode.rb

@@ -20,6 +20,7 @@ module Textbringer
     def indent_line
       result = false
       level = calculate_indentation
+      return result if level.nil?
       @buffer.save_excursion do
         @buffer.beginning_of_line
         has_space = @buffer.looking_at?(/[ \t]+/)
@@ -88,8 +89,8 @@ module Textbringer
       end
     end
 
-    def compile
-      cmd = read_from_minibuffer("Compile: ", default: default_compile_command)
+    def compile(cmd = read_from_minibuffer("Compile: ",
+                                           default: default_compile_command))
       shell_execute(cmd, "*Ruby compile result*")
       backtrace_mode
     end
@@ -98,6 +99,59 @@ module Textbringer
       /[\p{Letter}\p{Number}_$@!?]/
     end
 
+    def default_compile_command
+      @buffer[:ruby_compile_command] ||
+        if File.exist?("Rakefile")
+          prefix = File.exist?("Gemfile") ? "bundle exec " : ""
+          prefix + "rake"
+        elsif @buffer.file_name
+          "ruby " + @buffer.file_name
+        else
+          nil
+        end
+    end
+
+    def toggle_test
+      case @buffer.file_name
+      when %r'(.*)/test/(.*/)?test_(.*?)\.rb\z'
+        base = $1
+        namespace = $2
+        name = $3
+        if namespace
+          paths = Dir.glob("#{base}/{lib,app}/**/#{namespace}#{name}.rb")
+          if !paths.empty?
+            find_file(paths.first)
+            return
+          end
+        end
+        paths = Dir.glob("#{base}/{lib,app}/**/#{name}.rb")
+        if !paths.empty?
+          find_file(paths.first)
+          return
+        end
+        raise EditorError, "Test subject not found"
+      when %r'(.*)/(?:lib|app)/(.*/)?(.*?)\.rb\z'
+        base = $1
+        namespace = $2
+        name = $3
+        if namespace
+          paths = Dir.glob("#{base}/test/**/#{namespace}test_#{name}.rb")
+          if !paths.empty?
+            find_file(paths.first)
+            return
+          end
+        end
+        paths = Dir.glob("#{base}/test/**/test_#{name}.rb")
+        if !paths.empty?
+          find_file(paths.first)
+          return
+        end
+        raise EditorError, "Test not found"
+      else
+        raise EditorError, "Unknown file type"
+      end
+    end
+
     private
 
     def calculate_indentation
@@ -109,12 +163,29 @@ module Textbringer
         bol_pos = @buffer.point
         tokens = Ripper.lex(@buffer.substring(@buffer.point_min,
                                               @buffer.point))
+        _, event, = tokens.last
+        if event == :on_tstring_beg ||
+            event == :on_heredoc_beg ||
+            event == :on_tstring_content
+          return nil
+        end
         line, column, event, = find_nearest_beginning_token(tokens)
         if event == :on_lparen
           return column + 1
         end
         if line
           @buffer.goto_line(line)
+          while !@buffer.beginning_of_buffer?
+            if @buffer.save_excursion {
+              @buffer.backward_char
+              @buffer.skip_re_backward(/\s/)
+              @buffer.char_before == ?,
+            }
+              @buffer.backward_line
+            else
+              break
+            end
+          end
         else
           @buffer.backward_line
         end
@@ -183,56 +254,5 @@ module Textbringer
       end
       return nil
     end
-
-    def default_compile_command
-      @buffer[:ruby_compile_command] ||
-        if File.exist?("Rakefile")
-          prefix = File.exist?("Gemfile") ? "bundle exec " : ""
-          prefix + "rake"
-        else
-          "ruby " + @buffer.file_name
-        end
-    end
-
-    def toggle_test
-      case @buffer.file_name
-      when %r'(.*)/test/(.*/)?test_(.*?)\.rb\z'
-        base = $1
-        namespace = $2
-        name = $3
-        if namespace
-          paths = Dir.glob("#{base}/{lib,app}/**/#{namespace}#{name}.rb")
-          if !paths.empty?
-            find_file(paths.first)
-            return
-          end
-        end
-        paths = Dir.glob("#{base}/{lib,app}/**/#{name}.rb")
-        if !paths.empty?
-          find_file(paths.first)
-          return
-        end
-        raise EditorError, "Test subject not found"
-      when %r'(.*)/(?:lib|app)/(.*/)?(.*?)\.rb\z'
-        base = $1
-        namespace = $2
-        name = $3
-        if namespace
-          paths = Dir.glob("#{base}/test/**/#{namespace}test_#{name}.rb")
-          if !paths.empty?
-            find_file(paths.first)
-            return
-          end
-        end
-        paths = Dir.glob("#{base}/test/**/#{name}.rb")
-        if !paths.empty?
-          find_file(paths.first)
-          return
-        end
-        raise EditorError, "Test not found"
-      else
-        raise EditorError, "Unknown file type"
-      end
-    end
   end
 end

data/lib/textbringer/utils.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
+require "rbconfig"
+
 module Textbringer
   module Utils
+    module_function
+
     def message(msg, log: true, sit_for: nil, sleep_for: nil)
       if log && Buffer.current.name != "*Messages*"
         buffer = Buffer["*Messages*"] ||
@@ -15,7 +19,7 @@ module Textbringer
           if buffer.current_line > 1000
             buffer.beginning_of_buffer
             10.times do
-              buffer.next_line
+              buffer.forward_line
             end
             buffer.delete_region(buffer.point_min, buffer.point)
             buffer.end_of_buffer
@@ -52,7 +56,7 @@ module Textbringer
       Controller.current.received_keyboard_quit?
     end
 
-    def handle_exception(e)
+    def show_exception(e)
       if e.is_a?(SystemExit)
         raise
       end
@@ -65,8 +69,10 @@ module Textbringer
         begin
           buffer.delete_region(buffer.point_min, buffer.point_max)
           buffer.insert("#{e.class}: #{e}\n")
-          e.backtrace.each do |line|
-            buffer.insert(line + "\n")
+          if e.backtrace
+            e.backtrace.each do |line|
+              buffer.insert(line + "\n")
+            end
           end
           buffer.beginning_of_buffer
         ensure
@@ -148,7 +154,7 @@ module Textbringer
       File.expand_path(file)
     end
 
-    def complete(s, candidates)
+    def complete_for_minibuffer(s, candidates)
       xs = candidates.select { |i| i.start_with?(s) }
       if xs.size > 0
         y, *ys = xs
@@ -163,13 +169,13 @@ module Textbringer
     end
 
     def read_buffer(prompt, default: (Buffer.last || Buffer.current)&.name)
-      f = ->(s) { complete(s, Buffer.names) }
+      f = ->(s) { complete_for_minibuffer(s, Buffer.names) }
       read_from_minibuffer(prompt, completion_proc: f, default: default)
     end
 
     def read_command_name(prompt)
       f = ->(s) {
-        complete(s.tr("-", "_"), Commands.list.map(&:to_s))
+        complete_for_minibuffer(s.tr("-", "_"), Commands.list.map(&:to_s))
       }
       read_from_minibuffer(prompt, completion_proc: f)
     end
@@ -273,5 +279,13 @@ module Textbringer
       add_hook(:pre_command_hook, hook)
       Controller.current.overriding_map = map
     end
+
+    def ruby_install_name
+      RbConfig::CONFIG["ruby_install_name"]
+    end
+
+    def insert(s)
+      Buffer.current.insert(s)
+    end
   end
 end

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/textbringer/window.rb

@@ -191,7 +191,8 @@ module Textbringer
       Curses.beep
     end
 
-    attr_reader :buffer, :lines, :columns, :y, :x
+    attr_reader :buffer, :lines, :columns, :y, :x, :window, :mode_line
+    attr_reader :top_of_window, :bottom_of_window
 
     def initialize(lines, columns, y, x)
       @lines = lines
@@ -336,8 +337,9 @@ module Textbringer
           @window.attron(Curses::A_REVERSE)
         end
         while !@buffer.end_of_buffer?
+          cury, curx = @window.cury, @window.curx
           if @buffer.point_at_mark?(point)
-            y, x = @window.cury, @window.curx
+            y, x = cury, curx
             if current? && @buffer.visible_mark
               if @buffer.point_after_mark?(@buffer.visible_mark)
                 @window.attroff(Curses::A_REVERSE)
@@ -357,16 +359,31 @@ module Textbringer
           c = @buffer.char_after
           if c == "\n"
             @window.clrtoeol
-            break if @window.cury == lines - 2   # lines include mode line
+            break if cury == lines - 2   # lines include mode line
+            @window.setpos(cury + 1, 0)
+            @buffer.forward_char
+            next
           elsif c == "\t"
-            n = calc_tab_width(@window.curx)
+            n = calc_tab_width(curx)
             c = " " * n
           else
             c = escape(c)
           end
+          if curx < columns - 4
+            newx = nil
+          else
+            newx = curx + Buffer.display_width(c)
+            if newx > columns
+              if cury == lines - 2
+                break
+              else
+                @window.clrtoeol
+                @window.setpos(cury + 1, 0)
+              end
+            end
+          end
           @window.addstr(c)
-          break if @window.cury == lines - 2 &&  # lines include mode line
-            @window.curx == columns
+          break if newx == columns && cury == lines - 2
           @buffer.forward_char
         end
         if current? && @buffer.visible_mark
@@ -504,7 +521,7 @@ module Textbringer
       @mode_line.addstr(unicode_codepoint(c))
       @mode_line.addstr(" #{line},#{column}")
       @mode_line.addstr(" (#{@buffer.mode&.name || 'None'})")
-      @mode_line.addstr(" " * (@mode_line.maxx - @mode_line.curx))
+      @mode_line.addstr(" " * (columns - @mode_line.curx))
       @mode_line.attroff(Curses::A_REVERSE)
       @mode_line.noutrefresh
     end
@@ -519,13 +536,13 @@ module Textbringer
 
     def escape(s)
       if @buffer.binary?
-        s.gsub(/[\0-\b\v-\x1f]/) { |c|
+        s.gsub(/[\0-\b\v-\x1f\x7f]/) { |c|
           "^" + (c.ord ^ 0x40).chr
         }.gsub(/[\x80-\xff]/n) { |c|
           "<%02X>" % c.ord
         }
       else
-        s.gsub(/[\0-\b\v-\x1f]/) { |c|
+        s.gsub(/[\0-\b\v-\x1f\x7f]/) { |c|
           "^" + (c.ord ^ 0x40).chr
         }
       end
@@ -620,6 +637,7 @@ module Textbringer
   end
 
   class EchoArea < Window
+    attr_reader :message
     attr_accessor :prompt
     attr_writer :active
 

data/textbringer.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Shugo Maeda"]
   spec.email         = ["shugo@ruby-lang.org"]
 
-  spec.summary       = "A text editor"
-  spec.description   = "Textbringer is a member of a demon race that takes on the form of a text editor."
+  spec.summary       = "An Emacs-like text editor"
+  spec.description   = "Textbringer is a member of a demon race that takes on the form of an Emacs-like text editor."
   spec.homepage      = "https://github.com/shugo/textbringer"
   spec.license       = "MIT"
 
@@ -23,11 +23,14 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "curses", "~> 1.1"
   spec.add_runtime_dependency "unicode-display_width", "~> 1.1"
+  spec.add_runtime_dependency "clipboard", "~> 1.1"
+  spec.add_runtime_dependency "ffi"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "simplecov"
   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 "guard"
   spec.add_development_dependency "guard-shell"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !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
+  name: ffi
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,8 +192,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Textbringer is a member of a demon race that takes on the form of a text
-  editor.
+description: Textbringer is a member of a demon race that takes on the form of an
+  Emacs-like text editor.
 email:
 - shugo@ruby-lang.org
 executables:
@@ -173,14 +215,20 @@ files:
 - lib/textbringer.rb
 - lib/textbringer/buffer.rb
 - lib/textbringer/commands.rb
+- lib/textbringer/commands/buffers.rb
+- lib/textbringer/commands/clipboard.rb
 - lib/textbringer/commands/ctags.rb
 - lib/textbringer/commands/dabbrev.rb
+- lib/textbringer/commands/files.rb
+- lib/textbringer/commands/isearch.rb
+- lib/textbringer/commands/misc.rb
+- lib/textbringer/commands/replace.rb
+- lib/textbringer/commands/windows.rb
 - lib/textbringer/config.rb
 - lib/textbringer/controller.rb
 - lib/textbringer/errors.rb
 - lib/textbringer/keymap.rb
 - lib/textbringer/mode.rb
-- lib/textbringer/modes.rb
 - lib/textbringer/modes/backtrace_mode.rb
 - lib/textbringer/modes/fundamental_mode.rb
 - lib/textbringer/modes/programming_mode.rb
@@ -209,8 +257,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: A text editor
+summary: An Emacs-like text editor
 test_files: []
+has_rdoc: