Skip to content

Commit 52ea030

Browse files
pmcmawpmcmaw
authored
Merge pull request #953 from david22swan/Rubocop
Rubocop Process Complete
2 parents 718bf59 + 9937fdc commit 52ea030

File tree

74 files changed

+2621
-2695
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2621
-2695
lines changed

‎.sync.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@ appveyor.yml:
55
delete: true
66
spec/spec_helper.rb:
77
allow_deprecations: true
8+
.travis.yml:
9+
extras:
10+
- rvm: 2.1.9
11+
script: bundle exec rake rubocop

‎.travis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,7 @@ matrix:
2525
- rvm: 2.1.9
2626
bundler_args: --without system_tests
2727
env: PUPPET_GEM_VERSION="~> 4.0"
28+
- rvm: 2.1.9
29+
script: bundle exec rake rubocop
2830
notifications:
2931
email: false

‎lib/puppet/parser/functions/postgresql_acls_to_resources_hash.rb‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
# postgresql_acls_to_resources_hash.rb
12
module Puppet::Parser::Functions
2-
newfunction(:postgresql_acls_to_resources_hash, :type => :rvalue, :doc => <<-EOS
3+
newfunction(:postgresql_acls_to_resources_hash, type: :rvalue, doc: <<-EOS
34
This internal function translates the ipv(4|6)acls format into a resource
45
suitable for create_resources. It is not intended to be used outside of the
56
postgresql internal classes/defined resources.
@@ -14,11 +15,13 @@ module Puppet::Parser::Functions
1415
The third parameter is an order offset, so you can start the order at an
1516
arbitrary starting point.
1617
EOS
17-
) do |args|
18-
func_name = "postgresql_acls_to_resources_hash()"
18+
) do |args|
19+
func_name = 'postgresql_acls_to_resources_hash()'
1920

20-
raise(Puppet::ParseError, "#{func_name}: Wrong number of arguments " +
21-
"given (#{args.size} for 3)") if args.size != 3
21+
if args.size != 3
22+
raise(Puppet::ParseError, "#{func_name}: Wrong number of arguments " \
23+
"given (#{args.size} for 3)")
24+
end
2225

2326
acls = args[0]
2427
raise(Puppet::ParseError, "#{func_name}: first argument must be an array") \
@@ -38,36 +41,32 @@ module Puppet::Parser::Functions
3841

3942
parts = acl.split
4043

41-
raise(Puppet::ParseError, "#{func_name}: acl line #{index} does not " +
42-
"have enough parts") unless parts.length >= 4
44+
unless parts.length >= 4
45+
raise(Puppet::ParseError, "#{func_name}: acl line #{index} does not " \
46+
'have enough parts')
47+
end
4348

4449
resource = {
4550
'type' => parts[0],
4651
'database' => parts[1],
4752
'user' => parts[2],
48-
'order' => format('%03d', offset + index),
53+
'order' => format('%03d', offset + index), # rubocop:disable Style/FormatString
4954
}
50-
if parts[0] == 'local' then
55+
if parts[0] == 'local'
5156
resource['auth_method'] = parts[3]
52-
if parts.length > 4 then
53-
resource['auth_option'] = parts.last(parts.length - 4).join(" ")
57+
if parts.length > 4
58+
resource['auth_option'] = parts.last(parts.length - 4).join(' ')
5459
end
55-
else
56-
if parts[4] =~ /^\d/
57-
resource['address'] = parts[3] + ' ' + parts[4]
58-
resource['auth_method'] = parts[5]
60+
elsif parts[4] =~ %r{^\d}
61+
resource['address'] = parts[3] + ' ' + parts[4]
62+
resource['auth_method'] = parts[5]
5963

60-
if parts.length > 6 then
61-
resource['auth_option'] = parts.last(parts.length - 6).join(" ")
62-
end
63-
else
64-
resource['address'] = parts[3]
65-
resource['auth_method'] = parts[4]
64+
resource['auth_option'] = parts.last(parts.length - 6).join(' ') if parts.length > 6
65+
else
66+
resource['address'] = parts[3]
67+
resource['auth_method'] = parts[4]
6668

67-
if parts.length > 5 then
68-
resource['auth_option'] = parts.last(parts.length - 5).join(" ")
69-
end
70-
end
69+
resource['auth_option'] = parts.last(parts.length - 5).join(' ') if parts.length > 5
7170
end
7271
resources["postgresql class generated rule #{id} #{index}"] = resource
7372
end

‎lib/puppet/parser/functions/postgresql_escape.rb‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
require 'digest/md5'
22

3+
# postgresql_escape.rb
34
module Puppet::Parser::Functions
4-
newfunction(:postgresql_escape, :type => :rvalue, :doc => <<-EOS
5+
newfunction(:postgresql_escape, type: :rvalue, doc: <<-EOS
56
Safely escapes a string using $$ using a random tag which should be consistent
67
EOS
7-
) do |args|
8+
) do |args|
89

