Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234500
Change subject: Fixed Style/HashSyntax RuboCop offense
......................................................................
Fixed Style/HashSyntax RuboCop offense
Bug: T106220
Change-Id: I3cd9d5eda53e5520d6a0685a42835352b65130ed
---
M .rubocop_todo.yml
M Rakefile
M Vagrantfile
M lib/mediawiki-vagrant/config.rb
M lib/mediawiki-vagrant/git-update.rb
M lib/mediawiki-vagrant/import-dump.rb
M lib/mediawiki-vagrant/run-tests.rb
M puppet/modules/service/lib/puppet/parser/functions/merge_config.rb
M support/packager/package.rb
9 files changed, 14 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/00/234500/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index acfb7e1..7552611 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -46,12 +46,6 @@
Style/GuardClause:
Enabled: false
-# Offense count: 17
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles,
UseHashRocketsWithSymbolValues.
-Style/HashSyntax:
- Enabled: false
-
# Offense count: 4
# Cop supports --auto-correct.
# Configuration parameters: MaxLineLength.
diff --git a/Rakefile b/Rakefile
index 1813787..6c6fb23 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,4 +15,4 @@
config.log_format = '%{path}:%{linenumber} %{KIND}: %{message}'
end
-task :default => [:lint]
+task default: [:lint]
diff --git a/Vagrantfile b/Vagrantfile
index 2d58012..0e8e4af 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -120,12 +120,12 @@
unless settings[:forward_ports].nil?
settings[:forward_ports].each do |guest_port,host_port|
config.vm.network :forwarded_port,
- :host => host_port, :guest => guest_port,
+ host: host_port, guest: guest_port,
auto_correct: true
end
end
- root_share_options = {:id => 'vagrant-root'}
+ root_share_options = {id: 'vagrant-root'}
if settings[:nfs_shares]
root_share_options[:type] = :nfs
diff --git a/lib/mediawiki-vagrant/config.rb b/lib/mediawiki-vagrant/config.rb
index db42097..4fe3212 100644
--- a/lib/mediawiki-vagrant/config.rb
+++ b/lib/mediawiki-vagrant/config.rb
@@ -89,7 +89,7 @@
configure do |settings|
names.each do |name|
setting = settings.setting(name)
- @env.ui.info setting.value, :bold => setting.set? if setting
+ @env.ui.info setting.value, bold: setting.set? if setting
end
end
end
@@ -121,12 +121,12 @@
end
scope.each do |name, setting|
- @env.ui.info setting.description, :bold => true
+ @env.ui.info setting.description, bold: true
@env.ui.info setting.help unless setting.help.nil?
value = setting_display_value(setting.value)
- @env.ui.info name, :bold => true, :new_line => false
+ @env.ui.info name, bold: true, new_line: false
prompt = value.empty? ? "" : " [#{value}]"
prompt += ": "
@@ -147,7 +147,7 @@
#
def list_settings
Settings.definitions.reject { |_, setting| setting.internal? }.each do
|name, setting|
- @env.ui.info "#{name}\t#{setting.description}", :bold => true
+ @env.ui.info "#{name}\t#{setting.description}", bold: true
@env.ui.info indent(setting.help, 2) unless setting.help.nil?
@env.ui.info ""
end
diff --git a/lib/mediawiki-vagrant/git-update.rb
b/lib/mediawiki-vagrant/git-update.rb
index 65768f5..263bf20 100644
--- a/lib/mediawiki-vagrant/git-update.rb
+++ b/lib/mediawiki-vagrant/git-update.rb
@@ -10,9 +10,9 @@
return 0
end
- with_target_vms(nil, :single_target => true) do |vm|
- opts = { :extra_args => @argv.unshift('run-git-update') }
- vm.action :ssh, :ssh_opts => opts
+ with_target_vms(nil, single_target: true) do |vm|
+ opts = { extra_args: @argv.unshift('run-git-update') }
+ vm.action :ssh, ssh_opts: opts
end
end
end
diff --git a/lib/mediawiki-vagrant/import-dump.rb
b/lib/mediawiki-vagrant/import-dump.rb
index 8bcb42b..22036f6 100644
--- a/lib/mediawiki-vagrant/import-dump.rb
+++ b/lib/mediawiki-vagrant/import-dump.rb
@@ -10,7 +10,7 @@
return 0
end
opts = { extra_args: @argv.unshift('import-mediawiki-dump') }
- with_target_vms(nil, :single_target => true) do |vm|
+ with_target_vms(nil, single_target: true) do |vm|
vm.action :ssh, ssh_opts: opts
end
end
diff --git a/lib/mediawiki-vagrant/run-tests.rb
b/lib/mediawiki-vagrant/run-tests.rb
index 87db3eb..e152929 100644
--- a/lib/mediawiki-vagrant/run-tests.rb
+++ b/lib/mediawiki-vagrant/run-tests.rb
@@ -10,7 +10,7 @@
return 0
end
opts = { extra_args: @argv.unshift('run-mediawiki-tests') }
- with_target_vms(nil, :single_target => true) do |vm|
+ with_target_vms(nil, single_target: true) do |vm|
vm.action :ssh, ssh_opts: opts
end
end
diff --git a/puppet/modules/service/lib/puppet/parser/functions/merge_config.rb
b/puppet/modules/service/lib/puppet/parser/functions/merge_config.rb
index faefcf3..3f51db7 100644
--- a/puppet/modules/service/lib/puppet/parser/functions/merge_config.rb
+++ b/puppet/modules/service/lib/puppet/parser/functions/merge_config.rb
@@ -6,7 +6,7 @@
#
module Puppet::Parser::Functions
- newfunction(:merge_config, :type => :rvalue, :arity => 2) do |args|
+ newfunction(:merge_config, type: :rvalue, arity: 2) do |args|
main_conf, service_conf = *args.map do |conf|
case conf
when Hash
diff --git a/support/packager/package.rb b/support/packager/package.rb
index bd99287..7093738 100755
--- a/support/packager/package.rb
+++ b/support/packager/package.rb
@@ -63,7 +63,7 @@
Net::HTTP.start(
uri.host,
uri.port,
- :use_ssl => uri.scheme == 'https'
+ use_ssl: uri.scheme == 'https'
) do |http|
request = Net::HTTP::Get.new uri.request_uri
--
To view, visit https://gerrit.wikimedia.org/r/234500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cd9d5eda53e5520d6a0685a42835352b65130ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
