formatron 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0704fc0d914f4d7dbcc7051b00602ddacc35973a
-  data.tar.gz: 56b2a0dd76368627993b3e24ef65de73ea17acae
+  metadata.gz: 049951ef9db93c2170b452c87447f8a0861890fe
+  data.tar.gz: 59ff8f53b71c207181903b4ba7362bd7bde1a3d0
 SHA512:
-  metadata.gz: 6313cf8357cdce3a96d92c75cdcebccf175c9b2b34d758e533834ff2ece2123e54c90a86b3df2b8c3b3652023a4939eb8f2e8b94e6ccbd70a0085dae5949a340
-  data.tar.gz: c8108d166e067a3d97835000fde75ee45700501e11d6b10ef7745080efa114dd0c35fbda015aa08e2dafbfe8f326e0eadf12f97fd9ee43e4b4e48c7869471b47
+  metadata.gz: 00cfbb19687d2808ce482c3f4ae657593f4a489735ac25e1814a5de718a2ba59e96b9f49ddfa0ee709f471fcfa6f13630591910048fa8c152ebf142c098596a0
+  data.tar.gz: fe07f387ca07b44d693df4a73d85ce5ea2f7f84e84966df14b12d4b20a652797bed4bbe3ace3faf1d0f6a1107a4f53d911856191a4b998bd87aac87727ce2ec8

data/lib/formatron.rb

@@ -38,7 +38,8 @@ class Formatron
       file: File.join(directory, FORMATRONFILE),
       config: @config,
       target: @target,
-      external: @external
+      external: @external,
+      aws: @aws
     )
     _initialize
   end
@@ -65,7 +66,8 @@ class Formatron
     @kms_key = global.kms_key || external_global.kms_key
     @databag_secret = global.databag_secret || external_global.databag_secret
     hosted_zone_id = global.hosted_zone_id || external_global.hosted_zone_id
-    @hosted_zone_name = @aws.hosted_zone_name hosted_zone_id
+    @hosted_zone_name =
+      global.hosted_zone_name || external_global.hosted_zone_name
     @configuration = @external.export formatron: @formatron
     @cloud_formation_template = CloudFormation::Template.new(
       formatron: @formatron,

data/lib/formatron/dsl.rb

@@ -5,8 +5,8 @@ class Formatron
   class DSL
     attr_reader :formatron, :config, :target
 
-    def initialize(file:, config:, target:, external:)
-      @formatron = Formatron.new external: external
+    def initialize(file:, config:, target:, external:, aws:)
+      @formatron = Formatron.new external: external, aws: aws
       @config = config
       @target = target
       instance_eval File.read(file), file

data/lib/formatron/dsl/formatron.rb

@@ -8,13 +8,18 @@ class Formatron
     class Formatron
       extend Util::DSL
 
-      dsl_initialize_block do |external:|
+      dsl_initialize_block do |external:, aws:|
+        @aws = aws
         @external = external
       end
 
       dsl_property :name
       dsl_property :bucket
-      dsl_block :global, 'Global'
+
+      dsl_block :global, 'Global' do
+        { aws: @aws }
+      end
+
       dsl_hash :vpc, 'VPC'
 
       def depends(dependency)

data/lib/formatron/dsl/formatron/global.rb

@@ -7,12 +7,25 @@ class Formatron
       # Global configuration
       class Global
         extend Util::DSL
-        dsl_initialize_block
+
+        attr_reader :hosted_zone_name
+
+        dsl_initialize_block do |aws:|
+          @aws = aws
+        end
+
         dsl_property :protect
         dsl_property :kms_key
         dsl_property :databag_secret
-        dsl_property :hosted_zone_id
         dsl_block :ec2, 'EC2'
+
+        def hosted_zone_id(value = nil)
+          unless value.nil?
+            @hosted_zone_id = value
+            @hosted_zone_name = @aws.hosted_zone_name value
+          end
+          @hosted_zone_id
+        end
       end
     end
   end

data/lib/formatron/external.rb

@@ -22,7 +22,7 @@ class Formatron
       @target = target
       @config = config
       @local_config = Marshal.load Marshal.dump(@config)
-      @formatron = Formatron::DSL::Formatron.new external: nil
+      @formatron = Formatron::DSL::Formatron.new external: nil, aws: @aws
       @outputs = Outputs.new aws: @aws, target: @target
     end
 

data/lib/formatron/external/dsl.rb

@@ -106,6 +106,8 @@ class Formatron
             global.databag_secret unless global.databag_secret.nil?
           configuration_global['hosted_zone_id'] =
             global.hosted_zone_id unless global.hosted_zone_id.nil?
+          configuration_global['hosted_zone_name'] =
+            global.hosted_zone_name unless global.hosted_zone_name.nil?
           ec2 = global.ec2
           unless ec2.nil?
             configuration_ec2 = configuration_global['ec2'] = {}

data/lib/formatron/version.rb

@@ -1,4 +1,4 @@
 # add version to class
 class Formatron
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formatron
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Peter Halliday
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -413,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: AWS/Chef Deployment Tool