jenkins-bot has submitted this change and it was merged.
Change subject: Fixed Style/SpecialGlobalVars RuboCop offense
......................................................................
Fixed Style/SpecialGlobalVars RuboCop offense
Bug: T106220
Change-Id: I4c17a1c66bdb583ab01c9f3dcc029d5161695a41
---
M .rubocop.yml
M .rubocop_todo.yml
M lib/mediawiki-vagrant/setup.rb
M mediawiki-vagrant.gemspec
M support/completion.rb
M support/setup.rb
6 files changed, 5 insertions(+), 13 deletions(-)
Approvals:
Dduvall: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.rubocop.yml b/.rubocop.yml
index 7ef65f0..9e019fe 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -14,6 +14,7 @@
- 'puppet/modules/stdlib/**/*'
- 'puppet/modules/wikimetrics/**/*'
- 'puppet/modules/wmflib/**/*'
+ - 'srv/**/*'
- 'tmp/**/*'
- 'Vagrantfile-extra.rb'
- 'vendor/**/*'
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c897a42..0a85b65 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -85,15 +85,6 @@
# Offense count: 5
# Cop supports --auto-correct.
-Style/SpecialGlobalVars:
- Exclude:
- - 'lib/mediawiki-vagrant/setup.rb'
- - 'mediawiki-vagrant.gemspec'
- - 'support/completion.rb'
- - 'support/setup.rb'
-
-# Offense count: 5
-# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
Style/TrailingComma:
Exclude:
diff --git a/lib/mediawiki-vagrant/setup.rb b/lib/mediawiki-vagrant/setup.rb
index 271c9fd..a8870f3 100644
--- a/lib/mediawiki-vagrant/setup.rb
+++ b/lib/mediawiki-vagrant/setup.rb
@@ -163,7 +163,7 @@
blk ||= proc { |pipe| notify pipe, 1 }
result = IO.popen(command, err: [:child, :out], &blk)
- raise ExecutionError.new(command.join(' '), $?) unless $?.success?
+ raise ExecutionError.new(command.join(' '), $CHILD_STATUS) unless
$CHILD_STATUS.success?
result
end
diff --git a/mediawiki-vagrant.gemspec b/mediawiki-vagrant.gemspec
index e88710a..c406848 100644
--- a/mediawiki-vagrant.gemspec
+++ b/mediawiki-vagrant.gemspec
@@ -1,4 +1,4 @@
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
require 'mediawiki-vagrant/version'
diff --git a/support/completion.rb b/support/completion.rb
index 471c4ed..73b8f7e 100644
--- a/support/completion.rb
+++ b/support/completion.rb
@@ -1,5 +1,5 @@
project_path = File.expand_path('../..', __FILE__)
-$: << File.join(project_path, 'lib')
+$LOAD_PATH << File.join(project_path, 'lib')
require 'mediawiki-vagrant/environment'
require 'mediawiki-vagrant/settings/definitions'
diff --git a/support/setup.rb b/support/setup.rb
index 70f681d..afda41b 100644
--- a/support/setup.rb
+++ b/support/setup.rb
@@ -1,7 +1,7 @@
# Cross-platform setup script for MediaWiki-Vagrant.
#
-$: << File.expand_path('../../lib', __FILE__)
+$LOAD_PATH << File.expand_path('../../lib', __FILE__)
require 'mediawiki-vagrant/setup'
--
To view, visit https://gerrit.wikimedia.org/r/252669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4c17a1c66bdb583ab01c9f3dcc029d5161695a41
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
