starscope 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da191b58f08b524eb31cda50bf5194e3b691e4e4
-  data.tar.gz: eaa0415c40b4428a741d162b6ce632b8a985a07d
+  metadata.gz: 9a53857d630c84472be96e4290b3ea5e0db5a91f
+  data.tar.gz: fce33444e0824932570e254b79299eb02abdd3e5
 SHA512:
-  metadata.gz: ee659c9708a121d3c26dfc5a733fa90960bc71c6bbd5e19e47cc14278e45dbab63e7cc35a4b827b12db78b83be0f0951fef6015d5983dfa58ba450d29f4a5cc4
-  data.tar.gz: 73a5d16b4a4a21d8b4d4e2dc1eff507fb439445294868d809f76963e7264575c0a9a94b67a15ad9fb181ce63d590b7f86c5cf5b69583e21b698765945fcac2fb
+  metadata.gz: f99e826dd012862204a89d4578920835952f28a08929e22612f04dda3861c15d75919bac97f2fc2c89dc5e632db61ec1f49ae2619474814fec4e1fb492ea2cbf
+  data.tar.gz: eefdd45150054b3039ef7bd540a008fa44231def86f019803f0625a3b3945a145754fe927ac16b32a857e53a8828d32910b933a6ec97914b8eb33b2a2c6c96ab

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 sudo: false
+cache: bundler
 
 rvm:
     - 1.9.3

data/CHANGELOG.md

@@ -1,7 +1,17 @@
 Changelog
 =========
 
