starscope 1.0.4 → 1.1.0

data/test/{files → fixtures}/sample_golang.go

@@ -19,6 +19,10 @@ const (
 	Monday
 )
 
+var x error = fmt.Errorf("ABC")
+
+const y error = fmt.Errorf("ABC")
+
 type foo interface {
 	bar() int
 }

data/test/functional/test_starscope.rb

@@ -0,0 +1,35 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+class TestStarScope < Minitest::Test
+
+  BASE = "bundle exec bin/starscope --quiet"
+  EXTRACT = "#{BASE} --no-read --no-write #{FIXTURES}"
+
+  def test_help
+    `#{BASE} -h`.each_line do |line|
+      assert line.length <= 80
+    end
+  end
+
+  def test_version
+    assert_equal StarScope::VERSION, `#{BASE} -v`.chomp
+  end
+
+  def test_summary
+    lines = `#{EXTRACT} -s`.lines.to_a
+    assert_equal lines.length, 6
+  end
+
+  def test_dump
+    lines = `#{EXTRACT} -d requires`.lines.to_a
+    assert_equal 'date', lines[1].split.first
+    assert_equal 'zlib', lines[2].split.first
+  end
+
+  def test_query
+    `#{EXTRACT} -q calls,add_file`.each_line do |line|
+      assert_equal ["StarScope", "DB", "add_file"], line.split[0..2]
+    end
+  end
+
+end

data/test/test_helper.rb

@@ -2,6 +2,8 @@ require 'minitest/autorun'
 require 'minitest/pride'
 require File.expand_path('../../lib/starscope.rb', __FILE__)
 
-GOLANG_SAMPLE = 'test/files/sample_golang.go'
-RUBY_SAMPLE = 'test/files/sample_ruby.rb'
-EMPTY_FILE = 'test/files/empty'
+FIXTURES="test/fixtures"
+
+GOLANG_SAMPLE = "#{FIXTURES}/sample_golang.go"
+RUBY_SAMPLE = "#{FIXTURES}/sample_ruby.rb"
+EMPTY_FILE = "#{FIXTURES}/empty"

data/test/{lib → unit}/test_db.rb

@@ -22,7 +22,7 @@ describe StarScope::DB do
   end
 
   before do
-    @db = StarScope::DB.new(false, false)
+    @db = StarScope::DB.new(:quiet)
   end
 
   it "must raise on invalid tables" do
@@ -30,16 +30,16 @@ describe StarScope::DB do
   end
 
   it "must add paths" do
-    paths = [GOLANG_SAMPLE, 'test/files/**/*']
+    paths = [GOLANG_SAMPLE, "#{FIXTURES}/**/*"]
     @db.add_paths(paths)
     @db.instance_eval('@meta[:paths]').must_equal paths
     validate(@db)
   end
 
   it "must add excludes" do
-    paths = [GOLANG_SAMPLE, 'test/files/**/*']
+    paths = [GOLANG_SAMPLE, "#{FIXTURES}/**/*"]
     @db.add_paths(paths)
-    @db.add_excludes(['test/files/**'])
+    @db.add_excludes(["#{FIXTURES}/**"])
     files = @db.instance_eval('@meta[:files]').keys
     files.wont_include RUBY_SAMPLE
     files.wont_include GOLANG_SAMPLE
@@ -49,20 +49,20 @@ describe StarScope::DB do
   end
 
   it "must pick up new files in old paths" do
-    @db.instance_eval('@meta[:paths] = ["test/files/**/*"]')
+    @db.instance_eval("@meta[:paths] = [\"#{FIXTURES}/**/*\"]")
     @db.update
     validate(@db)
   end
 
   it "must remove old files in existing paths" do
-    @db.instance_eval('@meta[:paths] = ["test/files/**/*"]')
-    @db.instance_eval('@meta[:files] = {"test/files/foo" => {:last_updated=>1}}')
+    @db.instance_eval("@meta[:paths] = [\"#{FIXTURES}/**/*\"]")
+    @db.instance_eval("@meta[:files] = {\"#{FIXTURES}/foo\" => {:last_updated=>1}}")
     @db.update
-    @db.instance_eval('@meta[:files]').keys.wont_include 'test/files/foo'
+    @db.instance_eval("@meta[:files]").keys.wont_include "#{FIXTURES}/foo"
   end
 
   it "must update stale existing files" do
-    @db.instance_eval('@meta[:paths] = ["test/files/**/*"]')
+    @db.instance_eval("@meta[:paths] = [\"#{FIXTURES}/**/*\"]")
     @db.instance_eval("@meta[:files] = {\"#{GOLANG_SAMPLE}\" => {:last_updated=>1}}")
     @db.instance_eval("@tables[:defs] = [{:file => \"#{GOLANG_SAMPLE}\"}]")
     @db.update
@@ -70,17 +70,17 @@ describe StarScope::DB do
   end
 
   it "must load an old DB file" do
-    @db.load('test/files/db_old.json.gz')
-    @db.instance_eval('@meta[:paths]').must_equal ['test/files/**/*']
+    @db.load("#{FIXTURES}/db_old.json.gz")
+    @db.instance_eval('@meta[:paths]').must_equal ["#{FIXTURES}/**/*"]
     validate(@db)
   end
 
   it "must round-trip a database" do
     file = Tempfile.new('starscope_test')
     begin
-      @db.add_paths(['test/files'])
+      @db.add_paths(["#{FIXTURES}"])
       @db.save(file.path)
