aws-cfn-compiler 0.5.1 → 0.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjJhMzExNGM3MjcyYmUwZmI1MjNiODRiM2Q0MjMxZDg5MzY0MTZlMw==
+    ZmQ4ODM4MjllY2FjYWM4YjUzNDRkODYwMDNiNGZhZWFiNTk5ZGE5Mg==
   data.tar.gz: !binary |-
-    M2NjOGZmZTNjZjU0M2Q2NGQ0ZDUxY2VkMmViMmY3ZjMxMjVkZTVjMw==
+    Zjc3MTdkNmY0MDIyZTNmOWYyOWViMDE2ZTEzOWRmNDk2OTRkZWNkZQ==
 SHA512:
   metadata.gz: !binary |-
-    MzY0ODAwYzFmYjJiNDFlN2U5YWUxZGFiODAzYWI1MTUxYWY3MjM1OWM0YmUy
-    YmVkNGM3MDQ0NjQ5MjRmN2JlNDU3NWRhYmIyYzMzM2JlMjBkMWNlNDAyMzcw
-    YWNmYTM4Mzg3ZjkyMDExNGQ3Y2NkOTg1NjU3NDc3MzcwZDMyYjQ=
+    MmI4NWIwNjU1NjNlODQ2OGMwN2E0Mzc2MTE2OGVmMTExNWViODcwOGU5ZjU1
+    YzA2ZDQ0ZWU1NjYyZjA4NTk4NzhmOGUwZjk0YTlhYTUyNmJmYzlmZjJiNTI1
+    ZWY2ZTY4MWMxZGFmNzcwMzZkNTc4NWVjNWIyYWNiNzk5YTFhMmM=
   data.tar.gz: !binary |-
-    ZjY3ZTJiM2U3YzY0NTc5ZjU0MGY1NzBkNjUxODljMDdlZmNhMzMwZmJlZDZl
-    YjY4NGYxY2NlYzY4NjBiM2UwNDhkNTc3OTYyYTFhMTRlNmYzZGI5ZDJjY2Zm
-    YWU0MzM5MDIyNTM4NDcwMjliZTNhYWIxMTJlNDk3NjNjOWMxOGI=
+    YmEyZmViZmEzZDRmYmVkNzQ5ZDg0MDZlMDVlYTlmZmFlNmVhNjNlYTMwMThh
+    MGFmYmQ5NWMyNTlmMGViYWQ4MWQ5ZjVkMTViZmZiYzNjYzU2YTZmN2I2Nzcx
+    OTM3ZmVmMGE4NWYzNWNkZDcxODA1MmI4MTZiYmRjNjE1YTgwNmY=

data/Gemfile

@@ -4,7 +4,14 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'cloudformation-ruby-dsl', :path => '../cloudformation-ruby-dsl', :group => :development
+
+gem 'dldinternet-mixlib-logging', :path => '../dldinternet-mixlib-logging', :group => :development
+gem 'dldinternet-mixlib-cli', :path => '../dldinternet-mixlib-cli', :group => :development
 gem 'aws-cfn-dsl', :path => '../aws-cfn-dsl', :group => :development
 gem 'aws-cfn-decompiler', :path => '../aws-cfn-decompiler', :group => :development
+gem 'aws-cfn-compiler', :path => '../aws-cfn-compiler', :group => :development
+gem 'aws-cfn-yats', :path => '../aws-cfn-yats', :group => :development
+gem 'aws-cfn-stacker', :path => '../aws-cfn-stacker', :group => :development
+
 gem 'bundler', "~> 1.6", :group => :development
 gem 'rake', :group => :development

data/aws-cfn-compiler.iml

@@ -10,12 +10,62 @@
     <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-yats" />
     <orderEntry type="module" module-name="cloudformation-ruby-dsl" />
