starscope 1.5.7 → 1.6.0

data/lib/starscope/langs/erb.rb

@@ -3,8 +3,8 @@ module Starscope
     module ERB
       VERSION = 1
 
-      ERB_START = /<%(?:-|={1,4})?/
-      ERB_END = /[-=]?%>/
+      ERB_START = /<%(?:-|={1,4})?/.freeze
+      ERB_END = /[-=]?%>/.freeze
 
       def self.match_file(name)
         name.end_with?('.erb')
@@ -20,7 +20,7 @@ module Starscope
             term = line.index(ERB_END)
             if term
               yield Starscope::DB::FRAGMENT, :Ruby, frag: line[0...term], line_no: line_no
-              line = line[term + 1..-1]
+              line = line[term + 1..]
               multiline = false
             else
               yield Starscope::DB::FRAGMENT, :Ruby, frag: line, line_no: line_no

data/lib/starscope/langs/golang.rb

@@ -3,13 +3,13 @@ module Starscope
     module Golang
       VERSION = 1
 
-      FUNC_CALL = /([\w\.]*?\w)\(/
-      END_OF_BLOCK = /^\s*\}\s*$/
-      END_OF_GROUP = /^\s*\)\s*$/
-      STRING_LITERAL = /".+?"/
-      BUILTIN_FUNCS = %w(new make len close copy delete int int8 int16 int32 int64
-                         uint uint8 uint16 uint32 uint64 string byte).freeze
-      CONTROL_KEYS = %w(if for switch case).freeze
+      FUNC_CALL = /([[[:word:]].]*?[[:word:]])\(/.freeze
+      END_OF_BLOCK = /^\s*\}\s*$/.freeze
+      END_OF_GROUP = /^\s*\)\s*$/.freeze
+      STRING_LITERAL = /".+?"/.freeze
+      BUILTIN_FUNCS = %w[new make len close copy delete int int8 int16 int32 int64
+                         uint uint8 uint16 uint32 uint64 string byte].freeze
+      CONTROL_KEYS = %w[if for switch case].freeze
 
       def self.match_file(name)
         name.end_with?('.go')
@@ -36,6 +36,7 @@ module Starscope
           if stack[-1] == :comment
             match = %r{\*/(.*)}.match(line)
             next unless match
+
             line = match[1]
             stack.pop
           end
@@ -45,7 +46,7 @@ module Starscope
             pos = 0
             while (match = STRING_LITERAL.match(line, pos))
               eos = find_end_of_string(line, match.begin(0))
-              line = line[0..match.begin(0)] + line[eos..-1]
+              line = line[0..match.begin(0)] + line[eos..]
               pos = match.begin(0) + 2
             end
           end
@@ -56,14 +57,14 @@ module Starscope
             case line
             when END_OF_BLOCK
               end_block(line_no, scope, stack, &block)
-            when /(.+)\s+\w+/
+            when /(.+)\s+[[:word:]]+/
               parse_def(Regexp.last_match(1), line_no, scope, &block)
             end
           when :interface
             case line
             when END_OF_BLOCK
               end_block(line_no, scope, stack, &block)
-            when /(\w+)\(.*\)\s+/
+            when /([[:word:]]+)\(.*\)\s+/
               yield :defs, scope + [Regexp.last_match(1)], line_no: line_no
             end
           when :def
@@ -105,45 +106,42 @@ module Starscope
       # handles new lines (when not in the middle of an existing definition)
       def self.parse_new_line(line, line_no, scope, stack, &block)
         case line
