Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/393837 )
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.
Change-Id: I27299ac709aa6ba772b2fc5ee9dc976ad4bb07d3
---
M .rubocop.yml
M .rubocop_todo.yml
M Gemfile
M Gemfile.lock
M Rakefile
5 files changed, 103 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/37/393837/1
diff --git a/.rubocop.yml b/.rubocop.yml
index c4d7615..a12c4e2 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,10 +2,17 @@
AllCops:
StyleGuideCopsOnly: true
+ Include:
+ - 'Gemfile'
+ - 'Rakefile'
+ - '.jsduck/CustomTags.rb'
+ Exclude:
+ - 'node_modules/**/*'
+ - 'vendor/**/*'
+ - 'lib/ve/**/*'
-# uncomment when the offense is fixed
-# Metrics/LineLength:
-# Max: 100
+Metrics/LineLength:
+ Max: 100
Metrics/MethodLength:
Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 26e59ec..c5dd970 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,15 +1,70 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2016-02-15 14:53:20 +0100 using RuboCop version 0.32.1.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-11-28 12:08:04 -0800 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: 1
-Lint/HandleExceptions:
- Enabled: false
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment.
+Layout/SpaceAroundOperators:
+ Exclude:
+ - '.jsduck/CustomTags.rb'
-# Offense count: 56
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
- Max: 398
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: space, no_space
+Layout/SpaceInsideStringInterpolation:
+ Exclude:
+ - '.jsduck/CustomTags.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+Lint/UnusedMethodArgument:
+ Exclude:
+ - '.jsduck/CustomTags.rb'
+
+# Offense count: 3
+# Configuration parameters: Blacklist.
+# Blacklist: END, (?-mix:EO[A-Z]{1})
+Naming/HeredocDelimiterNaming:
+ Exclude:
+ - '.jsduck/CustomTags.rb'
+
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+ Exclude:
+ - '.jsduck/CustomTags.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles, UseHashRocketsWithSymbolValues,
PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+Style/HashSyntax:
+ EnforcedStyle: hash_rockets
+
+# Offense count: 4
+# Cop supports --auto-correct.
+Style/PerlBackrefs:
+ Exclude:
+ - '.jsduck/CustomTags.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
+ Exclude:
+ - '.jsduck/CustomTags.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles,
ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+ Exclude:
+ - '.jsduck/CustomTags.rb'
diff --git a/Gemfile b/Gemfile
index 2c79842..59b4be4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,4 +2,4 @@
gem 'commons_upload', '~> 1.0', '>= 1.0.1'
gem 'rake', '~> 10.4', '>= 10.4.2'
-gem 'rubocop', '~> 0.32.1', require: false
+gem 'rubocop', '~> 0.51', :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index 0fa0954..ced00bf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,41 +2,43 @@
remote: https://rubygems.org/
specs:
ast (2.3.0)
- astrolabe (1.3.1)
- parser (~> 2.2)
commons_upload (1.0.1)
mediawiki_api (~> 0.7.0)
- domain_name (0.5.20160615)
+ domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
- faraday (0.9.2)
+ faraday (0.13.1)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
- faraday_middleware (0.10.0)
- faraday (>= 0.7.4, < 0.10)
- http-cookie (1.0.2)
+ faraday_middleware (0.12.2)
+ faraday (>= 0.7.4, < 1.0)
+ http-cookie (1.0.3)
domain_name (~> 0.5)
- mediawiki_api (0.7.0)
+ mediawiki_api (0.7.1)
faraday (~> 0.9, >= 0.9.0)
faraday-cookie_jar (~> 0.0, >= 0.0.6)
faraday_middleware (~> 0.10, >= 0.10.0)
multipart-post (2.0.0)
- parser (2.3.1.2)
- ast (~> 2.2)
+ parallel (1.12.0)
+ parser (2.4.0.2)
+ ast (~> 2.3)
powerpack (0.1.1)
- rainbow (2.1.0)
+ rainbow (2.2.2)
+ rake
rake (10.5.0)
- rubocop (0.32.1)
- astrolabe (~> 1.3)
- parser (>= 2.2.2.5, < 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.8.1)
+ rainbow (>= 2.2.2, < 3.0)
+ ruby-progressbar (~> 1.7)
+ unicode-display_width (~> 1.0, >= 1.0.1)
+ ruby-progressbar (1.9.0)
unf (0.1.4)
unf_ext
- unf_ext (0.0.7.2)
+ unf_ext (0.0.7.4)
+ unicode-display_width (1.3.0)
PLATFORMS
ruby
@@ -44,7 +46,7 @@
DEPENDENCIES
commons_upload (~> 1.0, >= 1.0.1)
rake (~> 10.4, >= 10.4.2)
- rubocop (~> 0.32.1)
+ rubocop (~> 0.51)
BUNDLED WITH
- 1.15.4
+ 1.16.0
diff --git a/Rakefile b/Rakefile
index 6eef121..13fce2f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,13 +2,14 @@
require 'rubocop/rake_task'
RuboCop::RakeTask.new(:rubocop) do |task|
- # if you use mediawiki-vagrant, rubocop will by default use it's .rubocop.yml
- # the next line makes it explicit that you want .rubocop.yml from the
directory
- # where `bundle exec rake` is executed
+ # If you use mediawiki-vagrant, rubocop will by default use its .rubocop.yml.
+
+ # This line makes it explicit that you want .rubocop.yml from the directory
+ # where `bundle exec rake` is executed:
task.options = ['-c', '.rubocop.yml']
end
-task default: [:test]
+task :default => [:test]
desc 'Run all build/tests commands (CI entry point)'
-task test: [:rubocop]
+task :test => [:rubocop]
--
To view, visit https://gerrit.wikimedia.org/r/393837
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27299ac709aa6ba772b2fc5ee9dc976ad4bb07d3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
