stack_master 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 669fe955eddbb4bac2997b5225589202c839cd51
-  data.tar.gz: 8f4a070bf9d8a239dad4af929f77205cf28ca2e2
+  metadata.gz: a85d9f970dc4d0ab565bef1908fee42dfa1e018a
+  data.tar.gz: adc99ec3388382b0c65630b254c5bfd4d1bfb8b1
 SHA512:
-  metadata.gz: 27fc53a556cfdb8cdf310c7ccf2072ab9de8554c9c8f70ca57789ae9522a357974502dec79f9a5456a98ba47a38d27690cb47d6272c17a91ab3de5286d3b4a69
-  data.tar.gz: 68ccfeb10eb82cc6cde54d2ba559a3eebf80e5d882369d41ef267b79b08672c281906312fd73928a028e3224558a38986670b8a7996c3140f894fc43302eae60
+  metadata.gz: f961b7bf042713969f1cfcff18da0a1fabf9c674a566fd82be1486f0514ef2792efbf4b96a07d01c9f867c1174bc1bb6ad7036691fda4fa31311c54deae979b1
+  data.tar.gz: 07c708405ab34720c7ed62fdaace92fff09c86dc22bb6817008abc202de6626cdf9e1511085cfd890c2a88605a1efbad758934cc0788d3e5dfc3fdd09d519f28

data/README.md

@@ -329,7 +329,7 @@ my_parameter:
     - value2
 ```
 
-## User Data Files in SparkleFormation templates
+## ERB Template Files in SparkleFormation templates
 
 An extension to SparkleFormation is the `user_data_file!` method, which evaluates templates in `templates/user_data/[file_name]`. Most of the usual SparkleFormation methods are available in user data templates. Example:
 
@@ -346,6 +346,27 @@ And used like this in SparkleFormation templates:
   user_data user_data_file!('app.erb', role: :worker)
 ```
 