-v1.5.0 (trunk)
+v1.5.1 (trunk)
+--------------------
+
+Improvements:
+ * Support CommonJS require syntax and ES6 import syntax in JavaScript (#146).
+
+Bug Fixes:
+ * Fix handling of Ctrl-C in line-mode to exit cleanly instead of crashing.
+ * Fix handling of braceless fat-arrow methods in JavaScript (#147).
+
+v1.5.0 (2015-09-24)
 --------------------
 
 New Features:

data/Rakefile

@@ -1,9 +1,12 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
+require 'rubocop/rake_task'
 
 Rake::TestTask.new do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-desc 'Run tests'
-task default: :test
+RuboCop::RakeTask.new
+
+desc 'Run tests and style checks'
+task default: [:test, :rubocop]

data/bin/starscope

@@ -295,7 +295,6 @@ if options[:linemode]
       end
     end
   rescue Interrupt
-    # just exit
-    return
+    exit
   end
 end

data/doc/LANGUAGE_SUPPORT.md

@@ -62,7 +62,7 @@ belongs (basically its type). Current tables already include:
  * `defs` for definitions of classes, functions, modules, etc.
  * `end` for the matching *end* of each definition
  * `assigns` for variable assignment
- * `requires` for required files in Ruby
+ * `requires` for required files in Ruby and JavaScript
  * `imports` for imported packages in Golang
  * `reads` for reading of variables, constants etc. (e.g. use in an expression)
  * `sym` for Ruby symbols

data/lib/starscope/langs/javascript.rb

@@ -4,7 +4,7 @@ require 'sourcemap'
 
 module Starscope::Lang
   module Javascript
-    VERSION = 0
+    VERSION = 1
 
     def self.match_file(name)
       name.end_with?('.js')
@@ -49,17 +49,28 @@ module Starscope::Lang
           next if type == :class
 
           mapping = map.bsearch(SourceMap::Offset.new(node.range.to.line, node.range.to.char))
-          yield :end, :'}', line_no: mapping.original.line, type: type
+          if lines[mapping.original.line - 1].include? '}'
+            yield :end, '}', line_no: mapping.original.line, type: type
+          else
+            yield :end, '', line_no: mapping.original.line, type: type, col: mapping.original.column
+          end
         when RKelly::Nodes::FunctionCallNode
           name = node_name(node.value)
           next unless name
 
+          node = node.arguments.value[0] if name == 'require'
+
           line = find_line(node.range.from, map, lines, name)
           next unless line
 
-          yield :calls, name, line_no: line
           found[name] ||= Set.new
           found[name].add(line)
+
+          if name == 'require'
+            yield :requires, node.value[1...-1], line_no: line
+          else
+            yield :calls, name, line_no: line
+          end
         end
       end
 
@@ -73,6 +84,15 @@ module Starscope::Lang
         line = find_line(node.range.from, map, lines, node.name)
         next unless line
 
+        if node.value.is_a?(RKelly::Nodes::AssignExprNode) &&
+           node.value.value.is_a?(RKelly::Nodes::FunctionCallNode) &&
+           node.value.value.value.is_a?(RKelly::Nodes::ResolveNode) &&
+           node.value.value.value.value == 'require'
+          found[node.name] ||= Set.new
+          found[node.name].add(line)
+          next
+        end
+
         next if found[node.name] && found[node.name].include?(line)
         yield :defs, node.name, line_no: line
         found[node.name] ||= Set.new
@@ -107,7 +127,10 @@ module Starscope::Lang
     def self.find_line(from, map, lines, name)
       mapping = map.bsearch(SourceMap::Offset.new(from.line, from.char))
       return unless mapping
-      return unless lines[mapping.original.line - 1].include? name
+
+      line = lines[mapping.original.line - 1]
+      return unless line.include?(name) || (name == 'require' && line.include?('import'))
+
       mapping.original.line
     end
   end

data/lib/starscope/version.rb

@@ -1,3 +1,3 @@
 module Starscope
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

data/starscope.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |gem|
   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.34.2'
 end

data/test/fixtures/sample_javascript.js

@@ -2,6 +2,8 @@
 
 import React from 'react-native';
 
+let madness = require('foo-bar');
+
 var {
   Component,
   StyleSheet,
@@ -15,6 +17,7 @@ var styles = StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
   },
+  bracelessMethod: () => 42,
 });
 
 var func1 = () => {

data/test/functional/starscope_test.rb

@@ -22,7 +22,9 @@ describe 'starscope executable script' do
   it 'must produce a valid database dump' do
     lines = `#{EXTRACT} -d requires`.lines.to_a
     lines[1].split.first.must_equal 'date'
-    lines[2].split.first.must_equal 'zlib'
+    lines[2].split.first.must_equal 'foo-bar'
+    lines[3].split.first.must_equal 'react-native'
+    lines[4].split.first.must_equal 'zlib'
   end
 
   it 'must correctly query the database' do

data/test/unit/langs/javascript_test.rb

@@ -35,11 +35,14 @@ describe Starscope::Lang::Javascript do
     defs.must_include :foo
     defs.must_include :MyStat
     defs.must_include :myStatFunc
+    defs.must_include :bracelessMethod
 
     defs.wont_include :setStyle
     defs.wont_include :setState
     defs.wont_include :fontFamily
     defs.wont_include :navigator
+    defs.wont_include :madness
+    defs.wont_include :React
   end
 
   it 'must only tag static classes once' do
@@ -48,7 +51,12 @@ describe Starscope::Lang::Javascript do
 
   it 'must identify endings' do
     @db.keys.must_include :end
-    @db[:end].count.must_equal 11
+    @db[:end].count.must_equal 12
+
+    # bracelessMethod doesn't have a taggable end token so
+    # we have to do a little dancing with an empty name and a precise column
+    @db[:end][0][:name].must_equal [:'']
+    @db[:end][0][:col].must_equal 27
   end
 
   it 'must identify function calls' do
@@ -65,4 +73,12 @@ describe Starscope::Lang::Javascript do
     calls[:pop].count.must_equal 1
     calls[:_tabItem].count.must_equal 3
   end
+
+  it 'must identify module requires' do
+    @db.keys.must_include :requires
+    requires = @db[:requires].group_by { |x| x[:name][-1] }
+
+    requires.keys.must_include :'foo-bar'
+    requires.keys.must_include :'react-native'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: starscope
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Evan Huus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !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.34.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.34.2
 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
@@ -243,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Smart code search and indexing