ripper-tags 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 640b1a068e2264a9ff34622fe1a2403f2301b267
-  data.tar.gz: 3d03ce7a71b934a3131e599d66dfab5186fc4751
+  metadata.gz: 9c01afeab62bc05b48461054c69302ea2c6df300
+  data.tar.gz: 15381e892cf46a2c712059e9ec1a5cc1275fb17a
 SHA512:
-  metadata.gz: 0c33f81e059a2ceaf2191e80aaf0b664b11e6165aefdca146344326afd1cd9aabe5f97e6f00ef23ef12e17a4c8e5e0c72648763150a6222366982e8a564f2adc
-  data.tar.gz: cd26c13d7d50ed7ef413eac6fbd96d310339d88f96418122123c117c2a08d3c1638d0789131a87c8070b43dacbe984a7d3be0757bbffdd5c93f2fbfb18ee01dc
+  metadata.gz: 855d584aca0e552f9bd6cefd849255dad0a7119beeccd38465bfc62310f0c0ddad586721e3e4adf1ad27911764d50d6dc96103210e00837163aa5203693173f1
+  data.tar.gz: 47f730f13d9ff65c9ceeda5361b153f6117459546d2a5ddd4954cc06ba8d4fcb046f4ac4d3743abb0e83268ca19a14e828f96129e9dd86202dc51990ba1de2d6

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.5.1" end
+  def self.version() "0.6.0" end
 
   FatalError = Class.new(RuntimeError)
 
@@ -109,7 +109,7 @@ module RipperTags
       opts.on("-n", "Equivalent to --excmd=number.") do
         options.excmd = "number"
       end
-      opts.on("--fields=+n", "Include line number information in the tag") do |flags|
+      opts.on("--fields=+ln", "Add extra fields to output") do |flags|
         flags_string_to_set.call(flags, options.fields)
       end
       opts.on("--all-files", "Parse all files in recursive mode (default: parse `*.rb' files)") do
@@ -139,7 +139,7 @@ module RipperTags
       opts.on_tail("-V", "--verbose", "Print additional information on stderr") do
         options.verbose = true
       end
-      opts.on_tail("--force", "Skip files with parsing errors") do
+      opts.on_tail("--force", "Always exit with error code 0, even when parse errors occur") do
         options.force = true
       end
       opts.on_tail("--list-kinds=LANG", "Print tag kinds that this parser supports and exit") do |lang|
@@ -210,6 +210,9 @@ module RipperTags
         formatter.write(tag, out)
       end
     end
+    if reader.error_count > 0 && !options.force && reader.error_count == reader.file_count
+      exit 1
+    end
   rescue FatalError => err
     $stderr.puts "%s: %s" % [
       File.basename($0),

data/lib/ripper-tags/data_reader.rb

@@ -101,12 +101,14 @@ module RipperTags
   end
 
   class DataReader
-    attr_reader :options
+    attr_reader :options, :file_count, :error_count
 
     READ_MODE = 'r:utf-8'
 
     def initialize(options)
       @options = options
+      @file_count = 0
+      @error_count = 0
     end
 
     def file_finder
@@ -130,20 +132,21 @@ module RipperTags
 
     def each_tag
       return to_enum(__method__) unless block_given?
+
       file_finder.each_file do |file|
         begin
-          $stderr.puts "Parsing file #{file}" if options.verbose
+          $stderr.puts "Parsing file `#{file}'" if options.verbose
           extractor = tag_extractor(file)
         rescue => err
-          if options.force
-            $stderr.puts "Error parsing `#{file}': #{err.message}"
-          else
-            raise err
-          end
+          # print the error and continue
+          $stderr.puts "#{err.class.name} parsing `#{file}': #{err.message}"
+          @error_count += 1
         else
           extractor.tags.each do |tag|
             yield tag
           end
+        ensure
+          @file_count += 1
         end
       end
     end

data/lib/ripper-tags/vim_formatter.rb

@@ -3,7 +3,7 @@ require 'ripper-tags/default_formatter'
 module RipperTags
   class VimFormatter < DefaultFormatter
     def supported_flags() ['q'] end
-    def supported_fields() ['n'] end
+    def supported_fields() ['l', 'n'] end
 
     def include_qualified_names?
       return @include_qualified_names if defined? @include_qualified_names
@@ -72,6 +72,10 @@ module RipperTags
       end
     end
 
+    def display_language
+      "\tlanguage:Ruby" if field?('l')
+    end
+
     def display_kind(tag)
       case tag.fetch(:kind)
       when 'method' then 'f'
@@ -84,13 +88,14 @@ module RipperTags
     end
 
     def format(tag, name_field = :name)
-      "%s\t%s\t%s\t%s%s%s%s" % [
+      "%s\t%s\t%s\t%s%s%s%s%s" % [
         tag.fetch(name_field),
         relative_path(tag),
         display_excmd_info(tag),
         display_kind(tag),
         display_line_number(tag),
         name_field == :full_name ? nil : display_class(tag),
+        display_language,
         display_inheritance(tag),
       ]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ripper-tags
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies: []
 description: fast, accurate ctags generator for ruby source code using Ripper
 email:
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: ctags generator for ruby code