nodegrep 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f209db3fa387b6bbe388714324c6496e1b0ce06ad2d0e840f0d6b9fa926b02b8
-  data.tar.gz: 7a0b15225d3d88ce0fb526c62efe52d0e89b6cd3ef2b182dbf715b076ca17d26
+  metadata.gz: d519b2a5c909e0cc9dcaaceded64a73f3f9b5e4f6d31b2914da28a0e2fc0fb47
+  data.tar.gz: c8273e0c3797616efdb7f122819fab7424f4c44dcea1c63371f4a5609d68d9af
 SHA512:
-  metadata.gz: ac74bfa8b5ff5c094021067e27896af6d86388b214baa07815257fed2e529f13a2c3eaeafe417977d623bb86829db9407ff1785b0131e7bf8ee7ed20d53d2b72
-  data.tar.gz: d239b23e7279cbbe34a2b006c4e67b93465912c368cc1250ce4372d1f6f6ce2a7cb2d16a03f1d72600d25e9073314b229d37a6eed3e7a3ff58cabab64432a38c
+  metadata.gz: 57b38476abe2cf5680b95430ef0e1c64f7f908307a690e8e39ac316aa22ad044304ad0126750a4bd81e9af962eefbddc9c1cf61fdd3409fd4555d2299379602a
+  data.tar.gz: be6cf1bf29b45d197009e4838d4bb040b1f53e22f1cef3b253ffac960b45807255d8c6b22de6b204d87b2f9d9dc8f1ea1aff41557a839949502816a4535622ef

data/bin/nodegrep

@@ -1,25 +1,28 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'nodegrep'
 
+DIRECTORY_GLOB = '**/*.{rb,rake}'
+
 recurse = false
 line_numbers = false
 lazy = false
 
 helpmesg = <<~HELP
-nodegrep - find code that matches NodePattern DSL
+  nodegrep - find code that matches NodePattern DSL
 
-USAGE
+  USAGE
 
-nodegrep [flags] pattern files
+  nodegrep [flags] pattern files
 
-Available flags:
+  Available flags:
 
--l\tLazy evaluation - stop at the first match
--n\tTurn on line number output
--r\tRecurse into directories
+  -l\tLazy evaluation - stop at the first match
+  -n\tTurn on line number output
+  -r\tRecurse into directories
 HELP
 
-
 # nodegrep [flags] pattern file(s)
 
 # process flags
@@ -28,10 +31,11 @@ arg = ''
 loop do
   arg = ARGV.shift
   if arg.nil?
-    print helpmesg 
-    exit -1
+    print helpmesg
+    exit(-1)
   end
   break if arg[0] != '-'
+
   case arg[1]
   when 'l'
     lazy = true
@@ -42,7 +46,7 @@ loop do
   else
     puts "Error - Illegal flag: -#{arg[1]}".red
     print helpmesg
-    exit -1
+    exit(-1)
   end
 end
 
@@ -50,27 +54,34 @@ end
 
 pattern = arg
 
+# If 'pattern' is preceded by "method:", presume that we are just looking for method invocations
+
+if pattern =~ %r{\Amethod:([a-z_]+)}
+  pattern = "(send nil? :#{$1} ... )"
+end
+
 # The rest of the args are filenames
 
-if ARGV.length == 0 && !recurse
-  puts "Error - no files to process".red
-  exit -1
+if ARGV.length.zero? && !recurse
+  puts 'Error - no files to process'.red
+  exit(-1)
 end
 
 files_to_process = []
 
 if recurse
-  if ARGV.length == 0
-    files_to_process = Dir.glob('**/*.rb', base: Dir.getwd)
-  elsif ARGV.length == 1
+  case ARGV.length
+  when 0
+    files_to_process = Dir.glob(DIRECTORY_GLOB, base: Dir.getwd)
+  when 1
     unless File.directory?(ARGV[0])
       puts "Error - value #{ARGV[0]} is not a directory"
-      exit -1
+      exit(-1)
     end
-    files_to_process = Dir.glob('**/*.rb', base: ARGV[0]).map{ |f| File.join(ARGV[0], f) }
+    files_to_process = Dir.glob(DIRECTORY_GLOB, base: ARGV[0]).map { |f| File.join(ARGV[0], f) }
   else
-    puts "Error - cannot recursively process more than one directory"
-    exit -1
+    puts 'Error - cannot recursively process more than one directory'
+    exit(-1)
   end
 else
   files_to_process = ARGV
@@ -87,10 +98,9 @@ files_to_process.each do |f|
   pres = NodeGrep::Presenter.new(source)
   pres.line_numbers = line_numbers
   matches = m.matching_nodes(pattern)
-  puts " *** #{f}".green if matches.length > 0
+  puts " *** #{f}".green if matches.length.positive?
   matches.each do |match|
     puts pres.get_lines(match.first_line, match.last_line)
     exit if lazy
   end
 end
-

data/lib/nodegrep/matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubocop'
 require 'rubocop-ast'
 
@@ -23,8 +25,9 @@ module NodeGrep
 
     def visit_node(node)
       return unless node.class.to_s.include?('RuboCop::AST')
+
       @matches << node if @pattern.match(node)
-      node.children.each{ |child| visit_node(child) }
+      node.children.each { |child| visit_node(child) }
     end
   end
-end
+end

data/lib/nodegrep/presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'colorize'
 
 module NodeGrep
@@ -10,17 +12,18 @@ module NodeGrep
     @line_numbers = false
 
     def initialize(source)
-      @source_lines = source.split("\n").map{ |l| l.gsub("\r", "") }
+      @source_lines = source.split("\n").map { |l| l.gsub("\r", '') }
     end
 
     def get_lines(x, y)
       num_lines = @source_lines.length
       raise OutOfBounds if x < 1 || y < 1 || x > y
       raise OutOfBounds if x > num_lines || y > num_lines
+
       x -= 1
       y -= 1
       formatted_lines = (x..y).each.collect do |i|
-        output = ""
+        output = String.new
         output << "#{i + 1}: " if @line_numbers
         output << @source_lines[i]
         output
@@ -28,4 +31,4 @@ module NodeGrep
       formatted_lines.join("\n")
     end
   end
-end
+end

data/lib/nodegrep.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'nodegrep/matcher'
-require 'nodegrep/presenter'
+require 'nodegrep/presenter'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nodegrep
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Jon Jenkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-09 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -25,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.40'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
+        version: '0.14'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2.15'
 description: 
 email: jjenkins@gitlab.com
 executables:
@@ -77,7 +91,7 @@ files:
 - lib/nodegrep.rb
 - lib/nodegrep/matcher.rb
 - lib/nodegrep/presenter.rb
-homepage: https://gitlab.com/jon_jenkins
+homepage: https://gitlab.com/jon_jenkins/nodegrep
 licenses:
 - MIT
 metadata: {}
@@ -96,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A utility to match patterns in Ruby code