cql_ruby 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 958c076c71b8288666a536478ac62399953865f9d9f829be68252bce88eb7625
-  data.tar.gz: c4c6514cbef0488606b863654c2ad08471b75cd5b3dd2a0a9bb410e2a85a6551
+  metadata.gz: 50e03910538e8b57539419210406155ba4a9d0aed14f0852edfd1867e6fbccbe
+  data.tar.gz: acb0f56f0faefb1f39613f2805b25cbee66e61d0a715138007c021036e05e03a
 SHA512:
-  metadata.gz: 1cacdb6eb09004a14f2f5bcd4542a5a6935cf03ec95aaf3fbbcd9e61a6047f9f102a17e70575758fce2a15b57167260fc706176f92a0476f3a3185609f21320a
-  data.tar.gz: 662ee75e93906a67bacda9cfdd8b992a59f2cc695e39bc1abb7bcc931b47cb1c51585f9d7fa6385043455b7cdc74fc512fb9895f70d1ebd4013997b192b53092
+  metadata.gz: 71feb8dab0a500e27989d7a96117b2f558b09f1eade1db44503a69ee3cadf6f21bec65d7e921ae219a39835ded528fc62cf91216989a9121006343636098b81b
+  data.tar.gz: e3fdf1a7ecdc01fb7f5f3174d932a60e4718d2c08534414ec0627666590df1d29985cc113763423a3eb913a0d7994b789d1ad7c8baed645e04fe2b8104ecdb98

data/bin/cql_ruby

@@ -6,13 +6,14 @@ def show_help
   puts <<~HELP
         
     \tSYNOPSIS
-    \tcql_ruby options pattern path filters ...
+    \t\tcql_ruby options pattern path filters ...
 
     \tDESCRIPTION
-    \tCQL (Code Query Language) is a semantic search tool for your Ruby source code.
+    \t\tCQL (Code Query Language) is a semantic search tool for your Ruby source code.
 
     \tFILTERS
-    \t\tParent node type: type:T(,T)*
+    \t\tParent node type: type:T(,T)* Example: type:def,send,arg
+    \t\tNesting under: nest:T(=NAME) Example: nest:def=save_user nest:class=UserManager
 
     \tOPTIONS
     \t\t-nc (--no-color) No color on output.
@@ -20,7 +21,7 @@ def show_help
     \t\t-ns (--no-source) No source code.
 
     \tEXAMPLES
-    \tcql_ruby -ns update_user_info ./ type:send,arg
+    \t\tcql_ruby -ns update_user_info ./ type:send,arg
   HELP
 
   exit
@@ -32,6 +33,7 @@ def extract_options
     show_color: true,
     show_file: true,
     show_source: true,
+    recursive_search: true,
   }
 
   ARGV.delete_if do |arg|
@@ -42,8 +44,13 @@ def extract_options
         options[:show_file] = false
       elsif %w[-ns --no-source].include?(arg)
         options[:show_source] = false
-      elsif %w[-h --help]
+      elsif %w[-h --help].include?(arg)
         show_help
+      elsif %w[-v -vv -vvv].include?(arg)
+        lvl = arg.chars.find_all { |c| c == 'v' }.size
+        CqlRuby::Config.debug_level = lvl
+      elsif %w[-nr --no-recursive].include?(arg)
+        options[:recursive_search] = false
       else
         raise "Unknown arg #{arg}"
       end
@@ -64,15 +71,21 @@ end
 
 begin
   options = extract_options
+  CqlRuby.log "Call options: #{options}" if CqlRuby::Config.debug_level_2?
 
   raise unless ARGV.size >= 2
 
   pattern = ARGV.shift
+  CqlRuby.log "Call pattern: <#{pattern}>" if CqlRuby::Config.debug_level_2?
+
   # TODO Make path patterns universal.
   path = ARGV.shift
+  CqlRuby.log "Call path: <#{path}>" if CqlRuby::Config.debug_level_2?
 
   # Rest must be filters - can sink ARGV now.
   filters = extract_filters
+  CqlRuby.log "Call filters: #{filters}" if CqlRuby::Config.debug_level_2?
+
   filter_reader = CqlRuby::FilterReader.new(filters)
 
   printer = CqlRuby::ConsolePrinter.new
@@ -81,7 +94,14 @@ begin
   printer.source_on = options[:show_source]
 
   collector = CqlRuby::CrumbCollector.new(printer)
-  CqlRuby::Executor.new(collector, filter_reader, pattern, path, filters).search_all
+  CqlRuby::Executor.new(
+    collector: collector,
+    filter_reader: filter_reader,
+    pattern: pattern,
+    path: path,
+    filters: filters,
+    recursive: options[:recursive_search],
+  ).search_all
 rescue => e
   puts "Error: #{e}"
   show_help

