starscope 1.1.0 → 1.1.1

data/CHANGELOG.md

@@ -1,7 +1,17 @@
 Changelog
 =========
 
-v1.1.0 (trunk)
+v1.1.1 (trunk)
+--------------------
+
+New Features:
+ * Export of ctags `language` tag (needed for `YouCompleteMe` support).
+
+Bug Fixes:
+ * In ruby, correctly report calls to functions such as `foo=` as assignments to
+   `foo`.
+
+v1.1.0 (2014-07-16)
 --------------------
 
 Bug Fixes:

data/Gemfile.lock

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

data/README.md

@@ -4,14 +4,14 @@ 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)
 
-Anyone who has done much programming in C (or C++) on a unix-based OS has come
+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
 only works for C (and sort of works for C++).
 
 StarScope is a similar tool for [Ruby](https://www.ruby-lang.org/) and
 [Golang](http://golang.org/), with a design intended to make it easy to add
-support for other languages within the same framework (thus the name StarScope,
-i.e. \*scope).
+[support for other languages](doc/LANGUAGE_SUPPORT.md) within the same framework
+(thus the name StarScope, i.e. \*scope).
 
 Install it as a gem:
 ```

data/doc/USER_GUIDE.md

@@ -1,6 +1,17 @@
 StarScope User Guide
 ====================
 
+About
+-----
+
+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
+only works for C (and sort of works for C++).
+
+StarScope is a similar tool for [Ruby](https://www.ruby-lang.org/) and
+[Golang](http://golang.org/), with a design intended to make it easy to add
+[support for other languages](doc/LANGUAGE_SUPPORT.md) within the same framework
+(thus the name StarScope, i.e. \*scope).
 
 Installation
 ------------

data/lib/starscope/db.rb

@@ -193,7 +193,7 @@ class StarScope::DB
 END
     defs = (@tables[:defs] || {}).sort_by {|x| x[:name][-1].to_s}
     defs.each do |record|
-      file.puts StarScope::Record.ctag_line(record)
+      file.puts StarScope::Record.ctag_line(record, @meta[:files][record[:file]])
     end
   end
 

data/lib/starscope/langs/ruby.rb

@@ -55,8 +55,13 @@ module StarScope::Lang
 
         case node.type
         when :send
-          yield :calls, scoped_name(node), :line_no => loc.line, :col => loc.column
-          if node.children[0].nil? and node.children[1] == :require and node.children[2].type == :str
+          name = scoped_name(node)
+          yield :calls, name, :line_no => loc.line, :col => loc.column
+
+          if name.last.to_s =~ /\w+=$/
+            name[-1] = name.last.to_s.chop.to_sym
+            yield :assigns, name, :line_no => loc.line, :col => loc.column
+          elsif node.children[0].nil? and node.children[1] == :require and node.children[2].type == :str
             yield :requires, node.children[2].children[0].split("/"),
               :line_no => loc.line, :col => loc.column
           end

data/lib/starscope/record.rb

@@ -28,13 +28,13 @@ class StarScope::Record
     "#{rec[:name].join " "} -- #{rec[:file]}:#{rec[:line_no]} (#{rec[:line].strip})"
   end
 
-  def self.ctag_line(rec)
+  def self.ctag_line(rec, file)
     ret = "#{rec[:name][-1]}\t#{rec[:file]}\t/^#{rec[:line]}$/"
 
-    ext = self.ctag_ext_tags(rec)
+    ext = self.ctag_ext_tags(rec, file)
     if not ext.empty?
       ret << ";\""
-      ext.each do |k, v|
+      ext.sort.each do |k, v|
         ret << "\t#{k}:#{v}"
       end
     end
@@ -42,7 +42,7 @@ class StarScope::Record
     ret
   end
 
-  def self.ctag_ext_tags(rec)
+  def self.ctag_ext_tags(rec, file)
     tag = {}
 
     # these extensions are documented at http://ctags.sourceforge.net/FORMAT
@@ -53,6 +53,8 @@ class StarScope::Record
       tag["kind"] = "c"
     end
 
+    tag["language"] = file[:lang]
+
     tag
   end
 

data/lib/starscope/version.rb

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

data/test/fixtures/sample_ruby.rb

@@ -17,6 +17,7 @@ class StarScope::DB
     @paths = []
     @files = {}
     @tables = {}
+    self.foo = :bar
   end
 
   def load(file)

data/test/unit/test_db.rb

@@ -96,7 +96,7 @@ describe StarScope::DB do
       @db.export_ctags(file)
       file.rewind
       lines = file.lines.to_a
-      lines.must_include "NoTableError\t#{FIXTURES}/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\tlanguage:Ruby\n"
     ensure
       file.close
       file.unlink

data/test/unit/test_record.rb

@@ -25,7 +25,7 @@ describe StarScope::Record do
     rec = StarScope::Record.build(RUBY_SAMPLE, :a, {:line_no => 1})
     rec[:line].must_equal "require 'date'"
 
-    rec = StarScope::Record.build(RUBY_SAMPLE, :a, {:line_no => 163})
+    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})

data/test/unit/test_ruby.rb

@@ -49,7 +49,12 @@ class TestRuby < Minitest::Test
     assigns = @db[:assigns].group_by {|x| x[:name][-1]}
     assert assigns.keys.include? :pbar
     assert assigns.keys.include? :PBAR_FORMAT
+    assert assigns.keys.include? :foo
     assert assigns[:pbar].count == 2
     assert assigns[:PBAR_FORMAT].count == 1
+    assert assigns[:foo].count == 1
+
+    refute assigns.keys.include? "=".to_sym
+    refute assigns.keys.include? "<".to_sym
   end
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: starscope
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
+  prerelease: 
 platform: ruby
 authors:
 - Evan Huus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,43 +78,49 @@ 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
@@ -151,26 +166,30 @@ 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: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A code indexer and analyzer
 test_files:
 - test/fixtures/db_old.json.gz

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 9f58bc7549fa2f4d8d7da61d2771a1e6f75939e2
-  data.tar.gz: 1452b9af5221dc6bc2147d0149870e564e2344fc
-SHA512:
-  metadata.gz: d9c15bef6cef5e856d023944439efac3a0caa9c2b55f1b018e50d8f7c4fa6f2ced00b8bb595639958547426db52ae23abb9487611ff883638950dbac9876da48
-  data.tar.gz: 821ec54d44933500bffc87b871410fbd08cdbc3b9c2e9c0f28a9c4dadb289d07fd12215993763e0982b26013d82e1fd589a1cb3eba876bd852e958c495c17df5