querly 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c59512018b5efff3d07b7be91d84f27bdbcb03ab0c3c85d753776defae7f1465
-  data.tar.gz: 2d3a28676a671d80378c67e26bd2afd6bf047243a775da6db990dad97e0b0495
+  metadata.gz: 3604de13f36852d57290140b9bf4e4bfeb5811ffb8dbfef054a3e0ce8e9aa47a
+  data.tar.gz: '09038f2030b2c6bc859cfbd7087ae62da8efd2ac4ae1e3b945741d3f65d3146b'
 SHA512:
-  metadata.gz: b72388f4e4cd1d73c6b5942fcbe5897ffa7f1aac5fd4cfa40c644a5a2ac21f36809531847d10a455c97d6f5b9f4d1a580715f390b98f92352bcc9819949c4bca
-  data.tar.gz: 12116f61a8ae822d6a95560d4acdde918579e312702f402b51bb5a9244cca1f5c4b69b0d47e02a88a6b35fa4f37de90ed0727919eede1dce2362c95e3eb4b2da
+  metadata.gz: 8c2dbbd840b5eb4fa65418c4d2ab81af6154dbbac94c96d083c4f7f9d88e5447666f7d583b54f4c266f52c4f4f15d2f38210c353762c2f8c281785da161d0aec
+  data.tar.gz: 4fd40dc297b03b7de10e3f1bb348a553d1af355f3e6310feed4b9b8e1fe5324757684e443cb8a699952bc0ccfedcf95f072e13890b5cc838f4c2850b7ef09d58

data/.github/workflows/rubocop.yml

@@ -0,0 +1,18 @@
+name: RuboCop
+
+on: pull_request
+
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
+    - run: gem install rubocop rubocop-rubycw --no-document
+    - name: Run RuboCop
+      shell: bash
+      run: |
+        # https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-error-message
+        rubocop | ruby -pe 'sub(/^(.+):(\d+):(\d+): (.): (.+)$/, %q{::error file=\1,line=\2,col=\3::\5})'

data/.github/workflows/ruby.yml

@@ -11,18 +11,12 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        container_tag:
-        - 2.6-bionic
-        - 2.7-bionic
-        - master-nightly-bionic
-    container:
-      image: rubylang/ruby:${{ matrix.container_tag }}
+        ruby: [2.6, 2.7, head]
     steps:
-    - uses: actions/checkout@v1
-    - name: Run test
-      run: |
-        ruby -v
-        gem install bundler
-        bundle install --jobs 4 --retry 3
-        bin/setup
-        bundle exec rake build test
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - run: bundle install --jobs 4 --retry 3
+    - run: bin/setup
+    - run: bundle exec rake build test

data/.rubocop.yml

@@ -0,0 +1,10 @@
+require:
+  - rubocop-rubycw
+
+AllCops:
+  DisabledByDefault: true
+  Exclude:
+    - test/data/**/*.rb
+
+Rubycw/Rubycw:
+  Enabled: true

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 1.2.0 (2020-12-15)
+
+* Relax Thor version requirements by @y-yagi ([#85](https://github.com/soutaro/querly/pull/85))
+* Fix ERB comment preprocessing by @mallowlabs ([#84](https://github.com/soutaro/querly/pull/84))
+* Better error message for Ruby code syntax error by @ybiquitous ([#83](https://github.com/soutaro/querly/pull/83))
+
 ## 1.1.0 (2020-05-17)
 
 * Fix invalid bytes sequence in UTF-8 error by @mallowlabs [#75](https://github.com/soutaro/querly/pull/75)

data/README.md

@@ -1,7 +1,8 @@
 ![Querly logo](https://github.com/soutaro/querly/blob/master/logo/Querly%20horizontal.png)
+
 # Querly - Pattern Based Checking Tool for Ruby
 
-[![Build Status](https://travis-ci.org/soutaro/querly.svg?branch=master)](https://travis-ci.org/soutaro/querly)
+![Ruby](https://github.com/soutaro/querly/workflows/Ruby/badge.svg)
 
 Querly is a query language and tool to find out method calls from Ruby programs.
 Define rules to check your program with patterns to find out *bad* pieces.

data/Rakefile

@@ -11,7 +11,7 @@ task :default => :test
 task :build => :racc
 task :test => :racc
 
-rule /\.rb/ => ".y" do |t|
+rule %r/\.rb/ => ".y" do |t|
   sh "racc", "-v", "-o", "#{t.name}", "#{t.source}"
 end
 

data/lib/querly/cli/formatter.rb

@@ -46,7 +46,12 @@ module Querly
 
         def script_error(path, error)
           STDERR.puts Rainbow("Failed to load script: #{path}").red
-          STDERR.puts error.inspect
+
+          if error.is_a? Parser::SyntaxError
+            STDERR.puts error.diagnostic.render
+          else
+            STDERR.puts error.inspect
+          end
         end
 
         def issue_found(script, rule, pair)

data/lib/querly/node_pair.rb

@@ -25,7 +25,7 @@ module Querly
         yield self
 
         children.each do |child|
-          child.each_subpair &block
+          child.each_subpair(&block)
         end
       else
         enum_for :each_subpair

data/lib/querly/pp/cli.rb

@@ -82,7 +82,8 @@ module Querly
 
         new_source = source.gsub(/./, ' ')
         parser.ast.descendants(:erb).each do |erb_node|
-          _, _, code_node, = *erb_node
+          indicator_node, _, code_node, = *erb_node
+          next if indicator_node&.loc&.source == '#'
           new_source[code_node.loc.range] = code_node.loc.source
           new_source[code_node.loc.range.end] = ';'
         end

data/lib/querly/version.rb

@@ -1,3 +1,3 @@
 module Querly
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/querly.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "slim", "~> 4.0.1"
   spec.add_development_dependency "haml", "~> 5.0.4"
 
-  spec.add_dependency 'thor', ">= 0.19.0", "< 0.21.0"
+  spec.add_dependency 'thor', ">= 0.19.0"
   spec.add_dependency "parser", ">= 2.5.0"
   spec.add_dependency "rainbow", ">= 2.1"
   spec.add_dependency "activesupport", ">= 5.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: querly
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-16 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,9 +129,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,9 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -209,9 +203,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rubocop.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE

data/.travis.yml

@@ -1,11 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4.10
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
-before_install: gem install bundler
-script:
-  - bundle exec rake test
-  - bundle exec querly test --config=sample.yaml