starscope 1.5.3 → 1.5.4

data/lib/starscope/matcher.rb

@@ -8,8 +8,7 @@ module Starscope
       begin
         @regexp = Regexp.new(@query, Regexp::IGNORECASE)
       rescue RegexpError
-        # not a regex, oh well
-        return
+        @regexp = nil # not a regex, oh well
       end
     end
 

data/lib/starscope/output.rb

@@ -1,47 +1,49 @@
 require 'ruby-progressbar'
 
-class Starscope::Output
-  PBAR_FORMAT = '%t: %c/%C %E ||%b>%i||'.freeze
-
-  def initialize(level, out = STDOUT)
-    @out = out
-    @level = level
-    @pbar = nil
-  end
+module Starscope
+  class Output
+    PBAR_FORMAT = '%t: %c/%C %E ||%b>%i||'.freeze
+
+    def initialize(level, out = STDOUT)
+      @out = out
+      @level = level
+      @pbar = nil
+    end
 
-  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 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
-  end
+    def inc_pbar
+      @pbar.increment if @pbar
+    end
 
-  def finish_pbar
-    @pbar.finish if @pbar
-    @pbar = nil
-  end
+    def finish_pbar
+      @pbar.finish if @pbar
+      @pbar = nil
+    end
 
-  def extra(msg)
-    return unless @level == :verbose
-    output(msg)
-  end
+    def extra(msg)
+      return unless @level == :verbose
+      output(msg)
+    end
 
-  def normal(msg)
-    return if @level == :quiet
-    output(msg)
-  end
+    def normal(msg)
+      return if @level == :quiet
+      output(msg)
+    end
 
-  private
+    private
 
-  def output(msg)
-    if @pbar
-      @pbar.log(msg)
-    else
-      @out.puts msg
+    def output(msg)
+      if @pbar
+        @pbar.log(msg)
+      else
+        @out.puts msg
+      end
     end
   end
 end

data/lib/starscope/queryable.rb

@@ -1,46 +1,48 @@
 require 'starscope/matcher'
 
-module Starscope::Queryable
-  def query(tables, value, filters = {})
-    tables = [tables] if tables.is_a?(Symbol)
-    tables.each { |t| raise Starscope::DB::NoTableError, "Table '#{t}' not found" unless @tables[t] }
-    input = Enumerator.new do |y|
-      tables.each do |t|
-        @tables[t].each do |elem|
-          y << elem
+module Starscope
+  module Queryable
+    def query(tables, value, filters = {})
+      tables = [tables] if tables.is_a?(Symbol)
+      tables.each { |t| raise Starscope::DB::NoTableError, "Table '#{t}' not found" unless @tables[t] }
+      input = Enumerator.new do |y|
+        tables.each do |t|
+          @tables[t].each do |elem|
+            y << elem
+          end
         end
       end
+
+      run_query(value, input, filters)
     end
 
-    run_query(value, input, filters)
-  end
+    private
 
-  private
+    def run_query(query, input, filters)
+      query = Starscope::Matcher.new(query)
+      filters.each { |k, v| filters[k] = Starscope::Matcher.new(v) }
 
-  def run_query(query, input, filters)
-    query = Starscope::Matcher.new(query)
-    filters.each { |k, v| filters[k] = Starscope::Matcher.new(v) }
+      results = input.select { |x| filter(x, filters) }.group_by { |x| match(x, query) }
 
-    results = input.select { |x| filter(x, filters) }.group_by { |x| match(x, query) }
+      Starscope::Matcher::MATCH_TYPES.each do |type|
+        next if results[type].nil? || results[type].empty?
+        return results[type]
+      end
 
-    Starscope::Matcher::MATCH_TYPES.each do |type|
-      next if results[type].nil? || results[type].empty?
-      return results[type]
+      []
     end
 
-    []
-  end
-
-  def filter(record, filters)
-    filters.all? do |key, filter|
-      target = record[key] || (@meta[:files][record[:file]] || {})[key]
-      target && filter.match(target.to_s)
+    def filter(record, filters)
+      filters.all? do |key, filter|
+        target = record[key] || (@meta[:files][record[:file]] || {})[key]
+        target && filter.match(target.to_s)
+      end
     end
-  end
 
