Skip to content

Commit 7782fb5

Browse files
ekohlekohl
committed
Avoid monkey patching String to provide unindent
Ruby can do this natively for a while using <<~
1 parent a6ad919 commit 7782fb5

9 files changed

+31
-37
lines changed

Diff for: ‎spec/acceptance/postgresql_psql_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class { 'postgresql::server': } ->
7373
idempotent_apply(pp_five)
7474
end
7575

76-
pp_six = <<-MANIFEST.unindent
76+
pp_six = <<~MANIFEST
7777
class { 'postgresql::server': } ->
7878
notify { 'trigger': } ~>
7979
postgresql_psql { 'foobar':
@@ -89,7 +89,7 @@ class { 'postgresql::server': } ->
8989
apply_manifest(pp_six, expect_changes: true)
9090
end
9191

92-
pp_seven = <<-MANIFEST.unindent
92+
pp_seven = <<~MANIFEST
9393
class { 'postgresql::server': } ->
9494
notify { 'trigger': } ~>
9595
postgresql_psql { 'foobar':

Diff for: ‎spec/acceptance/server/default_privileges_spec.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
end
1515

1616
let(:pp_one) do
17-
<<-MANIFEST.unindent
17+
<<~MANIFEST
1818
$db = #{db}
1919
$user = #{user}
2020
$group = #{group}
@@ -76,7 +76,7 @@ class { 'postgresql::server': }
7676
end
7777

7878
let(:pp_target_role) do
79-
<<-MANIFEST.unindent
79+
<<~MANIFEST
8080
$db = #{db}
8181
$user = #{user}
8282
$group = #{group}
@@ -121,7 +121,7 @@ class { 'postgresql::server': }
121121
end
122122

123123
let(:pp_target_role_revoke) do
124-
<<-MANIFEST.unindent
124+
<<~MANIFEST
125125
$db = #{db}
126126
$user = #{user}
127127
$group = #{group}
@@ -172,7 +172,7 @@ class { 'postgresql::server': }
172172
end
173173

174174
let(:pp_schema) do
175-
<<-MANIFEST.unindent
175+
<<~MANIFEST
176176
$db = #{db}
177177
$user = #{user}
178178
$group = #{group}
@@ -233,7 +233,7 @@ class { 'postgresql::server': }
233233
end
234234

235235
let(:pp_unset_schema) do
236-
<<-MANIFEST.unindent
236+
<<~MANIFEST
237237
$db = #{db}
238238
$user = #{user}
239239
$group = #{group}

Diff for: ‎spec/acceptance/server/deferred_pw_role_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
let(:password) { 'test_password' }
88

99
let(:pp_one) do
10-
<<-MANIFEST.unindent
10+
<<~MANIFEST
1111
$user = #{user}
1212
$password = #{password}
1313

Diff for: ‎spec/acceptance/server/grant_role_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
'8.1' if os[:family] == 'redhat' && os[:release].start_with?('5')
1212
end
1313
let(:pp_one) do
14-
<<-MANIFEST.unindent
14+
<<~MANIFEST
1515
$db = #{db}
1616
$user = #{user}
1717
$group = #{group}

Diff for: ‎spec/acceptance/server/grant_spec.rb

+13-13
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
let(:user) { 'psql_grant_priv_tester' }
99
let(:password) { 'psql_grant_role_pw' }
1010
let(:pp_setup) do
11-
<<-MANIFEST.unindent
11+
<<~MANIFEST
1212
$db = #{db}
1313
$owner = #{owner}
1414
$user = #{user}
@@ -55,7 +55,7 @@ class { 'postgresql::server': }
5555
# testing grants on language requires a superuser
5656
let(:superuser) { 'postgres' }
5757
let(:pp) do
58-
pp_setup + <<-MANIFEST.unindent
58+
pp_setup + <<~MANIFEST
5959
postgresql_psql { 'make sure plpgsql exists':
6060
command => 'CREATE LANGUAGE plpgsql',
6161
db => $db,
@@ -97,7 +97,7 @@ class { 'postgresql::server': }
9797
### SEQUENCE grants
9898
context 'sequence' do
9999
let(:pp) do
100-
pp_setup + <<-MANIFEST.unindent
100+
pp_setup + <<~MANIFEST
101101
postgresql_psql { 'create test sequence':
102102
command => 'CREATE SEQUENCE test_seq',
103103
db => $db,
@@ -149,7 +149,7 @@ class { 'postgresql::server': }
149149

150150
context 'all sequences' do
151151
let(:pp) do
152-
pp_setup + <<-MANIFEST.unindent
152+
pp_setup + <<~MANIFEST
153153
154154
postgresql_psql { 'create test sequences':
155155
command => 'CREATE SEQUENCE test_seq2; CREATE SEQUENCE test_seq3;',
@@ -203,7 +203,7 @@ class { 'postgresql::server': }
203203
### FUNCTION grants
204204
context 'sequence' do
205205
let(:pp) do
206-
pp_setup + <<-MANIFEST.unindent
206+
pp_setup + <<~MANIFEST
207207
postgresql_psql { 'create test function':
208208
command => "CREATE FUNCTION test_func() RETURNS boolean AS 'SELECT true' LANGUAGE 'sql'",
209209
db => $db,
@@ -272,7 +272,7 @@ class { 'postgresql::server': }
272272
context 'table' do
273273
describe 'GRANT ... ON TABLE' do
274274
let(:pp_create_table) do
275-
pp_setup + <<-EOS.unindent
275+
pp_setup + <<~EOS
276276
postgresql_psql { 'create test table':
277277
command => 'CREATE TABLE test_tbl (col1 integer)',
278278
db => $db,
@@ -298,7 +298,7 @@ class { 'postgresql::server': }
298298
end
299299

300300
it 'grant select on a table to a user' do
301-
pp_grant = pp_setup + <<-EOS.unindent
301+
pp_grant = pp_setup + <<~EOS
302302
303303
postgresql::server::grant { 'grant select on test_tbl':
304304
privilege => 'SELECT',
@@ -318,7 +318,7 @@ class { 'postgresql::server': }
318318
}
319319
EOS
320320

321-
pp_revoke = pp_setup + <<-EOS.unindent
321+
pp_revoke = pp_setup + <<~EOS
322322
323323
postgresql::server::grant { 'revoke select on test_tbl':
324324
ensure => absent,
@@ -367,7 +367,7 @@ class { 'postgresql::server': }
367367
end
368368

369369
it 'grant update on all tables to a user' do
370-
pp_grant = pp_setup + <<-EOS.unindent
370+
pp_grant = pp_setup + <<~EOS
371371
372372
postgresql::server::grant { 'grant update on all tables':
373373
privilege => 'UPDATE',
@@ -379,7 +379,7 @@ class { 'postgresql::server': }
379379
}
380380
EOS
381381

382-
pp_revoke = pp_setup + <<-EOS.unindent
382+
pp_revoke = pp_setup + <<~EOS
383383
384384
postgresql::server::grant { 'revoke update on all tables':
385385
ensure => absent,
@@ -419,7 +419,7 @@ class { 'postgresql::server': }
419419
end
420420

421421
it 'grant all on all tables to a user' do
422-
pp_grant = pp_setup + <<-EOS.unindent
422+
pp_grant = pp_setup + <<~EOS
423423
424424
postgresql::server::grant { 'grant all on all tables':
425425
privilege => 'ALL',
@@ -431,7 +431,7 @@ class { 'postgresql::server': }
431431
}
432432
EOS
433433

434-
pp_revoke = pp_setup + <<-EOS.unindent
434+
pp_revoke = pp_setup + <<~EOS
435435
436436
postgresql::server::grant { 'revoke all on all tables':
437437
ensure => absent,
@@ -478,7 +478,7 @@ class { 'postgresql::server': }
478478
it 'do not fail on revoke connect from non-existant user' do
479479
if Gem::Version.new(postgresql_version) >= Gem::Version.new('9.1.24')
480480
apply_manifest(pp_setup, catch_failures: true)
481-
pp = pp_setup + <<-EOS.unindent
481+
pp = pp_setup + <<~EOS
482482
postgresql::server::grant { 'revoke connect on db from norole':
483483
ensure => absent,
484484
privilege => 'CONNECT',

Diff for: ‎spec/acceptance/server/reassign_owned_by_spec.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
let(:superuser) { 'postgres' }
1111

1212
let(:pp_setup) do
13-
<<-MANIFEST.unindent
13+
<<~MANIFEST
1414
$db = #{db}
1515
$old_owner = #{old_owner}
1616
$new_owner = #{new_owner}
@@ -54,7 +54,7 @@ class { 'postgresql::server': }
5454
end
5555

5656
let(:pp_db_old_owner) do
57-
<<-MANIFEST.unindent
57+
<<~MANIFEST
5858
postgresql::server::database { $db:
5959
owner => $old_owner,
6060
require => Postgresql::Server::Role[$old_owner],
@@ -63,7 +63,7 @@ class { 'postgresql::server': }
6363
end
6464

6565
let(:pp_db_no_owner) do
66-
<<-MANIFEST.unindent
66+
<<~MANIFEST
6767
postgresql::server::database { $db:
6868
}
6969
MANIFEST
@@ -76,7 +76,7 @@ class { 'postgresql::server': }
7676
let(:new_owner) { 'psql_reassign_new_owner' }
7777

7878
let(:pp_setup_objects) do
79-
<<-MANIFEST.unindent
79+
<<~MANIFEST
8080
postgresql_psql { 'create test table':
8181
command => 'CREATE TABLE test_tbl (col1 integer)',
8282
db => '#{db}',
@@ -94,7 +94,7 @@ class { 'postgresql::server': }
9494
MANIFEST
9595
end
9696
let(:pp_reassign_owned_by) do
97-
<<-MANIFEST.unindent
97+
<<~MANIFEST
9898
postgresql::server::reassign_owned_by { 'test reassign to new_owner':
9999
db => '#{db}',
100100
old_role => '#{old_owner}',

Diff for: ‎spec/acceptance/server/recovery_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
end
1010

1111
after(:all) do
12-
pp = <<-MANIFEST.unindent
12+
pp = <<~MANIFEST
1313
file { '/tmp/recovery.conf':
1414
ensure => absent,
1515
}
@@ -18,7 +18,7 @@
1818
apply_manifest(pp, catch_failures: true)
1919
end
2020

21-
pp = <<-MANIFEST.unindent
21+
pp = <<~MANIFEST
2222
class { 'postgresql::globals':
2323
recovery_conf_path => '/tmp/recovery.conf',
2424
manage_recovery_conf => true,
@@ -45,7 +45,7 @@ class { 'postgresql::server': }
4545

4646
describe 'should not create recovery if recovery config not specified' do
4747
it 'does not add conf file' do
48-
pp = <<-EOS.unindent
48+
pp = <<~EOS
4949
class { 'postgresql::globals':
5050
recovery_conf_path => '/tmp/recovery.conf',
5151
manage_recovery_conf => true,

Diff for: ‎spec/acceptance/server/schema_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
'8.1' if os[:family] == 'redhat' && os[:release].start_with?('5')
88
end
99
let(:pp) do
10-
<<-MANIFEST.unindent
10+
<<~MANIFEST
1111
$db = 'schema_test'
1212
$user = 'psql_schema_tester'
1313
$password = 'psql_schema_pw'

Diff for: ‎spec/spec_helper_acceptance_local.rb

-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ class LitmusHelper
77
include PuppetLitmus
88
end
99

10-
class String
11-
def unindent
12-
gsub(%r{^#{scan(%r{^\s*}).min_by(&:length)}}, '')
13-
end
14-
end
15-
1610
RSpec.configure do |c|
1711
c.before :suite do
1812
LitmusHelper.instance.apply_manifest(File.read(File.join(__dir__, 'setup_acceptance_node.pp')))

0 commit comments

Comments
 (0)