aws-cfn-compiler 0.5.2 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmQ4ODM4MjllY2FjYWM4YjUzNDRkODYwMDNiNGZhZWFiNTk5ZGE5Mg==
+    MWFiNWI1NTIzY2VhNjQ4NjM3ZDgzOWIwNTg4MzczZDI3OWFlNzFlMw==
   data.tar.gz: !binary |-
-    Zjc3MTdkNmY0MDIyZTNmOWYyOWViMDE2ZTEzOWRmNDk2OTRkZWNkZQ==
+    YjIwMjMwNzlkY2Q2YzliM2U3ZWM0YjE2ODgyZDcyMjUzMDM2MzJmMw==
 SHA512:
   metadata.gz: !binary |-
-    MmI4NWIwNjU1NjNlODQ2OGMwN2E0Mzc2MTE2OGVmMTExNWViODcwOGU5ZjU1
-    YzA2ZDQ0ZWU1NjYyZjA4NTk4NzhmOGUwZjk0YTlhYTUyNmJmYzlmZjJiNTI1
-    ZWY2ZTY4MWMxZGFmNzcwMzZkNTc4NWVjNWIyYWNiNzk5YTFhMmM=
+    NDhjYjgyZjZlNzM4ZWExMTA0Y2QxNGIzMWM3ZTNmZWQ2ZWUxNDdlMDlhNzA3
+    ZjI4Y2QxNDgwNDYwZjNiNTRjODY5ZmE3ZjBlYmJjYmYxMzhkYmJjN2YzMjNh
+    YTMwYjQ2Y2U4NDE2N2Q0NTJlZWZiNDVlZjg5MjFhMDRhMWRjNzk=
   data.tar.gz: !binary |-
-    YmEyZmViZmEzZDRmYmVkNzQ5ZDg0MDZlMDVlYTlmZmFlNmVhNjNlYTMwMThh
-    MGFmYmQ5NWMyNTlmMGViYWQ4MWQ5ZjVkMTViZmZiYzNjYzU2YTZmN2I2Nzcx
-    OTM3ZmVmMGE4NWYzNWNkZDcxODA1MmI4MTZiYmRjNjE1YTgwNmY=
+    NGYyNzU2MWE2NTZhOGFkZTRjYTgxZTMzNzVjOGVmZDJjZjQzOTQxNzg3M2Vh
+    ODY1YzQ1YWI5OWMxOGU5OGY5MzEyMTg0YjY2NzdiODcyYzUzNTk0ODVjNjQw
+    MjBhMmQzMmZmYzM3MTIxNTc1MzFlZTkyZWUxNGUzYWYxNTFkZDg=

data/aws-cfn-compiler.iml

@@ -10,23 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="aws-cfn-decompiler" />
     <orderEntry type="module" module-name="aws-cfn-dsl" />
-    <orderEntry type="module-library">
-      <library name="aws-cfn-stacker (v[path], /Users/cdelange/Dropbox/DLDInternet/ws/gems-ws/aws-cfn-stacker) [path][gem]">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/bin" />
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/lib" />
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/pkg" />
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/.idea" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/bin" />
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/lib" />
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/pkg" />
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/.idea" />
-        </SOURCES>
-      </library>
-    </orderEntry>
+    <orderEntry type="module" module-name="aws-cfn-stacker" />
     <orderEntry type="module" module-name="aws-cfn-yats" />
     <orderEntry type="module" module-name="cloudformation-ruby-dsl" />
     <orderEntry type="module-library">

data/lib/aws/cfn/compiler.rb

@@ -2,3 +2,16 @@ require "aws/cfn/compiler/version"
 require "aws/cfn/compiler/base"
 require "aws/cfn/compiler/main"
 
+module Aws::Cfn::Compiler
+  attr_accessor :binding
+
+  @binding ||= {}
+
+  def self.binding=(b)
+    @binding = b
+  end
+
+  def self.binding
+    @binding
+  end
+end

data/lib/aws/cfn/compiler/base.rb

@@ -9,7 +9,7 @@ require 'aws/cfn/dsl/template'
 module Aws
   module Cfn
     module Compiler
-      class Base < Aws::Cfn::Dsl::Base
+      class Base < ::Aws::Cfn::Dsl::Base
         attr_accessor :items
         attr_accessor :opts
         attr_accessor :spec
@@ -54,7 +54,7 @@ module Aws
           @logger.info '  References validated'
         end
 
-        def save(output_file,compiled)
+        def save_template(output_file,compiled)
           output_file = File.realpath(File.expand_path(output_file)) if @config[:expandedpaths]
           logStep "Writing compiled file to #{output_file}..."
           begin
@@ -77,21 +77,21 @@ module Aws
           end
         end
 
-        def load(spec=nil)
+        def load_spec(spec=nil)
           if spec
             abs = nil
