rbr 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f991cd863713e0995b19ec6dd66772030342e9af5ef18441ed14afe7c68a24d
-  data.tar.gz: a12bb9d633f5b33dbd78034a26915e4168deefa306d5ec567adf672b02d4cf34
+  metadata.gz: 5432cecc06454f1661bfaffc004f86cea0847830fc2b515041d6bc7eef95c01d
+  data.tar.gz: 4b647a9113e3c7c722dac052f818046214fcf4608800630d93b1e22bf9539563
 SHA512:
-  metadata.gz: 36c06cff179b606e84e217adfc1233f0fe9b817acb749c780230959445b7585ac6a39ac41e3ddef4a58399935d3ad8602b51fe1d3a5d13e9ea90e7251ff01f68
-  data.tar.gz: 76040e738fb9c97400836106c368eafa9e1a93112622d9f13ef86f77f9cd9d54a477a4bb9f42c7dc5f237c14a99ea4cbe3adfe4d767b354cbd84e3d6a547a80f
+  metadata.gz: f6250ccbdc34e10bea0c6830a8c3d0c6e5d3559135c614d4b837f8497d89c512a4fe34aca464cf1add7793d82f6715f0cbdb9dad4b5824143cff8acf0e267f40
+  data.tar.gz: ccef9e8f51d646c6c74dcda32078b462f98e3651aea6c43e58739f981a82d598b38dd0c3401a76b4b7983f5a8bcfb18872b9c200a18065099dde7031e7b43454

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    rbr (0.2.0)
+    rbr (0.3.0)
       parser
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    ast (2.4.1)
     coderay (1.1.3)
     method_source (1.0.0)
     minitest (5.14.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)

data/README.md

@@ -5,50 +5,76 @@ constructs.
 
 ## Usage examples
 
+assignment to an lvalue named `@author`
+
 ```sh
-# assignment to an lvalue named `@author`
 $ rbr assignment :@author test/fixtures/book.rb
-5: @author = author
+test/fixtures/book.rb:5: @author = author
+```
 
-# int or float
+int or float with value `5`
+
+```sh
 $ rbr number 5 test/fixtures/book.rb
-12: 5
+test/fixtures/book.rb:12: 5
+```
+
+string matching the pattern `/ring/`
 
-# string
+```sh
 $ rbr string ring test/fixtures/book.rb
-13: "a string!"
+test/fixtures/book.rb:13: "a string!"
+```
+
+literal (int, float, or string) with the value `5`
 
-# a literal (int, float, or string)
+```sh
 $ rbr literal 5 test/fixtures/book.rb
-12: 5
-49: "5"
+test/fixtures/book.rb:12: 5
+test/fixtures/book.rb:49: "5"
+```
+
+comment matching the pattern `/great/`
 
-# comments matching the pattern /great/
+```sh
 $ rbr comment great test/fixtures/book.rb
-1: # This is a great class
+test/fixtures/book.rb:1: # This is a great class
+```
+
+call of a method named `great_method`
 
-# find all calls of a method named `great_method`
+```sh
 $ rbr method_call :great_method test/fixtures/book.rb
-27: book.update!(title: "Great Title")
-50: book.send(:update!, title: "Great Title")
+test/fixtures/book.rb:27: book.great_method
+test/fixtures/book.rb:50: book.send(:great_method)
+```
 
-# statements that update an ActiveRecord model attribute named `title`
+statement that updates an ActiveRecord model attribute named `title`
+
+```sh
 $ rbr ar_update :title test/fixtures/book.rb
-21: book.title = "Great Title"
-27: book.update!(title: "Great Title")
-31: book.send(:update_column, :title, "Great Title")
+test/fixtures/book.rb:21: book.title = "Great Title"
+test/fixtures/book.rb:27: book.update!(title: "Great Title")
+test/fixtures/book.rb:31: book.send(:update_column, :title, "Great Title")
 ```
 
 rbr is the wrong tool for the following situations:
 
+appearance of the string "author" in the source
+
 ```sh
-# find any appearance of the string "author" in the source
 $ grep "author"
+```
+
+symbol named :author
 
-# find a symbol named :author
+```sh
 $ grep ":author"
+```
+
+definition of any function named "publish"
 
-# find the definition of any function named "publish"
+```sh
 $ grep "def publish"
 ```
 

data/lib/rbr/cli.rb

@@ -14,21 +14,32 @@ module Rbr
     end
 
     def start
-      filenames.each do |filename|
-        root, comments = Parser::CurrentRuby.parse_file_with_comments(filename)
+      matching_nodes.each do |filename, nodes|
+        nodes.each { |node| puts "#{filename}:#{node.pretty_print}" }
+      end
+    end
 
-        matching_nodes = Query.new(@matcher, @condition).run(root, comments)
+    def matching_nodes
+      filenames.map do |filename|
+        root, comments = Parser::CurrentRuby.parse_file_with_comments(filename)
 
-        matching_nodes.each { |node| puts node.pretty_print }
+        [filename, Query.new(@matcher, @condition).run(root, comments)]
       rescue EncodingError
         warn "# Encoding error parsing #{filename}"
-      end
+        [filename, []]
+      end.to_h
     end
 
     def filenames
-      ARGV[2..].map { |arg| expand_path(arg) }
-               .flatten
-               .select { |filename| File.file?(filename) }
+      pattern = if ARGV.count > 2
+                  ARGV[2..]
+                else
+                  ["."]
+                end
+
+      pattern.map { |arg| expand_path(arg) }
+             .flatten
+             .select { |filename| File.file?(filename) }
     end
 
     def expand_path(path)
@@ -39,7 +50,7 @@ module Rbr
     end
 
     def check_arg_count
-      return true if ARGV.count >= 3
+      return true if ARGV.count >= 2
 
       warn <<~USAGE
         Usage:

data/lib/rbr/matchers.rb

@@ -33,7 +33,7 @@ module Rbr
 
     # Node is a literal int, float, or string
     def self.literal(node, value)
-      number(node, value) || str(node, value)
+      number(node, value) || string(node, value)
     end
 
     # Node is a literal int or float
@@ -51,7 +51,7 @@ module Rbr
     end
 
     # Node is a string
-    def self.str(node, pattern)
+    def self.string(node, pattern)
       pattern &&
         node.str? &&
         node.any_descendant_matches?(

data/lib/rbr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rbr
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbr
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Eddie Lebow
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-13 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser