Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/252677
Change subject: Fixed Style/RescueModifier RuboCop offense ...................................................................... Fixed Style/RescueModifier RuboCop offense More information at: https://github.com/bbatsov/ruby-style-guide#no-rescue-modifiers Bug: T106220 Change-Id: I649b8c9e1592550d0bca109d7c94b331c789570f --- M .rubocop_todo.yml M Vagrantfile M lib/mediawiki-vagrant/config.rb 3 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/77/252677/1 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 54e3b4b..ec446ba 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -64,13 +64,6 @@ - 'lib/mediawiki-vagrant/roles/list.rb' - 'lib/mediawiki-vagrant/setup.rb' -# Offense count: 2 -# Cop supports --auto-correct. -Style/RescueModifier: - Exclude: - - 'Vagrantfile' - - 'lib/mediawiki-vagrant/config.rb' - # Offense count: 1 # Configuration parameters: Methods. Style/SingleLineBlockParams: diff --git a/Vagrantfile b/Vagrantfile index ceb545c..dd61e50 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -254,9 +254,12 @@ dst = mwv.path('cache', type) src.each_child do |src_file| - unless src_file.directory? || src_file.basename.fnmatch?('.*') - src_file.rename(dst.join(src_file.basename)) rescue nil - end + next if src_file.directory? || src_file.basename.fnmatch?('.*') +begin + src_file.rename(dst.join(src_file.basename)) + rescue + nil + end end end diff --git a/lib/mediawiki-vagrant/config.rb b/lib/mediawiki-vagrant/config.rb index dcab194..807748f 100644 --- a/lib/mediawiki-vagrant/config.rb +++ b/lib/mediawiki-vagrant/config.rb @@ -161,7 +161,11 @@ # Current width of the terminal. # def screen_width - @screen_width ||= `tput cols`.chomp.to_i rescue 80 + @screen_width ||= begin + `tput cols`.chomp.to_i + rescue + 80 + end end # Unsets the given settings. -- To view, visit https://gerrit.wikimedia.org/r/252677 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I649b8c9e1592550d0bca109d7c94b331c789570f 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