-        when /^func\s+(\w+)\(/
+        when /^func\s+([[:word:]]+)\(/
           yield :defs, scope + [Regexp.last_match(1)], line_no: line_no, type: :func
           stack.push(:func)
-        when /^func\s+\(\w+\s+\*?(\w+)\)\s*(\w+)\(/
+        when /^func\s+\([[:word:]]+\s+\*?([[:word:]]+)\)\s*([[:word:]]+)\(/
           yield :defs, scope + [Regexp.last_match(1), Regexp.last_match(2)], line_no: line_no, type: :func
           stack.push(:func)
-        when /^package\s+(\w+)/
+        when /^package\s+([[:word:]]+)/
           scope.push(Regexp.last_match(1))
           yield :defs, scope, line_no: line_no, type: :package
-        when /^type\s+(\w+)\s+struct\s*\{/
+        when /^type\s+([[:word:]]+)\s+struct\s*\{/
           scope.push(Regexp.last_match(1))
           stack.push(:struct)
           yield :defs, scope, line_no: line_no, type: :class
-        when /^type\s+(\w+)\s+interface\s*\{/
+        when /^type\s+([[:word:]]+)\s+interface\s*\{/
           scope.push(Regexp.last_match(1))
           stack.push(:interface)
           yield :defs, scope, line_no: line_no, type: :class
-        when /^type\s+(\w+)/
+        when /^type\s+([[:word:]]+)/
           yield :defs, scope + [Regexp.last_match(1)], line_no: line_no, type: :type
         when /^import\s+"(.+)"/
           name = Regexp.last_match(1).split('/')
           yield :imports, name, line_no: line_no
         when /^import\s+\(/
           stack.push(:import)
-        when /^var\s+\(/
-          stack.push(:def)
-        when /^var\s+(\w+)\s/
-          yield :defs, scope + [Regexp.last_match(1)], line_no: line_no
-          parse_call(line, line_no, scope, &block)
-        when /^const\s+\(/
+        when /^var\s+\(/, /^const\s+\(/
           stack.push(:def)
-        when /^const\s+(\w+)\s/
+        when /^var\s+([[:word:]]+)\s/, /^const\s+([[:word:]]+)\s/
           yield :defs, scope + [Regexp.last_match(1)], line_no: line_no
           parse_call(line, line_no, scope, &block)
         when /^\s+(.*?) :?=[^=]/
-          Regexp.last_match(1).split(' ').each do |var|
+          Regexp.last_match(1).split.each do |var|
             next if CONTROL_KEYS.include?(var)
+
             name = var.delete(',').split('.')
             next if name[0] == '_' # assigning to _ is a discard in golang
+
             if name.length == 1
               yield :assigns, scope + [name[0]], line_no: line_no
             else
@@ -158,9 +156,10 @@ module Starscope
 
       def self.parse_call(line, line_no, scope)
         line.scan(FUNC_CALL) do |match|
-          name = match[0].split('.').select { |chunk| !chunk.empty? }
+          name = match[0].split('.').reject(&:empty?)
           if name.length == 1
             next if name[0] == 'func'
+
             if BUILTIN_FUNCS.include?(name[0])
               yield :calls, name[0], line_no: line_no
             else

data/lib/starscope/langs/javascript.rb

@@ -96,7 +96,8 @@ module Starscope
             next
           end
 
-          next if found[node.name] && found[node.name].include?(line)
+          next if found[node.name]&.include?(line)
+
           yield :defs, node.name, line_no: line
           found[node.name] ||= Set.new
           found[node.name].add(line)
@@ -113,7 +114,8 @@ module Starscope
           line = find_line(node.range.from, map, lines, name)
           next unless line
 
-          next if found[name] && found[name].include?(line)
+          next if found[name]&.include?(line)
+
           yield :reads, name, line_no: line
         end
       end

data/lib/starscope/langs/ruby.rb

@@ -16,9 +16,11 @@ module Starscope
 
       def self.match_file(name)
         return true if name.end_with?('.rb', '.rake')
+
         File.open(name) do |f|
           head = f.read(2)
           return false if head.nil? || !head.start_with?('#!')
+
           return f.readline.include?('ruby')
         end
       end
@@ -39,7 +41,7 @@ module Starscope
         extract_node(tree, scope, &block)
 
         new_scope = []
-        if [:class, :module].include? tree.type
+        if %i[class module].include? tree.type
           new_scope = scoped_name(tree.children[0], scope)
           scope += new_scope
         end
@@ -118,7 +120,7 @@ module Starscope
       def self.scoped_name(node, scope)
         if node.type == :block
           scoped_name(node.children[0], scope)
-        elsif [:lvar, :ivar, :cvar, :gvar, :const, :send, :casgn].include? node.type
+        elsif %i[lvar ivar cvar gvar const send casgn].include? node.type
           if node.children[0].is_a? Symbol
             [node.children[0]]
           elsif node.children[0].is_a? AST::Node

data/lib/starscope/matcher.rb

@@ -1,6 +1,6 @@
 module Starscope
   class Matcher
-    MATCH_TYPES = [:literal_match, :regexp_match].freeze
+    MATCH_TYPES = %i[literal_match regexp_match].freeze
 
     def initialize(query)
       @query = query
@@ -15,7 +15,7 @@ module Starscope
     def match(input)
       if input.end_with?(@query)
         :literal_match
-      elsif @regexp && @regexp.match(input)
+      elsif @regexp&.match(input)
         :regexp_match
       end
     end

data/lib/starscope/output.rb

@@ -4,7 +4,7 @@ module Starscope
   class Output
     PBAR_FORMAT = '%t: %c/%C %E ||%b>%i||'.freeze
 
-    def initialize(level, out = STDOUT)
+    def initialize(level, out = $stdout)
       @out = out
       @level = level
       @pbar = nil
@@ -12,27 +12,30 @@ module Starscope
 
     def new_pbar(title, num_items)
       return if @level == :quiet
+
       @pbar = ProgressBar.create(title: title, total: num_items,
                                  format: PBAR_FORMAT, length: 80,
                                  out: @out)
     end
 
     def inc_pbar
-      @pbar.increment if @pbar
+      @pbar&.increment
     end
 
     def finish_pbar
-      @pbar.finish if @pbar
+      @pbar&.finish
       @pbar = nil
     end
 
     def extra(msg)
       return unless @level == :verbose
+
       output(msg)
     end
 
     def normal(msg)
       return if @level == :quiet
+
       output(msg)
     end
 

data/lib/starscope/queryable.rb

@@ -26,6 +26,7 @@ module Starscope
 
       Starscope::Matcher::MATCH_TYPES.each do |type|
         next if results[type].nil? || results[type].empty?
+
         return results[type]
       end
 

data/lib/starscope/version.rb

@@ -1,3 +1,3 @@
 module Starscope
-  VERSION = '1.5.7'.freeze
+  VERSION = '1.6.0'.freeze
 end

data/starscope.gemspec

@@ -1,14 +1,14 @@
-require File.expand_path('../lib/starscope/version.rb', __FILE__)
+require File.expand_path('lib/starscope/version.rb', __dir__)
 
 Gem::Specification.new do |gem|
   gem.name          = 'starscope'
   gem.version       = Starscope::VERSION
   gem.summary       = 'Smart code search and indexing'
-  gem.description   = <<-EOF
+  gem.description   = <<-DESC
   Starscope is a code indexer, search and navigation tool for Ruby, Golang, and JavaScript.
   Inspired by the extremely popular Ctags and Cscope utilities, Starscope can
   answer a lot of questions about a lot of code.
-  EOF
+  DESC
   gem.authors       = ['Evan Huus']
   gem.homepage      = 'https://github.com/eapache/starscope'
   gem.email         = 'eapache@gmail.com'
@@ -17,19 +17,22 @@ Gem::Specification.new do |gem|
   gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.test_files    = `git ls-files -- test/*`.split("\n")
   gem.require_paths = ['lib']
-  gem.required_ruby_version = '>= 2.0'
+  gem.required_ruby_version = '>= 2.6'
 
+  gem.add_dependency 'babel-transpiler', '~> 0.7'
   gem.add_dependency 'oj', '~> 3.7'
-  gem.add_dependency 'parser', '~> 2.6'
-  gem.add_dependency 'ruby-progressbar', '~> 1.9'
+  gem.add_dependency 'parser', '~> 3.1'
   gem.add_dependency 'rkelly-remix', '~> 0.0.7'
-  gem.add_dependency 'babel-transpiler', '~> 0.7'
+  gem.add_dependency 'ruby-progressbar', '~> 1.9'
   gem.add_dependency 'sourcemap', '~> 0.1'
 
   gem.add_development_dependency 'bundler', '>= 1.7'
-  gem.add_development_dependency 'rake', '~> 11.2'
-  gem.add_development_dependency 'pry', '~> 0.11'
-  gem.add_development_dependency 'minitest', '~> 5.10'
+  gem.add_development_dependency 'minitest', '~> 5.12'
   gem.add_development_dependency 'mocha', '~> 1.3'
-  gem.add_development_dependency 'rubocop', '~> 0.44.0'
+  gem.add_development_dependency 'pry', '~> 0.11'
+  gem.add_development_dependency 'rake', '~> 13.0'
+  gem.add_development_dependency 'rubocop', '~> 1.25.0'
+  gem.add_development_dependency 'rubocop-minitest', '~> 0.17.1'
+  gem.add_development_dependency 'rubocop-rake', '~> 0.6.0'
+  gem.metadata['rubygems_mfa_required'] = 'true'
 end

data/test/fixtures/sample_golang.go

@@ -10,7 +10,7 @@ var (
 	}
 )
 
-var single_var = 3
+var single_var_Äunicode = 3
 
 const single_const = 4
 

data/test/functional/starscope_test.rb

@@ -1,43 +1,43 @@
 require_relative '../test_helper'
 
-describe 'starscope executable script' do
-  BASE = 'bundle exec bin/starscope --quiet'.freeze
-  EXTRACT = "#{BASE} --no-read --no-write #{FIXTURES}".freeze
+BASE = 'bundle exec bin/starscope --quiet'.freeze
+EXTRACT = "#{BASE} --no-read --no-write #{FIXTURES}".freeze
 
+describe 'starscope executable script' do
   it 'must not produce help wider than 80 characters' do
     `#{BASE} -h`.each_line do |line|
-      line.length.must_be :<=, 80
+      _(line.length).must_be :<=, 80
     end
   end
 
   it 'must produce the right version' do
-    `#{BASE} -v`.chomp.must_equal Starscope::VERSION
+    _(`#{BASE} -v`.chomp).must_equal Starscope::VERSION
   end
 
   it 'must produce a valid database summary' do
     lines = `#{EXTRACT} -s`.lines.to_a
-    lines.length.must_equal 8
+    _(lines.length).must_equal 8
   end
 
   it 'must produce a valid database dump' do
     lines = `#{EXTRACT} -d requires`.lines.to_a
-    lines[1].split.first.must_equal 'date'
-    lines[2].split.first.must_equal 'foo-bar'
-    lines[3].split.first.must_equal 'react-native'
-    lines[4].split.first.must_equal 'zlib'
+    _(lines[1].split.first).must_equal 'date'
+    _(lines[2].split.first).must_equal 'foo-bar'
+    _(lines[3].split.first).must_equal 'react-native'
+    _(lines[4].split.first).must_equal 'zlib'
   end
 
   it 'must correctly query the database' do
     `#{EXTRACT} -q calls,add_file`.each_line do |line|
-      line.split[0..2].must_equal %w(Starscope DB add_file)
+      _(line.split[0..2]).must_equal %w[Starscope DB add_file]
     end
 
     `#{EXTRACT} -q lang:ruby,calls,add_file`.each_line do |line|
-      line.split[0..2].must_equal %w(Starscope DB add_file)
+      _(line.split[0..2]).must_equal %w[Starscope DB add_file]
     end
 
     `#{EXTRACT} -q lang:go,calls,add_file`.each_line do |line|
-      line.must_equal "No results found.\n"
+      _(line).must_equal "No results found.\n"
     end
   end
 
@@ -45,7 +45,7 @@ describe 'starscope executable script' do
     file = Tempfile.new('starscope_test')
     begin
       `#{EXTRACT} -e cscope,#{file.path}`
-      $?.exitstatus.must_equal 0
+      _($?.exitstatus).must_equal 0
     ensure
       file.close
       file.unlink
@@ -56,7 +56,7 @@ describe 'starscope executable script' do
     file = Tempfile.new('starscope_test')
     begin
       `#{EXTRACT} -e ctags,#{file.path}`
-      $?.exitstatus.must_equal 0
+      _($?.exitstatus).must_equal 0
     ensure
       file.close
       file.unlink

data/test/unit/db_test.rb

@@ -7,14 +7,14 @@ describe Starscope::DB do
   end
 
   it 'must raise on invalid tables' do
-    proc { @db.records(:foo) }.must_raise Starscope::DB::NoTableError
+    _(proc { @db.records(:foo) }).must_raise Starscope::DB::NoTableError
   end
 
   it 'must add paths' do
     paths = [GOLANG_SAMPLE, "#{FIXTURES}/**/*"]
     @db.add_paths(paths)
 
-    @db.metadata(:paths).must_equal paths
+    _(@db.metadata(:paths)).must_equal paths
     validate(@db)
   end
 
@@ -24,10 +24,10 @@ describe Starscope::DB do
     @db.add_excludes(["#{FIXTURES}/**"])
 
     files = @db.metadata(:files).keys
-    files.wont_include RUBY_SAMPLE
-    files.wont_include GOLANG_SAMPLE
-    @db.records(:defs).must_be_empty
-    @db.records(:end).must_be_empty
+    _(files).wont_include RUBY_SAMPLE
+    _(files).wont_include GOLANG_SAMPLE
+    _(@db.records(:defs)).must_be_empty
+    _(@db.records(:end)).must_be_empty
   end
 
   it 'must pick up new files in old paths' do
@@ -40,23 +40,23 @@ describe Starscope::DB do
   it 'must remove old files in existing paths' do
     @db.load("#{FIXTURES}/db_removed_files.json")
     @db.update
-    @db.metadata(:files).keys.wont_include "#{FIXTURES}/foo"
+    _(@db.metadata(:files).keys).wont_include "#{FIXTURES}/foo"
   end
 
   it "must update stale existing files when extractor hasn't changed" do
     @db.load("#{FIXTURES}/db_out_of_date.json")
-    @db.metadata(:langs)[:Golang].must_be :>=, Starscope::DB::LANGS[:Golang]
+    _(@db.metadata(:langs)[:Golang]).must_be :>=, Starscope::DB::LANGS[:Golang]
 
     cur_mtime = @db.metadata(:files)[GOLANG_SAMPLE][:last_updated]
     File.expects(:mtime).twice.returns(cur_mtime + 1)
     @db.update
 
     file = @db.metadata(:files)[GOLANG_SAMPLE]
-    file[:last_updated].must_equal cur_mtime + 1
-    file[:lang].must_equal :Golang
-    file[:lines].wont_be_empty
-    @db.records(:defs).wont_be_empty
-    @db.records(:calls).wont_be_empty
+    _(file[:last_updated]).must_equal cur_mtime + 1
+    _(file[:lang]).must_equal :Golang
+    _(file[:lines]).wont_be_empty
+    _(@db.records(:defs)).wont_be_empty
+    _(@db.records(:calls)).wont_be_empty
   end
 
   it 'must update unchanged existing files with old extractor versions' do
@@ -67,11 +67,11 @@ describe Starscope::DB do
     @db.update
 
     file = @db.metadata(:files)[GOLANG_SAMPLE]
-    file[:last_updated].must_equal cur_mtime
-    file[:lang].must_equal :Golang
-    file[:lines].wont_be_empty
-    @db.records(:defs).wont_be_empty
-    @db.records(:calls).wont_be_empty
+    _(file[:last_updated]).must_equal cur_mtime
+    _(file[:lang]).must_equal :Golang
+    _(file[:lines]).wont_be_empty
+    _(@db.records(:defs)).wont_be_empty
+    _(@db.records(:calls)).wont_be_empty
   end
 
   it 'must update unchanged existing files with old sublang extractor versions' do
@@ -82,12 +82,12 @@ describe Starscope::DB do
     @db.update
 
     file = @db.metadata(:files)[GOLANG_SAMPLE]
-    file[:last_updated].must_equal cur_mtime
-    file[:lang].must_equal :Golang
-    file[:sublangs].must_be_empty
-    file[:lines].wont_be_empty
-    @db.records(:defs).wont_be_empty
-    @db.records(:calls).wont_be_empty
+    _(file[:last_updated]).must_equal cur_mtime
+    _(file[:lang]).must_equal :Golang
+    _(file[:sublangs]).must_be_empty
+    _(file[:lines]).wont_be_empty
+    _(@db.records(:defs)).wont_be_empty
+    _(@db.records(:calls)).wont_be_empty
   end
 
   it 'must update unchanged existing files when the extractor has been removed' do
@@ -98,11 +98,11 @@ describe Starscope::DB do
     @db.update
 
     file = @db.metadata(:files)[GOLANG_SAMPLE]
-    file[:last_updated].must_equal cur_mtime
-    file[:lang].must_equal :Golang
-    file[:lines].wont_be_empty
-    @db.records(:defs).wont_be_empty
-    @db.records(:calls).wont_be_empty
+    _(file[:last_updated]).must_equal cur_mtime
+    _(file[:lang]).must_equal :Golang
+    _(file[:lines]).wont_be_empty
+    _(@db.records(:defs)).wont_be_empty
+    _(@db.records(:calls)).wont_be_empty
   end
 
   it 'must not update file with up-to-date time and extractor' do
@@ -110,13 +110,13 @@ describe Starscope::DB do
     @db.update
 
     file = @db.metadata(:files)[GOLANG_SAMPLE]
-    file[:last_updated].must_equal 10_000_000_000
-    @db.tables.must_be_empty
+    _(file[:last_updated]).must_equal 10_000_000_000
+    _(@db.tables).must_be_empty
   end
 
   it 'must load an old DB file' do
     @db.load("#{FIXTURES}/db_old.json.gz")
-    @db.metadata(:paths).must_equal ["#{FIXTURES}/**/*"]
+    _(@db.metadata(:paths)).must_equal ["#{FIXTURES}/**/*"]
     validate(@db)
   end
 
@@ -136,26 +136,26 @@ describe Starscope::DB do
 
   it 'must run queries' do
     @db.add_paths([FIXTURES])
-    @db.query(:calls, 'abc').must_equal []
-    @db.query(:defs, 'xyz').must_equal []
-    @db.query(:calls, 'add_file').length.must_equal 3
+    _(@db.query(:calls, 'abc')).must_equal []
+    _(@db.query(:defs, 'xyz')).must_equal []
+    _(@db.query(:calls, 'add_file').length).must_equal 3
   end
 
   it 'must run queries on multiple tables' do
     @db.add_paths([FIXTURES])
-    ret = @db.query([:calls, :defs], 'foo')
-    ret.length.must_equal 4
-    ret.first[:name].last.must_equal :foo
+    ret = @db.query(%i[calls defs], 'foo')
+    _(ret.length).must_equal 4
+    _(ret.first[:name].last).must_equal :foo
   end
 
   it 'must symbolize compound name' do
     rec = Starscope::DB.normalize_record(:foo, ['a', :b], {})
-    rec[:name].must_equal [:a, :b]
+    _(rec[:name]).must_equal %i[a b]
   end
 
   it 'must symbolize and array-wrap simple name' do
     rec = Starscope::DB.normalize_record(:foo, 'a', {})
-    rec[:name].must_equal [:a]
+    _(rec[:name]).must_equal [:a]
   end
 
   it 'must store extractor metadata returned from the `extract` call' do
@@ -167,21 +167,21 @@ describe Starscope::DB do
 
     @db.add_paths([GOLANG_SAMPLE])
 
-    @db.metadata(:files)[GOLANG_SAMPLE][:a].must_equal 1
+    _(@db.metadata(:files)[GOLANG_SAMPLE][:a]).must_equal 1
   end
 
   private
 
   def validate(db)
     files = db.metadata(:files)
-    files.keys.must_include GOLANG_SAMPLE
-    files.keys.must_include RUBY_SAMPLE
-    files[GOLANG_SAMPLE][:last_updated].must_equal File.mtime(GOLANG_SAMPLE).to_i
-    files[RUBY_SAMPLE][:last_updated].must_equal File.mtime(RUBY_SAMPLE).to_i
-
-    db.records(:defs).wont_be_empty
-    db.records(:calls).wont_be_empty
-    db.records(:imports).wont_be_empty
-    db.records(:requires).wont_be_empty
+    _(files.keys).must_include GOLANG_SAMPLE
+    _(files.keys).must_include RUBY_SAMPLE
+    _(files[GOLANG_SAMPLE][:last_updated]).must_equal File.mtime(GOLANG_SAMPLE).to_i
+    _(files[RUBY_SAMPLE][:last_updated]).must_equal File.mtime(RUBY_SAMPLE).to_i
+
+    _(db.records(:defs)).wont_be_empty
+    _(db.records(:calls)).wont_be_empty
+    _(db.records(:imports)).wont_be_empty
+    _(db.records(:requires)).wont_be_empty
   end
 end

data/test/unit/exportable_test.rb

@@ -11,7 +11,7 @@ describe Starscope::Exportable do
     @db.export_to(:ctags, @buf, '.')
     @buf.rewind
     lines = @buf.each_line.to_a
-    lines.must_include(
+    _(lines).must_include(
       "NoTableError\t" \
       "./#{FIXTURES}/sample_ruby.rb\t" \
       "/^  class NoTableError < StandardError; end$/;\"\t" \
@@ -24,7 +24,7 @@ describe Starscope::Exportable do
     @db.export_to(:ctags, @buf, '../foo')
     @buf.rewind
     lines = @buf.each_line.to_a
-    lines.must_include(
+    _(lines).must_include(
       "NoTableError\t" \
       "../foo/#{FIXTURES}/sample_ruby.rb\t" \
       "/^  class NoTableError < StandardError; end$/;\"\t" \
@@ -38,14 +38,16 @@ describe Starscope::Exportable do
     @buf.rewind
     lines = @buf.each_line.to_a
 
-    lines.must_include "\t@#{FIXTURES}/sample_golang.go\n"
-    lines.must_include "\tgSunday\n"
-    lines.must_include "\t`add_file\n"
-    lines.must_include "\t}}\n"
-    lines.must_include "13 class \n"
+    _(lines).must_include "\t@#{FIXTURES}/sample_golang.go\n"
+    _(lines).must_include "\tgSunday\n"
+    _(lines).must_include "\t`add_file\n"
+    _(lines).must_include "\t}}\n"
+    _(lines).must_include "13 class \n"
+    _(lines).must_include "\tgsingle_var_unicode\n"
 
-    lines.wont_include "= [\n"
-    lines.wont_include "4 LANGS = [\n"
-    lines.wont_include "116 tmpdb[entry[:file]][entry[:line_no]] ||= []\n"
+    _(lines).wont_include "\tgsingle_var_Äunicode\n"
+    _(lines).wont_include "= [\n"
+    _(lines).wont_include "4 LANGS = [\n"
+    _(lines).wont_include "116 tmpdb[entry[:file]][entry[:line_no]] ||= []\n"
   end
 end