Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/393836 )
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, 80 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/36/393836/1
diff --git a/.rubocop.yml b/.rubocop.yml
index c5d903f..2735a4a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,7 +3,12 @@
AllCops:
Include:
- 'Gemfile'
- - '.jsduck/**/*.rb'
+ - 'Rakefile'
+ - '.jsduck/CustomTags.rb'
+ Exclude:
+ - 'node_modules/**/*'
+ - 'vendor/**/*'
+ - 'rebaser/**/*'
Metrics/LineLength:
Max: 100
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 3102583..4e1ebb2 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,5 +1,6 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-11-12 14:07:33 +0100 using RuboCop version 0.27.1.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-11-28 12:11:12 -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
@@ -7,20 +8,55 @@
# Offense count: 2
# Cop supports --auto-correct.
-Lint/UnusedMethodArgument:
- Enabled: false
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: space, no_space
+Layout/SpaceInsideStringInterpolation:
+ Exclude:
+ - '.jsduck/CustomTags.rb'
-# Offense count: 5
-Style/Documentation:
- Enabled: false
-
-# Offense count: 5
+# Offense count: 2
# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles.
+# 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: 4
+Style/Documentation:
+ Exclude:
+ - 'spec/**/*'
+ - 'test/**/*'
+ - '.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:
- Enabled: false
+ EnforcedStyle: hash_rockets
# Offense count: 4
# Cop supports --auto-correct.
Style/PerlBackrefs:
- Enabled: false
+ Exclude:
+ - '.jsduck/CustomTags.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
+ Exclude:
+ - '.jsduck/CustomTags.rb'
diff --git a/Gemfile b/Gemfile
index eea2055..449daca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,3 @@
source 'https://rubygems.org'
-gem 'rubocop', require: false
+gem 'rubocop', :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index 30d2965..3e7127c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,23 +1,29 @@
GEM
remote: https://rubygems.org/
specs:
- ast (2.0.0)
- astrolabe (1.3.0)
- parser (>= 2.2.0.pre.3, < 3.0)
- parser (2.2.0.3)
- ast (>= 1.1, < 3.0)
- powerpack (0.1.0)
- rainbow (2.0.0)
- rubocop (0.29.1)
- astrolabe (~> 1.3)
- parser (>= 2.2.0.1, < 3.0)
+ ast (2.3.0)
+ parallel (1.12.0)
+ parser (2.4.0.2)
+ ast (~> 2.3)
+ powerpack (0.1.1)
+ rainbow (2.2.2)
+ rake
+ rake (12.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.1)
+ 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
rubocop
+
+BUNDLED WITH
+ 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/393836
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27299ac709aa6ba772b2fc5ee9dc976ad4bb07d3
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