-            [spec, File.join(@opts[:directory],spec)].each do |p|
+            [spec, File.join(@config[:directory],spec)].each do |p|
               begin
                 abs = File.realpath(File.absolute_path(File.expand_path(p)))
                 break if File.exists?(abs)
               rescue => e
-                @logger.error e
+                @logger.debug e
                 # pass
               end
             end
 
-            if File.exists?(abs)
-              logStep "Loading specification #{@opts[:expandedpaths] ? abs : spec}..."
+            if not abs.nil? and File.exists?(abs)
+              logStep "Loading specification #{@config[:expandedpaths] ? abs : spec}..."
               unless abs =~ /\.(json|ya?ml|jts|yts)\z/i
                 abort! "Unsupported specification file type: #{spec}=>#{abs}\n\tSupported types are: json,yaml,jts,yts\n"
               end
@@ -107,9 +107,9 @@ module Aws
                   abort! "Unsupported file type for specification: #{spec}"
               end
             else
-              abort! "Unable to open specification: #{abs}"
+              abort! "Unable to open specification"+ (abs.nil? ? " or {,#{@config[:directory]}/}#{spec} not found" : ": #{abs}")
             end
-            @dsl ||= Aws::Cfn::Dsl::Template.new(@opts[:directory])
+            @dsl ||= Aws::Cfn::Dsl::Template.new(@config[:directory])
             %w( Mappings Parameters Resources Outputs ).each do |dir|
               load_dir(dir,@spec)
             end
@@ -125,7 +125,7 @@ module Aws
           logStep "Loading #{dir}..."
 
           if spec and spec[dir]
-            raise "No such directory: #{@opts[:directory]}" unless File.directory?(@opts[:directory])
+            raise "No such directory: #{@config[:directory]}" unless File.directory?(@config[:directory])
             path = vet_path(dir)
             @items      ||= {}
             @items[dir] ||= {}
@@ -135,7 +135,7 @@ module Aws
 
             item = {}
             spec[dir].each do |rsrc|
-              @logger.info "\tUsing #{dir}/#{rsrc}"
+              @logger.info "\tUsing #{dir}::#{rsrc}"
               set = get[path]
               refp,sub,base,rel = map_resource_reference(rsrc)
               unless refp.nil?
@@ -163,18 +163,7 @@ module Aws
                   next if content.size==0
 
                   if filename =~ /\.(rb|ruby)\z/i
-                    $Aws_Cfn_Compiler ||= {}
-                    $Aws_Cfn_Compiler[dir] ||= {}
-                    $Aws_Cfn_Compiler[dir][base] ||= {
-                        brick_path: @opts[:directory],
-                        template:   @dsl,
-                        logger:     @logger
-                    }
-                    source_file = File.expand_path(filename)
-                    eval "require source_file", binding
-                    unless @dsl.dict[dir.to_sym]
-                      raise "Unable to expand #{filename} for #{dir}/#{base}"
-                    end
+                    compile_rb_file(base, dir, filename)
                     item.merge! @dsl.dict[dir.to_sym]
                   elsif filename =~ /\.js(|on)\z/i
                     item.merge! JSON.parse(content)
@@ -209,6 +198,22 @@ module Aws
 
         end
 
+        def compile_rb_file(base, dir, filename)
+          Aws::Cfn::Compiler.binding ||= {}
+          Aws::Cfn::Compiler.binding[dir] ||= {}
+          Aws::Cfn::Compiler.binding[dir][base] ||= {
+              brick_path: @config[:directory],
+              template: @dsl,
+              logger: @logger
+          }
+          source_file = File.expand_path(filename)
+          # source      = IO.read(source_file)
+          eval "require source_file", binding
+          unless @dsl.dict[dir.to_sym]
+            abort! "Unable to compile/expand #{filename} for #{dir}/#{base}"
+          end
+        end
+
         def find_refs(hash, type='Reference', parent='')
           h = {}
           newparent = parent
@@ -334,6 +339,9 @@ module Aws
           if rsrc.match %r'^(\.\./.*?)::(.*)$'
             # Relative path stack reference
             path,sub,ref,rel  = map_resource_reference(File.basename(rsrc))
+          elsif rsrc.match %r'^(~/.*?)$'
+            # Relative to HOME
+            path,sub,ref,rel  = map_resource_reference(File.expand_path(rsrc))
           elsif rsrc.match %r'^(\.\./[^:]*?)$'
             # Relative path
             path = File.dirname(rsrc)
@@ -341,26 +349,26 @@ module Aws
             path = File.dirname(path)
             ref  = File.basename(rsrc)
             rel  = true
