querly 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a7dfd2ae45b1173ea9e23967e5c39b211bebffb
-  data.tar.gz: d014023c1f6e4d6989d04ea688dbaad0fed475ba
+  metadata.gz: 4a98ed1029750241af4e9b51f823e58742290ec6
+  data.tar.gz: 58cddad4c97eeef01447dcc0cc0751a8c9483176
 SHA512:
-  metadata.gz: 54969626459f41a814877e188ee487a911f01cbe9a17fe83ed2ed8b110736be3088994c2c0e73754c418c93e37e640fe409707740edd9245f63adc7d09045cf0
-  data.tar.gz: 100d7dbc6eb4dc7a6edadd86c08760782aa4ab65f1b4958d1b1e3f6360a2db28b00b748297367dd7df47caef9259b7b93f13b3a4f6ffc57dc694c785dcb49332
+  metadata.gz: 21906e1368f509bd343621ee669ab215b8509e591d268d4731bf01db7b4839fc36cc5c95e66f7a6013799ee4cd7c5896d5524248b30c3fc1aedb398991eac100
+  data.tar.gz: 9c685311e79b68e507d8167171523f3f3e979032ae67068ee07dbd8f53e2d4c74006bccae19c156e9e99a4fd16a51259616a324aa399fb2d7ef6b38c206b8bba

data/.travis.yml

@@ -4,3 +4,6 @@ rvm:
   - 2.3.3
   - 2.4.0
 before_install: gem install bundler -v 1.12.5
+script:
+  - bundle exec rake test
+  - bundle exec querly test --config=sample.yaml

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## master
 
+## 0.8.0 (2017-12-19)
+
+* Make `[conditional]` be aware of safe-navigation-operator (@pocke) #30
+* Make preprocessors be aware of `bundle exec`.
+  When `querly` is invoked with `bundle exec`, so are preprocessors, and vice vesa.
+* Add `--rule` option for `querly check` to filter rules to test
+* Print rule id in text output
+ 
 ## 0.7.0 (2017-08-22)
 
 * Add Wiki pages to repository in manual directory #25

data/lib/querly.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 require "yaml"
 require "rainbow"
-require "parser/current"
+require "parser/ruby24"
 require "set"
 require "open3"
 require "active_support/inflector"

data/lib/querly/analyzer.rb

@@ -2,10 +2,12 @@ module Querly
   class Analyzer
     attr_reader :config
     attr_reader :scripts
+    attr_reader :rule
 
-    def initialize(config:)
+    def initialize(config:, rule:)
       @config = config
       @scripts = []
+      @rule = rule
     end
 
     #
@@ -16,8 +18,10 @@ module Querly
         rules = config.rules_for_path(script.path)
         script.root_pair.each_subpair do |node_pair|
           rules.each do |rule|
-            if rule.patterns.any? {|pattern| test_pair(node_pair, pattern) }
-              yield script, rule, node_pair
+            if rule.match?(identifier: self.rule)
+              if rule.patterns.any? {|pattern| test_pair(node_pair, pattern) }
+                yield script, rule, node_pair
+              end
             end
           end
         end

data/lib/querly/cli.rb

@@ -7,6 +7,7 @@ module Querly
     option :config, default: "querly.yml"
     option :root
     option :format, default: "text", type: :string, enum: %w(text json)
+    option :rule, type: :string
     def check(*paths)
       require 'querly/cli/formatter'
 
@@ -38,7 +39,7 @@ Specify configuration file by --config option.
           exit
         end
 
-        analyzer = Analyzer.new(config: config)
+        analyzer = Analyzer.new(config: config, rule: options[:rule])
 
         ScriptEnumerator.new(paths: paths.empty? ? [Pathname.pwd] : paths.map {|path| Pathname(path) }, config: config).each do |path, script|
           case script

data/lib/querly/cli/console.rb

@@ -35,7 +35,7 @@ Querly #{VERSION}, interactive console
       def analyzer
         return @analyzer if @analyzer
 
-        @analyzer = Analyzer.new(config: nil)
+        @analyzer = Analyzer.new(config: nil, rule: nil)
 
         ScriptEnumerator.new(paths: paths, config: nil).each do |path, script|
           case script

