starscope 1.1.1 → 1.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2235e7d803ca938cc48e75eee57d14eb6b5b7a9d
+  data.tar.gz: 20c2ff4775299f5b0fa8b96aa38d260a62a48149
+SHA512:
+  metadata.gz: 900973601a54f6383c1b58f2302d5c9f6f37e6333540b4ff36167bff8523038d842bf78f6b2337b518208381e2b395634cf93e429750ec879a1b828b4825ef5e
+  data.tar.gz: 6570238f423d05dcf5e17f3b133380f2d7e77f542520d7d65e3572062de9f93c87ac8f97350c8b47903a82e881ba0361c19a4358769d9f87ce78311e70a22647

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 Changelog
 =========
 
-v1.1.1 (trunk)
+v1.1.2 (trunk)
+--------------------
+
+Bug Fixes:
+ * Don't crash exporting to cscope if tokens overlap.
+ * In golang, don't parse inside string literals.
+
+v1.1.1 (2014-07-21)
 --------------------
 
 New Features:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    starscope (1.1.1)
+    starscope (1.1.2)
       oj (~> 2.9)
       parser (~> 2.1)
       ruby-progressbar (~> 1.5)

data/README.md

@@ -2,7 +2,7 @@ StarScope
 =========
 
 [![Gem Version](https://badge.fury.io/rb/starscope.png)](http://badge.fury.io/rb/starscope)
-[![Build Status](https://travis-ci.org/eapache/starscope.png?branch=master)](https://travis-ci.org/eapache/starscope)
+[![Build Status](https://travis-ci.org/eapache/starscope.svg?branch=master)](https://travis-ci.org/eapache/starscope)
 
 Anyone who has done much programming in C (or C++) on a Unix-based OS has come
 across the fantastic [Cscope](http://cscope.sourceforge.net/) tool. Sadly, it

data/lib/starscope/db.rb

@@ -218,6 +218,8 @@ END
         buf << line_no.to_s << " "
         toks.each do |offset, record|
 
+          next if offset < prev # this probably indicates an extractor bug
+
           # Don't export nested functions, cscope barfs on them since C doesn't
           # have them at all. Skipping tokens is easy; since prev isn't updated
           # they get turned into plain text automatically.

data/lib/starscope/langs/go.rb

@@ -3,6 +3,7 @@ module StarScope::Lang
     FUNC_CALL = /([\w\.]*?\w)\(/
     END_OF_BLOCK = /^\s*\}\s*$/
     END_OF_GROUP = /^\s*\)\s*$/
+    STRING_LITERAL = /".+?"/
     BUILTIN_FUNCS = ['new', 'make', 'len', 'close', 'copy', 'delete',
                      'int', 'int8', 'int16', 'int32', 'int64',
                      'uint', 'uint8', 'uint16', 'uint32', 'uint64',
@@ -16,18 +17,18 @@ module StarScope::Lang
     def self.extract(file, &block)
       stack = []
       scope = []
-      str = File.readlines(file).each_with_index do |line, line_no|
+      File.readlines(file).each_with_index do |line, line_no|
         line_no += 1 # zero-index to one-index
 
         # strip single-line comments like // foo
-        match = /(.*)\/\//.match(line)
-        line = match[1] if match
+        match = /\/\//.match(line)
+        line = match.pre_match if match
         # strip single-line comments like foo /* foo */ foo
-        match = /(.*?)\/\*.*\*\/(.*)/.match(line)
-        line = match[1] + match[2] if match
+        match = /\/\*.*\*\//.match(line)
+        line = match.pre_match + match.post_match if match
         # strip end-of-line comment starters like foo /* foo \n
-        match = /(.*?)\/\*/.match(line)
-        line = match[1] if match
+        match = /\/\*/.match(line)
+        line = match.pre_match if match
         ends_with_comment = !match.nil?
 
         # if we're in a block comment, wait for it to end
@@ -38,6 +39,15 @@ module StarScope::Lang
           stack.pop
         end
 
+        if stack[-1] != :import && !line.start_with?("import")
+          # strip string literals like "foo" unless they're part of an import
+          pos = 0
+          while match = STRING_LITERAL.match(line[pos..-1])
+            line = line[0...pos] + match.pre_match + "\"\"" + match.post_match
+            pos += match.begin(0) + 2
+          end
+        end
+
         # poor-man's parser
         case stack[-1]
         when :struct

data/lib/starscope/version.rb

@@ -1,3 +1,3 @@
 module StarScope
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/test/fixtures/sample_golang.go

@@ -21,7 +21,7 @@ const (
 
 var x error = fmt.Errorf("ABC")
 
-const y error = fmt.Errorf("ABC")
+const y string = "ABC"
 
 type foo interface {
 	bar() int
@@ -43,6 +43,11 @@ func ttt() (int, int) {
 	return 1, 2
 }
 
+type Message struct {
+	Topic, Value string
+	Key          *int
+}
+
 func main() {
 	var (
 		q int
@@ -64,4 +69,8 @@ func main() {
 
 	fmt.Println(n)
 	fmt.Println(t)
+
+	msg := &Message{Topic: "single_partition", Key: nil, Value: string(fmt.Sprintf("testing %d", q))}
+
+	fmt.Print(msg)
 }

data/test/unit/test_golang.rb

@@ -38,7 +38,7 @@ class TestGolang < Minitest::Test
 
   def test_ends
     assert @db.keys.include? :end
-    assert @db[:end].count == 6
+    assert @db[:end].count == 7
   end
 
   def test_function_calls
@@ -53,7 +53,7 @@ class TestGolang < Minitest::Test
     assert calls[:b].count == 4
     assert calls[:c].count == 4
     assert calls[:ttt].count == 2
-    assert calls[:Errorf].count == 2
+    assert calls[:Errorf].count == 1
   end
 
   def test_variable_assigns
@@ -64,10 +64,17 @@ class TestGolang < Minitest::Test
     assert assigns.keys.include? :z
     assert assigns.keys.include? :n
     assert assigns.keys.include? :m
+    assert assigns.keys.include? :msg
     assert assigns[:x].count == 2
     assert assigns[:y].count == 1
     assert assigns[:z].count == 1
     assert assigns[:n].count == 1
     assert assigns[:m].count == 2
   end
+
+  def test_imports
+    assert @db.keys.include? :imports
+    imports = @db[:imports].group_by {|x| x[:name][-1]}
+    assert imports.keys.include? :fmt
+  end
 end

data/test/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 => 66})
+    rec = StarScope::Record.build(GOLANG_SAMPLE, :a, {:line_no => 71})
     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 => 164})
     rec[:line].must_equal "end"
 
-    rec = StarScope::Record.build(GOLANG_SAMPLE, :a, {:line_no => 67})
+    rec = StarScope::Record.build(GOLANG_SAMPLE, :a, {:line_no => 44})
     rec[:line].must_equal "}"
   end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: starscope
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.1.2
 platform: ruby
 authors:
 - Evan Huus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-07-29 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
@@ -166,30 +151,26 @@ files:
 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: 4529526884689841888
 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/fixtures/db_old.json.gz