starscope 0.1.9 → 0.1.10

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 
 rvm:
+    - 1.8.7
+    - 1.9.2
     - 1.9.3
     - 2.0.0
     - 2.1.0

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 Changelog
 =========
 
-v0.1.9 (trunk)
+v0.1.10 (trunk)
+-------------------
+
+Improvements:
+ * Import new ruby parser version and make necessary changes so that StarScope
+   now runs on older Ruby versions (1.9.2 and 1.8.7)
+
+v0.1.9 (2014-02-22)
 -------------------
 
 Bug Fixes:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    starscope (0.1.9)
+    starscope (0.1.10)
       oj (~> 2.5)
       parser (~> 2.1)
       ruby-progressbar (~> 1.4)
@@ -11,25 +11,16 @@ GEM
   specs:
     ast (1.1.0)
     coderay (1.1.0)
-    columnize (0.3.6)
-    debugger (1.6.5)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.1)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.1)
     method_source (0.8.2)
+    minitest (5.2.3)
     oj (2.5.5)
-    parser (2.1.4)
+    parser (2.1.5)
       ast (~> 1.1)
       slop (~> 3.4, >= 3.4.5)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-debugger (0.2.2)
-      debugger (~> 1.3)
-      pry (~> 0.9.10)
     rake (10.1.1)
     ruby-progressbar (1.4.1)
     slop (3.4.7)
@@ -39,7 +30,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.5)
+  minitest
   pry
-  pry-debugger
   rake
   starscope!

data/README.md

