cfndsl 0.8.9 → 0.9.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjE5YTc0ODM5NzUxZGI2YmMwNDg1NjljZjdjMjA3NzY3NjI0NjM1MA==
+    NDllMmI2MjhiMWMzYmY0NzAyZDgzZjE2NWJhYzRlOWVjZmUxYmQ5Nw==
   data.tar.gz: !binary |-
-    YmIwMzI3MTcxMGRlZDgwZGUxMDNkZjlkYTlhMDNjNWM0OTU4YjE2NA==
+    MjBmNzQ3OWRlMjAxMDZlMmJiOWE4NjZlNTBlZmNmYzExZTc3MTUyMw==
 SHA512:
   metadata.gz: !binary |-
-    YzAxZDUyZTA3NzJjM2NiMWEzMjYxMDVjYTYxOTg0NjRmNjJiMGQ4NmFmMjU5
-    MDA3M2Y1ZmY4MzcxMDYzY2JmNjcwNzJkZGQ2ZDJjMWZiODc5MjZkYWQ1ODU1
-    NTE4M2E3NDQ2NDk2ZTkyMDg1MWZlNmE3NWQxOTk5Mjk3OWI5ZGE=
+    M2YyNjlhOTlhM2RmZDFkNDE3MjFmYTMzZGE2MjI1NjgyNmNjMDA3OTA0NDNj
+    NmYwZmMwYzFjODQxZDBiNTFjMjFkZGQ2M2ZkYzMxNDE1NjI5ZTc3NjI5Y2Q1
+    MjU1N2FhNDFiOTRlNzA0NDljNDJhYTUxNTk4YWE1YjQ2OTc5NmI=
   data.tar.gz: !binary |-
-    NmYxODgyNmU1ODJjZjg5ZmEzNmNhZDlmODcyMDQxNjdhMGM4N2FlYTc4Y2Q0
-    YjBiMDcyOGViYmQ4ZWM1MGVkZGNlM2YzMzQ2Y2ZlMjUwMzU4NmE3NWU4MGI1
-    ODAyNjUyOGNmZTNkZTMzNDdkYzEyOTJhZTNjMDhiMzJjYmZhOGU=
+    OWI3YTUzZGViNTMxYTAyZTc4Y2U3ZjQ5Njg1YjVlZmVjNjVjYThlMzNiNDQx
+    NzBjYTliZjlmOGJhNWQ4ZmM5ODU4ZDQ2ZmRlNWQyNjM3ZWI5OGY1YzkyOTgw
+    YzZiN2ExZmMxYWRjYWE3NGUwYTVhYmYyZDlhOGZiOTlhNDQ1YWE=

data/lib/cfndsl.rb

@@ -61,7 +61,7 @@ module CfnDsl
   # rubocop:disable all
   def self.eval_file_with_extras(filename, extras = [], logstream = nil)
     b = binding
-    params = CfnDsl::ExternalParameters.new
+    params = CfnDsl::ExternalParameters.refresh!
     extras.each do |type, file|
       case type
       when :yaml, :json
@@ -85,7 +85,6 @@ module CfnDsl
       end
     end
 
-    CfnDsl::CloudFormationTemplate.external_parameters params
     logstream.puts("Loading template file #{filename}") if logstream
     b.eval(File.read(filename), filename)
   end

data/lib/cfndsl/external_parameters.rb

@@ -7,8 +7,24 @@ module CfnDsl
 
     attr_reader :parameters
 
+    class << self
+      def defaults(params = {})
+        @defaults ||= {}
+        @defaults.merge! params
+        @defaults
+      end
+
+      def current
+        @current || refresh!
+      end
+
+      def refresh!
+        @current = new
+      end
+    end
+
     def initialize
-      @parameters = {}
+      @parameters = self.class.defaults.clone
     end
 
     def set_param(k, v)

data/lib/cfndsl/jsonable.rb

@@ -131,6 +131,14 @@ module CfnDsl
     extend Functions
     include RefCheck
 
