starscope 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a672745a78f09d23b3777f8f11ca3725f673afe6
-  data.tar.gz: 7ec09bdfae0344c549d6c145d10dfc6593bf6bfc
+  metadata.gz: 16cc0b7d5c3226ca3680b475dfcd923348352d9f
+  data.tar.gz: f3c98060b7b84c54fc13fab3469387f691dfb76f
 SHA512:
-  metadata.gz: 7026d21cc7c2c1be4755db9f6b4c5ab93cbed8073c31b417d39dc9d8ffdf8bb2c028cb5d999cff4185795a86c19fedc7d0a45ecadd9bbb1d14effbce1265ada1
-  data.tar.gz: 2fe2786def57bbbae6e24d4baeee414dc971a7c6b07e0b7f1b0ed56e5db03f723da28b9023bc245ff810e4ce5c7f812144e466c2476cfc1c6a0807b32bb27450
+  metadata.gz: 6b56db7031396663009a1d062b7444ada17e3d103f2bb972e6bd94b6211eb22a4a44d3891ae1e9a01dc8317800d64438c3f45d4fa25fc8dd17e8e8e1f9ce36bc
+  data.tar.gz: 7080292f2aaa289b20733edf0a40594ad213864cdda3b7c014143aae6405c51aa142993b52058313f8ddfa0703401db21c47eec0b7d30cfcc36de94648c344b4

data/.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 
 rvm:
     - 2.0
-    - 2.1
-    - 2.2
     - 2.3
     - 2.4
+    - 2.5
+    - 2.6.1

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+v1.5.7 (2019-04-04)
+--------------------
+
+ * Use binary mode for file writes to fix compatibility on MS Windows (#171).
+ * Make sure the database is still valid when a parse exception happens (#173).
+ * Fix handling of `__ENCODING__` literals in ruby parser (#174).
+ * Update some dependencies.
+
 v1.5.6 (2018-01-16)
 --------------------
 

data/README.md

@@ -63,5 +63,3 @@ Other Uses
 
 - Starscope is a supported backend for
 [CodeQuery](https://github.com/ruben2020/codequery).
-- Starscope has been [packaged for Arch
-  Linux](https://aur.archlinux.org/packages/ruby-starscope/).

data/lib/starscope/db.rb

@@ -56,7 +56,7 @@ module Starscope
 
       @meta[:langs].merge!(LANGS)
 
-      File.open(filename, 'w') do |file|
+      File.open(filename, 'wb') do |file|
         Zlib::GzipWriter.wrap(file) do |stream|
           stream.puts DB_FORMAT
           stream.puts Oj.dump @meta
@@ -148,7 +148,7 @@ module Starscope
     private
 
     def open_db(filename)
-      File.open(filename, 'r') do |file|
+      File.open(filename, 'rb') do |file|
         begin
           Zlib::GzipReader.wrap(file) do |stream|
             parse_db(stream)
@@ -272,15 +272,17 @@ module Starscope
         @meta[:files][file][:sublangs] << lang
       end
 
+    rescue => e
+      @output.normal("#{extractor} raised \"#{e}\" while extracting #{file}")
+    ensure
+      # metadata must be created for any record that was inserted into a tbl
+      # even if there was later a rescued exception
       @meta[:files][file][:lang] = extractor.name.split('::').last.to_sym
       @meta[:files][file][:lines] = lines
 
       if extractor_metadata.is_a? Hash
         @meta[:files][file] = extractor_metadata.merge!(@meta[:files][file])
       end
-
-    rescue => e
-      @output.normal("#{extractor} raised \"#{e}\" while extracting #{file}")
     end
 
     def file_changed(name)

data/lib/starscope/exportable.rb

@@ -19,7 +19,7 @@ module Starscope
 
       @output.normal("Exporting to '#{path}' in format '#{format}'...")
       path_prefix = Pathname.getwd.relative_path_from(Pathname.new(path).dirname.expand_path)
-      File.open(path, 'w') do |file|
+      File.open(path, 'wb') do |file|
         export_to(format, file, path_prefix)
       end
       @output.normal('Export complete.')

data/lib/starscope/langs/ruby.rb

@@ -90,7 +90,16 @@ module Starscope
 
         when :const
           name = scoped_name(node, scope)
-          yield :reads, name, line_no: loc.line, col: loc.name.column
+          # handle `__ENCODING__` and other weird quasi-constants
+          column = case loc
+                   when Parser::Source::Map::Constant
+                     loc.name.column
+                   when Parser::Source::Map
+                     loc.column
+                   when nil
+                     return
+                   end
+          yield :reads, name, line_no: loc.line, col: column
 
         when :lvar, :ivar, :cvar, :gvar
           yield :reads, scope + [node.children[0]], line_no: loc.line, col: loc.name.column

data/lib/starscope/version.rb

@@ -1,3 +1,3 @@
 module Starscope
-  VERSION = '1.5.6'.freeze
+  VERSION = '1.5.7'.freeze
 end

data/starscope.gemspec

@@ -19,14 +19,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.required_ruby_version = '>= 2.0'
 
-  gem.add_dependency 'oj', '~> 3.3'
-  gem.add_dependency 'parser', '~> 2.4'
+  gem.add_dependency 'oj', '~> 3.7'
+  gem.add_dependency 'parser', '~> 2.6'
   gem.add_dependency 'ruby-progressbar', '~> 1.9'
   gem.add_dependency 'rkelly-remix', '~> 0.0.7'
   gem.add_dependency 'babel-transpiler', '~> 0.7'
   gem.add_dependency 'sourcemap', '~> 0.1'
 
-  gem.add_development_dependency 'bundler', '~> 1.7'
+  gem.add_development_dependency 'bundler', '>= 1.7'
   gem.add_development_dependency 'rake', '~> 11.2'
   gem.add_development_dependency 'pry', '~> 0.11'
   gem.add_development_dependency 'minitest', '~> 5.10'

data/test/fixtures/sample_ruby.rb

@@ -162,3 +162,5 @@ class Starscope::DB
     end
   end
 end
+
+puts __ENCODING__

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 require 'minitest/autorun'
 require 'minitest/pride'
-require 'mocha/mini_test'
+require 'mocha/minitest'
 require_relative '../lib/starscope'
 
 FIXTURES = 'test/fixtures'.freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: starscope
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Evan Huus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +98,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Smart code search and indexing