From 99dd5de1926ef61e3b5addb8280297fec606b2c4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=BDeljko=20Filipin?= Date: Fri, 6 Mar 2015 17:06:54 +0100 Subject: [PATCH] Set up RuboCop configuration according to coding conventions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Updated RuboCop to the latest version. Renenerated .rubocop_todo.yml file with “bundle exec rubocop --auto-gen-config”. See also: https://www.mediawiki.org/wiki/Manual:Coding_conventions/Ruby#Base_confi guration Bug: T91485 Change-Id: I926d6ee114ccc01076e8df6ec3f95eb2af78c212 --- .rubocop.yml | 18 ++++++++++++++++++ .rubocop_todo.yml | 8 ++------ Gemfile.lock | 14 ++++++-------- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index c04818e205..3f1af395be 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,5 +7,23 @@ AllCops: - 'tests/frontend/node_modules/**/*' - 'vendor/**/*' +AllCops: + StyleGuideCopsOnly: true + Metrics/LineLength: Max: 100 + +Metrics/MethodLength: + Enabled: false + +Style/Alias: + Enabled: false + +Style/SignalException: + Enabled: false + +Style/StringLiterals: + EnforcedStyle: single_quotes + +Style/TrivialAccessors: + ExactNameMatch: true diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 90671fa9a4..58cee0c18f 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,5 +1,5 @@ # This configuration was generated by `rubocop --auto-gen-config` -# on 2014-10-21 15:10:03 +0200 using RuboCop version 0.26.1. +# on 2015-03-06 17:05:39 +0100 using RuboCop version 0.29.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 @@ -10,10 +10,6 @@ Lint/UnusedMethodArgument: Enabled: false -# Offense count: 10 -Style/Documentation: - Enabled: false - # Offense count: 1 # Configuration parameters: Exclude. Style/FileName: @@ -30,7 +26,7 @@ Style/HashSyntax: Style/PerlBackrefs: Enabled: false -# Offense count: 89 +# Offense count: 81 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles. Style/StringLiterals: diff --git a/Gemfile.lock b/Gemfile.lock index 148266ce6b..0b360aedbe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -58,30 +58,28 @@ GEM watir-webdriver (>= 0.6.11) page_navigation (0.9) data_magic (>= 0.14) - parser (2.2.0.pre.4) + parser (2.2.0.3) ast (>= 1.1, < 3.0) - slop (~> 3.4, >= 3.4.5) - powerpack (0.0.9) + powerpack (0.1.0) rainbow (2.0.0) rest-client (1.7.3) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) rspec-expectations (2.99.2) diff-lcs (>= 1.1.3, < 2.0) - rubocop (0.26.1) + rubocop (0.29.1) astrolabe (~> 1.3) - parser (>= 2.2.0.pre.4, < 3.0) - powerpack (~> 0.0.6) + parser (>= 2.2.0.1, < 3.0) + powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) - ruby-progressbar (1.6.0) + ruby-progressbar (1.7.1) rubyzip (1.1.7) selenium-webdriver (2.45.0) childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0) - slop (3.6.0) syntax (1.2.0) thor (0.19.1) unf (0.1.4) -- 2.20.1