-  def match(record, query)
-    name = record[:name].map(&:to_s).join('::')
+    def match(record, query)
+      name = record[:name].map(&:to_s).join('::')
 
-    query.match(name)
+      query.match(name)
+    end
   end
 end

data/lib/starscope/version.rb

@@ -1,3 +1,3 @@
 module Starscope
-  VERSION = '1.5.3'.freeze
+  VERSION = '1.5.4'.freeze
 end

data/starscope.gemspec

@@ -20,16 +20,16 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_dependency 'oj', '~> 2.9'
-  gem.add_dependency 'parser', '>= 2.2.2'
-  gem.add_dependency 'ruby-progressbar', '~> 1.5'
+  gem.add_dependency 'parser', '~> 2.3'
+  gem.add_dependency 'ruby-progressbar', '~> 1.8'
   gem.add_dependency 'rkelly-remix', '~> 0.0.7'
   gem.add_dependency 'babel-transpiler', '~> 0.7'
   gem.add_dependency 'sourcemap', '~> 0.1'
 
   gem.add_development_dependency 'bundler', '~> 1.7'
-  gem.add_development_dependency 'rake', '~> 10.4'
+  gem.add_development_dependency 'rake', '~> 11.2'
   gem.add_development_dependency 'pry', '~> 0.10.1'
   gem.add_development_dependency 'minitest', '~> 5.8'
   gem.add_development_dependency 'mocha', '~> 1.1'
-  gem.add_development_dependency 'rubocop', '~> 0.37.0'
+  gem.add_development_dependency 'rubocop', '~> 0.39.0'
 end

data/test/fixtures/sample_ruby.rb

@@ -8,6 +8,7 @@ LANGS = [
 
 class Starscope::DB
   PBAR_FORMAT = '%t: %c/%C %E ||%b>%i||'.freeze
+  SOME_INVALID_ENCODING = "\xff"
 
   class NoTableError < StandardError; end
 

data/test/unit/exportable_test.rb

@@ -8,12 +8,25 @@ describe Starscope::Exportable do
   end
 
   it 'must export to ctags' do
-    @db.export_to(:ctags, @buf)
+    @db.export_to(:ctags, @buf, '.')
     @buf.rewind
     lines = @buf.each_line.to_a
     lines.must_include(
       "NoTableError\t" \
-      "#{FIXTURES}/sample_ruby.rb\t" \
+      "./#{FIXTURES}/sample_ruby.rb\t" \
+      "/^  class NoTableError < StandardError; end$/;\"\t" \
+      "kind:c\t" \
+      "language:Ruby\n"
+    )
+  end
+
+  it 'must export to ctags with different path prefixes' do
+    @db.export_to(:ctags, @buf, '../foo')
+    @buf.rewind
+    lines = @buf.each_line.to_a
+    lines.must_include(
+      "NoTableError\t" \
+      "../foo/#{FIXTURES}/sample_ruby.rb\t" \
       "/^  class NoTableError < StandardError; end$/;\"\t" \
       "kind:c\t" \
       "language:Ruby\n"
@@ -21,7 +34,7 @@ describe Starscope::Exportable do
   end
 
   it 'must export to cscope' do
-    @db.export_to(:cscope, @buf)
+    @db.export_to(:cscope, @buf, '.')
     @buf.rewind
     lines = @buf.each_line.to_a
 
@@ -29,7 +42,7 @@ describe Starscope::Exportable do
     lines.must_include "\tgSunday\n"
     lines.must_include "\t`add_file\n"
     lines.must_include "\t}}\n"
-    lines.must_include "12 class \n"
+    lines.must_include "13 class \n"
 
     lines.wont_include "= [\n"
     lines.wont_include "4 LANGS = [\n"

data/test/unit/fragment_extractor_test.rb

@@ -1,7 +1,12 @@
 require_relative '../test_helper'
 
 describe Starscope::FragmentExtractor do
-  module ::Starscope::Lang::Dummy; end
+  module Starscope
+    module Lang
+      module Dummy
+      end
+    end
+  end
 
   before do
     @extractor = Starscope::FragmentExtractor.new(

metadata

@@ -1,183 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: starscope
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Evan Huus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2017-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rkelly-remix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: sourcemap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '11.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.8'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.39.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.39.0
 description: |2
     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
@@ -188,9 +188,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -247,17 +247,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Smart code search and indexing