ripper-tags 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af64b5310db2c8944c8a3af1bbbf3514b71f003e
-  data.tar.gz: 249c8b6dc4dc5d53cbe6d1c3505d5cc6110912c6
+  metadata.gz: d472bb663bdcfad6fc036ad754053b5836a59b58
+  data.tar.gz: e02b4cc630471c544b14d83fffae62562cc6d814
 SHA512:
-  metadata.gz: bc5ba6f2d1789d1bf02f849e7c0536cf1b3c99c8a3b58fcd3395994ac25223f4134908e1203ae91e2c99694d2cdd0921343b44a094893b8865baa09c941ce939
-  data.tar.gz: 74c81007636f8cdb8ed8c3243cc090a8a538a0319d157699e40e8d93490cdf814f73ab1c234118e14d3c7189f60643accd99d0c581448b1bc2604101f8f4c782
+  metadata.gz: 3349ce8680e14d37b98c4d771a4e1d3426b5f8ded4e3ee9efb15e8d4117c2058a8384de47537ef057c36dbb05b97fa5524dfccd16b1eefb1f19f18022c1c72cd
+  data.tar.gz: 77effbe07be672bca0881d3b4ad7176b41a567b060f1ad601c520365964955266a4bd5aa8b9e4dae3ea16e2370521b9d138e2ce7b93f18754d433bdae23a3072

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.2.1" end
+  def self.version() "0.3.0" end
 
   FatalError = Class.new(RuntimeError)
 

data/lib/ripper-tags/data_reader.rb

@@ -1,10 +1,15 @@
 require 'pp'
+require 'pathname'
 require 'ripper-tags/parser'
 
 module RipperTags
   class FileFinder
     attr_reader :options
 
+    RE_RUBY = /\.rb\z/
+    DIR_CURRENT = '.'.freeze
+    DIR_PARENT = '..'.freeze
+
     def initialize(options)
       @options = options
     end
@@ -35,27 +40,35 @@ module RipperTags
     end
 
     def include_file?(file)
-      (options.all_files || file =~ /\.rb\z/) && !exclude_file?(file)
+      (options.all_files || file =~ RE_RUBY) && !exclude_file?(file)
     end
 
-    def find_files(list, depth = 0)
-      list.each do |file|
-        if File.directory?(file)
-          if options.recursive
-            files = Dir.entries(file).map { |name|
-              File.join(file, name) unless '.' == name || '..' == name
-            }.compact
-            find_files(files, depth + 1) {|f| yield f }
+    def resolve_file(file, depth = 0, &block)
+      if File.directory?(file)
+        if options.recursive
+          Dir.entries(file).each do |name|
+            if name != DIR_CURRENT && name != DIR_PARENT
+              subfile = File.join(file, name)
+              subfile = clean_path(subfile) if depth == 0
+              resolve_file(subfile, depth + 1, &block)
+            end
           end
-        else
-          yield file if include_file?(file)
         end
+      else
+        file = clean_path(file) if depth == 0
+        yield file if include_file?(file)
       end
     end
 
-    def each_file
+    def clean_path(file)
+      Pathname.new(file).cleanpath.to_s
+    end
+
+    def each_file(&block)
       return to_enum(__method__) unless block_given?
-      find_files(options.files) {|f| yield f }
+      options.files.each do |file|
+        resolve_file(file, &block)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ripper-tags
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Aman Gupta