Skip to content

Commit eacba26

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

9 files changed

+31
-37
lines changed

‎spec/acceptance/postgresql_psql_spec.rb

Lines changed: 2 additions & 2 deletions
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':

‎spec/acceptance/server/default_privileges_spec.rb

Lines changed: 5 additions & 5 deletions
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}

‎spec/acceptance/server/deferred_pw_role_spec.rb

Lines changed: 1 addition & 1 deletion
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

‎spec/acceptance/server/grant_role_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
end
1414
end
1515
let(:pp_one) do
16-
<<-MANIFEST.unindent
16+
<<~MANIFEST
1717
$db = #{db}
1818
$user = #{user}
1919
$group = #{group}

‎spec/acceptance/server/grant_spec.rb

Lines changed: 13 additions & 13 deletions
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,
@@ -99,7 +99,7 @@ class { 'postgresql::server': }
9999
### SEQUENCE grants
100100
context 'sequence' do
101101
let(:pp) do
102-
pp_setup + <<-MANIFEST.unindent
102+
pp_setup + <<~MANIFEST
103103
postgresql_psql { 'create test sequence':
104104
command => 'CREATE SEQUENCE test_seq',
105105
db => $db,
@@ -151,7 +151,7 @@ class { 'postgresql::server': }
151151

152152
context 'all sequences' do
153153
let(:pp) do
154-
pp_setup + <<-MANIFEST.unindent
154+
pp_setup + <<~MANIFEST
155155
156156
postgresql_psql { 'create test sequences':
157157
command => 'CREATE SEQUENCE test_seq2; CREATE SEQUENCE test_seq3;',
@@ -204,7 +204,7 @@ class { 'postgresql::server': }
204204
### FUNCTION grants
205205
context 'sequence' do
206206
let(:pp) do
207-
pp_setup + <<-MANIFEST.unindent
207+
pp_setup + <<~MANIFEST
208208
postgresql_psql { 'create test function':
209209
command => "CREATE FUNCTION test_func() RETURNS boolean AS 'SELECT true' LANGUAGE 'sql'",
210210
db => $db,
@@ -271,7 +271,7 @@ class { 'postgresql::server': }
271271
context 'table' do
272272
describe 'GRANT ... ON TABLE' do
273273
let(:pp_create_table) do
274-
pp_setup + <<-EOS.unindent
274+
pp_setup + <<~EOS
275275
postgresql_psql { 'create test table':
276276
command => 'CREATE TABLE test_tbl (col1 integer)',
277277
db => $db,
@@ -297,7 +297,7 @@ class { 'postgresql::server': }
297297
end
298298

299299
it 'grant select on a table to a user' do
300-
pp_grant = pp_setup + <<-EOS.unindent
300+
pp_grant = pp_setup + <<~EOS
301301
302302
postgresql::server::grant { 'grant select on test_tbl':
303303
privilege => 'SELECT',
@@ -317,7 +317,7 @@ class { 'postgresql::server': }
317317
}
318318
EOS
319319

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

368368
it 'grant update on all tables to a user' do
369-
pp_grant = pp_setup + <<-EOS.unindent
369+
pp_grant = pp_setup + <<~EOS
370370
371371
postgresql::server::grant { 'grant update on all tables':
372372
privilege => 'UPDATE',
@@ -378,7 +378,7 @@ class { 'postgresql::server': }
378378
}
379379
EOS
380380

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

420420
it 'grant all on all tables to a user' do
421-
pp_grant = pp_setup + <<-EOS.unindent
421+
pp_grant = pp_setup + <<~EOS
422422
423423
postgresql::server::grant { 'grant all on all tables':
424424
privilege => 'ALL',
@@ -430,7 +430,7 @@ class { 'postgresql::server': }
430430
}
431431
EOS
432432

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

‎spec/acceptance/server/reassign_owned_by_spec.rb

Lines changed: 5 additions & 5 deletions
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}',

‎spec/acceptance/server/recovery_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
pre_run
99
end
1010
after(:all) do
11-
pp = <<-MANIFEST.unindent
11+
pp = <<~MANIFEST
1212
file { '/tmp/recovery.conf':
1313
ensure => absent,
1414
}
@@ -17,7 +17,7 @@
1717
apply_manifest(pp, catch_failures: true)
1818
end
1919

20-
pp = <<-MANIFEST.unindent
20+
pp = <<~MANIFEST
2121
class { 'postgresql::globals':
2222
recovery_conf_path => '/tmp/recovery.conf',
2323
manage_recovery_conf => true,
@@ -44,7 +44,7 @@ class { 'postgresql::server': }
4444

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

‎spec/acceptance/server/schema_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
end
1010
end
1111
let(:pp) do
12-
<<-MANIFEST.unindent
12+
<<~MANIFEST
1313
$db = 'schema_test'
1414
$user = 'psql_schema_tester'
1515
$password = 'psql_schema_pw'

‎spec/spec_helper_acceptance_local.rb

Lines changed: 0 additions & 6 deletions
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 { |l| l.length }}}, '')
13-
end
14-
end
15-
1610
RSpec.configure do |c|
1711
c.before :suite do
1812
install_dependencies

0 commit comments

Comments
 (0)