jenkins-bot has submitted this change and it was merged.

Change subject: Updated RuboCop to the latest version
......................................................................


Updated RuboCop to the latest version

Added recommended configuration and regenerated TODO file.

See:

https://www.mediawiki.org/wiki/Manual:Coding_conventions/Ruby#Base_confi
guration

Bug: T117985
Change-Id: I6effe8523ad47d76e1acb4df94232a5cdd0e8d97
---
M .rubocop.yml
M .rubocop_todo.yml
M Gemfile
M Gemfile.lock
4 files changed, 40 insertions(+), 18 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.rubocop.yml b/.rubocop.yml
index cc32da4..f5b99e8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1 +1,23 @@
 inherit_from: .rubocop_todo.yml
+
+AllCops:
+  StyleGuideCopsOnly: true
+
+Metrics/LineLength:
+  Max: 100
+
+Metrics/MethodLength:
+  Enabled: false
+
+Style/Alias:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
+# uncomment when the offense is fixed
+# Style/StringLiterals:
+#   EnforcedStyle: single_quotes
+
+Style/TrivialAccessors:
+  ExactNameMatch: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b13264f..5464b70 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,21 +1,19 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-10-21 15:48:50 +0200 using RuboCop version 0.26.1.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-11-25 15:37:03 +0100 using RuboCop version 0.35.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
-  Max: 82
-
-# Offense count: 2
 # Cop supports --auto-correct.
-Style/LeadingCommentSpace:
-  Enabled: false
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+Style/RegexpLiteral:
+  Exclude:
+    - 'tests/browser/features/support/pages/page_triage_page.rb'
 
-# Offense count: 22
+# Offense count: 31
 # Cop supports --auto-correct.
 # Configuration parameters: SupportedStyles.
 Style/StringLiterals:
diff --git a/Gemfile b/Gemfile
index 45f75d7..429c07d 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
 source "https://rubygems.org";
 
 gem "mediawiki_selenium", "~> 1.6.2"
-gem "rubocop", "~> 0.26.1", require: false
+gem "rubocop", "~> 0.35.1", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 7afed8e..47934de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -59,9 +59,9 @@
       watir-webdriver (>= 0.6.11)
     page_navigation (0.9)
       data_magic (>= 0.14)
-    parser (2.3.0.pre.3)
+    parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
-    powerpack (0.0.9)
+    powerpack (0.1.1)
     rainbow (2.0.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -70,12 +70,13 @@
     rspec-core (2.99.2)
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rubocop (0.26.1)
+    rubocop (0.35.1)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.pre.4, < 3.0)
-      powerpack (~> 0.0.6)
+      parser (>= 2.2.3.0, < 3.0)
+      powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
+      ruby-progressbar (~> 1.7)
+      tins (<= 1.6.0)
     ruby-progressbar (1.7.5)
     rubyzip (1.1.7)
     selenium-webdriver (2.48.1)
@@ -85,6 +86,7 @@
       websocket (~> 1.0)
     syntax (1.2.0)
     thor (0.19.1)
+    tins (1.6.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
@@ -98,4 +100,4 @@
 
 DEPENDENCIES
   mediawiki_selenium (~> 1.6.2)
-  rubocop (~> 0.26.1)
+  rubocop (~> 0.35.1)

-- 
To view, visit https://gerrit.wikimedia.org/r/255387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6effe8523ad47d76e1acb4df94232a5cdd0e8d97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <zfili...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Zfilipin <zfili...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to