Upgrade rubocop and config (#536)

* Upgrade rubocop and config

* Run rubocop on github actions

* Try rubocop github actions

* Fixes to workflow, try cache

* bundle exec rubocop -a

* Cache?

* Test cache

* Fix error in yml

* Work rubocop, work

* Exclude vendor rubocop

* ok, now cache works

* Cache works!

Author: sebazai

.github/workflows/rubocop.yml

@@ -0,0 +1,31 @@
+name: RuboCop
+
+on:
+  push:
+    branches: [ master, bs4 ]
+  pull_request:
+    branches: [ master, bs4 ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.6
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
+    - name: Cache gems
+      uses: actions/cache@v1
+      with:
+        path: vendor/bundle
+        key: ${{ runner.os }}-rubocop-${{ hashFiles('**/Gemfile.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-rubocop-
+    - name: Install gems
+      run: |
+        bundle config path vendor/bundle
+        bundle install --jobs 4 --retry 3
+    - name: Run RuboCop
+      run: bundle exec rubocop

.rubocop.yml

@@ -8,6 +8,7 @@ AllCops:
   Exclude:
     - 'ext/**/*'
     - 'db/**/*'
+    - '**/vendor/**/*'
 
 # Style
 Style/StringLiterals:

Gemfile

@@ -66,8 +66,8 @@ group :development, :test do
   gem 'launchy' # for capybara's save_and_open_page
   gem 'mimic', '~> 0.4'
   gem 'railroady' # for doc/diagrams
-  gem 'rubocop', '~> 1.5.2', require: false # HoundCI requires 1.5.2
-  gem 'rubocop-rails_config', '~> 1.2.2' # Rubocop locked
+  gem 'rubocop', '~> 1.13', require: false # HoundCI requires 1.5.2
+  gem 'rubocop-rails_config', '~> 1.5' # Rubocop locked
   gem 'ruby-prof', '~> 1.4' # for performance tests
   gem 'simplecov', require: false
 end

Gemfile.lock

@@ -347,32 +347,32 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    rubocop (1.5.2)
+    rubocop (1.15.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.5.0)
       parser (>= 3.0.1.1)
     rubocop-packaging (0.5.1)
       rubocop (>= 0.89, < 2.0)
-    rubocop-performance (1.10.2)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-performance (1.11.3)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.9.1)
+    rubocop-rails (2.10.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rails_config (1.2.2)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rails_config (1.5.3)
       railties (>= 5.0)
-      rubocop (>= 1.0)
+      rubocop (>= 1.13)
       rubocop-ast (>= 1.0.1)
       rubocop-packaging (~> 0.5)
-      rubocop-performance (~> 1.3)
+      rubocop-performance (~> 1.11)
       rubocop-rails (~> 2.0)
     ruby-prof (1.4.3)
     ruby-progressbar (1.11.0)
@@ -426,7 +426,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
     webrick (1.7.0)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
@@ -489,8 +489,8 @@ DEPENDENCIES
   rspec-activemodel-mocks (~> 1.1)
   rspec-core (~> 3.10)
   rspec-rails (~> 5.0)
-  rubocop (~> 1.5.2)
-  rubocop-rails_config (~> 1.2.2)
+  rubocop (~> 1.13)
+  rubocop-rails_config (~> 1.5)
   ruby-prof (~> 1.4)
   sassc-rails (~> 2.1)
   simplecov

app/models/source_file_list.rb

@@ -154,13 +154,12 @@ def self.make_path_names_relative(root_dir, files)
 
     def self.sort_source_files(files)
       files.sort_by do |f|
-        priority = begin
-          if f.path.include?('WEB-INF/') then 1
-          elsif f.path.start_with?('src/main/resources') then 2
-          elsif f.path == 'pom.xml' then 3
-          else 0
-          end
+        priority = if f.path.include?('WEB-INF/') then 1
+        elsif f.path.start_with?('src/main/resources') then 2
+        elsif f.path == 'pom.xml' then 3
+        else 0
         end
+
         [priority, f.path]
       end
     end