cql_ruby 0.0.9 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e459067630e91a0d52a1839445f881647e9c0271c052d973ccfafd6040f21b6
-  data.tar.gz: 39379431fb2d817930aff070a8335c02b62822d6bba0129956f6691cb5ea99b8
+  metadata.gz: a2d4b179a2563722c3dc2ef101ec10f817b1f79b3ce7d81a9ca6550fd088f39d
+  data.tar.gz: 3cace84921a72b38150aa52d60d1a48a48775b20234a3f4094e58939cf1c6058
 SHA512:
-  metadata.gz: 1de5455822e96348fad5fbda540e66ebf830723a4579927f8d4b1a2a9a4c9dd1c6d4763a514674eebff6974c8d61958e53af9fae74397fd643bb8a036f0a725d
-  data.tar.gz: 94c05fd4d565b1db7e793137495bd97456b1e459f9a58c6faba8c008c772a4898929ce5dc02d4064dec2ef0ee2ef0a7a2b68a2f9915430c681aca2a1a2bbb6f9
+  metadata.gz: e4c5f5f1e37f8520a7e366d6dc1bb07792ba8062230cd41a068cb846516e76497639131d0f93a0b60c360586bc886743d0a02aac4d3c3660281e1c8a18021f26
+  data.tar.gz: 65b4991554e454c0ca76f1077ae19665b3b4b27fc48243d301fb873e36af0da6652dcb6d741a249f529f72263866c4a5d2104b9fd5c958c0ed6c307218f829eb

data/bin/cql_ruby

@@ -7,7 +7,8 @@ def show_help
   puts <<~HELP
         
     \tSYNOPSIS
-    \t\tcql_ruby options pattern path filters ...
+    \t\tcql_ruby [--token] pattern path options filters ...
+    \t\tcql_ruby --node    type    path options filters ...
 
     \tDESCRIPTION
     \t\tCQL (Code Query Language) is a semantic search tool for your Ruby source code.
@@ -16,6 +17,7 @@ def show_help
     \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
     \t\tHas child: has:T(=NAME) Example: has:const has:def=valid?
+    \t\tPattern: pattern:(T-)*X(-T)* Example: pattern:class-def-X-block
 
     \tOPTIONS
     \t\t--include=PATTERN Parses only files whose name matches the pattern.
@@ -49,6 +51,7 @@ def extract_options
     surrounding_lines: 0,
     include_pattern: nil,
     exclude_pattern: nil,
+    search_type: :token,
   }
 
   ARGV.delete_if do |arg|
@@ -72,6 +75,10 @@ def extract_options
         options[:include_pattern] = arg.split('=')[1]
       elsif arg.start_with?('--exclude=')
         options[:exclude_pattern] = arg.split('=')[1]
+      elsif arg == '--node'
+        options[:search_type] = :node
+      elsif arg == '--token'
+        options[:search_type] = :token
       else
         raise "Unknown arg #{arg}"
       end
@@ -124,8 +131,9 @@ begin
     recursive: options[:recursive_search],
     include: options[:include_pattern],
     exclude: options[:exclude_pattern],
+    search_type: options[:search_type],
   ).search_all
-rescue => e
-  puts "Error: #{e}"
+rescue
+  puts "Error: #{$!}"
   show_help
 end

data/lib/cql_ruby.rb

@@ -6,6 +6,7 @@ module CqlRuby;
   end
 end
 
+require 'cql_ruby/defs'
 require 'cql_ruby/executor'
 require 'cql_ruby/crumb_collector'
 require 'cql_ruby/abstract_printer'

data/lib/cql_ruby/abstract_printer.rb

@@ -2,7 +2,7 @@
 
 module CqlRuby
   #
-  # Printing Cqlruby::Crumb-s.
+  # Printing CqlRuby::Crumb-s.
   #
   class AbstractPrinter
     def print(_crumb)

data/lib/cql_ruby/console_printer.rb

@@ -21,7 +21,7 @@ module CqlRuby
     end
 
     #
-    # @param crumb [Cqlruby::Crumb]
+    # @param crumb [CqlRuby::Crumb]
     #
     def print(crumb)
       parts = "##{color(97)}#{@counter}#{decor_reset}"
@@ -71,7 +71,7 @@ module CqlRuby
       end
     end
 
-    # @param [Cqlruby::Crumb] crumb
+    # @param [CqlRuby::Crumb] crumb
     # @return [String]
     def decorate_source_line(crumb)
       source = crumb.source

