jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/393918 )
Change subject: build: Bump Ruby cruft to avoid security warnings for old rubocop ...................................................................... build: Bump Ruby cruft to avoid security warnings for old rubocop So. Much. Cruft. Bug: T180878 Change-Id: I27299ac709aa6ba772b2fc5ee9dc976ad4bb07d3 --- M .rubocop.yml M .rubocop_todo.yml M Gemfile M Gemfile.lock 4 files changed, 67 insertions(+), 63 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/.rubocop.yml b/.rubocop.yml index ca572ce..305b0a5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,37 +1,18 @@ inherit_from: .rubocop_todo.yml -# See discussion of rules at -# https://www.mediawiki.org/wiki/Manual:Coding_conventions/Ruby - -Metrics/AbcSize: - Enabled: false - -Metrics/ClassLength: - Enabled: false - -Metrics/CyclomaticComplexity: - Enabled: false - -Metrics/MethodLength: - Enabled: false - -Metrics/ParameterLists: - Enabled: false - -Metrics/PerceivedComplexity: - Enabled: false - -Style/Alias: - Enabled: false - -# rubocop fix lifted from CirrusSearch/.rubocop.yml -Style/LeadingCommentSpace: +AllCops: + Include: + - 'Gemfile' + - 'Rakefile' + - '.jsduck/CustomTags.rb' Exclude: - - Gemfile # RVM doesn't recognise spaces after the #s + - 'node_modules/**/*' + - 'vendor/**/*' + - 'rebaser/**/*' -Style/SignalException: - Enabled: false +Metrics/LineLength: + Max: 100 -Style/SpaceInsideStringInterpolation: +Layout/SpaceInsideStringInterpolation: Exclude: - jsduck_custom_tags.rb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 6b987fb..3232d95 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,21 +1,51 @@ -# This configuration was generated by `rubocop --auto-gen-config` -# on 2017-11-29 20:07:39 +0100 using RuboCop version 0.32.1. +# This configuration was generated by +# `rubocop --auto-gen-config` +# on 2017-12-05 12:18:44 +0100 using RuboCop version 0.51.0. # 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: 4 -# Configuration parameters: AllowURI, URISchemes. -Metrics/LineLength: - Max: 84 +# Configuration parameters: Blacklist. +# Blacklist: END, (?-mix:EO[A-Z]{1}) +Naming/HeredocDelimiterNaming: + Exclude: + - 'jsduck_custom_tags.rb' # Offense count: 5 Style/Documentation: - Enabled: false + Exclude: + - 'spec/**/*' + - 'test/**/*' + - 'jsduck_custom_tags.rb' -# Offense count: 8 +# Offense count: 1 +# Configuration parameters: MinBodyLength. +Style/GuardClause: + Exclude: + - 'jsduck_custom_tags.rb' + +# Offense count: 1 # Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. +# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols. +# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys +Style/HashSyntax: + Exclude: + - 'Gemfile' + +# Offense count: 2 +# Cop supports --auto-correct. +# Configuration parameters: AllowMultipleReturnValues. +Style/RedundantReturn: + Exclude: + - 'jsduck_custom_tags.rb' + +# Offense count: 6 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline. +# SupportedStyles: single_quotes, double_quotes Style/StringLiterals: - Enabled: false + Exclude: + - 'Gemfile' + - 'jsduck_custom_tags.rb' diff --git a/Gemfile b/Gemfile index 942680a..2f7b6b0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,4 @@ source "https://rubygems.org"; -gem "csscss", "~> 1.3.3" gem 'rake', '~> 11.1', '>= 11.1.1' -gem "rubocop", "~> 0.32.1", require: false +gem "rubocop", "~> 0.51", :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 81120cd..fd633f8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,36 +1,30 @@ GEM remote: https://rubygems.org/ specs: - ast (2.1.0) - astrolabe (1.3.1) - parser (~> 2.2) - blankslate (3.1.3) - colorize (0.7.7) - csscss (1.3.3) - colorize - parslet (>= 1.6.1, < 2.0) - parser (2.2.2.6) - ast (>= 1.1, < 3.0) - parslet (1.7.1) - blankslate (>= 2.0, <= 4.0) + ast (2.3.0) + parallel (1.12.0) + parser (2.4.0.2) + ast (~> 2.3) powerpack (0.1.1) - rainbow (2.0.0) - rake (11.1.1) - rubocop (0.32.1) - astrolabe (~> 1.3) - parser (>= 2.2.2.5, < 3.0) + rainbow (2.2.2) + rake + rake (11.3.0) + rubocop (0.51.0) + parallel (~> 1.10) + parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.4) - ruby-progressbar (1.7.5) + rainbow (>= 2.2.2, < 3.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + ruby-progressbar (1.9.0) + unicode-display_width (1.3.0) PLATFORMS ruby DEPENDENCIES - csscss (~> 1.3.3) rake (~> 11.1, >= 11.1.1) - rubocop (~> 0.32.1) + rubocop (~> 0.51) BUNDLED WITH 1.16.0 -- To view, visit https://gerrit.wikimedia.org/r/393918 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I27299ac709aa6ba772b2fc5ee9dc976ad4bb07d3 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Catrope <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: Zfilipin <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
