Skip to content

Commit ae287be

Browse files
bstoppbstopp
committed
Merge pull request #41 from bstopp/update/codeformat
Updating to clean up rubocop violations.
2 parents ddbe581 + da3e2be commit ae287be

11 files changed

+78
-84
lines changed

‎.codeclimate.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
engines:
22
rubocop:
33
enabled: true
4+
5+
exclude_fingerprints:
6+
- 1e9123a63d444ad851bcca004f70892d

‎Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
22

33
group :development, :tests do
4-
gem 'rspec', '~> 3.3', :require => false
4+
gem 'rspec', '~> 3.3', :require => false
55
gem 'rake', :require => false
66
gem 'metadata-json-lint', :require => false
77
gem 'rspec-puppet', :require => false

‎Rakefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ require 'puppet-syntax/tasks/puppet-syntax'
33
require 'rubocop/rake_task'
44

55
exclude_paths = [
6-
"spec/**/*"
6+
'spec/**/*'
77
]
88

9-
task :default => [ :spec, :lint, :rubocop ]
9+
task :default => [:spec, :lint, :rubocop]
1010

1111
PuppetLint.configuration.fail_on_warnings = true
1212
PuppetLint.configuration.send('relative')

‎spec/acceptance/acceptance_spec.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ class { \"java\" : }
151151
end
152152

153153
context 'license' do
154-
context 'author' do
154+
context 'author' do
155155
it 'should have license file' do
156-
shell("test -f /opt/aem/author/license.properties", :acceptable_exit_codes => 0)
156+
shell('test -f /opt/aem/author/license.properties', :acceptable_exit_codes => 0)
157157
end
158158

159159
it 'should have correct owner:group' do
@@ -219,7 +219,7 @@ class { \"java\" : }
219219
end
220220

221221
describe 'aem::instance updated' do
222-
222+
223223
let :facts do
224224
{
225225
:environment => :root
@@ -344,7 +344,7 @@ class { \"java\" : }
344344
shell("grep -- \"JVM_MEM_OPTS='-Xmx2048m -XX:MaxPermSize=512M'\" /opt/aem/author/crx-quickstart/bin/start-env",
345345
:acceptable_exit_codes => 0)
346346
end
347-
347+
348348
it 'should update the jvm settings' do
349349
shell("grep -- JVM_OPTS=\\'-XX:+UseParNewGC\\' /opt/aem/author/crx-quickstart/bin/start-env",
350350
:acceptable_exit_codes => 0)
@@ -377,7 +377,7 @@ class { \"java\" : }
377377
end
378378
end
379379
rescue
380-
380+
381381
end
382382
sleep 15
383383
end

‎spec/defines/aem_config_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
let :default_facts do
77
{
8-
:kernel => 'Linux',
9-
:operatingsystem => 'CentOS',
10-
:operatingsystemmajrelease => '7',
8+
:kernel => 'Linux',
9+
:operatingsystem => 'CentOS',
10+
:operatingsystemmajrelease => '7'
1111
}
1212
end
1313

‎spec/defines/aem_instance_spec.rb

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
:kernel => 'Linux',
99
:operatingsystem => 'CentOS',
10-
:operatingsystemmajrelease => '7',
10+
:operatingsystemmajrelease => '7'
1111
}
1212
end
1313

@@ -109,9 +109,8 @@
109109
it { is_expected.to contain_aem_installer('aem').that_requires('Aem::Config[aem]') }
110110
it { is_expected.to contain_aem__config('aem').that_requires('Aem::Package[aem]') }
111111
it { is_expected.to contain_aem__config('aem').that_notifies('Aem::Service[aem]') }
112-
113-
it { is_expected.to contain_aem__package('aem').that_requires('Anchor[aem::aem::begin]') }
114112

113+
it { is_expected.to contain_aem__package('aem').that_requires('Anchor[aem::aem::begin]') }
115114

116115
it do
117116
is_expected.to contain_file(

‎spec/defines/aem_license_spec.rb

+5-6
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
default_params
9393
end
9494

95-
95+
9696
context 'product name' do
9797
it do
9898
is_expected.to contain_file(
@@ -107,17 +107,16 @@
107107
it { is_expected.to contain_file('/opt/aem/license.properties').with_mode('0644') }
108108
end
109109

110-
111110
context 'customer' do
112111

113112
it do
114113
val = params[:customer]
115114

116115
is_expected.to contain_file(
117-
'/opt/aem/license.properties'
118-
).with_content(
119-
/license.customer.name=#{val}\s/
120-
)
116+
'/opt/aem/license.properties'
117+
).with_content(
118+
/license.customer.name=#{val}\s/
119+
)
121120
end
122121
end
123122

‎spec/defines/aem_params_spec.rb

+8-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
let :default_facts do
77
{
8-
:kernel => 'Linux',
9-
:operatingsystem => 'CentOS',
10-
:operatingsystemmajrelease => '7',
8+
:kernel => 'Linux',
9+
:operatingsystem => 'CentOS',
10+
:operatingsystemmajrelease => '7'
1111
}
1212
end
1313

@@ -294,7 +294,11 @@
294294
let :params do
295295
default_params.merge(:status => 'invalid')
296296
end
297-
it { expect { is_expected.to compile }.to raise_error(/Allowed values are 'enabled', 'disabled', 'running' and 'unmanaged'/) }
297+
it do
298+
expect do
299+
is_expected.to compile
300+
end.to raise_error(/Allowed values are 'enabled', 'disabled', 'running' and 'unmanaged'/)
301+
end
298302
end
299303
end
300304

‎spec/defines/aem_service_spec.rb

+37-37
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
let :default_params do
1717
{
18-
:home => '/opt/aem',
18+
:home => '/opt/aem'
1919
}
2020
end
2121

@@ -44,7 +44,7 @@
4444
context 'version >= 7' do
4545

4646
let :facts do
47-
default_facts.merge({ :operatingsystem => os, :operatingsystemmajrelease => '7' })
47+
default_facts.merge(:operatingsystem => os, :operatingsystemmajrelease => '7')
4848
end
4949

5050
let :params do
@@ -53,18 +53,18 @@
5353

5454
it do
5555
is_expected.to contain_aem__service__systemd('aem').with(
56-
:ensure => 'present',
57-
:status => 'enabled',
58-
:group => 'aem',
59-
:home => '/opt/aem',
60-
:user => 'aem'
56+
:ensure => 'present',
57+
:status => 'enabled',
58+
:group => 'aem',
59+
:home => '/opt/aem',
60+
:user => 'aem'
6161
)
6262
end
6363
end
6464

6565
context 'version < 7' do
6666
let :facts do
67-
default_facts.merge({ :operatingsystem => os, :operatingsystemmajrelease => '6' })
67+
default_facts.merge(:operatingsystem => os, :operatingsystemmajrelease => '6')
6868
end
6969

7070
let :params do
@@ -73,11 +73,11 @@
7373

7474
it do
7575
is_expected.to contain_aem__service__init('aem').with(
76-
:ensure => 'present',
77-
:status => 'enabled',
78-
:group => 'aem',
79-
:home => '/opt/aem',
80-
:user => 'aem'
76+
:ensure => 'present',
77+
:status => 'enabled',
78+
:group => 'aem',
79+
:home => '/opt/aem',
80+
:user => 'aem'
8181
)
8282
end
8383

@@ -89,7 +89,7 @@
8989
context 'version >= 8' do
9090

9191
let :facts do
92-
default_facts.merge({ :operatingsystem => 'Debian', :operatingsystemmajrelease => '8' })
92+
default_facts.merge(:operatingsystem => 'Debian', :operatingsystemmajrelease => '8')
9393
end
9494

9595
let :params do
@@ -98,18 +98,18 @@
9898

9999
it do
100100
is_expected.to contain_aem__service__systemd('aem').with(
101-
:ensure => 'present',
102-
:status => 'enabled',
103-
:group => 'aem',
104-
:home => '/opt/aem',
105-
:user => 'aem'
101+
:ensure => 'present',
102+
:status => 'enabled',
103+
:group => 'aem',
104+
:home => '/opt/aem',
105+
:user => 'aem'
106106
)
107107
end
108108
end
109109

110110
context 'version < 7' do
111111
let :facts do
112-
default_facts.merge({ :operatingsystem => 'Debian', :operatingsystemmajrelease => '7' })
112+
default_facts.merge(:operatingsystem => 'Debian', :operatingsystemmajrelease => '7')
113113
end
114114

115115
let :params do
@@ -118,11 +118,11 @@
118118

119119
it do
120120
is_expected.to contain_aem__service__init('aem').with(
121-
:ensure => 'present',
122-
:status => 'enabled',
123-
:group => 'aem',
124-
:home => '/opt/aem',
125-
:user => 'aem'
121+
:ensure => 'present',
122+
:status => 'enabled',
123+
:group => 'aem',
124+
:home => '/opt/aem',
125+
:user => 'aem'
126126
)
127127
end
128128

@@ -133,7 +133,7 @@
133133
context 'version >= 15' do
134134

135135
let :facts do
136-
default_facts.merge({ :operatingsystem => 'Ubuntu', :operatingsystemmajrelease => '15' })
136+
default_facts.merge(:operatingsystem => 'Ubuntu', :operatingsystemmajrelease => '15')
137137
end
138138

139139
let :params do
@@ -142,18 +142,18 @@
142142

143143
it do
144144
is_expected.to contain_aem__service__systemd('aem').with(
145-
:ensure => 'present',
146-
:status => 'enabled',
147-
:group => 'aem',
148-
:home => '/opt/aem',
149-
:user => 'aem'
145+
:ensure => 'present',
146+
:status => 'enabled',
147+
:group => 'aem',
148+
:home => '/opt/aem',
149+
:user => 'aem'
150150
)
151151
end
152152
end
153153

154154
context 'version < 7' do
155155
let :facts do
156-
default_facts.merge({ :operatingsystem => 'Ubuntu', :operatingsystemmajrelease => '14' })
156+
default_facts.merge(:operatingsystem => 'Ubuntu', :operatingsystemmajrelease => '14')
157157
end
158158

159159
let :params do
@@ -162,11 +162,11 @@
162162

163163
it do
164164
is_expected.to contain_aem__service__init('aem').with(
165-
:ensure => 'present',
166-
:status => 'enabled',
167-
:group => 'aem',
168-
:home => '/opt/aem',
169-
:user => 'aem'
165+
:ensure => 'present',
166+
:status => 'enabled',
167+
:group => 'aem',
168+
:home => '/opt/aem',
169+
:user => 'aem'
170170
)
171171
end
172172

‎spec/defines/service/aem_service_systemd_spec.rb

+10-11
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,45 @@
55

66
let :facts do
77
{
8-
:kernel => 'Linux',
9-
:operatingsystem => 'CentOS',
10-
:osfamily => 'RedHat',
11-
:operatingsystemmajrelease => '7',
8+
:kernel => 'Linux',
9+
:operatingsystem => 'CentOS',
10+
:osfamily => 'RedHat',
11+
:operatingsystemmajrelease => '7'
1212
}
1313
end
1414

1515
let :title do
1616
'aem'
1717
end
1818

19-
2019
let :default_params do
2120
{
2221
:ensure => 'present',
2322
:status => 'enabled',
2423
:home => '/opt/aem',
2524
:user => 'aem',
26-
:group => 'aem',
25+
:group => 'aem'
2726
}
2827
end
2928

3029
context 'Setup service' do
31-
let :params do
30+
let :params do
3231
default_params
3332
end
3433
it { should contain_aem__service__systemd('aem') }
3534
it { should contain_exec('reload_systemd_aem_aem').with(:command => '/bin/systemctl daemon-reload') }
3635
it { should contain_service('aem-aem').with(:ensure => 'running', :enable => true, :provider => 'systemd') }
37-
36+
3837
end
3938

4039
context 'Remove service' do
41-
let :params do
40+
let :params do
4241
default_params
4342
end
4443
it { should contain_aem__service__systemd('aem') }
4544
it { should contain_exec('reload_systemd_aem_aem').with(:command => '/bin/systemctl daemon-reload') }
4645
it { should contain_service('aem-aem').with(:ensure => 'running', :enable => true, :provider => 'systemd') }
47-
46+
4847
end
4948

50-
end
49+
end

0 commit comments

Comments
 (0)