data/lib/cql_ruby.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
-module CqlRuby; end
+module CqlRuby;
+  def self.log(txt)
+    p txt
+  end
+end
 
 require 'cql_ruby/executor'
 require 'cql_ruby/crumb_collector'

data/lib/cql_ruby/executor.rb

@@ -1,6 +1,21 @@
 # frozen_string_literal: true
 
 require 'parser/current'
+require 'pathname'
+
+module CqlRuby
+  class Config
+    @@debug_level = 0
+
+    class << self
+      def debug_level=(lvl); @@debug_level = lvl; end
+      def debug_level; @@debug_level; end
+      def debug_level_1?; @@debug_level >= 1; end
+      def debug_level_2?; @@debug_level >= 2; end
+      def debug_level_3?; @@debug_level >= 3; end
+    end
+  end
+end
 
 #
 # Executes search and dumps results into the collector.
@@ -10,43 +25,75 @@ require 'parser/current'
 # @param path [String]
 # @param filters [Array<String>]
 #
-CqlRuby::Executor = Struct.new(:collector, :filter_reader, :pattern, :path, :filters) do
-  def search_all
-    files.flat_map do |file|
-      search(file)
+module CqlRuby
+  class Executor
+    def initialize(
+      collector:,
+      filter_reader:,
+      pattern:,
+      path:,
+      filters: [],
+      recursive: true
+    )
+      @collector = collector
+      @filter_reader = filter_reader
+      @pattern = pattern
+      @path = path
+      @filters = filters
+      @recursive = recursive
     end
-  end
 
-  private
+    def search_all
+      files.flat_map do |file|
+        CqlRuby.log "File check: #{file}" if CqlRuby::Config.debug_level_3?
+        search(file)
+      end
+    end
 
-  def search(file)
-    ast = Parser::CurrentRuby.parse(File.read(file))
-    source_reader = CqlRuby::SourceReader.new(file)
-    walk(ast, [], source_reader)
+    private
 
-    nil
-  end
+    def search(file)
+      ast = Parser::CurrentRuby.parse(File.read(file))
+      source_reader = CqlRuby::SourceReader.new(file)
+      walk(ast, [], source_reader)
 
-  def walk(node, ancestors, source_reader)
-    if node.is_a?(Parser::AST::Node)
-      node.children.flat_map do |child|
-        walk(child, ancestors.dup + [node], source_reader)
-      end
-    else
-      if match?(node) && CqlRuby::FilterEvaluator.pass?(filter_reader, node, ancestors)
-        collector.add(CqlRuby::Crumb.new(node, ancestors, source_reader))
+      nil
+    end
+
+    def walk(node, ancestors, source_reader)
+      if node.is_a?(Parser::AST::Node)
+        node.children.flat_map do |child|
+          walk(child, ancestors.dup + [node], source_reader)
+        end
+      else
+        if match?(node) && CqlRuby::FilterEvaluator.pass?(filter_reader, node, ancestors)
+          collector.add(CqlRuby::Crumb.new(node, ancestors, source_reader))
+        end
       end
+
+      nil
     end
 
-    nil
-  end
+    def match?(target)
+      CqlRuby::PatternMatcher.match?(pattern, target)
+    end
 
-  def match?(target)
-    CqlRuby::PatternMatcher.match?(pattern, target)
-  end
+    def files
+      return [path] if File.file?(path)
+
+      clean_path = Pathname(path).cleanpath.to_s
+      clean_path += '/**' if recursive
+      clean_path += '/*.rb'
+
+      Dir.glob(clean_path)
+    end
 
-  def files
-    Dir.glob(path)
+    attr_reader :collector
+    attr_reader :filter_reader
+    attr_reader :pattern
+    attr_reader :path
+    attr_reader :filters
+    attr_reader :recursive
   end
 end
 

data/lib/cql_ruby/pattern_matcher.rb

@@ -15,7 +15,7 @@ module CqlRuby
     end
 
     def self.regex?(pattern)
-      pattern[0..1] == 'r:'
+      pattern[0..1] == 'r/'
     end
     private_class_method :regex?
 
@@ -26,7 +26,9 @@ module CqlRuby
 
     def self.regex_match?(pattern, subject)
       pattern = pattern[2..]
-      pattern, *mods = pattern.split('+')
+      delim_idx = pattern.rindex('/')
+      mods = pattern[delim_idx + 1..].chars
+      pattern = pattern[0..delim_idx - 1]
 
       fops = 0
       fops |= Regexp::IGNORECASE if mods.include?('i')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - itarato