data/lib/querly/cli/formatter.rb

@@ -56,7 +56,7 @@ module Querly
           col = pair.node.loc.column
           message = rule.messages.first.split(/\n/).first
 
-          STDOUT.puts "#{path}:#{line}:#{col}\t#{src}\t#{message}"
+          STDOUT.puts "#{path}:#{line}:#{col}\t#{src}\t#{message} (#{rule.id})"
         end
       end
 

data/lib/querly/cli/test.rb

@@ -136,11 +136,11 @@ module Querly
       end
 
       def test_pattern(pattern, example, expected:)
-        analyzer = Analyzer.new(config: nil)
+        analyzer = Analyzer.new(config: nil, rule: nil)
 
         found = false
 
-        node = Parser::CurrentRuby.parse(example)
+        node = Parser::Ruby24.parse(example)
         NodePair.new(node: node).each_subpair do |pair|
           if analyzer.test_pair(pair, pattern)
             found = true

data/lib/querly/pattern/kind.rb

@@ -44,6 +44,8 @@ module Querly
             node.equal? parent.children.first
           when :or
             node.equal? parent.children.first
+          when :csend
+            node.equal? parent.children.first
           else
             false
           end

data/lib/querly/preprocessor.rb

@@ -19,8 +19,30 @@ module Querly
     end
 
     def run!(source_code)
-      output, status = Open3.capture2({ 'RUBYOPT' => nil }, command, stdin_data: source_code)
-      raise Error.new(status: status, command: command) unless status.success?
+      stdin_read, stdin_write = IO.pipe
+      stdout_read, stdout_write = IO.pipe
+
+      writer = Thread.new do
+        stdin_write.print source_code
+        stdin_write.close
+      end
+
+      output = ""
+
+      reader = Thread.new do
+        while (line = stdout_read.gets)
+          output << line
+        end
+      end
+
+      succeeded = system(command, in: stdin_read, out: stdout_write)
+      stdout_write.close
+
+      writer.join
+      reader.join
+
+      raise Error.new(status: $?, command: command) unless succeeded
+
       output
     end
   end

data/lib/querly/script_enumerator.rb

@@ -56,7 +56,7 @@ module Querly
     end
 
     def parser
-      Parser::CurrentRuby.new(Builder.new).tap do |parser|
+      Parser::Ruby24.new(Builder.new).tap do |parser|
         parser.diagnostics.all_errors_are_fatal = true
         parser.diagnostics.ignore_warnings = true
       end
@@ -106,7 +106,7 @@ module Querly
       def string_value(token)
         value(token)
       end
-
+      
       def emit_lambda
         true
       end

data/lib/querly/version.rb

@@ -1,3 +1,3 @@
 module Querly
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/manual/patterns.md

@@ -143,6 +143,27 @@ def f()
 end
 ```
 
+# Interpolation Syntax
+
+If you want to describe a pattern that can not be described with adove syntax, you can use interpolation as follows:
+
+```rb
+id: find_by_abc_and_def
+pattern:
+  subject: "'finder(...)"
+  where:
+    finder: 
+      - /find_by_\w+\_.*/
+      - find_by_id
+```
+
+It matches with `find_by_email_and_name(...)`.
+
+- Meta variables `'finder` can occur only as method name
+- Unused meta var definition i1s okay, but undefined meta var reference raises an error
+- If value of meta var is a string `foo`, it matches send nodes with exactly same method name
+- If value of meta var is a regexp `/foo/`, it matches send nodes with method name which `=~` the regexp
+
 # Difference from Ruby
 
 * Method call parenthesis cannot be omitted (if omitted, it means *any arguments*)

data/sample.yaml

@@ -143,8 +143,6 @@ rules:
         after: "[].size"
       - after: "[].count(:x)"
       - after: "[].count {|x| x > 3 }"
-      - before: "[].count(x)"
-        after: "[].count"
 
 preprocessor:
   .slim: slimrb --compile

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: querly
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Pattern Based Checking Tool for Ruby