cql_ruby 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17840020ae4f57f60763716ac438b33a68abb4b1add767d5f8e88cfb946439c8
-  data.tar.gz: 789aa975ced7c62036da026f7e4bd377c09b1502692ff217fb697641d5478d64
+  metadata.gz: 4e459067630e91a0d52a1839445f881647e9c0271c052d973ccfafd6040f21b6
+  data.tar.gz: 39379431fb2d817930aff070a8335c02b62822d6bba0129956f6691cb5ea99b8
 SHA512:
-  metadata.gz: ee8c4e5ea2cfde9a8837cc1e19734e0051424af9c15fe02fc5db49b11984052b70a4acb6d196b94c38820ea34bccbb8d78ff431e5bef45ac0627a55548fae324
-  data.tar.gz: 9e550d59e360717069c3198269bbe815d73aae7cc1d43b9532ed2fc4dee60b8f9decee399051ceedb9b0ae21867e785cce0423170f1f417550b3611c018d4270
+  metadata.gz: 1de5455822e96348fad5fbda540e66ebf830723a4579927f8d4b1a2a9a4c9dd1c6d4763a514674eebff6974c8d61958e53af9fae74397fd643bb8a036f0a725d
+  data.tar.gz: 94c05fd4d565b1db7e793137495bd97456b1e459f9a58c6faba8c008c772a4898929ce5dc02d4064dec2ef0ee2ef0a7a2b68a2f9915430c681aca2a1a2bbb6f9

data/bin/cql_ruby

@@ -18,6 +18,8 @@ def show_help
     \t\tHas child: has:T(=NAME) Example: has:const has:def=valid?
 
     \tOPTIONS
+    \t\t--include=PATTERN Parses only files whose name matches the pattern.
+    \t\t--exclude=PATTERN Parses only files whose name does not match the pattern.
     \t\t-lN (N is integer) Add N surrounding line before and after.
     \t\t-nc (--no-color) No color on output.
     \t\t-nf (--no-file) No file names.
@@ -45,6 +47,8 @@ def extract_options
     show_source: true,
     recursive_search: true,
     surrounding_lines: 0,
+    include_pattern: nil,
+    exclude_pattern: nil,
   }
 
   ARGV.delete_if do |arg|
@@ -64,6 +68,10 @@ def extract_options
         options[:recursive_search] = false
       elsif arg[0..1] == '-l' && arg[2..].to_i > 0
         options[:surrounding_lines] = arg[2..].to_i
+      elsif arg.start_with?('--include=')
+        options[:include_pattern] = arg.split('=')[1]
+      elsif arg.start_with?('--exclude=')
+        options[:exclude_pattern] = arg.split('=')[1]
       else
         raise "Unknown arg #{arg}"
       end
@@ -91,7 +99,6 @@ begin
   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?
 
@@ -115,6 +122,8 @@ begin
     path: path,
     filters: filters,
     recursive: options[:recursive_search],
+    include: options[:include_pattern],
+    exclude: options[:exclude_pattern],
   ).search_all
 rescue => e
   puts "Error: #{e}"

data/lib/cql_ruby/executor.rb

@@ -33,7 +33,9 @@ module CqlRuby
       pattern:,
       path:,
       filters: [],
-      recursive: true
+      recursive: true,
+      include: nil,
+      exclude: nil
     )
       @collector = collector
       @filter_reader = filter_reader
@@ -41,10 +43,15 @@ module CqlRuby
       @path = path
       @filters = filters
       @recursive = recursive
+      @include = include
+      @exclude = exclude
     end
 
     def search_all
       files.flat_map do |file|
+        next if !@exclude.nil? && CqlRuby::PatternMatcher.match?(@exclude, file)
+        next unless @include.nil? || CqlRuby::PatternMatcher.match?(@include, file)
+
         CqlRuby.log "File check: #{file}" if CqlRuby::Config.debug_level_3?
         search(file)
       end
@@ -59,7 +66,8 @@ module CqlRuby
 
       nil
     rescue => e
-      CqlRuby.log "File #{file} cannot be parsed: #{e}"
+      CqlRuby.log "File #{file} cannot be parsed"
+      CqlRuby.log "Reason: #{e}" if CqlRuby::Config.debug_level_1?
     end
 
     def walk(node, ancestors, source_reader)

metadata

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