Merge pull request #25 from codenamephp/templateVariables

bastianschwarz · web-flow · commit c8220911fe47 · 2020-10-02T10:23:13.000+02:00
Template variables
diff --git a/.travis.yml b/.travis.yml
@@ -27,8 +27,7 @@ install:
   - openssl aes-256-cbc -K $encrypted_264707aa6565_key -iv $encrypted_264707aa6565_iv -in codenamephp.pem.enc -out codenamephp.pem -d
 
 script: 
-  - chef exec foodcritic .
-  - chef exec rubocop
+  - chef exec cookstyle .
   - chef exec kitchen test
 
 before_deploy:
diff --git a/resources/template.rb b/resources/template.rb
@@ -5,6 +5,7 @@
 property :filename, String, required: true, description: 'The file name in the dropfolder, should begin with a number for sorting, e.g. 100-myFile'
 property :source, String, required: true, description: 'The source template to use'
 property :cookbook, String, description: 'The cookbook the template file is in, defaults to the current cookbook'
+property :variables, Hash, default: {}, description: 'Hash of variables to pass to the template resource'
 
 action :add do
   create_file('/etc/skel', 'root', new_resource.filename, new_resource.source) if new_resource.skel
@@ -20,6 +21,7 @@ def create_file(folder, user, filename, source)
       path "#{folder}/.bashrc.d/#{filename}"
       source source
       cookbook new_resource.cookbook
+      variables(new_resource.variables)
     end
   end
 
diff --git a/test/fixtures/cookbooks/test/recipes/default.rb b/test/fixtures/cookbooks/test/recipes/default.rb
@@ -10,46 +10,54 @@
 end
 
 codenamephp_bash_manage 'manage bash' do
-  users %w[user1 user2 user3]
+  users %w(user1 user2 user3)
 end
 
 codenamephp_bash_file 'add a file' do
-  users %w[user1 user2 user3]
+  users %w(user1 user2 user3)
   filename '100-content'
   content 'just some test'
 end
 
 codenamephp_bash_cookbook_file 'add a cookbook file' do
-  users %w[user1 user2 user3]
+  users %w(user1 user2 user3)
   filename '200-file'
   cookbook_file 'some_file'
   cookbook 'test'
 end
 
 codenamephp_bash_template 'add a template file' do
-  users %w[user1 user2 user3]
+  users %w(user1 user2 user3)
   filename '300-template'
   source 'some_template'
   cookbook 'test'
 end
 
+codenamephp_bash_template 'add a template file with variables' do
+  users %w(user1 user2 user3)
+  filename '300-template-with-variables'
+  source 'template_with_variable.erb'
+  cookbook 'test'
+  variables({ 'value': 'super value' })
+end
+
 codenamephp_bash_file 'add a file' do
-  users %w[user3]
+  users %w(user3)
   filename '400-content'
   content 'just some test'
 end
 codenamephp_bash_file 'add a file' do
-  users %w[user3]
+  users %w(user3)
   filename '500-content'
   content 'just some test'
 end
 
 codenamephp_bash_remove_file 'remove a file' do
-  users %w[user3]
+  users %w(user3)
   filename '400-content'
 end
 codenamephp_bash_remove_file 'remove a file' do
-  users %w[user3]
+  users %w(user3)
   filename '500-content'
   skel false
 end
diff --git a/test/fixtures/cookbooks/test/templates/default/template_with_variable.erb b/test/fixtures/cookbooks/test/templates/default/template_with_variable.erb
@@ -0,0 +1 @@
+Just some <%= @value %>
diff --git a/test/smoke/default/default_test.rb b/test/smoke/default/default_test.rb
@@ -124,6 +124,16 @@
     its('owner') { should eq 'user1' }
     its('group') { should eq 'user1' }
   end
+
+  describe file('/home/user1/.bashrc.d/300-template-with-variables') do
+    it { should exist }
+    it { should be_file }
+    its('content') { should match('Just some super value') }
+    its('mode') { should cmp '0770' }
+    its('owner') { should eq 'user1' }
+    its('group') { should eq 'user1' }
+  end
+
   describe file('/home/user1/.bashrc.d/400-content') do
     it { should_not exist }
   end