9-
raise(Puppet::ParseError, "postgresql_escape(): Wrong number of arguments " +
10-
"given (#{args.size} for 1)") if args.size != 1
10+
if args.size != 1
11+
raise(Puppet::ParseError, 'postgresql_escape(): Wrong number of arguments ' \
12+
"given (#{args.size} for 1)")
13+
end
1114

1215
password = args[0]
1316

14-
if password !~ /\$\$/ and password[-1] != '$'
17+
if password !~ %r{\$\$} && password[-1] != '$'
1518
retval = "$$#{password}$$"
1619
else
17-
escape = Digest::MD5.hexdigest(password)[0..5].gsub(/\d/,'')
18-
until password !~ /#{escape}/
19-
escape = Digest::MD5.hexdigest(escape)[0..5].gsub(/\d/,'')
20+
escape = Digest::MD5.hexdigest(password)[0..5].gsub(%r{\d}, '')
21+
until password !~ %r{#{escape}}
22+
escape = Digest::MD5.hexdigest(escape)[0..5].gsub(%r{\d}, '')
2023
end
2124
retval = "$#{escape}$#{password}$#{escape}$"
2225
end

‎lib/puppet/parser/functions/postgresql_password.rb‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
# hash a string as mysql's "PASSWORD()" function would do it
22
require 'digest/md5'
33

4+
# postgresql_password.rb
45
module Puppet::Parser::Functions
5-
newfunction(:postgresql_password, :type => :rvalue, :doc => <<-EOS
6+
newfunction(:postgresql_password, type: :rvalue, doc: <<-EOS
67
Returns the postgresql password hash from the clear text username / password.
78
EOS
8-
) do |args|
9+
) do |args|
910

10-
raise(Puppet::ParseError, "postgresql_password(): Wrong number of arguments " +
11-
"given (#{args.size} for 2)") if args.size != 2
11+
if args.size != 2
12+
raise(Puppet::ParseError, 'postgresql_password(): Wrong number of arguments ' \
13+
"given (#{args.size} for 2)")
14+
end
1215

1316
username = args[0]
1417
password = args[1]

‎lib/puppet/provider/postgresql_conf/parsed.rb‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,39 @@
22

33
Puppet::Type.type(:postgresql_conf).provide(
44
:parsed,
5-
:parent => Puppet::Provider::ParsedFile,
6-
:default_target => '/etc/postgresql.conf',
7-
:filetype => :flat
5+
parent: Puppet::Provider::ParsedFile,
6+
default_target: '/etc/postgresql.conf',
7+
filetype: :flat,
88
) do
9-
desc "Set key/values in postgresql.conf."
9+
desc 'Set key/values in postgresql.conf.'
1010

11-
text_line :comment, :match => /^\s*#/
12-
text_line :blank, :match => /^\s*$/
11+
text_line :comment, match: %r{^\s*#}
12+
text_line :blank, match: %r{^\s*$}
1313

1414
record_line :parsed,
15-
:fields => %w{name value comment},
16-
:optional => %w{comment},
17-
:match => /^\s*([\w\.]+)\s*=?\s*(.*?)(?:\s*#\s*(.*))?\s*$/,
18-
:to_line => proc { |h|
19-
20-
# simple string and numeric values don't need to be enclosed in quotes
21-
if h[:value].is_a?(Numeric)
22-
val = h[:value].to_s
23-
else
24-
val = h[:value]
25-
end
26-
dontneedquote = val.match(/^(\d+.?\d+|\w+)$/)
27-
dontneedequal = h[:name].match(/^(include|include_if_exists)$/i)
28-
29-
str = h[:name].downcase # normalize case
30-
str += dontneedequal ? ' ' : ' = '
31-
str += "'" unless dontneedquote && !dontneedequal
32-
str += val
33-
str += "'" unless dontneedquote && !dontneedequal
34-
str += " # #{h[:comment]}" unless (h[:comment].nil? or h[:comment] == :absent)
35-
str
36-
},
37-
:post_parse => proc { |h|
38-
h[:name].downcase! # normalize case
39-
h[:value].gsub!(/(^'|'$)/, '') # strip out quotes
40-
}
15+
fields: %w[name value comment],
16+
optional: %w[comment],
17+
match: %r{^\s*([\w\.]+)\s*=?\s*(.*?)(?:\s*#\s*(.*))?\s*$},
18+
to_line: proc { |h|
19+
# simple string and numeric values don't need to be enclosed in quotes
20+
val = if h[:value].is_a?(Numeric)
21+
h[:value].to_s
22+
else
23+
h[:value]
24+
end
25+
dontneedquote = val.match(%r{^(\d+.?\d+|\w+)$})
26+
dontneedequal = h[:name].match(%r{^(include|include_if_exists)$}i)
4127

28+
str = h[:name].downcase # normalize case
29+
str += dontneedequal ? ' ' : ' = '
30+
str += "'" unless dontneedquote && !dontneedequal
31+
str += val
32+
str += "'" unless dontneedquote && !dontneedequal
33+
str += " # #{h[:comment]}" unless h[:comment].nil? || h[:comment] == :absent
34+
str
35+
},
36+
post_parse: proc { |h|
37+
h[:name].downcase! # normalize case
38+
h[:value].gsub!(%r{(^'|'$)}, '') # strip out quotes
39+
}
4240
end

‎lib/puppet/provider/postgresql_conn_validator/ruby.rb‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__),"..","..",".."))
1+
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
22
require 'puppet/util/postgresql_validator'
33

44
# This file contains a provider for the resource type `postgresql_conn_validator`,
@@ -38,6 +38,4 @@ def create
3838
def validator
3939
@validator ||= Puppet::Util::PostgresqlValidator.new(resource)
4040
end
41-
4241
end
43-

‎lib/puppet/provider/postgresql_psql/ruby.rb‎

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
Puppet::Type.type(:postgresql_psql).provide(:ruby) do
2-
32
def run_unless_sql_command(sql)
43
# for the 'unless' queries, we wrap the user's query in a 'SELECT COUNT',
54
# which makes it easier to parse and process the output.
6-
run_sql_command('SELECT COUNT(*) FROM (' << sql << ') count')
5+
run_sql_command('SELECT COUNT(*) FROM (' << sql << ') count')
76
end
87

98
def run_sql_command(sql)
@@ -12,9 +11,9 @@ def run_sql_command(sql)
1211
end
1312

1413
command = [resource[:psql_path]]
15-
command.push("-d", resource[:db]) if resource[:db]
16-
command.push("-p", resource[:port]) if resource[:port]
17-
command.push("-t", "-c", '"' + sql.gsub('"', '\"') + '"')
14+
command.push('-d', resource[:db]) if resource[:db]
15+
command.push('-p', resource[:port]) if resource[:port]
16+
command.push('-t', '-c', '"' + sql.gsub('"', '\"') + '"')
1817

1918
environment = get_environment
2019

@@ -29,28 +28,29 @@ def run_sql_command(sql)
2928

3029
private
3130

32-
def get_environment
31+
def get_environment # rubocop:disable Style/AccessorMethodName : Refactor does not work correctly
3332
environment = (resource[:connect_settings] || {}).dup
34-
if envlist = resource[:environment]
35-
envlist = [envlist] unless envlist.is_a? Array
36-
envlist.each do |setting|
37-
if setting =~ /^(\w+)=((.|\n)+)$/
38-
env_name = $1
39-
value = $2
40-
if environment.include?(env_name) || environment.include?(env_name.to_sym)
41-
if env_name == 'NEWPGPASSWD'
42-
warning "Overriding environment setting '#{env_name}' with '****'"
43-
else
44-
warning "Overriding environment setting '#{env_name}' with '#{value}'"
45-
end
33+
envlist = resource[:environment]
34+
return environment unless envlist
35+
36+
envlist = [envlist] unless envlist.is_a? Array
37+
envlist.each do |setting|
38+
if setting =~ %r{^(\w+)=((.|\n)+)$}
39+
env_name = Regexp.last_match(1)
40+
value = Regexp.last_match(2)
41+
if environment.include?(env_name) || environment.include?(env_name.to_sym)
42+
if env_name == 'NEWPGPASSWD'
43+
warning "Overriding environment setting '#{env_name}' with '****'"
44+
else
45+
warning "Overriding environment setting '#{env_name}' with '#{value}'"
4646
end
47-
environment[env_name] = value
48-
else
49-
warning "Cannot understand environment setting #{setting.inspect}"
5047
end
48+
environment[env_name] = value
49+
else
50+
warning "Cannot understand environment setting #{setting.inspect}"
5151
end
5252
end
53-
return environment
53+
environment
5454
end
5555

5656
def run_command(command, user, group, environment)
@@ -65,16 +65,13 @@ def run_command(command, user, group, environment)
6565
Puppet::Util::SUIDManager.run_and_capture(command, user, group)
6666
end
6767
else
68-
output = Puppet::Util::Execution.execute(command, {
69-
:uid => user,
70-
:gid => group,
71-
:failonfail => false,
72-
:combine => true,
73-
:override_locale => true,
74-
:custom_environment => environment,
75-
})
68+
output = Puppet::Util::Execution.execute(command, uid: user,
69+
gid: group,
70+
failonfail: false,
71+
combine: true,
72+
override_locale: true,
73+
custom_environment: environment)
7674
[output, $CHILD_STATUS.dup]
7775
end
7876
end
79-
8077
end

0 commit comments

Comments
 (0)