data/lib/cql_ruby/crumb_collector.rb

@@ -3,7 +3,7 @@
 module CqlRuby
   class CrumbCollector
     #
-    # @param printer [Cqlruby::AbstractPrinter]
+    # @param printer [CqlRuby::AbstractPrinter]
     #
     def initialize(printer)
       super()

data/lib/cql_ruby/defs.rb

@@ -0,0 +1,3 @@
+module CqlRuby
+  MATCH_ANYTHING = '*'
+end

data/lib/cql_ruby/executor.rb

@@ -20,7 +20,7 @@ end
 #
 # Executes search and dumps results into the collector.
 #
-# @param collector [Cqlruby::CrumbCollector]
+# @param collector [CqlRuby::CrumbCollector]
 # @param pattern [String]
 # @param path [String]
 # @param filters [Array<String>]
@@ -35,7 +35,8 @@ module CqlRuby
       filters: [],
       recursive: true,
       include: nil,
-      exclude: nil
+      exclude: nil,
+      search_type: :token
     )
       @collector = collector
       @filter_reader = filter_reader
@@ -45,6 +46,7 @@ module CqlRuby
       @recursive = recursive
       @include = include
       @exclude = exclude
+      @search_type = search_type
     end
 
     def search_all
@@ -65,18 +67,24 @@ module CqlRuby
       walk(ast, [], source_reader)
 
       nil
-    rescue => e
+    rescue
       CqlRuby.log "File #{file} cannot be parsed"
-      CqlRuby.log "Reason: #{e}" if CqlRuby::Config.debug_level_1?
+      CqlRuby.log "Reason: #{$!}" if CqlRuby::Config.debug_level_1?
     end
 
     def walk(node, ancestors, source_reader)
       if node.is_a?(Parser::AST::Node)
+        if search_for_node?
+          if match?(node.type) && CqlRuby::FilterEvaluator.pass?(filter_reader, ancestors, node)
+            collector.add(CqlRuby::Crumb.new(node, ancestors, source_reader))
+          end
+        end
+
         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)
+        if search_for_token? && match?(node) && CqlRuby::FilterEvaluator.pass?(filter_reader, ancestors, node)
           collector.add(CqlRuby::Crumb.new(node, ancestors, source_reader))
         end
       end
@@ -98,6 +106,14 @@ module CqlRuby
       Dir.glob(clean_path)
     end
 
+    def search_for_token?
+      @search_type == :token
+    end
+
+    def search_for_node?
+      @search_type == :node
+    end
+
     attr_reader :collector
     attr_reader :filter_reader
     attr_reader :pattern
@@ -107,33 +123,55 @@ module CqlRuby
   end
 end
 
-CqlRuby::Crumb = Struct.new(:full_name, :ancestors, :source_reader) do
-  def line_no
-    ancestors.last.location.expression.line
-  end
+module CqlRuby
+  class Crumb
+    def initialize(node, ancestors, source_reader)
+      @node = node
+      @ancestors = ancestors
+      @source_reader = source_reader
+    end
 
-  def line_col_no
-    ancestors.last.location.expression.column
-  end
+    def line_no
+      anchor.location.expression.line
+    end
 
-  def source
-    source_reader.source_line(line_no)
-  end
+    def line_col_no
+      anchor.location.expression.column
+    end
 
-  def surrounding_line(offset)
-    source_reader.source_line(line_no + offset)
-  end
+    def source
+      source_reader.source_line(line_no)
+    end
 
-  def file_name
-    source_reader.file
-  end
+    def surrounding_line(offset)
+      source_reader.source_line(line_no + offset)
+    end
 
-  def expression_size
-    ancestors.last.location.expression.size
-  end
+    def file_name
+      source_reader.file
+    end
+
+    def expression_size
+      anchor.location.expression.size
+    end
+
+    def type
+      anchor.type
+    end
+
+    private
+
+    def anchor
+      if node.is_a?(Parser::AST::Node)
+        node
+      else
+        ancestors.last
+      end
+    end
 
-  def type
-    ancestors.last.type
+    attr_reader :node
+    attr_reader :ancestors
+    attr_reader :source_reader
   end
 end
 

data/lib/cql_ruby/filter_evaluator.rb

@@ -3,18 +3,19 @@
 module CqlRuby
   class FilterEvaluator
     class << self
