Skip to content

Commit 4fd0dec

Browse files
author
Sean OMeara
committed
rubocops
1 parent 2b76935 commit 4fd0dec

File tree

7 files changed

+16
-13
lines changed

7 files changed

+16
-13
lines changed

.rubocop.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ MethodLength:
1313
LineLength:
1414
Enabled: false
1515

16-
# HashSyntax:
17-
# EnforcedStyle: hash_rockets
18-
1916
Documentation:
2017
Enabled: false
2118

@@ -37,3 +34,9 @@ AllCops:
3734

3835
Style/GuardClause:
3936
Enabled: false
37+
38+
Lint/HandleExceptions:
39+
Enabled: false
40+
41+
Metrics/ModuleLength:
42+
Enabled: false

libraries/provider_mysql_service_smf.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ class MysqlServiceSmf < Chef::Provider::MysqlServiceBase
44
# FIXME: we should have a service_helper to determine if the platform supports SMF similarly
55
# to how we handle systemd on linux
66
if defined?(provides)
7-
provides :mysql_service, os: %w(solaris2 omnios smartos openindiana opensolaris nexentacore) do |node|
8-
File.exist?("/usr/sbin/svccfg")
7+
provides :mysql_service, os: %w(solaris2 omnios smartos openindiana opensolaris nexentacore) do
8+
File.exist?('/usr/sbin/svccfg')
99
end
1010
end
1111

libraries/provider_mysql_service_systemd.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class Chef
44
class Provider
55
class MysqlServiceSystemd < Chef::Provider::MysqlServiceBase
66
if defined?(provides)
7-
provides :mysql_service, os: 'linux' do |node|
7+
provides :mysql_service, os: 'linux' do
88
Chef::Platform::ServiceHelpers.service_resource_providers.include?(:systemd)
99
end
1010
end

libraries/provider_mysql_service_upstart.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class Chef
44
class Provider
55
class MysqlServiceUpstart < Chef::Provider::MysqlServiceBase
66
if defined?(provides)
7-
provides :mysql_service, os: 'linux' do |node|
7+
provides :mysql_service, os: 'linux' do
88
Chef::Platform::ServiceHelpers.service_resource_providers.include?(:upstart) &&
99
!Chef::Platform::ServiceHelpers.service_resource_providers.include?(:redhat)
1010
end

test/integration/client51/serverspec/assert_functioning_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
puts "os: #{os}"
66

77
def mysql_cmd
8-
return "scl enable mysql51 \"mysql --version\"" if os[:family] == "redhat" && os[:release] =~ /^5\./
8+
return "scl enable mysql51 \"mysql --version\"" if os[:family] == 'redhat' && os[:release] =~ /^5\./
99
'/usr/bin/mysql --version'
1010
end
1111

test/integration/client55/serverspec/assert_functioning_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
puts "os: #{os}"
66

77
def mysql_cmd
8-
return "scl enable mysql55 \"mysql --version\"" if os[:family] == "redhat" && os[:release] =~ /^5\./
9-
return '/opt/local/bin/mysql --version' if os[:family] == "smartos"
10-
return '/opt/omni/bin/mysql --version' if os[:family] == "solaris"
8+
return "scl enable mysql55 \"mysql --version\"" if os[:family] == 'redhat' && os[:release] =~ /^5\./
9+
return '/opt/local/bin/mysql --version' if os[:family] == 'smartos'
10+
return '/opt/omni/bin/mysql --version' if os[:family] == 'solaris'
1111
'/usr/bin/mysql --version'
1212
end
1313

test/integration/client56/serverspec/assert_functioning_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
puts "os: #{os}"
66

77
def mysql_cmd
8-
return '/opt/local/bin/mysql --version' if os[:family] == "smartos"
9-
return '/opt/mysql56/bin/mysql --version' if os[:family] == "solaris"
8+
return '/opt/local/bin/mysql --version' if os[:family] == 'smartos'
9+
return '/opt/mysql56/bin/mysql --version' if os[:family] == 'solaris'
1010
'/usr/bin/mysql --version'
1111
end
1212

0 commit comments

Comments
 (0)