@@ -13,7 +13,7 @@ StarScope is a similar tool for [Ruby](https://www.ruby-lang.org/) and
 support for other languages at some point within the same framework (thus the
 name StarScope, ie \*scope).
 
-Install it as a gem (requires at least Ruby 1.9.3):
+Install it as a gem:
 ```
 $ gem install starscope
 ```

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
@@ -6,5 +6,5 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['test/lib/test_*.rb']
 end
 
-desc "Run tests"
+desc 'Run tests'
 task :default => :test

data/lib/starscope/db.rb

@@ -33,7 +33,7 @@ class StarScope::DB
         if format == DB_FORMAT
           @paths  = Oj.load(file.gets)
           @files  = Oj.load(file.gets)
-          @tables = Oj.load(file.gets, symbol_keys: true)
+          @tables = Oj.load(file.gets, :symbol_keys => true)
         elsif format <= 2
           # Old format (pre-json), so read the directories segment then rebuild
           len = file.gets.to_i
@@ -66,7 +66,7 @@ class StarScope::DB
     files = paths.map {|p| self.class.files_from_path(p)}.flatten
     return if files.empty?
     if @progress
-      pbar = ProgressBar.create(title: "Building", total: files.length, format: PBAR_FORMAT, length: 80)
+      pbar = ProgressBar.create(:title => "Building", :total => files.length, :format => PBAR_FORMAT, :length => 80)
     end
     files.each do |f|
       add_file(f)
@@ -77,7 +77,7 @@ class StarScope::DB
   def update
     new_files = (@paths.map {|p| self.class.files_from_path(p)}.flatten) - @files.keys
     if @progress
-      pbar = ProgressBar.create(title: "Updating", total: new_files.length + @files.length, format: PBAR_FORMAT, length: 80)
+      pbar = ProgressBar.create(:title => "Updating", :total => new_files.length + @files.length, :format => PBAR_FORMAT, :length => 80)
     end
     changed = @files.keys.map do |f|
       changed = update_file(f)
@@ -236,7 +236,7 @@ END
           if entry[:line_no]
             tmpdb[entry[:file]] ||= {}
             tmpdb[entry[:file]][entry[:line_no]] ||= []
-            tmpdb[entry[:file]][entry[:line_no]] << {tbl: tbl, key: key, entry: entry}
+            tmpdb[entry[:file]][entry[:line_no]] << {:tbl => tbl, :key => key, :entry => entry}
           end
         end
       end

data/lib/starscope/langs/go.rb

@@ -1,7 +1,7 @@
 module StarScope::Lang
   module Go
     FUNC_CALL = /([\w\.]*?\w)\(/
-    END_OF_BLOCK = /^\s*}\s*$/
+    END_OF_BLOCK = /^\s*\}\s*$/
     END_OF_GROUP = /^\s*\)\s*$/
     BUILTIN_FUNCS = ['new', 'make', 'len', 'close', 'copy', 'delete',
                      'int', 'int8', 'int16', 'int32', 'int64',
@@ -51,7 +51,7 @@ module StarScope::Lang
         when :struct
           case line
           when END_OF_BLOCK
-            yield :end, "}", line_no: line_no, scope: scope, type: :class
+            yield :end, "}", :line_no => line_no, :scope => scope, :type => :class
             stack.pop
             scope.pop
           when /(.+)\s+\w+/
@@ -60,11 +60,11 @@ module StarScope::Lang
         when :interface
           case line
           when END_OF_BLOCK
-            yield :end, "}", line_no: line_no, scope: scope, type: :class
+            yield :end, "}", :line_no => line_no, :scope => scope, :type => :class
             stack.pop
             scope.pop
           when /(\w+)\(.*\)\s+/
-            yield :defs, $1, line_no: line_no, scope: scope
+            yield :defs, $1, :line_no => line_no, :scope => scope
           end
         when :def
           case line
@@ -81,55 +81,55 @@ module StarScope::Lang
             stack.pop
           when /"(.+)"/
             name = $1.split('/')
-            yield :imports, name[-1], line_no: line_no, scope: name[0...-1]
+            yield :imports, name[-1], :line_no => line_no, :scope => name[0...-1]
           end
         else
-          if stack[-1] == :func and /^}/ =~ line
-            yield :end, "}", line_no: line_no, type: :func
+          if stack[-1] == :func and /^\}/ =~ line
+            yield :end, "}", :line_no => line_no, :type => :func
             stack.pop
           end
           case line
           when /^func\s+(\w+)\(/
-            yield :defs, $1, line_no: line_no, scope: scope, type: :func
+            yield :defs, $1, :line_no => line_no, :scope => scope, :type => :func
             stack.push(:func)
           when /^func\s+\(\w+\s+\*?(\w+)\)\s*(\w+)\(/
-            yield :defs, $2, line_no: line_no, scope: scope + [$1], type: :func
+            yield :defs, $2, :line_no => line_no, :scope => scope + [$1], :type => :func
             stack.push(:func)
           when /^package\s+(\w+)/
-            yield :defs, $1, line_no: line_no, scope: scope, type: :package
+            yield :defs, $1, :line_no => line_no, :scope => scope, :type => :package
             scope.push($1)
-          when /^type\s+(\w+)\s+struct\s*{/
-            yield :defs, $1, line_no: line_no, scope: scope, type: :class
+          when /^type\s+(\w+)\s+struct\s*\{/
+            yield :defs, $1, :line_no => line_no, :scope => scope, :type => :class
             scope.push($1)
             stack.push(:struct)
-          when /^type\s+(\w+)\s+interface\s*{/
-            yield :defs, $1, line_no: line_no, scope: scope, type: :class
+          when /^type\s+(\w+)\s+interface\s*\{/
+            yield :defs, $1, :line_no => line_no, :scope => scope, :type => :class
             scope.push($1)
             stack.push(:interface)
           when /^type\s+(\w+)/
-            yield :defs, $1, line_no: line_no, scope: scope, type: :type
+            yield :defs, $1, :line_no => line_no, :scope => scope, :type => :type
           when /^import\s+"(.+)"/
             name = $1.split('/')
-            yield :imports, name[-1], line_no: line_no, scope: name[0...-1]
+            yield :imports, name[-1], :line_no => line_no, :scope => name[0...-1]
           when /^import\s+\(/
             stack.push(:import)
           when /^var\s+\(/
             stack.push(:def)
           when /^var\s+(\w+)\s+\w+/
-            yield :defs, $1, line_no: line_no, scope: scope
+            yield :defs, $1, :line_no => line_no, :scope => scope
           when /^const\s+\(/
             stack.push(:def)
           when /^const\s+(\w+)\s+\w+/
-            yield :defs, $1, line_no: line_no, scope: scope
+            yield :defs, $1, :line_no => line_no, :scope => scope
           when /^\s+(.*?) :?=[^=]/
             $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, name[0], line_no: line_no, scope: scope
+                yield :assigns, name[0], :line_no => line_no, :scope => scope
               else
-                yield :assigns, name[1], line_no: line_no, scope: name[0..-1]
+                yield :assigns, name[1], :line_no => line_no, :scope => name[0..-1]
               end
             end
             parse_call(line, line_no, scope, &block)
@@ -151,19 +151,19 @@ module StarScope::Lang
         if name.length == 1
           next if name[0] == 'func'
           if BUILTIN_FUNCS.include?(name[0])
-            yield :calls, name[0], line_no: line_no
+            yield :calls, name[0], :line_no => line_no
           else
-            yield :calls, name[0], line_no: line_no, scope: scope
+            yield :calls, name[0], :line_no => line_no, :scope => scope
           end
         else
-          yield :calls, name[-1], line_no: line_no, scope: name[0...-1]
+          yield :calls, name[-1], :line_no => line_no, :scope => name[0...-1]
         end
       end
     end
 
     def self.parse_def(line, line_no, scope)
       line.split.each do |var|
-        yield :defs, var.delete(','), line_no: line_no, scope: scope
+        yield :defs, var.delete(','), :line_no => line_no, :scope => scope
         break if not var.end_with?(',')
       end
     end

data/lib/starscope/langs/ruby.rb

@@ -53,38 +53,38 @@ module StarScope::Lang
         when :send
           fqn = scoped_name(node)
           yield :calls, fqn.last,
-            line_no: node.location.expression.line,
-            scope: fqn[0...-1]
+            :line_no => node.location.expression.line,
+            :scope => fqn[0...-1]
           if node.children[0].nil? and node.children[1] == :require and node.children[2].type == :str
             fqn = node.children[2].children[0].split("/")
             yield :requires, fqn.last,
-              line_no: node.location.expression.line,
-              scope: fqn[0...-1]
+              :line_no => node.location.expression.line,
+              :scope => fqn[0...-1]
           end
         when :def
           yield :defs, node.children[0],
-            line_no: node.location.expression.line,
-            scope: @scope, type: :func
-          yield :end, :end, line_no: node.location.end.line, type: :func
+            :line_no => node.location.expression.line,
+            :scope => @scope, :type => :func
+          yield :end, :end, :line_no => node.location.end.line, :type => :func
         when :defs
           yield :defs, node.children[1],
-            line_no: node.location.expression.line,
-            scope: @scope, type: :func
-          yield :end, :end, line_no: node.location.end.line, type: :func
+            :line_no => node.location.expression.line,
+            :scope => @scope, :type => :func
+          yield :end, :end, :line_no => node.location.end.line, :type => :func
         when :module, :class
           fqn = @scope + scoped_name(node.children[0])
-          yield :defs, fqn.last, line_no: node.location.expression.line,
-            scope: fqn[0...-1], type: node.type
-          yield :end, :end, line_no: node.location.end.line, type: node.type
+          yield :defs, fqn.last, :line_no => node.location.expression.line,
+            :scope => fqn[0...-1], :type => node.type
+          yield :end, :end, :line_no => node.location.end.line, :type => node.type
         when :casgn
           fqn = scoped_name(node)
           yield :assigns, fqn.last,
-            line_no: node.location.expression.line,
-            scope: fqn[0...-1]
+            :line_no => node.location.expression.line,
+            :scope => fqn[0...-1]
         when :lvasgn, :ivasgn, :cvasgn, :gvasgn
           yield :assigns, node.children[0],
-            line_no: node.location.expression.line,
-            scope: @scope
+            :line_no => node.location.expression.line,
+            :scope => @scope
         end
       end
 

data/lib/starscope/version.rb

@@ -1,3 +1,3 @@
 module StarScope
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/starscope.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'bundler', '~> 1.5'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'pry-debugger'
+  gem.add_development_dependency 'minitest'
 end

data/test/files/sample_ruby.rb

@@ -26,7 +26,7 @@ class StarScope::DB
         if format == DB_FORMAT
           @paths  = Oj.load(file.gets)
           @files  = Oj.load(file.gets)
-          @tables = Oj.load(file.gets, symbol_keys: true)
+          @tables = Oj.load(file.gets, :symbol_keys => true)
         elsif format <= 2
           # Old format (pre-json), so read the directories segment then rebuild
           len = file.gets.to_i
@@ -59,7 +59,7 @@ class StarScope::DB
     files = paths.map {|p| self.class.files_from_path(p)}.flatten
     return if files.empty?
     if @progress
-      pbar = ProgressBar.create(title: "Building", total: files.length, format: PBAR_FORMAT, length: 80)
+      pbar = ProgressBar.create(:title => "Building", :total => files.length, :format => PBAR_FORMAT, :length => 80)
     end
     files.each do |f|
       add_file(f)
@@ -70,7 +70,7 @@ class StarScope::DB
   def update
     new_files = (@paths.map {|p| self.class.files_from_path(p)}.flatten) - @files.keys
     if @progress
-      pbar = ProgressBar.create(title: "Updating", total: new_files.length + @files.length, format: PBAR_FORMAT, length: 80)
+      pbar = ProgressBar.create(:title => "Updating", :total => new_files.length + @files.length, :format => PBAR_FORMAT, :length => 80)
     end
     changed = @files.keys.map do |f|
       changed = update_file(f)
@@ -114,7 +114,7 @@ class StarScope::DB
           if entry[:line_no]
             tmpdb[entry[:file]] ||= {}
             tmpdb[entry[:file]][entry[:line_no]] ||= []
-            tmpdb[entry[:file]][entry[:line_no]] << {tbl: tbl, key: key, entry: entry}
+            tmpdb[entry[:file]][entry[:line_no]] << {:tbl => tbl, :key => key, :entry => entry}
           end
         end
       end

data/test/lib/test_db.rb

@@ -1,4 +1,4 @@
-require_relative '../test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 describe StarScope::DB do
 

data/test/lib/test_golang.rb

@@ -1,6 +1,6 @@
-require_relative '../test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
-class TestGolang < MiniTest::Unit::TestCase
+class TestGolang < Minitest::Test
   def setup
     @db = {}
     StarScope::Lang::Go.extract(GOLANG_SAMPLE) do |tbl, key, args|

data/test/lib/test_ruby.rb

@@ -1,6 +1,6 @@
-require_relative '../test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
-class TestRuby < MiniTest::Unit::TestCase
+class TestRuby < Minitest::Test
   def setup
     @db = {}
     StarScope::Lang::Ruby.extract(RUBY_SAMPLE) do |tbl, key, args|

data/test/lib/test_version.rb

@@ -1,4 +1,4 @@
-require_relative '../test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 describe StarScope do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: starscope
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-debugger
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3638836367076446031
+      hash: 818285020742325812
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23