comment_collector 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd7163400e0f5dad62167c657187a19b3b7d86d19aad2f3c2d878190e22a0853
-  data.tar.gz: 8ec29610159563a21f8d5c70d28e1b76894912c636a6a3c893f86b936781c133
+  metadata.gz: 9442e8e2379b44671f01e6b7febcfc1b1ff7ee28d85fe96acf855e03ec451f68
+  data.tar.gz: 7dcff69ec142cccb629efb610c13b79c8b1d1f13ff48bdf6dae2aa2c3ebdbde8
 SHA512:
-  metadata.gz: cbf8a96d9f0c327db8f7eb8423319eda02f7c92ddf0d08571ce611dc15986642d247115b2ddb2f2e329417b298a609afd37b4d8f1ed6af4721452758288b4512
-  data.tar.gz: 76faf9432d6f64ea29a309a4238a9de4ce5de213dbf9013e3f38ec9a87154f7cf6155ffda91ec67553d3d342a046bc9f07661b10d8d26bfb2b88203dbd0db169
+  metadata.gz: 91a856c21725733c3f42f5ea883de67e8df238dc574ed6cce7ca276d64cd8df4c8c6ab4e679ad55f138d5e6139b2ec45f0d2685effe4bd2a1c0f90e38375732b
+  data.tar.gz: 4bac0b1c7b62a24a0f5c20fdeb748b6129e658734beb6aba76c1c3c55b4adcf04aa2dc887d090cba45fdf2fae719bdfbad38e14e72cb6ccaa16b22d471c9a06f

data/.travis.yml

@@ -1,5 +1,8 @@
 sudo: false
 language: ruby
 rvm:
+  - ruby-2.3.7
+  - ruby-2.4.4
+  - ruby-2.5.1
   - ruby-2.6.0-preview2
 before_install: gem install bundler -v 1.16.2

data/Gemfile.lock

@@ -1,12 +1,16 @@
 PATH
   remote: .
   specs:
-    comment_collector (0.0.1)
+    comment_collector (0.0.2)
+      parser
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.0)
     diff-lcs (1.3)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
     rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)

data/README.md

@@ -1,9 +1,9 @@
+[![Build Status](https://travis-ci.org/siman-man/comment_collector.svg?branch=master)](https://travis-ci.org/siman-man/comment_collector)
+
 # CommentCollector
 
 Get source code comments of Ruby.
 
-require RUBY_VERSION >= '2.6.0'
-
 
 ## Installation
 

data/comment_collector.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Commenct collector}
   spec.homepage      = 'https://github.com/siman-man/comment_collector'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '> 2.5.9'
+  spec.required_ruby_version = '>= 2.3.0'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -23,6 +23,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'parser'
+
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/comment_collector.rb

@@ -1,3 +1,4 @@
+require 'parser/current'
 require 'comment_collector/version'
 
 class CommentCollector
@@ -13,7 +14,7 @@ class CommentCollector
     @end_of_lines = src.lines.map { |l| l.size - 1 } # for 0-index
     @src = src
 
-    traverse(RubyVM::AST.parse(src))
+    traverse(Parser::CurrentRuby.parse(src))
   end
 
   def comments
@@ -27,7 +28,7 @@ class CommentCollector
 
     @src.lines.each_with_index do |line, lineno|
       sp = @last_of_lines[lineno]
-      l = line[sp..]
+      l = line[sp..-1]
 
       break if line.start_with?('__END__')
 
@@ -74,18 +75,22 @@ class CommentCollector
   private
 
   def traverse(parent)
-    if parent.type != 'NODE_SCOPE'
-      first_lineno = parent.first_lineno - 1
-      first_column = parent.first_column
-      last_lineno = parent.last_lineno - 1
-      last_column = parent.last_column
+    return if parent.nil?
+
+    loc = parent.loc
+
+    unless [:args].include?(parent.type)
+      first_lineno = loc.line - 1
+      first_column = loc.column
+      last_lineno = loc.last_line - 1
+      last_column = loc.last_column
 
       @last_of_lines[first_lineno] = [@last_of_lines[first_lineno], first_column].max
       @last_of_lines[last_lineno] = [@last_of_lines[last_lineno], last_column].max
       @exists_any_node[first_lineno] = @exists_any_node[last_lineno] = true
     end
 
-    parent.children.compact.each do |child|
+    parent.children.select { |n| n.instance_of?(Parser::AST::Node) }.each do |child|
       traverse(child)
     end
   end

data/lib/comment_collector/version.rb

@@ -1,3 +1,3 @@
 class CommentCollector
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comment_collector
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Shuichi Tamayose
@@ -34,8 +34,22 @@ cert_chain:
   qhBmALr0zPrR292f2IxpPPpA3EGv375Yy0dblIxJ2U0C0p2JafJlIbdzTttaG+nR
   hYkTSRBLdxDTa7SbFGW40+TWobTOX/itwk9w0F6Zo7Y=
   -----END CERTIFICATE-----
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -109,9 +123,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.9
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -119,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Commenct collector