+    def self.external_parameters
+      CfnDsl::ExternalParameters.current
+    end
+
+    def external_parameters
+      self.class.external_parameters
+    end
+
     # Use instance variables to build a json object. Instance
     # variables that begin with a single underscore are elided.
     # Instance variables that begin with two underscores have one of

data/lib/cfndsl/orchestration_template.rb

@@ -10,15 +10,6 @@ module CfnDsl
     dsl_attr_setter :AWSTemplateFormatVersion, :Description
     dsl_content_object :Condition, :Parameter, :Output, :Resource, :Mapping
 
-    def self.external_parameters(params = nil)
-      @external_parameters = params if params
-      @external_parameters
-    end
-
-    def external_parameters
-      self.class.external_parameters
-    end
-
     def initialize
       @AWSTemplateFormatVersion = '2010-09-09'
     end

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = '0.8.9'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/spec/cfndsl_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 
 describe CfnDsl do
+  after(:example) { CfnDsl::ExternalParameters.refresh! }
+
   it 'evaluates a cloud formation' do
     filename = "#{File.dirname(__FILE__)}/fixtures/test.rb"
-    subject.eval_file_with_extras(filename)
+    subject.eval_file_with_extras(filename, [[:raw, 'test=123']])
   end
 
   it 'evaluates a heat' do

data/spec/external_parameters_spec.rb

@@ -8,6 +8,30 @@ describe CfnDsl::ExternalParameters do
     exp
   end
 
+  context '.defaults' do
+    after(:example) { described_class.defaults.clear }
+
+    it 'allows for defaults to be set for each new parameters instance' do
+      described_class.defaults(reminder: 'You Know What It Is')
+      expect(subject[:reminder]).to eq('You Know What It Is')
+    end
+  end
+
+  context '.current' do
+    it 'retrieves the current parameters instance' do
+      expect(described_class.current).to be_an_instance_of(described_class)
+    end
+  end
+
+  context '.refresh!' do
+    it 'restores the current parameters to the defaults' do
+      described_class.current.set_param(:reminder, 'You Know What It Is')
+      expect(described_class.current[:reminder]).to eq('You Know What It Is')
+      described_class.refresh!
+      expect(described_class.current[:reminder]).to be_nil
+    end
+  end
+
   context '#set_param' do
     it 'treats keys as symbols only' do
       subject.set_param('reminder', 'You Know What It Is')

data/spec/fixtures/test.rb

@@ -2,7 +2,7 @@ CloudFormation do
   TEST ||= 'no value set'.freeze
   puts TEST
 
-  Description 'Test'
+  Description external_parameters[:test]
 
   Parameter('One') do
     String
@@ -49,7 +49,7 @@ CloudFormation do
       DeviceName '/dev/sda'
       VirtualName 'stuff'
       Ebs do
-        SnapshotId 'asdasdfasdf'
+        SnapshotId external_parameters[:test]
         VolumeSize Ref('MyInstance')
       end
     end

data/spec/jsonable_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe CfnDsl::JSONable do
+  context '.external_parameters' do
+    it 'allows access to the current parameters instance' do
+      expect(subject.class.external_parameters).to be_an_instance_of(CfnDsl::ExternalParameters)
+    end
+  end
+
+  context '#external_parameters' do
+    it 'allows access to the current parameters instance' do
+      expect(subject.external_parameters).to be_an_instance_of(CfnDsl::ExternalParameters)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.0
 platform: ruby
 authors:
 - Steven Jack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - spec/external_parameters_spec.rb
 - spec/fixtures/heattest.rb
 - spec/fixtures/test.rb
+- spec/jsonable_spec.rb
 - spec/resources_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/stevenjack/cfndsl
@@ -124,5 +125,6 @@ test_files:
 - spec/external_parameters_spec.rb
 - spec/fixtures/heattest.rb
 - spec/fixtures/test.rb
+- spec/jsonable_spec.rb
 - spec/resources_spec.rb
 - spec/spec_helper.rb