-      tmp = StarScope::DB.new(false, false)
+      tmp = StarScope::DB.new(:quiet)
       tmp.load(file.path)
       validate(tmp)
     ensure
@@ -92,11 +92,11 @@ describe StarScope::DB do
   it "must export to ctags" do
     file = Tempfile.new('starscope_test')
     begin
-      @db.add_paths(['test/files'])
+      @db.add_paths(["#{FIXTURES}"])
       @db.export_ctags(file)
       file.rewind
       lines = file.lines.to_a
-      lines.must_include "NoTableError\ttest/files/sample_ruby.rb\t/^  class NoTableError < StandardError; end$/;\"\tkind:c\n"
+      lines.must_include "NoTableError\t#{FIXTURES}/sample_ruby.rb\t/^  class NoTableError < StandardError; end$/;\"\tkind:c\n"
     ensure
       file.close
       file.unlink
@@ -106,13 +106,20 @@ describe StarScope::DB do
   it "must export to cscope" do
     file = Tempfile.new('starscope_test')
     begin
-      @db.add_paths(['test/files'])
+      @db.add_paths(["#{FIXTURES}"])
       @db.export_cscope(file)
       file.rewind
       lines = file.lines.to_a
-      lines.must_include "\t@test/files/sample_golang.go\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.wont_include "= [\n"
+      lines.wont_include "4 LANGS = [\n"
+      lines.wont_include "116 tmpdb[entry[:file]][entry[:line_no]] ||= []\n"
     ensure
       file.close
       file.unlink
@@ -120,7 +127,7 @@ describe StarScope::DB do
   end
 
   it "must run queries" do
-    @db.add_paths(['test/files'])
+    @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

data/test/{lib → unit}/test_golang.rb

@@ -48,10 +48,12 @@ class TestGolang < Minitest::Test
     assert calls.keys.include? :b
     assert calls.keys.include? :c
     assert calls.keys.include? :ttt
+    assert calls.keys.include? :Errorf
     assert calls[:a].count == 3
     assert calls[:b].count == 4
     assert calls[:c].count == 4
     assert calls[:ttt].count == 2
+    assert calls[:Errorf].count == 2
   end
 
   def test_variable_assigns

data/test/{lib → unit}/test_record.rb

@@ -19,7 +19,7 @@ describe StarScope::Record do
     rec = StarScope::Record.build(GOLANG_SAMPLE, :a, {:line_no => 1})
     rec[:line].must_equal "package main"
 
-    rec = StarScope::Record.build(GOLANG_SAMPLE, :a, {:line_no => 62})
+    rec = StarScope::Record.build(GOLANG_SAMPLE, :a, {:line_no => 66})
     rec[:line].must_equal "\tfmt.Println(t)"
 
     rec = StarScope::Record.build(RUBY_SAMPLE, :a, {:line_no => 1})
@@ -28,7 +28,7 @@ describe StarScope::Record do
     rec = StarScope::Record.build(RUBY_SAMPLE, :a, {:line_no => 163})
     rec[:line].must_equal "end"
 
-    rec = StarScope::Record.build(GOLANG_SAMPLE, :a, {:line_no => 63})
+    rec = StarScope::Record.build(GOLANG_SAMPLE, :a, {:line_no => 67})
     rec[:line].must_equal "}"
   end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: starscope
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Evan Huus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,49 +69,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A tool like the venerable cscope, but for ruby, golang and other languages
@@ -139,6 +124,9 @@ files:
 - README.md
 - Rakefile
 - bin/starscope
+- doc/DB_FORMAT.md
+- doc/LANGUAGE_SUPPORT.md
+- doc/USER_GUIDE.md
 - lib/starscope.rb
 - lib/starscope/db.rb
 - lib/starscope/langs/coffeescript.rb
@@ -149,54 +137,50 @@ files:
 - lib/starscope/record.rb
 - lib/starscope/version.rb
 - starscope.gemspec
-- test/files/db_old.json.gz
-- test/files/empty
-- test/files/sample_golang.go
-- test/files/sample_ruby.rb
-- test/lib/test_db.rb
-- test/lib/test_golang.rb
-- test/lib/test_matcher.rb
-- test/lib/test_record.rb
-- test/lib/test_ruby.rb
-- test/lib/test_starscope.rb
+- test/fixtures/db_old.json.gz
+- test/fixtures/empty
+- test/fixtures/sample_golang.go
+- test/fixtures/sample_ruby.rb
+- test/functional/test_starscope.rb
 - test/test_helper.rb
+- test/unit/test_db.rb
+- test/unit/test_golang.rb
+- test/unit/test_matcher.rb
+- test/unit/test_record.rb
+- test/unit/test_ruby.rb
 homepage: https://github.com/eapache/starscope
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1535830419513548498
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A code indexer and analyzer
 test_files:
-- test/files/db_old.json.gz
-- test/files/empty
-- test/files/sample_golang.go
-- test/files/sample_ruby.rb
-- test/lib/test_db.rb
-- test/lib/test_golang.rb
-- test/lib/test_matcher.rb
-- test/lib/test_record.rb
-- test/lib/test_ruby.rb
-- test/lib/test_starscope.rb
+- test/fixtures/db_old.json.gz
+- test/fixtures/empty
+- test/fixtures/sample_golang.go
+- test/fixtures/sample_ruby.rb
+- test/functional/test_starscope.rb
 - test/test_helper.rb
+- test/unit/test_db.rb
+- test/unit/test_golang.rb
+- test/unit/test_matcher.rb
+- test/unit/test_record.rb
+- test/unit/test_ruby.rb