rgr 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b6902568d4e4f4c69e9d5e5cbef2a254f5d82c9
-  data.tar.gz: 20ad9a28fd50452d9b5b8cd455d26311df93a77d
+  metadata.gz: 72fbf35e650c79a99860f5cdf526c2aba2515bbc
+  data.tar.gz: ece6ac7f87bcd96289272757b02921117578411c
 SHA512:
-  metadata.gz: 19ded3ab4811baeb36e2b0667f21d90f28d2c4a27e690e3abc9390bd93c375735ebf389543fc4dc2eb411ceaabdd40b6d78e606fd46720eabf4010d9ed91cd8e
-  data.tar.gz: 27744f5225974a0a8ce71c55571d954e6c1fc9d93a4fa0af4dd2ff7f9840c8be4d16b4931fd043964fc3ed222627237082afc12e3a674d94059197162af3d01f
+  metadata.gz: de716f18a460e55439033308faacf768ae27b5c7b168a699f0be6210b82f3dd14f469b307b99e67a0d0b3ccd30362efb629bc712384ebff0924beb075a1cddc4
+  data.tar.gz: 40708c03e1997130884e9b7e33fe80227e92ded1645331e3eee9a469846e006dbda74a217a6f257f9bc1220371a949973a47e38ca9dfe7e2658d2f543d3e3e23

data/bin/rgr

@@ -1,17 +1,31 @@
 #!/usr/bin/env ruby
 require "rgr"
 
-search_query = ARGV.shift or abort "Usage: rgr <search_query> <files...>"
+if ARGV.empty?
+  abort "Usage: rgr [<options>] <search_query> <files...>"
+end
 
 reporter = Rgr.reporter.new
+globber = Rgr::Globber.new
 
-files =
-  if ARGV.any?
-    ARGV
+loop do
+  case option = ARGV.shift
+  when "--ignore"
+    prefix = ARGV.shift or abort "Expected path after --ignore"
+    globber.ignore_prefix(prefix)
   else
-    Dir["**/*.rb"]
+    # not an option, put it back
+    ARGV.unshift(option)
+    break
   end
+end
+
+search_query = ARGV.shift
+
+ARGV.each do |path|
+  globber.add_path(path)
+end
 
-Rgr.search(search_query, files).each do |file, matches|
+Rgr.search(search_query, globber.each_file).each do |file, matches|
   reporter.report_file_matches(file, matches)
 end

data/lib/rgr.rb

@@ -1,6 +1,7 @@
-require "rgr/searcher"
 require "rgr/coloured_reporter"
+require "rgr/globber"
 require "rgr/plain_reporter"
+require "rgr/searcher"
 
 module Rgr
   def self.search(search_term, files)

data/lib/rgr/coloured_reporter.rb

@@ -15,8 +15,8 @@ module Rgr
 
       matches.each do |match|
         expr = match.expression
-        highlighted_source = highlight_source(expr.source)
-        printf "\e[33;1m%#{line_number_places}d\e[0m: %s\n", expr.line, highlighted_source
+        highlighted_source = highlight_source(expr.source_line)
+        output.printf "\e[33;1m%#{line_number_places}d\e[0m: %s\n", expr.line, highlighted_source
       end
     end
 

data/lib/rgr/globber.rb

@@ -0,0 +1,51 @@
+module Rgr
+  class Globber
+    attr_reader :paths, :ignored_prefixes
+
+    def initialize
+      @paths = []
+      @ignored_prefixes = []
+    end
+
+    def add_path(path)
+      paths << path
+    end
+
+    def ignore_prefix(prefix)
+      ignored_prefixes << prefix
+    end
+
+    def each_file
+      return enum_for(:each_file) unless block_given?
+
+      unfiltered_files.each do |file|
+        next if ignored?(file)
+        yield file
+      end
+    end
+
+    def ignored?(file)
+      ignored_prefixes.any? { |prefix|
+        file.start_with?(prefix)
+      }
+    end
+
+    def unfiltered_files
+      if paths.empty?
+        Dir["**/*.rb"]
+      else
+        paths.flat_map { |path|
+          glob_path(path)
+        }
+      end
+    end
+
+    def glob_path(path)
+      if File.file?(path)
+        [path]
+      else
+        Dir["#{path}/**/*.rb"]
+      end
+    end
+  end
+end

data/lib/rgr/plain_reporter.rb

@@ -8,7 +8,7 @@ module Rgr
 
     def report_file_matches(file, matches)
       matches.each do |match|
-        puts "#{match.expression}: #{match.expression.source}"
+        output.puts "#{match.expression}: #{match.expression.source}"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgr
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Charlie Somerville
@@ -48,6 +48,7 @@ files:
 - bin/rgr
 - lib/rgr.rb
 - lib/rgr/coloured_reporter.rb
+- lib/rgr/globber.rb
 - lib/rgr/plain_reporter.rb
 - lib/rgr/searcher.rb
 homepage: https://github.com/charliesome/rgr