Fix Rubocop workflow (#41)

* Fix Rubocop workflow

* Bump rubocop

* Update files

* Fix supers

* Bump mocha

* Bump simplecov

* Downgrade rubocop

* Another attempt

* Revert

* Exclude simplecov

* Exclude all vendor

Author: ErikSchierboom

.github/workflows/rubocop.yml

@@ -11,19 +11,25 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout code
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@a699edbce608a2c128dedad88e3b6a0e28687b3c
+        uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
         with:
-          ruby-version: 2.6.6
+          ruby-version: .ruby-version
           bundler-cache: true
 
       - name: Install gems
         run: |
-          gem install rubocop
-          gem install rubocop-minitest
-          gem install rubocop-performance
+          # Extract the exact versions of the rubocop gems from Gemfile.lock
+          rubocop_version=$(sed -n -E 's/^    rubocop \((.+)\)/\1/p' Gemfile.lock)
+          rubocop_minitest_version=$(sed -n -E 's/^    rubocop-minitest \((.+)\)/\1/p' Gemfile.lock)
+          rubocop_performance_version=$(sed -n -E 's/^    rubocop-performance \((.+)\)/\1/p' Gemfile.lock)
+
+          gem install rubocop -v $rubocop_version
+          gem install rubocop-minitest -v $rubocop_minitest_version
+          gem install rubocop-performance -v $rubocop_performance_version
 
       - name: Run Rubocop
         run: rubocop --except Metrics

.rubocop.yml

@@ -6,6 +6,8 @@ AllCops:
   NewCops: disable
   Exclude:
     - "bin/**/*"
+    - "tests/**/*"
+    - "vendor/**/*"
     - "Gemfile"
     - "Gemfile.lock"
 
@@ -27,6 +29,7 @@ Layout/EmptyLinesAroundAccessModifier:
 Layout/LineLength:
   Exclude:
     - "scripts/generate_fixture.rb"
+    - "test/**/*"
 
 Lint/SuppressedException:
   Exclude:

Gemfile.lock

@@ -1,48 +1,53 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
+    ast (2.4.2)
     coderay (1.1.3)
-    docile (1.3.2)
-    json (2.3.1)
+    docile (1.4.0)
+    json (2.6.3)
     mandate (0.3.0)
     method_source (1.0.0)
     minitest (5.14.2)
     minitest-stub-const (0.6)
-    mocha (1.11.2)
-    parallel (1.20.0)
-    parser (2.7.2.0)
+    mocha (2.1.0)
+      ruby2_keywords (>= 0.0.5)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
+    racc (1.7.1)
+    rainbow (3.1.1)
     rake (13.0.1)
-    regexp_parser (1.8.2)
-    rexml (3.2.4)
-    rubocop (1.3.1)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
+    rubocop (1.50.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 1.1.1)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.1)
-      parser (>= 2.7.1.5)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)
     rubocop-performance (1.9.0)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.10.1)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
@@ -62,4 +67,4 @@ DEPENDENCIES
   simplecov (~> 0.17.0)
 
 BUNDLED WITH
-   2.1.4
+   2.3.6

bin/rubocop-quick

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-git diff --name-status --staged | grep '^[MA]' | grep -o '\s\+.*rb' | xargs bundle exec rubocop --except Metrics --auto-correct --format quiet --force-exclusion Gemfile && \
+git diff --name-status --staged | grep '^[MA]' | grep -o '\s\+.*rb' | xargs bundle exec rubocop --except Metrics --autocorrect --format quiet --force-exclusion Gemfile && \
 git diff --name-status --staged | grep '^[MA]' | grep -o '\s\+.*rb' | xargs git add

lib/generate_mapping.rb

@@ -6,6 +6,7 @@ class GenerateMapping < Parser::AST::Processor
   def initialize(code)
     @code = code
     @mapping = {}
+    super()
   end
 
   def call
@@ -90,7 +91,7 @@ def process(node)
           node.arguments.each do |arg|
             case arg.type
             when :sym
-              add_entry(arg.loc.expression.source[1..-1])
+              add_entry(arg.loc.expression.source[1..])
             when :str
               add_entry(arg.value)
             end
@@ -128,14 +129,15 @@ def add_entry(token)
     return if mapping.key?(token)
 
     # The placeholder case should match the token type and case
-    if token[0] == "@"
-      mapping[token] = "@placeholder_#{mapping.size}"
-    elsif token[0] == "$"
-      mapping[token] = "$placeholder_#{mapping.size}"
-    elsif token[0] == token[0].capitalize
-      mapping[token] = "PLACEHOLDER_#{mapping.size}"
-    else
-      mapping[token] = "placeholder_#{mapping.size}"
-    end
+    mapping[token] = case token[0]
+                     when "@"
+                       "@placeholder_#{mapping.size}"
+                     when "$"
+                       "$placeholder_#{mapping.size}"
+                     when token[0].capitalize
+                       "PLACEHOLDER_#{mapping.size}"
+                     else
+                       "placeholder_#{mapping.size}"
+                     end
   end
 end

lib/normalizers/naming_normalizer.rb

@@ -7,6 +7,7 @@ class NamingNormalizer < Parser::TreeRewriter
   def initialize(code, mapping)
     @original_code = code
     @mapping = mapping
+    super()
   end
 
   def call
@@ -39,31 +40,31 @@ def on_send(node)
     super
   end
 
-  def process_regular_node
-    super
-  end
+  # def process_regular_node
+  #   super
+  # end
 
   def on_op_asgn(node)
     p "opasgn"
-    #node.pry
+    # node.pry
     super
   end
 
   def on_casgn(node)
     p "casgn"
-    #node.pry
+    # node.pry
     super
   end
 
   def on_defs(node)
     p "defs"
-    #node.pry
+    # node.pry
     super
   end
 
   def on_numblock(node)
     p "numblock"
-    #node.pry
+    # node.pry
     super
   end
 
@@ -74,7 +75,7 @@ def handler_missing(node)
       super
     else
       p "handler_missing"
-      #node.pry
+      # node.pry
     end
   end
 

lib/representer.rb

@@ -11,7 +11,7 @@
 require_relative 'representation'
 require_relative 'represent_solution'
 
-#require 'pry'
+# require 'pry'
 
 module Representer
   def self.generate(exercise_slug, solution_path, output_path)

test/normalizers/naming_normalisation_test.rb

@@ -130,6 +130,4 @@ def placeholder_0(placeholder_1, placeholder_2)
     "
     assert_representation code, representation
   end
-
-
 end

test/representer_test.rb

@@ -45,5 +45,4 @@ def total_time_in_minutes(number_of_layers:, actual_minutes_in_oven:)
       assert_equal ast, File.read("#{dir}/representation.txt")
     end
   end
-  
 end