ripper-tags 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21e15e7c0755842e08a5282365f768fe798dde04
-  data.tar.gz: 5a6f04f288b3a1ee78fa6a8932e7f9ce5f9cbcf9
+  metadata.gz: c08d7efdfd064f08e9ddfe9f04764ef7ff8c416b
+  data.tar.gz: 81a55c49ef2731f5df43c5d6b19293af677a82f3
 SHA512:
-  metadata.gz: f76bd4af060842dd28dd26d9a5fc1f38a484dd939c617d49eee7dedfe9dd8ae5294158463f652fba026fd5b37d30c91973ac77dd1bc037fd12863c16d9f3fa85
-  data.tar.gz: 2c95b91e67ee8002ea2961851fa7bf34c353fd7d734c88d5e52362e3d0544fb030a7e107cdb328270577b7d1f53161d69de00599b37d350514827482682e5544
+  metadata.gz: ec1d0a697a94f42071a7b1046ea5e979b21b927dd85821ff8a66047fb8fc77b8cfbb32c7e3ca4c337b421d4f13e4732d83847e47e0261c3d81a32a0fec09ff34
+  data.tar.gz: 5e3b0c4915d6761a30c3d146fd18a74c149621931b67c15920ca74875f67c4f1ceee5e1a2f5a8da887eebe441f661abd65a19dc78a6abbced149472896b28cb1

data/lib/ripper-tags.rb

@@ -9,7 +9,7 @@ require 'ripper-tags/vim_formatter'
 require 'ripper-tags/json_formatter'
 
 module RipperTags
-  def self.version() "0.4.3" end
+  def self.version() "0.5.0" end
 
   FatalError = Class.new(RuntimeError)
 
@@ -35,17 +35,24 @@ module RipperTags
   class ForgivingOptionParser < OptionParser
     attr_accessor :ignore_unsupported_options
 
-    def parse(argv)
-      argv = argv.dup
+    def load_options_file(file)
+      @argv.unshift(*File.readlines(file).flat_map { |line|
+        line.strip!.match(/(=|\s)/)
+        ($1 == "" || $1 == "=") ? line : line.split(/\s+/, 2)
+      })
+    end
+
+    private
+
+    def parse_in_order(argv = default_argv, *)
       exceptions = []
-      remaining = []
+      @argv = argv
 
-      while argv.size > 0
+      loop do
         begin
-          remaining = super(argv)
+          super
           break
         rescue OptionParser::InvalidOption => err
-          argv -= err.args
           exceptions << err
         end
       end
@@ -54,7 +61,7 @@ module RipperTags
         raise exceptions.first
       end
 
-      remaining
+      argv
     end
   end
 
@@ -151,6 +158,9 @@ module RipperTags
           exit 1
         end
       end
+      opts.on_tail("--options=FILE", "Read additional options from file") do |file|
+        opts.load_options_file(file)
+      end
       opts.on_tail("--ignore-unsupported-options", "Don't fail when unsupported options given, just skip them") do
         opts.ignore_unsupported_options = true
       end

data/lib/ripper-tags/parser.rb

@@ -71,9 +71,9 @@ class Parser < Ripper
          "has_one", "has_many",
          "belongs_to", "has_and_belongs_to_many",
          "scope", "named_scope",
-         "public_class_method", "private_class_method",
+         "public_class_method", "private_class_method", "protected_class_method",
          "public", "protected", "private",
-         /^attr_(accessor|reader|writer)$/
+         /^[mc]?attr_(accessor|reader|writer)$/
       on_method_add_arg([:fcall, name], args[0])
     when "delegate"
       on_delegate(*Array(args[0])[1..-1])
@@ -171,21 +171,25 @@ class Parser < Ripper
         [:alias, args[1][0], args[2][0], line] if args[1] && args[2]
       when "define_method"
         [:def, args[1][0], line]
-      when "public_class_method", "private_class_method", "private", "public", "protected"
+      when "public_class_method", "private_class_method", "protected_class_method", "private", "public", "protected"
         access = name.sub("_class_method", "")
+        klass = name == access ? nil : 'self'
+        procedure = :def_with_access
 
-        if args[1][1] == 'self'
-          klass = 'self'
+        if args[1][0].is_a?(String)
+          procedure = :redefine_access
+          method_name = args[1][0]
+        elsif args[1][1] == 'self'
           method_name = args[1][2]
         else
           klass = nil
           method_name = args[1][1]
         end
 
-        [:def_with_access, klass, method_name, access, line]
+        [procedure, klass, method_name, access, line]
       when "scope", "named_scope"
         [:rails_def, :scope, args[1][0], line]
-      when /^attr_(accessor|reader|writer)$/
+      when /^[mc]?attr_(accessor|reader|writer)$/
         gen_reader = $1 != 'writer'
         gen_writer = $1 != 'reader'
         args[1..-1].inject([]) do |gen, arg|
@@ -457,6 +461,14 @@ end
         :access => access
     end
 
+    def on_redefine_access(klass, name, access, line)
+      ns = (@namespace.empty? ? 'Object' : @namespace.join('::'))
+      singleton = @is_singleton || klass == 'self'
+      full_name = "#{ns}#{singleton ? '.' : '#'}#{name}"
+      tag = @tags.select { |t| t[:full_name] == full_name }.last
+      tag[:access] = access if tag
+    end
+
     def on_rails_def(kind, name, line)
       ns = (@namespace.empty?? 'Object' : @namespace.join('::'))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ripper-tags
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies: []
 description: fast, accurate ctags generator for ruby source code using Ripper
 email: