Switch to using manageiq-style for linting dependencies

bdunne · Jun 19, 2020 · d9479cd · d9479cd
1 parent ff855ea
commit d9479cd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,4 +1,5 @@
+inherit_gem:
+  manageiq-style: .rubocop_base.yml
 inherit_from:
-- https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_base.yml
 # put all local rubocop config into .rubocop_local.yml as it will be loaded by .rubocop_cc.yml as well
 - .rubocop_local.yml
diff --git a/Gemfile b/Gemfile
@@ -39,10 +39,8 @@ gem 'awesome_spawn',        '>= 1.4.1'
 gem 'default_value_for',    '>= 3.1.0'
 gem 'haml',                 '~> 5.1',    :require => false # force newer version of haml
 gem 'haml_lint',            '~> 0.35.0', :require => false
+gem 'manageiq-style',                    :require => false
 gem 'more_core_extensions', '~> 4.0.0',  :require => 'more_core_extensions/all'
-gem 'rubocop',              '~> 0.82.0', :require => false
-gem 'rubocop-performance',               :require => false
-gem 'rubocop-rails',                     :require => false
 gem 'rugged',                            :require => false
 
 gem 'octokit', '~> 4.8.0', :require => false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -168,7 +168,7 @@ GEM
       sysexits (~> 1.1)
     hashdiff (1.0.0)
     highline (1.7.10)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     ice_cube (0.14.0)
     ice_nine (0.11.2)
@@ -190,14 +190,18 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    manageiq-style (1.0.1)
+      rubocop (~> 0.82.0)
+      rubocop-performance
+      rubocop-rails
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
     mimemagic (0.3.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minigit (0.0.4)
-    minitest (5.14.0)
+    minitest (5.14.1)
     more_core_extensions (4.0.0)
       activesupport
     multi_json (1.14.1)
@@ -211,9 +215,9 @@ GEM
       mini_portile2 (~> 2.4.0)
     octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     pg (1.2.2)
     pry (0.9.12.6)
       coderay (~> 1.0)
@@ -291,12 +295,12 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-performance (1.5.2)
+    rubocop-performance (1.6.1)
       rubocop (>= 0.71.0)
-    rubocop-rails (2.5.2)
-      activesupport
+    rubocop-rails (2.6.0)
+      activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.72.0)
+      rubocop (>= 0.82.0)
     ruby-progressbar (1.10.1)
     ruby2_keywords (0.0.2)
     rugged (0.28.4.1)
@@ -377,7 +381,7 @@ GEM
     turbolinks-source (5.2.0)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unicode-display_width (1.7.0)
@@ -413,16 +417,14 @@ DEPENDENCIES
   influxdb (~> 0.3.13)
   jquery-rails
   listen
+  manageiq-style
   minigit (~> 0.0.4)
   more_core_extensions (~> 4.0.0)
   octokit (~> 4.8.0)
   pg
   rails (~> 5.2.2)
   rspec
   rspec-rails
-  rubocop (~> 0.82.0)
-  rubocop-performance
-  rubocop-rails
   rugged
   sass-rails (~> 5.0.7)
   sidekiq (~> 5.2.5)