-      def pass?(filter_reader, node, ancestors)
+      def pass?(filter_reader, ancestors, node)
         [
           pass_type?(filter_reader, ancestors),
           pass_nesting?(filter_reader, ancestors),
-          pass_has?(filter_reader, node, ancestors),
+          pass_has?(filter_reader, ancestors, node),
+          pass_pattern?(filter_reader, ancestors, node),
         ].all?
       end
 
       private
 
       #
-      # @param [Cqlruby::FilterReader] filter_reader
+      # @param [CqlRuby::FilterReader] filter_reader
       # @param [Array<Parser::AST::Node>] ancestors
       #
       # @return [Boolean]
@@ -39,7 +40,6 @@ module CqlRuby
             next false unless ancestor.type.to_s == nest_rule.type
             next true unless nest_rule.restrict_name?
 
-            # TODO Make a proper matcher class.
             if %w[class module].include?(nest_rule.type)
               CqlRuby::PatternMatcher.match?(nest_rule.name, ancestor.children[0].children[1])
             elsif %[def].include?(nest_rule.type)
@@ -53,20 +53,69 @@ module CqlRuby
 
       #
       # @param [CqlRuby::FilterReader] filter_reader
-      # @param [Parser::AST::Node] node
       # @param [Array<Parser::AST::Node>] ancestors
+      # @param [Any<Parser::AST::Node, Symbol>] node
       #
-      def pass_has?(filter_reader, node, ancestors)
+      def pass_has?(filter_reader, ancestors, node)
         return true unless filter_reader.restrict_children?
 
         filter_reader.has_leaves.all? do |has_rule|
-          anchor_node = try_get_class(ancestors) || try_get_module(ancestors) || try_get_def(ancestors)
+          anchor_node = if node.is_a?(Symbol)
+            try_get_class(ancestors) || try_get_module(ancestors) || try_get_def(ancestors)
+          else
+            node
+          end
           next false unless anchor_node
 
           has_node_with_name?(anchor_node, has_rule)
         end
       end
 
+      #
+      # @param [CqlRuby::FilterReader] filter_reader
+      # @param [Array<Parser::AST::Node>] ancestors
+      # @param [Any<Parser::AST::Node, Symbol>] node
+      #
+      def pass_pattern?(filter_reader, ancestors, node)
+        return true unless filter_reader.restrict_pattern?
+
+        filter_reader.patterns.all? do |pattern|
+          pattern_ancestors = pattern.ancestors.dup
+          ancestor_idx = ancestors.size - 1
+
+          while !pattern_ancestors.empty? && ancestor_idx >= 0
+            if CqlRuby::PatternMatcher.match?(pattern_ancestors.last, ancestors[ancestor_idx].type)
+              pattern_ancestors.pop
+            end
+
+            ancestor_idx -= 1
+          end
+          return false unless pattern_ancestors.empty?
+
+          pattern_descendants = pattern.descendants.dup
+          match_descendant_pattern?(pattern_descendants, node)
+        end
+      end
+
+      #
+      # @param [Array<String>] pattern_descendants
+      # @param [Parser::AST::Node] node
+      #
+      def match_descendant_pattern?(pattern_descendants, node)
+        return true if pattern_descendants.empty?
+        # If we're at the end and we're still expecting a type - no match.
+        return false unless node.is_a?(Parser::AST::Node)
+
+        node.children.any? do |child|
+          next false unless child.is_a?(Parser::AST::Node)
+          if CqlRuby::PatternMatcher.match?(pattern_descendants.first, child.type)
+            match_descendant_pattern?(pattern_descendants[1..], child)
+          else
+            match_descendant_pattern?(pattern_descendants.dup, child)
+          end
+        end
+      end
+
       #
       # @param [Array<Parser::AST::Node>] ancestors
       #
@@ -101,7 +150,7 @@ module CqlRuby
 
       #
       # @param [Parser::AST::Node] anchor_node
-      # @param [CqlRuby::NodeSpec]
+      # @param [CqlRuby::FilterReader::NodeSpec]
       #
       def has_node_with_name?(anchor_node, has_rule)
         return false unless anchor_node.is_a?(Parser::AST::Node)

data/lib/cql_ruby/filter_reader.rb

@@ -1,33 +1,6 @@
 # frozen_string_literal: true
 
-# TODO: Have convenience filters for type:_ such as: isclass, ismodule, isdef ...
-
 module CqlRuby
