querly 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d2f7b1ba2cfc19fc71ac84ab1f2b65e6f50fab63
-  data.tar.gz: 270c4fbe0609fae2af52c9f5bc0d1b70f00304e5
+SHA256:
+  metadata.gz: e84d868d2fc893c8ca087565a483bf0ad7aa2088d6ff7e4c890584bcf5deb2a3
+  data.tar.gz: 1c2836c3c6b87b0ddc9195d0b8af9a242bc8a31b12a7a9f4c758d3e0c0815229
 SHA512:
-  metadata.gz: 4808003cfd6d836c4a627bce6b31bb88115f301a0d41347c7e56f352b22fec95d4469a1d94eed904335f842f21517ce1fa09234add15e79a42423146035e8925
-  data.tar.gz: 624cf0658f0f4badf70aa4297d1f2e0fef84c576bad0f43e6aae9350536fe4003a530fb47bb84b24aab45532927823d706cee9e31d30c0f3268887922ec1ddc0
+  metadata.gz: ee0e9bde00fe3052ac30d60da5a73f18270e5e800460d36e3304dd0b3ec791b6233560dc16731f99f28e6cc1482f915607453b66fd2d418ab0c1e7e00fdc9c12
+  data.tar.gz: 0e17feb0be475e457946c465930e5254e3b3618e06ec9305f68b4d7a047bdfff1849069b6827519358ee2d34e392cf11c175e58440dbac2e3c8c78c5bcc7ccb6

data/.travis.yml

@@ -1,10 +1,10 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
-before_install: gem install bundler -v 1.12.5
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
+before_install: gem install bundler
 script:
   - bundle exec rake test
   - bundle exec querly test --config=sample.yaml

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## master
 
+## 0.14.0 (2019-01-22)
+
+* Allow having `...` pattens anywhere positional argument patterns are valid #54
+* Add `querly find` command (@gfx) #49
+
 ## 0.13.0 (2018-08-27)
 
 * Make history file location configurable through `QUERLY_HOME` (defaults to `~/.querly`)

data/lib/querly/cli.rb

@@ -83,6 +83,16 @@ Specify configuration file by --config option.
       ).start
     end
 
+    desc "find pattern [paths]", "Find for the pattern in given paths"
+    def find(pattern, *paths)
+      require 'querly/cli/find'
+
+      Find.new(
+        pattern: pattern,
+        paths: paths.empty? ? [Pathname.pwd] : paths.map {|path| Pathname(path) },
+      ).start
+    end
+
     desc "test", "Check configuration"
     option :config, default: "querly.yml"
     def test()

data/lib/querly/cli/find.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Querly
+  class CLI
+    class Find
+      include Concerns::BacktraceFormatter
+
+      attr_reader :pattern_str
+      attr_reader :paths
+
+      def initialize(pattern:, paths:)
+        @pattern_str = pattern
+        @paths = paths
+      end
+
+      def start
+        count = 0
+
+        analyzer.find(pattern) do |script, pair|
+          path = script.path.to_s
+          line_no = pair.node.loc.first_line
+          range = pair.node.loc.expression
+          start_col = range.column
+          end_col = range.last_column
+
+          src = range.source_buffer.source_lines[line_no-1]
+          src = Rainbow(src[0...start_col]).blue +
+            Rainbow(src[start_col...end_col]).bright.blue.bold +
+            Rainbow(src[end_col..-1]).blue
+
+          puts "  #{path}:#{line_no}:#{start_col}\t#{src}"
+
+          count += 1
+        end
+
+        puts "#{count} results"
+      rescue => exn
+        STDOUT.puts Rainbow("Error: #{exn}").red
+        STDTOU.puts "pattern: #{pattern_str}"
+        STDOUT.puts "Backtrace:"
+        STDOUT.puts format_backtrace(exn.backtrace)
+      end
+
+      def pattern
+        Pattern::Parser.parse(pattern_str, where: {})
+      end
+
+      def analyzer
+        return @analyzer if @analyzer
+
+        @analyzer = Analyzer.new(config: nil, rule: nil)
+
+        ScriptEnumerator.new(paths: paths, config: nil).each do |path, script|
+          case script
+          when Script
+            @analyzer.scripts << script
+          when StandardError
+            p path: path, script: script.inspect
+            puts script.backtrace
+          end
+        end
+
+        @analyzer
+      end
+    end
+  end
+end

data/lib/querly/pattern/expr.rb

@@ -200,7 +200,8 @@ module Querly
 
           case args
           when Argument::AnySeq
-            if args.tail
+            case args.tail
+            when Argument::KeyValue
               if first_node
                 case
                 when nodes.last.type == :kwsplat
@@ -214,6 +215,10 @@ module Querly
               else
                 test_hash_args({}, args.tail)
               end
+            when Argument::Expr
+              nodes.size.times.any? do |i|
+                test_args(nodes.drop(i), args.tail)
+              end
             else
               true
             end

data/lib/querly/pattern/parser.y

@@ -40,6 +40,7 @@ args:  { result = nil }
   | AMP expr { result = Argument::BlockPass.new(expr: val[1]) }
   | kw_args
   | DOTDOTDOT { result = Argument::AnySeq.new }
+  | DOTDOTDOT COMMA args { result = Argument::AnySeq.new(tail: val[2]) }
   | DOTDOTDOT COMMA kw_args { result = Argument::AnySeq.new(tail: val[2]) }
 
 kw_args: { result = nil }

data/lib/querly/version.rb

@@ -1,3 +1,3 @@
 module Querly
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

data/querly.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler", ">= 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "racc", "= 1.4.14"

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: querly
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
@@ -169,6 +169,7 @@ files:
 - lib/querly/check.rb
 - lib/querly/cli.rb
 - lib/querly/cli/console.rb
+- lib/querly/cli/find.rb
 - lib/querly/cli/formatter.rb
 - lib/querly/cli/rules.rb
 - lib/querly/cli/test.rb
@@ -214,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Pattern Based Checking Tool for Ruby