+You can also use the `joined_file!` method which evaluates templates in `templates/config/[file_name]`. It is similar to `user_data_file!` but doesn't do base64 encoding. Example:
+
+```
+# templates/config/someconfig.conf.erb
+my_variable=<%= ref!(:foo) %>
+my_other_variable=<%= account_id! %>
+```
+
+```
+# templates/ecs_task.rb
+container_definitions array!(
+  -> {
+    command array!(
+      "-e",
+      joined_file!('someconfig.conf.erb')
+    )
+    ...
+  }
+)
+```
+
 ## Commands
 
 ```bash

data/lib/stack_master/sparkle_formation/{user_data_file.rb → template_file.rb}

@@ -3,7 +3,7 @@ require 'erubis'
 
 module StackMaster
   module SparkleFormation
-    UserDataFileNotFound = ::Class.new(StandardError)
+    TemplateFileNotFound = ::Class.new(StandardError)
 
     class SfEruby < Erubis::Eruby
       include Erubis::ArrayEnhancer
@@ -76,15 +76,28 @@ module StackMaster
       end
     end
 
-    module UserDataFile
-      def _user_data_file(file_name, vars = {})
-        file_path = File.join(::SparkleFormation.sparkle_path, 'user_data', file_name)
+    module Template
+      def self.render(prefix, file_name, vars)
+        file_path = File.join(::SparkleFormation.sparkle_path, prefix, file_name)
         template = File.read(file_path)
         template_context = TemplateContext.build(vars)
         compiled_template = SfEruby.new(template).evaluate(template_context)
-        base64!(join!(CloudFormationLineFormatter.format(compiled_template)))
+        CloudFormationLineFormatter.format(compiled_template)
       rescue Errno::ENOENT => e
-        Kernel.raise UserDataFileNotFound, "Could not find user data file at path: #{file_path}"
+        Kernel.raise TemplateFileNotFound, "Could not find template file at path: #{file_path}"
+      end
+    end
+
+    module JoinedFile
+      def _joined_file(file_name, vars = {})
+        join!(Template.render('joined_file', file_name, vars))
+      end
+      alias_method :joined_file!, :_joined_file
+    end
+
+    module UserDataFile
+      def _user_data_file(file_name, vars = {})
+        base64!(join!(Template.render('user_data', file_name, vars)))
       end
       alias_method :user_data_file!, :_user_data_file
     end
@@ -92,3 +105,5 @@ module StackMaster
 end
 
 SparkleFormation::SparkleAttribute::Aws.send(:include, StackMaster::SparkleFormation::UserDataFile)
+SparkleFormation::SparkleAttribute::Aws.send(:include, StackMaster::SparkleFormation::JoinedFile)
+

data/lib/stack_master/template_compilers/sparkle_formation.rb

@@ -2,7 +2,7 @@ module StackMaster::TemplateCompilers
   class SparkleFormation
     def self.require_dependencies
       require 'sparkle_formation'
-      require 'stack_master/sparkle_formation/user_data_file'
+      require 'stack_master/sparkle_formation/template_file'
     end
 
     def self.compile(template_file_path)

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/spec/stack_master/sparkle_formation/{user_data_file_spec.rb → template_file_spec.rb}

@@ -1,4 +1,4 @@
-require 'stack_master/sparkle_formation/user_data_file'
+require 'stack_master/sparkle_formation/template_file'
 
 RSpec.describe SparkleFormation::SparkleAttribute::Aws, '#user_data_file!' do
   let(:user_data) do
@@ -66,7 +66,44 @@ echo $REGION
     it 'raises a specific error' do
       expect {
         @attr.user_data_file!('test.erb')
-      }.to raise_error(StackMaster::SparkleFormation::UserDataFileNotFound)
+      }.to raise_error(StackMaster::SparkleFormation::TemplateFileNotFound)
+    end
+  end
+end
+
+RSpec.describe SparkleFormation::SparkleAttribute::Aws, '#joined_file!' do
+  let(:config) do
+    <<-EOS
+variable=<%= ref!(:test) %>
+    EOS
+  end
+
+  let(:expected_hash) do
+    {"Fn::Join"=>["", ["variable=", {"Ref"=>"Test"}, "\n"]]}
+  end
+
+  before do
+    allow(SparkleFormation).to receive(:sparkle_path).and_return('/templates_dir')
+    klass = Class.new(AttributeStruct)
+    klass.include(SparkleFormation::SparkleAttribute)
+    klass.include(SparkleFormation::SparkleAttribute::Aws)
+    klass.include(SparkleFormation::Utils::TypeCheckers)
+    @attr = klass.new
+    @attr._camel_keys = true
+  end
+
+  it 'reads from the config dir in templates' do
+    expect(File).to receive(:read).with('/templates_dir/joined_file/test.erb').and_return(config)
+    @attr.joined_file!('test.erb')
+  end
+
+  context 'when the file exists' do
+    before do
+      allow(File).to receive(:read).and_return(config)
+    end
+
+    it 'compiles the file and returns a joined version' do
+      expect(@attr.joined_file!('test.erb')).to eq expected_hash
     end
   end
 end

data/stack_master.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop"
   spec.add_dependency "ruby-progressbar"
   spec.add_dependency "commander"
-  spec.add_dependency "aws-sdk", "~> 2.2.31"
+  spec.add_dependency "aws-sdk", "~> 2.6.26"
   spec.add_dependency "diffy"
   spec.add_dependency "erubis"
   spec.add_dependency "colorize"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,14 +143,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.31
+        version: 2.6.26
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.31
+        version: 2.6.26
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -348,7 +348,7 @@ files:
 - lib/stack_master/resolver_array.rb
 - lib/stack_master/security_group_finder.rb
 - lib/stack_master/sns_topic_finder.rb
-- lib/stack_master/sparkle_formation/user_data_file.rb
+- lib/stack_master/sparkle_formation/template_file.rb
 - lib/stack_master/stack.rb
 - lib/stack_master/stack_definition.rb
 - lib/stack_master/stack_differ.rb
@@ -405,7 +405,7 @@ files:
 - spec/stack_master/resolver_array_spec.rb
 - spec/stack_master/security_group_finder_spec.rb
 - spec/stack_master/sns_topic_finder_spec.rb
-- spec/stack_master/sparkle_formation/user_data_file_spec.rb
+- spec/stack_master/sparkle_formation/template_file_spec.rb
 - spec/stack_master/stack_definition_spec.rb
 - spec/stack_master/stack_differ_spec.rb
 - spec/stack_master/stack_events/fetcher_spec.rb
@@ -447,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: StackMaster is a sure-footed way of creating, updating and keeping track
@@ -500,7 +500,7 @@ test_files:
 - spec/stack_master/resolver_array_spec.rb
 - spec/stack_master/security_group_finder_spec.rb
 - spec/stack_master/sns_topic_finder_spec.rb
-- spec/stack_master/sparkle_formation/user_data_file_spec.rb
+- spec/stack_master/sparkle_formation/template_file_spec.rb
 - spec/stack_master/stack_definition_spec.rb
 - spec/stack_master/stack_differ_spec.rb
 - spec/stack_master/stack_events/fetcher_spec.rb