Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/259718
Change subject: RuboCop: fixed Style/MethodCallParentheses offense ...................................................................... RuboCop: fixed Style/MethodCallParentheses offense Do not use parentheses for method calls with no arguments. Change-Id: I373869e7184d4d6a1a34b7f8a2df64b8feb95c89 See: https://github.com/bbatsov/ruby-style-guide#no-args-no-parens Bug: T112651 --- M .rubocop_todo.yml M modules/base/lib/facter/physicalcorecount.rb M modules/base/spec/defines/service_unit_spec.rb M modules/install_server/spec/classes/install_server_preseed_server_spec.rb M modules/squid3/spec/classes/squid3_spec.rb M modules/wmflib/lib/puppet/parser/functions/ipresolve.rb M modules/wmflib/lib/puppet/parser/functions/secret.rb M modules/wmflib/spec/functions/role_spec.rb M modules/wmflib/spec/hiera/proxy_backend_spec.rb M modules/wmflib/spec/hiera/role_backend_spec.rb M utils/hiera_lookup 11 files changed, 15 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/18/259718/1 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 1ad9f5f..4013bef 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -180,21 +180,6 @@ - 'modules/wmflib/lib/hiera/backend/proxy_backend.rb' - 'modules/wmflib/lib/hiera/mwcache.rb' -# Offense count: 15 -# Cop supports --auto-correct. -Style/MethodCallParentheses: - Exclude: - - 'modules/base/lib/facter/physicalcorecount.rb' - - 'modules/base/spec/defines/service_unit_spec.rb' - - 'modules/install_server/spec/classes/install_server_preseed_server_spec.rb' - - 'modules/squid3/spec/classes/squid3_spec.rb' - - 'modules/wmflib/lib/puppet/parser/functions/ipresolve.rb' - - 'modules/wmflib/lib/puppet/parser/functions/secret.rb' - - 'modules/wmflib/spec/functions/role_spec.rb' - - 'modules/wmflib/spec/hiera/proxy_backend_spec.rb' - - 'modules/wmflib/spec/hiera/role_backend_spec.rb' - - 'utils/hiera_lookup' - # Offense count: 1 # Cop supports --auto-correct. Style/MultilineIfThen: diff --git a/modules/base/lib/facter/physicalcorecount.rb b/modules/base/lib/facter/physicalcorecount.rb index 2e6456e..79da4c8 100644 --- a/modules/base/lib/facter/physicalcorecount.rb +++ b/modules/base/lib/facter/physicalcorecount.rb @@ -6,7 +6,7 @@ Facter.add("physicalcorecount") do setcode do Pathname::glob('/sys/devices/system/cpu/cpu[0-9]*/topology/thread_siblings_list').map{|x| - File.open(x,'r').read().split(',')[0] + File.open(x,'r').read.split(',')[0] }.sort.uniq.count end end diff --git a/modules/base/spec/defines/service_unit_spec.rb b/modules/base/spec/defines/service_unit_spec.rb index 6be090c..a3776b4 100644 --- a/modules/base/spec/defines/service_unit_spec.rb +++ b/modules/base/spec/defines/service_unit_spec.rb @@ -42,7 +42,7 @@ it 'should not refresh service' do expect { should contain_file('/etc/init.d/nginx').that_notifies('Service[nginx]') - }.to raise_error() + }.to raise_error end end diff --git a/modules/install_server/spec/classes/install_server_preseed_server_spec.rb b/modules/install_server/spec/classes/install_server_preseed_server_spec.rb index dd4a332..3b6a6a2 100644 --- a/modules/install_server/spec/classes/install_server_preseed_server_spec.rb +++ b/modules/install_server/spec/classes/install_server_preseed_server_spec.rb @@ -10,6 +10,6 @@ 'group' => 'root', 'recurse' => 'true', 'links' => 'manage', - }).without_path() + }).without_path end end diff --git a/modules/squid3/spec/classes/squid3_spec.rb b/modules/squid3/spec/classes/squid3_spec.rb index ff0bab7..20b4d34 100644 --- a/modules/squid3/spec/classes/squid3_spec.rb +++ b/modules/squid3/spec/classes/squid3_spec.rb @@ -10,13 +10,13 @@ 'mode' => '0444', 'owner' => 'root', 'group' => 'root', - }).without_path() + }).without_path should contain_file('/etc/logrotate.d/squid3').with({ 'ensure' => 'present', 'mode' => '0444', 'owner' => 'root', 'group' => 'root', - }).without_path() + }).without_path end end diff --git a/modules/wmflib/lib/puppet/parser/functions/ipresolve.rb b/modules/wmflib/lib/puppet/parser/functions/ipresolve.rb index 7470ff5..aefd5ce 100644 --- a/modules/wmflib/lib/puppet/parser/functions/ipresolve.rb +++ b/modules/wmflib/lib/puppet/parser/functions/ipresolve.rb @@ -74,7 +74,7 @@ def get_resource(name, type, nameserver) if nameserver.nil? - dns = Resolv::DNS.open() + dns = Resolv::DNS.open else dns = Resolv::DNS.open(:nameserver => [nameserver]) end diff --git a/modules/wmflib/lib/puppet/parser/functions/secret.rb b/modules/wmflib/lib/puppet/parser/functions/secret.rb index fc66a02..062677e 100644 --- a/modules/wmflib/lib/puppet/parser/functions/secret.rb +++ b/modules/wmflib/lib/puppet/parser/functions/secret.rb @@ -11,19 +11,19 @@ in_path = args.first if mod = Puppet::Module.find(mod_name) - mod_path = mod.path() + mod_path = mod.path else fail("secret(): Module #{mod_name} not found") end sec_path = mod_path + secs_subdir + in_path - final_path = Pathname.new(sec_path).cleanpath() + final_path = Pathname.new(sec_path).cleanpath # Bail early if it's not a regular, readable file if !final_path.file? || !final_path.readable? fail(ArgumentError, "secret(): invalid secret #{in_path}") end - return final_path.read() + return final_path.read end end diff --git a/modules/wmflib/spec/functions/role_spec.rb b/modules/wmflib/spec/functions/role_spec.rb index 26dd021..4587ff6 100644 --- a/modules/wmflib/spec/functions/role_spec.rb +++ b/modules/wmflib/spec/functions/role_spec.rb @@ -29,7 +29,7 @@ end it "includes the role class" do - expect { @scope.function_role(['test']) }.to_not raise_error() + expect { @scope.function_role(['test']) }.to_not raise_error end it "raises an error when called more than once in a scope" do diff --git a/modules/wmflib/spec/hiera/proxy_backend_spec.rb b/modules/wmflib/spec/hiera/proxy_backend_spec.rb index 9b0574e..a80e894 100644 --- a/modules/wmflib/spec/hiera/proxy_backend_spec.rb +++ b/modules/wmflib/spec/hiera/proxy_backend_spec.rb @@ -7,7 +7,7 @@ # Build a node with two roles applied @hiera = Hiera.new({:config => 'spec/fixtures/hiera.proxy.yaml'}) Hiera::Config.load('spec/fixtures/hiera.proxy.yaml') - @backend = Hiera::Backend::Proxy_backend.new() + @backend = Hiera::Backend::Proxy_backend.new @compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("foo")) @scope = Puppet::Parser::Scope.new(@compiler) @scope.source = Puppet::Resource::Type.new(:node, :foo) diff --git a/modules/wmflib/spec/hiera/role_backend_spec.rb b/modules/wmflib/spec/hiera/role_backend_spec.rb index 19c436a..59638f1 100644 --- a/modules/wmflib/spec/hiera/role_backend_spec.rb +++ b/modules/wmflib/spec/hiera/role_backend_spec.rb @@ -7,7 +7,7 @@ @hiera = Hiera.new({:config => 'spec/fixtures/hiera.yaml'}) Hiera::Config.load('spec/fixtures/hiera.yaml') - @backend = Hiera::Backend::Role_backend.new() + @backend = Hiera::Backend::Role_backend.new @compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("foo")) @scope = Puppet::Parser::Scope.new(@compiler) @scope.source = Puppet::Resource::Type.new(:node, :foo) diff --git a/utils/hiera_lookup b/utils/hiera_lookup index 1fa0528..38e8f84 100755 --- a/utils/hiera_lookup +++ b/utils/hiera_lookup @@ -69,12 +69,12 @@ $LOAD_PATH << File.join($DIR, 'modules/wmflib/lib') cfg = File.join($DIR, 'modules/puppetmaster/files/production.hiera.yaml') -key = ARGV.pop() +key = ARGV.pop abort(usage "\nError: KEY is required") if key.match('^--') hiera = Hiera.new(:config => cfg) -if not verbose || get_scope().include?('::debug') +if not verbose || get_scope.include?('::debug') Hiera.logger = "noop" end -puts hiera.lookup(key, nil, get_scope(), nil, :priority) +puts hiera.lookup(key, nil, get_scope, nil, :priority) -- To view, visit https://gerrit.wikimedia.org/r/259718 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I373869e7184d4d6a1a34b7f8a2df64b8feb95c89 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Zfilipin <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