-  class NodeSpec < Struct.new(:type, :name)
-    # Make this non duplicated.
-    NAME_ANY = '*'
-
-    class << self
-      #
-      # @param [String] raw_value
-      #   Format: TYPE(=NAME|=*)
-      #   Accepted types: class, module, def, block
-      #
-      def from(raw_value)
-        type, name = raw_value.split('=')
-        name ||= NAME_ANY
-
-        raise "Type '#{type}' is not recognized. See 'cql_ruby --help' for allowed types." unless Parser::Meta::NODE_TYPES.member?(type.to_sym)
-
-        new(type, name)
-      end
-    end
-
-    def restrict_name?
-      name != NAME_ANY
-    end
-  end
-
   #
   # Reads and provides filters.
   #
@@ -39,21 +12,69 @@ module CqlRuby
   # example: type:def,send
   #
   class FilterReader
+    class HierarchyPattern
+      SELF_MARKER = 'X'
+
+      def self.from(raw_value)
+        parts = raw_value.split('-')
+        self_marker_idx = parts.index(SELF_MARKER)
+        raise "Missing self marker '#{SELF_MARKER}' in hierarchy pattern." if self_marker_idx.nil?
+
+        ancestors = parts[0...self_marker_idx]
+        descendants = parts[self_marker_idx + 1..]
+
+        new(ancestors, descendants)
+      end
+
+      attr_reader :ancestors
+      attr_reader :descendants
+
+      def initialize(ancestors, descendants)
+        @ancestors = ancestors
+        @descendants = descendants
+      end
+    end
+
+    class NodeSpec < Struct.new(:type, :name)
+      class << self
+        #
+        # @param [String] raw_value
+        #   Format: TYPE(=NAME|=*)
+        #   Accepted types: class, module, def, block
+        #
+        def from(raw_value)
+          type, name = raw_value.split('=')
+          name ||= CqlRuby::MATCH_ANYTHING
+
+          raise "Type '#{type}' is not recognized. See 'cql_ruby --help' for allowed types." unless Parser::Meta::NODE_TYPES.member?(type.to_sym)
+
+          new(type, name)
+        end
+      end
+
+      def restrict_name?
+        name != CqlRuby::MATCH_ANYTHING
+      end
+    end
+
     NESTING_ALLOWED_TYPES = %w[class module def block].freeze
 
     # @attribute [Array<Symbol>] allowed_types
     attr_reader :allowed_types
-    # @attribute [Array<CqlRuby::NodeSpec>] nest_under
+    # @attribute [Array<CqlRuby::FilterReader::NodeSpec>] nest_under
     attr_reader :nest_under
-    # @attribute [Array<CqlRuby::NodeSpec>] has_leaves
+    # @attribute [Array<CqlRuby::FilterReader::NodeSpec>] has_leaves
     attr_reader :has_leaves
+    # @attribute [Array<CqlRuby::FilterReader::HierarchyPattern>] patterns
+    attr_reader :patterns
 
-    def initialize(raw_filters)
+    def initialize(raw_filters = [])
       super()
 
       @allowed_types = []
       @nest_under = []
       @has_leaves = []
+      @patterns = []
 
       parse_raw_filters(raw_filters)
     end
@@ -70,6 +91,10 @@ module CqlRuby
       !@has_leaves.empty?
     end
 
+    def restrict_pattern?
+      !@patterns.empty?
+    end
+
     private
 
     # @param [Array<String>] raw_filters
@@ -88,6 +113,8 @@ module CqlRuby
           @nest_under << spec
         elsif %w[has h].include?(name)
           @has_leaves << NodeSpec.from(value)
+        elsif %w[pattern p].include?(name)
+          @patterns << HierarchyPattern.from(value)
         end
       end
 

data/lib/cql_ruby/pattern_matcher.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 module CqlRuby
   module PatternMatcher
-    MATCH_ANY = '*'
-
     def self.match?(pattern, subject)
       pattern = pattern.to_s
-      return true if pattern == MATCH_ANY
+      return true if pattern == CqlRuby::MATCH_ANYTHING
 
       subject = subject.to_s
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.14
 platform: ruby
 authors:
 - itarato
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: it.arato@gmail.com
 executables:
@@ -42,6 +56,7 @@ files:
 - lib/cql_ruby/abstract_printer.rb
 - lib/cql_ruby/console_printer.rb
 - lib/cql_ruby/crumb_collector.rb
+- lib/cql_ruby/defs.rb
 - lib/cql_ruby/executor.rb
 - lib/cql_ruby/filter_evaluator.rb
 - lib/cql_ruby/filter_reader.rb