Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/250409
Change subject: Fixed Style/RedundantBegin RuboCop offense
......................................................................
Fixed Style/RedundantBegin RuboCop offense
Bug: T106220
Change-Id: Id0e6cd635b5d67e8c851de890c5bc983fa785a09
---
M .rubocop_todo.yml
M lib/mediawiki-vagrant/paste-puppet.rb
2 files changed, 17 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/09/250409/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 3437201..608153c 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -73,12 +73,6 @@
# Offense count: 1
# Cop supports --auto-correct.
-Style/RedundantBegin:
- Exclude:
- - 'lib/mediawiki-vagrant/paste-puppet.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
Style/RedundantSelf:
Exclude:
- 'lib/mediawiki-vagrant/settings_definer.rb'
diff --git a/lib/mediawiki-vagrant/paste-puppet.rb
b/lib/mediawiki-vagrant/paste-puppet.rb
index b0125bf..04b3def 100644
--- a/lib/mediawiki-vagrant/paste-puppet.rb
+++ b/lib/mediawiki-vagrant/paste-puppet.rb
@@ -14,23 +14,23 @@
end
def execute
- begin
- res = Net::HTTP.post_form URL, content: latest_logfile.read
- raise unless res.value.nil? && res.body =~ /^"[^"]+"$/
- rescue RuntimeError
- @env.ui.error "Unexpected response from #{URL}."
- 1
- rescue TypeError
- @env.ui.error 'No Puppet log files found.'
- 1
- rescue SocketError, Net::HTTPExceptions
- @env.ui.error "Unable to connect to #{URL}."
- 1
- else
- @env.ui.success "HTTP #{res.code} #{res.msg}"
- @env.ui.info res.body[1...-1]
- 0
- end
+
+ res = Net::HTTP.post_form URL, content: latest_logfile.read
+ raise unless res.value.nil? && res.body =~ /^"[^"]+"$/
+ rescue RuntimeError
+ @env.ui.error "Unexpected response from #{URL}."
+ 1
+ rescue TypeError
+ @env.ui.error 'No Puppet log files found.'
+ 1
+ rescue SocketError, Net::HTTPExceptions
+ @env.ui.error "Unable to connect to #{URL}."
+ 1
+ else
+ @env.ui.success "HTTP #{res.code} #{res.msg}"
+ @env.ui.info res.body[1...-1]
+ 0
+
end
private
--
To view, visit https://gerrit.wikimedia.org/r/250409
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0e6cd635b5d67e8c851de890c5bc983fa785a09
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <zfili...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