+          elsif rsrc.match %r'(^/.*?)::(.*)$'
+            # Absolute path
+            _,sub,ref,rel  = map_resource_reference(File.basename(rsrc))
+            path = File.realpath(File.join(File.dirname(rsrc),_))
           elsif rsrc.match %r'(^/.*?[^:]*?)$'
             # Absolute path
             path = File.dirname(rsrc)
             sub  = File.basename(path)
             path = File.dirname(path)
             ref  = File.basename(rsrc)
-          elsif rsrc.match %r'(^/.*?)::(.*)$'
-            # Absolute path
-            path = File.dirname(rsrc)
-            ref  = map_resource_reference(File.basename(rsrc))
           elsif (match = rsrc.match %r'^(.*?)::(.*)$')
             # Inherited stack reference
             ref = match[2]
             # noinspection RubyParenthesesAroundConditionInspection
             if (subm = match[1].match(%r'^(.+?)/(.+)$'))
-              path = File.join(File.dirname(@opts[:directory]),subm[1])
+              path = File.join(File.dirname(@config[:directory]),subm[1])
               sub = subm[2]
             else
               # sub = nil
-              path = File.join(File.dirname(@opts[:directory]),match[1])
+              path = File.join(File.dirname(@config[:directory]),match[1])
             end
           else
             # Otherwise it is what it seems ;)
@@ -371,9 +379,9 @@ module Aws
 
         def vet_path(dir,base=nil,rel=false)
           if rel
-            base = File.realpath(File.expand_path(File.join(@opts[:directory], base)))
+            base = File.realpath(File.expand_path(File.join(@config[:directory], base)))
           else
-            base = @opts[:directory] unless base
+            base = @config[:directory] unless base
           end
           path = nil
           [dir, dir.downcase].each do |d|

data/lib/aws/cfn/compiler/main.rb

@@ -13,13 +13,24 @@ module Aws
 
           @opts = Slop.parse(help: true) do
             # command File.basename(__FILE__,'.rb')
-            on :d, :directory=,     'The directory to look in', as: String
+            on :d, :directory=,     'The directory containing template sections', as: String
             on :o, :output=,        'The JSON file to output', as: String
             on :s, :specification=, 'The specification to use when selecting components. A JSON or YAML file or JSON object', as: String
-            on :f, :formatversion=, 'The AWS Template format version. Default 2010-09-09', as: String
-            on :p, :precedence=,    'The precedence of template component types. Default: rb,yaml,yml,json,js', as: String, default: 'rb,ruby,yaml,yml,json,js'
-            on :t, :description=,   "The AWS Template description. Default: output basename or #{File.basename(__FILE__,'.rb')}", as: String
-            on :x, :expandedpaths=, 'Show expanded paths in output', as: String, default: 'off'
+            on :f, :formatversion=, 'The AWS Template format version. ', {  as: String,
+                                                                            optional_argument: true,
+                                                                            default: '2010-09-09' }
+            on :p, :precedence=,    'The precedence of template component types. Default: rb,ruby,yaml,yml,json,js', { as: String,
+                                                                                                                  default: 'rb,ruby,yaml,yml,json,js' }
+            on :t, :description=,   "The AWS Template description. Default: output basename or #{File.basename(__FILE__,'.rb')}", { as: String,
+                                                                                                                                    default: File.basename(__FILE__,'.rb') }
+            on :x, :expandedpaths,  'Show expanded paths in output', { as: String,
+                                                                       optional_argument: true,
+                                                                       default: 'off',
+                                                                       match: %r/0|1|yes|no|on|off|enable|disable|set|unset|true|false|raw/i }
+            on :O, :overwrite,      'Overwrite existing generated source files. (HINT: Think twice ...)', { as: String,
+                                                                                                            optional_argument: true,
+                                                                                                            default: 'off',
+                                                                                                            match: %r/0|1|yes|no|on|off|enable|disable|set|unset|true|false|raw/i }
           end
 
           unless @opts[:directory]
@@ -29,8 +40,9 @@ module Aws
 
           @config[:precedence]    = @opts[:precedence].split(%r',+\s*').reverse
           @config[:expandedpaths] = @opts[:expandedpaths].downcase.match %r'^(1|true|on|yes|enable|set)$'
+          @config[:directory]     = @opts[:directory]
 
-          load @opts[:specification]
+          load_spec @opts[:specification]
 
           desc = @opts[:output] ? File.basename(@opts[:output]).gsub(%r/\.(json|yaml)/, '') : File.basename(__FILE__,'.rb')
           if @spec and @spec['Description']
@@ -53,7 +65,7 @@ module Aws
           validate(compiled)
 
           output_file = @opts[:output] || 'compiled.json'
-          save(output_file,compiled)
+          save_template(output_file,compiled)
 
           @logger.step '*** Compiled Successfully ***'
         end

data/lib/aws/cfn/compiler/version.rb

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module Compiler
-      VERSION = "0.5.2"
+      VERSION = "0.6.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - PKinney