Skip to content

Commit 3205b83

Browse files
apenneyapenney
committed
Merge pull request #219 from apenney/fixes
Fixes suggested by RubyMine (just playing around with it)
2 parents 1bd970d + b00a675 commit 3205b83

File tree

19 files changed

+75
-76
lines changed

19 files changed

+75
-76
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module Puppet::Parser::Functions
77
EOS
88
) do |args|
99

10-
raise(Puppet::ParseError, "mysql_password(): Wrong number of arguments " +
10+
raise(Puppet::ParseError, 'mysql_password(): Wrong number of arguments ' +
1111
"given (#{args.size} for 1)") if args.size != 1
1212

1313
'*' + Digest::SHA1.hexdigest(Digest::SHA1.digest(args[0])).upcase

‎lib/puppet/provider/database/mysql.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Puppet::Type.type(:database).provide(:mysql) do
2-
desc "Manages MySQL database."
2+
desc 'Manages MySQL database.'
33

44
defaultfor :kernel => 'Linux'
55

@@ -19,7 +19,7 @@ def defaults_file
1919
end
2020

2121
def self.instances
22-
mysql([defaults_file, '-NBe', "show databases"].compact).split("\n").collect do |name|
22+
mysql([defaults_file, '-NBe', 'show databases'].compact).split("\n").collect do |name|
2323
new(:name => name)
2424
end
2525
end
@@ -42,7 +42,7 @@ def charset=(value)
4242

4343
def exists?
4444
begin
45-
mysql([defaults_file, '-NBe', "show databases"].compact).match(/^#{@resource[:name]}$/)
45+
mysql([defaults_file, '-NBe', 'show databases'].compact).match(/^#{@resource[:name]}$/)
4646
rescue => e
4747
debug(e.message)
4848
return nil

‎lib/puppet/provider/database_grant/mysql.rb

+14-14
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
Puppet::Type.type(:database_grant).provide(:mysql) do
77

8-
desc "Uses mysql as database."
8+
desc 'Uses mysql as database.'
99

1010
defaultfor :kernel => 'Linux'
1111

@@ -34,19 +34,19 @@ def db_privs
3434
end
3535

3636
def self.query_user_privs
37-
results = mysql([defaults_file, "mysql", "-Be", "describe user"].compact)
37+
results = mysql([defaults_file, 'mysql', '-Be', 'describe user'].compact)
3838
column_names = results.split(/\n/).map { |l| l.chomp.split(/\t/)[0] }
3939
@user_privs = column_names.delete_if { |e| !( e =~/_priv$/) }
4040
end
4141

4242
def self.query_db_privs
43-
results = mysql([defaults_file, "mysql", "-Be", "describe db"].compact)
43+
results = mysql([defaults_file, 'mysql', '-Be', 'describe db'].compact)
4444
column_names = results.split(/\n/).map { |l| l.chomp.split(/\t/)[0] }
4545
@db_privs = column_names.delete_if { |e| !(e =~/_priv$/) }
4646
end
4747

4848
def mysql_flush
49-
mysqladmin([defaults_file, "flush-privileges"].compact)
49+
mysqladmin([defaults_file, 'flush-privileges'].compact)
5050
end
5151

5252
# this parses the
@@ -74,11 +74,11 @@ def create_row
7474
name = split_name(@resource[:name])
7575
case name[:type]
7676
when :user
77-
mysql([defaults_file, "mysql", "-e", "INSERT INTO user (host, user) VALUES ('%s', '%s')" % [
77+
mysql([defaults_file, 'mysql', '-e', "INSERT INTO user (host, user) VALUES ('%s', '%s')" % [
7878
name[:host], name[:user],
7979
]].compact)
8080
when :db
81-
mysql([defaults_file, "mysql", "-e", "INSERT INTO db (host, user, db) VALUES ('%s', '%s', '%s')" % [
81+
mysql([defaults_file, 'mysql', '-e', "INSERT INTO db (host, user, db) VALUES ('%s', '%s', '%s')" % [
8282
name[:host], name[:user], name[:db],
8383
]].compact)
8484
end
@@ -87,7 +87,7 @@ def create_row
8787
end
8888

8989
def destroy
90-
mysql([defaults_file, "mysql", "-e", "REVOKE ALL ON '%s'.* FROM '%s@%s'" % [ @resource[:privileges], @resource[:database], @resource[:name], @resource[:host] ]].compact)
90+
mysql([defaults_file, 'mysql', '-e', "REVOKE ALL ON '%s'.* FROM '%s@%s'" % [ @resource[:privileges], @resource[:database], @resource[:name], @resource[:host] ]].compact)
9191
end
9292

9393
def row_exists?
@@ -96,7 +96,7 @@ def row_exists?
9696
if name[:type] == :db
9797
fields << :db
9898
end
99-
not mysql([defaults_file, "mysql", '-NBe', "SELECT '1' FROM %s WHERE %s" % [ name[:type], fields.map do |f| "%s='%s'" % [f, name[f]] end.join(' AND ')]].compact).empty?
99+
not mysql([defaults_file, 'mysql', '-NBe', "SELECT '1' FROM %s WHERE %s" % [ name[:type], fields.map do |f| "%s='%s'" % [f, name[f]] end.join(' AND ')]].compact).empty?
100100
end
101101

102102
def all_privs_set?
@@ -106,21 +106,21 @@ def all_privs_set?
106106
when :db
107107
db_privs
108108
end
109-
all_privs = all_privs.collect do |p| p.downcase end.sort.join("|")
110-
privs = privileges.collect do |p| p.downcase end.sort.join("|")
109+
all_privs = all_privs.collect do |p| p.downcase end.sort.join('|')
110+
privs = privileges.collect do |p| p.downcase end.sort.join('|')
111111

112112
all_privs == privs
113113
end
114114

115115
def privileges
116116
name = split_name(@resource[:name])
117-
privs = ""
117+
privs = ''
118118

119119
case name[:type]
120120
when :user
121-
privs = mysql([defaults_file, "mysql", "-Be", "select * from mysql.user where user='%s' and host='%s'" % [ name[:user], name[:host] ]].compact)
121+
privs = mysql([defaults_file, 'mysql', '-Be', "select * from mysql.user where user='%s' and host='%s'" % [ name[:user], name[:host] ]].compact)
122122
when :db
123-
privs = mysql([defaults_file, "mysql", "-Be", "select * from mysql.db where user='%s' and host='%s' and db='%s'" % [ name[:user], name[:host], name[:db] ]].compact)
123+
privs = mysql([defaults_file, 'mysql', '-Be', "select * from mysql.db where user='%s' and host='%s' and db='%s'" % [ name[:user], name[:host], name[:db] ]].compact)
124124
end
125125

126126
if privs.match(/^$/)
@@ -172,7 +172,7 @@ def privileges=(privs)
172172
stmt = stmt << set << where
173173

174174
validate_privs privs, all_privs
175-
mysql([defaults_file, "mysql", "-Be", stmt].compact)
175+
mysql([defaults_file, 'mysql', '-Be', stmt].compact)
176176
mysql_flush
177177
end
178178

‎lib/puppet/provider/database_user/mysql.rb

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
Puppet::Type.type(:database_user).provide(:mysql) do
22

3-
desc "manage users for a mysql database."
3+
desc 'manage users for a mysql database.'
44

55
defaultfor :kernel => 'Linux'
66

77
commands :mysql => 'mysql'
88
commands :mysqladmin => 'mysqladmin'
99

1010
def self.instances
11-
users = mysql([defaults_file, "mysql", '-BNe' "select concat(User, '@',Host) as User from mysql.user"].compact).split("\n")
11+
users = mysql([defaults_file, 'mysql', '-BNe' "select concat(User, '@',Host) as User from mysql.user"].compact).split("\n")
1212
users.select{ |user| user =~ /.+@/ }.collect do |name|
1313
new(:name => name)
1414
end
1515
end
1616

1717
def create
18-
merged_name = @resource[:name].sub("@", "'@'")
18+
merged_name = @resource[:name].sub('@', "'@'")
1919
password_hash = @resource.value(:password_hash)
2020
max_user_connections = @resource.value(:max_user_connections) || 0
2121

22-
mysql([defaults_file, "mysql", "-e", "grant usage on *.* to '#{merged_name}' identified by PASSWORD
22+
mysql([defaults_file, 'mysql', '-e', "grant usage on *.* to '#{merged_name}' identified by PASSWORD
2323
'#{password_hash}' with max_user_connections #{max_user_connections}"].compact)
2424

2525
exists? ? (return true) : (return false)
2626
end
2727

2828
def destroy
29-
merged_name = @resource[:name].sub("@", "'@'")
30-
mysql([defaults_file, "mysql", "-e", "drop user '#{merged_name}'"].compact)
29+
merged_name = @resource[:name].sub('@', "'@'")
30+
mysql([defaults_file, 'mysql', '-e', "drop user '#{merged_name}'"].compact)
3131

3232
exists? ? (return false) : (return true)
3333
end
3434

3535
def password_hash
36-
mysql([defaults_file, "mysql", "-NBe", "select password from mysql.user where CONCAT(user, '@', host) = '#{@resource[:name]}'"].compact).chomp
36+
mysql([defaults_file, 'mysql', '-NBe', "select password from mysql.user where CONCAT(user, '@', host) = '#{@resource[:name]}'"].compact).chomp
3737
end
3838

3939
def password_hash=(string)
40-
mysql([defaults_file, "mysql", "-e", "SET PASSWORD FOR '%s' = '%s'" % [ @resource[:name].sub("@", "'@'"), string ] ].compact)
40+
mysql([defaults_file, 'mysql', '-e', "SET PASSWORD FOR '%s' = '%s'" % [ @resource[:name].sub('@', "'@'"), string ] ].compact)
4141

4242
password_hash == string ? (return true) : (return false)
4343
end
@@ -53,12 +53,12 @@ def max_user_connections=(int)
5353
end
5454

5555
def exists?
56-
not mysql([defaults_file, "mysql", "-NBe", "select '1' from mysql.user where CONCAT(user, '@', host) = '%s'" % @resource.value(:name)].compact).empty?
56+
not mysql([defaults_file, 'mysql', '-NBe', "select '1' from mysql.user where CONCAT(user, '@', host) = '%s'" % @resource.value(:name)].compact).empty?
5757
end
5858

5959
def flush
6060
@property_hash.clear
61-
mysqladmin([defaults_file, "flush-privileges"].compact)
61+
mysqladmin([defaults_file, 'flush-privileges'].compact)
6262
end
6363

6464
# Optional defaults file

‎lib/puppet/type/database.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# This has to be a separate type to enable collecting
22
Puppet::Type.newtype(:database) do
3-
@doc = "Manage databases."
3+
@doc = 'Manage databases.'
44

55
ensurable
66

77
newparam(:name, :namevar=>true) do
8-
desc "The name of the database."
8+
desc 'The name of the database.'
99
end
1010

1111
newproperty(:charset) do
12-
desc "The characterset to use for a database"
12+
desc 'The characterset to use for a database'
1313
defaultto :utf8
1414
newvalue(/^\S+$/)
1515
end

‎lib/puppet/type/database_grant.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,25 @@
1919
reqs = []
2020
matches = self[:name].match(/^([^@]+)@([^\/]+).*$/)
2121
unless matches.nil?
22-
reqs << "%s@%s" % [ matches[1], matches[2] ]
22+
reqs << '%s@%s' % [ matches[1], matches[2] ]
2323
end
2424
# puts "Autoreq: '%s'" % reqs.join(" ")
2525
reqs
2626
end
2727

2828
newparam(:name, :namevar=>true) do
29-
desc "The primary key: either user@host for global privilges or user@host/database for database specific privileges"
29+
desc 'The primary key: either user@host for global privilges or user@host/database for database specific privileges'
3030
end
3131

3232
newproperty(:privileges, :array_matching => :all) do
33-
desc "The privileges the user should have. The possible values are implementation dependent."
33+
desc 'The privileges the user should have. The possible values are implementation dependent.'
3434

3535
def should_to_s(newvalue = @should)
3636
if newvalue
3737
unless newvalue.is_a?(Array)
3838
newvalue = [ newvalue ]
3939
end
40-
newvalue.collect do |v| v.downcase end.sort.join ", "
40+
newvalue.collect do |v| v.downcase end.sort.join ', '
4141
else
4242
nil
4343
end
@@ -48,7 +48,7 @@ def is_to_s(currentvalue = @is)
4848
unless currentvalue.is_a?(Array)
4949
currentvalue = [ currentvalue ]
5050
end
51-
currentvalue.collect do |v| v.downcase end.sort.join ", "
51+
currentvalue.collect do |v| v.downcase end.sort.join ', '
5252
else
5353
nil
5454
end
@@ -58,7 +58,7 @@ def is_to_s(currentvalue = @is)
5858
def insync?(is)
5959
if defined? @should and @should
6060
case self.should_to_s
61-
when "all"
61+
when 'all'
6262
self.provider.all_privs_set?
6363
when self.is_to_s(is)
6464
true

‎lib/puppet/type/database_user.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This has to be a separate type to enable collecting
22
Puppet::Type.newtype(:database_user) do
3-
@doc = "Manage a database user. This includes management of users password as well as privileges"
3+
@doc = 'Manage a database user. This includes management of users password as well as privileges'
44

55
ensurable
66

@@ -12,13 +12,13 @@
1212
raise(ArgumentError, "Invalid database user #{value}") unless value =~ /[\w-]*@[\w%\.:]+/
1313
username = value.split('@')[0]
1414
if username.size > 16
15-
raise ArgumentError, "MySQL usernames are limited to a maximum of 16 characters"
15+
raise ArgumentError, 'MySQL usernames are limited to a maximum of 16 characters'
1616
end
1717
end
1818
end
1919

2020
newproperty(:password_hash) do
21-
desc "The password hash of the user. Use mysql_password() for creating such a hash."
21+
desc 'The password hash of the user. Use mysql_password() for creating such a hash.'
2222
newvalue(/\w+/)
2323
end
2424

‎manifests/params.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
$query_cache_limit = '1M'
3434
$query_cache_size = '16M'
3535
$expire_logs_days = 10
36-
$max_binlog_size = 100M
36+
$max_binlog_size = '100M'
3737

3838
case $::operatingsystem {
3939
'Ubuntu': {

‎spec/classes/mysql_backup_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
'delete_before_dump' => true,
1111
}
1212
}
13-
context "standard conditions" do
13+
context 'standard conditions' do
1414
let(:params) { default_params }
1515

1616
it { should contain_database_user('testuser@localhost')}
1717

1818
it { should contain_database_grant('testuser@localhost').with(
19-
:privileges => [ 'Select_priv', 'Reload_priv', 'Lock_tables_priv', 'Show_view_priv' ]
19+
:privileges => %w(Select_priv Reload_priv Lock_tables_priv Show_view_priv)
2020
)}
2121

2222
it { should contain_cron('mysql-backup').with(
@@ -46,7 +46,7 @@
4646
end
4747
end
4848

49-
context "with compression disabled" do
49+
context 'with compression disabled' do
5050
let(:params) do
5151
{ :backupcompress => false }.merge(default_params)
5252
end

‎spec/classes/mysql_config_spec.rb

-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@
135135
{
136136
:service_name => 'dans_service',
137137
:config_file => '/home/dan/mysql.conf',
138-
:service_name => 'dans_mysql',
139138
:pidfile => '/home/dan/mysql.pid',
140139
:socket => '/home/dan/mysql.sock',
141140
:bind_address => '0.0.0.0',

‎spec/classes/mysql_server_monitor_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
}
1515
end
1616

17-
it { should contain_database_user("monitoruser@monitorhost")}
17+
it { should contain_database_user('monitoruser@monitorhost')}
1818
end

‎spec/system/mysql_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class { 'mysql': }
2121
it { should be_installed }
2222
end
2323

24-
describe service('mysqld') do
24+
describe service('mysql') do
2525
it { should_not be_running }
2626
it { should_not be_enabled }
2727
end

‎spec/unit/mysql_password_spec.rb

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env rspec
22
require 'spec_helper'
33

4-
describe "the mysql_password function" do
4+
describe 'the mysql_password function' do
55
before :all do
66
Puppet::Parser::Functions.autoloader.loadall
77
end
@@ -14,20 +14,20 @@
1414
end
1515
end
1616

17-
it "should exist" do
18-
Puppet::Parser::Functions.function("mysql_password").should == "function_mysql_password"
17+
it 'should exist' do
18+
Puppet::Parser::Functions.function('mysql_password').should == 'function_mysql_password'
1919
end
2020

21-
it "should raise a ParseError if there is less than 1 arguments" do
21+
it 'should raise a ParseError if there is less than 1 arguments' do
2222
lambda { @scope.function_mysql_password([]) }.should( raise_error(Puppet::ParseError))
2323
end
2424

25-
it "should raise a ParseError if there is more than 1 arguments" do
26-
lambda { @scope.function_mysql_password(['foo', 'bar']) }.should( raise_error(Puppet::ParseError))
25+
it 'should raise a ParseError if there is more than 1 arguments' do
26+
lambda { @scope.function_mysql_password(%w(foo bar)) }.should( raise_error(Puppet::ParseError))
2727
end
2828

29-
it "should convert password into a hash" do
30-
result = @scope.function_mysql_password(["password"])
29+
it 'should convert password into a hash' do
30+
result = @scope.function_mysql_password(%w(password))
3131
result.should(eq('*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19'))
3232
end
3333

0 commit comments

Comments
 (0)