textbringer 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7239f854b8c82327c4ee8f1afc538f57d14dc083d51580ac79cf3b8b899ab251
-  data.tar.gz: be654b2f51c7e445826caadca3324feb3c13fce6c350fcb044768170311baaec
+  metadata.gz: 7f61a01528e59c0b8185339a9120fd528602e4df0c8db6b859a3756043309ac2
+  data.tar.gz: cd1eef029b832c4fcdd9b7bdf709c29c3e60676d79f7084028ac2c683ca7ef82
 SHA512:
-  metadata.gz: 33d3d5398d6c35b76666cefc846e02930106520bfb8ac76f1ec32b1e9abf76f5a0cdde7fa425e3b46bdfe334daf6d6678a9cbf787564588068029bfb325a2288
-  data.tar.gz: c475825d5801f90bb1d5f960a811a195a8a7e7d5573e5bbe7c67ade0ab47d69d5055ac3831c23b4691b41bdcd98a489ae9d51027ef7feb14ec9ef4906b409b5e
+  metadata.gz: 501f358854f97ca17dafdbd3d908d1a29a2ea32f103a596958b48e1f11c7397178334e75dfa369ac779e7df77d92958632790c77d2ffd520e6959a6a071e32a6
+  data.tar.gz: d1c443c92cd12df433bdee6df2af8d211ebca023946c268386f813c3292bcc195f4f9cd2b6e17e010ff1d168e31d8ba3da92c75c181644585fe3fdb15d21b532

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.3.0
+
+* toggle_test_command supports RSpec now.
+* Improve auto indentation in the Ruby mode.
+
 ## 0.2.9
 
 * Add the following new commands:

data/README.md

@@ -1,7 +1,6 @@
 # Textbringer
 
 [![Gem Version](https://badge.fury.io/rb/textbringer.svg)](https://badge.fury.io/rb/textbringer)
-[![Dependency Status](https://gemnasium.com/shugo/textbringer.svg)](https://gemnasium.com/shugo/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)
 [![codecov](https://codecov.io/gh/shugo/textbringer/branch/master/graph/badge.svg)](https://codecov.io/gh/shugo/textbringer)

data/lib/textbringer/modes/ruby_mode.rb

@@ -160,39 +160,14 @@ module Textbringer
     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"
+        path = find_test_target_path($1, $2, $3)
+        find_file(path)
+      when %r'(.*)/spec/(.*/)?(.*?)_spec\.rb\z'
+        path = find_test_target_path($1, $2, $3)
+        find_file(path)
       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"
+        path = find_test_path($1, $2, $3)
+        find_file(path)
       else
         raise EditorError, "Unknown file type"
       end
@@ -227,6 +202,7 @@ module Textbringer
       end
       @buffer.save_excursion do
         @buffer.beginning_of_line
+        start_with_period = @buffer.looking_at?(/[ \t]*\./)
         bol_pos = @buffer.point
         base_indentation = beginning_of_indentation
         start_pos = @buffer.point
@@ -240,8 +216,9 @@ module Textbringer
             event == :on_tstring_content
           return nil
         end
-        line, column, event, = find_nearest_beginning_token(tokens)
-        if event == :on_lparen
+        i = find_nearest_beginning_token(tokens)
+        (line, column), event, = i ? tokens[i] : nil
+        if event == :on_lparen && tokens.dig(i + 1, 1) != :on_ignored_nl
           return column + 1
         end
         if line
@@ -272,10 +249,11 @@ module Textbringer
         _, last_event, last_text = tokens.reverse_each.find { |_, e, _|
           e != :on_sp && e != :on_nl && e != :on_ignored_nl
         }
-        if (last_event == :on_op && last_text != "|") ||
+        if start_with_period ||
+            (last_event == :on_op && last_text != "|") ||
             last_event == :on_period ||
-            (last_event == :on_comma &&
-             event != :on_lbrace && event != :on_lbracket)
+            (last_event == :on_comma && event != :on_lbrace &&
+             event != :on_lparen && event != :on_lbracket)
           indentation += @buffer[:indent_level]
         end
         indentation
@@ -291,7 +269,7 @@ module Textbringer
     def find_nearest_beginning_token(tokens)
       stack = []
       (tokens.size - 1).downto(0) do |i|
-        (line, column), event, text = tokens[i]
+        (line, ), event, text = tokens[i]
         case event
         when :on_kw
           _, prev_event, _ = tokens[i - 1]
@@ -305,7 +283,7 @@ module Textbringer
               next if t && !(t[1] == :on_op && t[2] == "=")
             end
             if stack.empty?
-              return line, column, event, text
+              return i
             end
             if stack.last != "end"
               raise EditorError, "#{@buffer.name}:#{line}: Unmatched #{text}"
@@ -318,7 +296,7 @@ module Textbringer
           stack.push(text)
         when :on_lbrace, :on_lparen, :on_lbracket, :on_tlambeg
           if stack.empty?
-            return line, column, event, text
+            return i
           end
           if stack.last != BLOCK_END[text]
             raise EditorError, "#{@buffer.name}:#{line}: Unmatched #{text}"
@@ -329,6 +307,34 @@ module Textbringer
       return nil
     end
 
+    def find_test_target_path(base, namespace, name)
+      patterns = []
+      if namespace
+        patterns.push("#{base}/{lib,app}/**/#{namespace}#{name}.rb")
+      end
+      patterns.push("#{base}/{lib,app}/**/#{name}.rb")
+      find_first_path(patterns) or raise EditorError, "Test target not found"
+    end
+
+    def find_test_path(base, namespace, name)
+      patterns = []
+      if namespace
+        patterns.push("#{base}/test/**/#{namespace}test_#{name}.rb")
+        patterns.push("#{base}/spec/**/#{namespace}#{name}_spec.rb")
+      end
+      patterns.push("#{base}/test/**/test_#{name}.rb")
+      patterns.push("#{base}/spec/**/#{name}_spec.rb")
+      find_first_path(patterns) or raise EditorError, "Test not found"
+    end
+
+    def find_first_path(patterns)
+      patterns.each do |pattern|
+        paths = Dir.glob(pattern)
+        return paths.first if !paths.empty?
+      end
+      nil
+    end
+    
     class PartialLiteralAnalyzer < Ripper
       def self.in_literal?(src)
         new(src).in_literal?

data/lib/textbringer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 3.0.0.beta1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An Emacs-like text editor