+    <orderEntry type="module-library">
+      <library name="dldinternet-mixlib-cli (v0.1.0, /Users/cdelange/Dropbox/DLDInternet/ws/gems-ws/dldinternet-mixlib-cli) [path][gem]">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/bin" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/lib" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/pkg" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/.idea" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/bin" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/lib" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/pkg" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-cli/.idea" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="dldinternet-mixlib-logging (v0.2.0, /Users/cdelange/Dropbox/DLDInternet/ws/gems-ws/dldinternet-mixlib-logging) [path][gem]">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/bin" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/lib" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/pkg" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/.idea" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/bin" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/lib" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/pkg" />
+          <root url="file://$MODULE_DIR$/../dldinternet-mixlib-logging/.idea" />
+        </SOURCES>
+      </library>
+    </orderEntry>
     <orderEntry type="library" scope="PROVIDED" name="awesome_print (v1.2.0, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="colorize (v0.7.3, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="detabulator (v0.1.0, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="dldinternet-mixlib-cli (v0.1.0, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="dldinternet-mixlib-logging (v0.1.6, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="inifile (v2.0.2, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="json (v1.8.1, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="little-plugger (v1.1.3, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />

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

@@ -3,33 +3,25 @@ require 'json'
 require 'ap'
 require 'yaml'
 require 'slop'
+require 'aws/cfn/dsl/base'
 require 'aws/cfn/dsl/template'
 
 module Aws
   module Cfn
     module Compiler
-      class Base
+      class Base < Aws::Cfn::Dsl::Base
         attr_accessor :items
         attr_accessor :opts
         attr_accessor :spec
 
-        require 'dldinternet/mixlib/logging'
-        include DLDInternet::Mixlib::Logging
-
         def initialize
+          super
           @items = {}
-          @config ||= {}
-          @config[:log_opts] = lambda{|mlll| {
-                                      :pattern      => "%#{mlll}l: %m %C\n",
-                                      :date_pattern => '%Y-%m-%d %H:%M:%S',
-                                    }
-                                  }
-          @config[:log_level] = :step
-          @logger = getLogger(@config)
         end
 
         def validate(compiled)
-          raise 'No Resources!?' unless compiled['Resources']
+          abort! 'No Resources!?' unless compiled['Resources']
+          logStep 'Validating compiled file...'
 
           # Mappings => Resources
           maps  = find_maps(compiled) #.select { |a| !(a =~ /^AWS::/) }
@@ -44,9 +36,9 @@ module Aws
             end
             abort!
           end
-          @logger.step '  Mappings validated'
+          @logger.info '  Mappings validated'
 
-          # Parameters => Resources => Out@logger.step
+          # Parameters => Resources => Outputs
           refs  = find_refs(compiled).select { |a,_| !(a =~ /^AWS::/) }
           prms  = compiled['Parameters'].keys rescue []
           # outs  = compiled['Outputs'].keys rescue []
@@ -59,12 +51,12 @@ module Aws
             end
             abort!
           end
-          @logger.step '  References validated'
+          @logger.info '  References validated'
         end
 
-        def save(compiled, output_file)
-          output_file = File.expand_path(output_file) if @config[:expandedpaths]
-          @logger.step"Writing compiled file to #{output_file}..."
+        def save(output_file,compiled)
+          output_file = File.realpath(File.expand_path(output_file)) if @config[:expandedpaths]
+          logStep "Writing compiled file to #{output_file}..."
           begin
             hash = {}
             compiled.each do |item,value|
@@ -78,7 +70,7 @@ module Aws
             File.open output_file, 'w' do |f|
               f.write JSON.pretty_generate(hash, { indent: "\t", space: ' '})
             end
-            @logger.step '  Compiled file written.'
+            @logger.info '  Compiled file written.'
           rescue
             @logger.error "!!! Could not write compiled file: #{$!}"
             abort!
@@ -87,18 +79,23 @@ module Aws
 
         def load(spec=nil)
           if spec
-            begin
-              abs = File.absolute_path(File.expand_path(spec))
-              unless File.exists?(abs)
-                abs = File.absolute_path(File.expand_path(File.join(@opts[:directory],spec)))
+            abs = nil
+            [spec, File.join(@opts[: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
+                # pass
               end
-            rescue
-              # pass
             end
+
             if File.exists?(abs)
-              raise "Unsupported specification file type: #{spec}=>#{abs}\n\tSupported types are: json,yaml,jts,yts\n" unless abs =~ /\.(json|ya?ml|jts|yts)\z/i
+              logStep "Loading specification #{@opts[: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
 
-              @logger.step "Loading specification #{abs}..."
               spec = File.read(abs)
 
               case File.extname(File.basename(abs)).downcase
@@ -107,11 +104,10 @@ module Aws
                 when /yaml|yts/
                   @spec = YAML.load(spec)
                 else
-                  raise "Unsupported file type for specification: #{spec}"
+                  abort! "Unsupported file type for specification: #{spec}"
               end
-              # @spec = spec
             else
-              raise "Unable to open specification: #{abs}"
+              abort! "Unable to open specification: #{abs}"
             end
             @dsl ||= Aws::Cfn::Dsl::Template.new(@opts[:directory])
             %w( Mappings Parameters Resources Outputs ).each do |dir|
@@ -124,9 +120,93 @@ module Aws
 
         protected
 
-        def abort!
-          @logger.fatal '!!! Aborting !!!'
-          exit
+        # noinspection RubyGlobalVariableNamingConvention
+        def load_dir(dir,spec=nil)
+          logStep "Loading #{dir}..."
+
+          if spec and spec[dir]
+            raise "No such directory: #{@opts[:directory]}" unless File.directory?(@opts[:directory])
+            path = vet_path(dir)
+            @items      ||= {}
+            @items[dir] ||= {}
+            set = {}
+            get = {}
+            get[path] = get_file_set([".*"], path, @config[:precedence])
+
+            item = {}
+            spec[dir].each do |rsrc|
+              @logger.info "\tUsing #{dir}/#{rsrc}"
+              set = get[path]
+              refp,sub,base,rel = map_resource_reference(rsrc)
+              unless refp.nil?
+                path = vet_path(sub ? sub : dir,refp, rel)
+                unless get[path]
+                  get[path] = get_file_set([".*"], path, @config[:precedence])
+                  set = get[path]
+                end
+              end
+              if set[base]
+                if item.has_key?(base)
+                  @logger.error "  !! error: Duplicate item: #{dir}/#{base}"
+                  abort!
+                end
+
+                filename = set[base]
+                unless filename =~ /\.(ru?by?|ya?ml|js(|on))\z/i
+                  @logger.info "Brick not supported/ relevant: #{filename}"
+                  next
+                end
+
+                begin
+                  @logger.debug "  reading #{filename}"
+                  content = File.read(filename)
+                  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
+                    item.merge! @dsl.dict[dir.to_sym]
+                  elsif filename =~ /\.js(|on)\z/i
+                    item.merge! JSON.parse(content)
+                  elsif filename =~ /\.ya?ml\z/i
+                    item.merge! YAML.load(content)
+                  else
+                    next
+                  end
+
+                rescue
+                  @logger.error "  !! error: #{$!}"
+                  abort!
+                end
+              else
+                @logger.error "  !! error: #{dir}/#{base} not found!"
+                abort!
+              end
+            end
+            item.keys.each { |key|
+              if @items[dir].has_key?(key)
+                @logger.error "  !! error: Duplicate item: #{dir}/#{key}"
+                abort!
+              end
+            }
+            @items[dir].merge! item
+
+            unless @items[dir].keys.count == spec[dir].count
+              @logger.error "  !! error: Suspect that a #{dir} item was missed! \nRequested: #{spec[dir]}\n    Found: #{@items[dir].keys}"
+              abort!
+            end
+          end
+
         end
 
         def find_refs(hash, type='Reference', parent='')
@@ -196,8 +276,7 @@ module Aws
 
         # --------------------------------------------------------------------------------
         def get_file_set(want, path, exts=[])
-          # Dir[File.join(@opts[:directory], "#{dir}.*")] | Dir[File.join(@opts[:directory], dir.to_s, "**", "*")]
-          raise "Bad call to #{self.class.name}.getPathSet: want == nil" unless want
+          raise "Bad call to #{self.class.name}.get_file_set: want == nil" unless want
           @logger.debug "Look for #{want.ai} in #{[path]} with #{exts} extensions"
           if exts.nil?
             exts = @config[:precedence]
@@ -225,7 +304,7 @@ module Aws
               end
             }
           rescue RegexpError => e
-            raise ChopError.new "The regular expression attempting to match resources in '#{path}' is incorrect! #{e.message}"
+            raise "The regular expression attempting to match resources in '#{path}' is incorrect! #{e.message}"
           end
           @logger.debug "getPathSet set=#{set.ai}"
           res = {}
@@ -236,92 +315,78 @@ module Aws
             h = set[e]
             if h
               h.each{ |n,f|
-                @logger.warn "Ignoring #{File.basename(res[n])}" if res[n]
+                @logger.info "Ignoring #{File.basename(res[n])}" if res[n]
                 res[n] = f
               }
             else
-              @logger.info "'#{e}' set is empty! (No #{path}/*.#{e} files found using precedence #{exts})"
+              @logger.debug "'#{e}' set is empty! (No #{path}/*.#{e} files found using precedence #{exts})"
             end
           }
-          set = res
+          res
         end
 
-        def load_dir(dir,spec=nil)
-          logStep "Loading #{dir}..."
-
-          if spec and spec[dir]
-            raise "No such directory: #{@opts[:directory]}" unless File.directory?(@opts[:directory])
-            set = []
-            if File.directory?(File.join(@opts[:directory], dir))
-              @items[dir] = {}
-              set = get_file_set([".*"], "#{@opts[:directory]}/#{dir}", @config[:precedence])
+        def map_resource_reference(rsrc)
+          path = nil
+          sub  = nil
+          ref  = nil
+          rel  = false
+          # noinspection RubyParenthesesAroundConditionInspection
+          if rsrc.match %r'^(\.\./.*?)::(.*)$'
+            # Relative path stack reference
+            path,sub,ref,rel  = map_resource_reference(File.basename(rsrc))
+          elsif rsrc.match %r'^(\.\./[^:]*?)$'
+            # Relative path
+            path = File.dirname(rsrc)
+            sub  = File.basename(path)
+            path = File.dirname(path)
+            ref  = File.basename(rsrc)
+            rel  = true
+          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])
+              sub = subm[2]
             else
-              if File.directory?(File.join(@opts[:directory], dir.downcase))
-                @items[dir] = {}
-                set = get_file_set(['.*'], dir.downcase, @config[:precedence])
-              else
-                @logger.error "  !! error: Cannot load bricks from #{File.join(@opts[:directory], dir)}"
-                abort!
-              end
+              # sub = nil
+              path = File.join(File.dirname(@opts[:directory]),match[1])
             end
+          else
+            # Otherwise it is what it seems ;)
+            ref  = rsrc
+          end
+          [path,sub,ref,rel]
+        end
 
-            item = {}
-            spec[dir].each do |base|
-              @logger.info "\tUsing #{dir}/#{base}"
-              if set[base]
-                if item.has_key?(base)
-                  @logger.error "  !! error: Duplicate item: #{dir}/#{base}"
-                  abort!
-                end
-
-                filename = set[base]
-                unless filename =~ /\.(ru?by?|ya?ml|js(|on))\z/i
-                  @logger.info "Brick not supported/ relevant: #{filename}"
-                  next
-                end
-
-                begin
-                  @logger.step "  reading #{filename}"
-                  content = File.read(filename)
-                  next if content.size==0
-
-                  if filename =~ /\.(rb|ruby)\z/i
-                    eval "@dsl.#{content.gsub(%r'^\s+','')}"
-                    unless @dsl.dict[dir.to_sym]
-                      raise "Unable to expand #{filename} for #{dir}/#{base}"
-                    end
-                    item.merge! @dsl.dict[dir.to_sym]
-                  elsif filename =~ /\.js(|on)\z/i
-                    item.merge! JSON.parse(content)
-                  elsif filename =~ /\.ya?ml\z/i
-                    item.merge! YAML.load(content)
-                  else
-                    next
-                  end
-
-                rescue
-                  @logger.error "  !! error: #{$!}"
-                  abort!
-                end
-              else
-                @logger.error "  !! error: #{dir}/#{base} not found!"
-                abort!
-              end
-            end
-            item.keys.each { |key|
-              if @items[dir].has_key?(key)
-                @logger.error "  !! error: Duplicate item: #{dir}/#{key}"
-                abort!
-              end
-            }
-            @items[dir].merge! item
-
-            unless @items[dir].keys.count == spec[dir].count
-              @logger.error "  !! error: Suspect that a #{dir} item was missed! \nRequested: #{spec[dir]}\n    Found: #{@items[dir].keys}"
-              abort!
+        def vet_path(dir,base=nil,rel=false)
+          if rel
+            base = File.realpath(File.expand_path(File.join(@opts[:directory], base)))
+          else
+            base = @opts[:directory] unless base
+          end
+          path = nil
+          [dir, dir.downcase].each do |d|
+            path = File.join(base, dir)
+            if File.directory?(path)
+              break
             end
           end
-
+          unless File.directory?(path)
+            @logger.error "  !! error: Cannot load bricks from #{path} (started with #{File.join(base, dir)}')"
+            abort!
+          end
+          path
         end
 
       end

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

@@ -12,6 +12,7 @@ module Aws
         def run
 
           @opts = Slop.parse(help: true) do
+            # command File.basename(__FILE__,'.rb')
             on :d, :directory=,     'The directory to look in', 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
@@ -49,15 +50,12 @@ module Aws
               'Outputs'                  => @items['Outputs'],
           }
 
-          @logger.step'Validating compiled file...'
-
           validate(compiled)
 
           output_file = @opts[:output] || 'compiled.json'
-          save(compiled, output_file)
+          save(output_file,compiled)
 
-          puts
-          @logger.step'*** Compiled Successfully ***'
+          @logger.step '*** Compiled Successfully ***'
         end
 
       end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-compiler
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - PKinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print