aws-cfn-dsl 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 4a3fe04c5cf9704bc7d15981e3a6b711e24511e5
-  data.tar.gz: 0db31d25dbd543b2a4256d11ac81752c79d927c7
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTRkZGM3ZjljMDFlZDk5NjFkNGNmNjRlYzYwM2ExNTNlNGRhMjM2NQ==
+  data.tar.gz: !binary |-
+    MDhjZTc2YzRhMmRhMTU2ODg3OGQxZDhmMDU0ZmM4Yzc2MzAzYWRhNA==
 SHA512:
-  metadata.gz: d9c7d4f3cd64dad255c1c629de8a3efef649ad18ee5a4702d45453cc182e82330401b0f17c97b5cc60b7a2be92a49b707e379ef5d9566bc4c61e156e0b4939f4
-  data.tar.gz: 00380934662ed35d83bfbbdf4ab0ca8e8598b95913ed715572df5959700c112a94d5628ef7df696dee85dad967845f500481b032ce6ab8574484093ca86e7c6e
+  metadata.gz: !binary |-
+    ZDIyMmZkNDQ1ZDFjNWNmZjI0NzEzNTI0MDJhZjIwOTcwZDMyMTkwNjU3MWU2
+    MzBlNDAwNjUxZjg0ZjlhODhjMGI2ZGI3NzA2ODAzZjkyYmExZjc2ODFiZTM0
+    ZjRjOGRkYTcwYjBjNzY5NjRjYmUyNWIzOTg2NjExOGM4ZjhhNzI=
+  data.tar.gz: !binary |-
+    ZTI1MmVkZWQzODgwZWVjMTUzMDJmMTcwMmVhZGZiOTRmY2Y0OWEwOWVlYzk0
+    ZWJhNzQxYWIxMDkwNDAzMGEzYTU2YzBlMDU1ODhiYzk4YmU2OGYwNzdhMzA3
+    MzVkNWQzYTYxZDlkNWVlOGEyMzNiOGU2MDE4Y2ZkMjE4YmRhOTc=

data/Gemfile

@@ -4,6 +4,15 @@ 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 'slop', :group => :development
 
 gem 'json_pure', :group => :development

data/aws-cfn-dsl.iml

@@ -8,11 +8,72 @@
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="aws-cfn-compiler" />
+    <orderEntry type="module" module-name="aws-cfn-decompiler" />
+    <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="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="json_pure (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" />
+    <orderEntry type="library" scope="PROVIDED" name="logging (v1.8.2, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mixlib-cli (v1.5.0, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.10.1, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="psych (v2.0.5, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v10.3.2, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="slop (v3.5.0, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
   </component>

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

@@ -1,13 +1,51 @@
 require "aws/cfn/decompiler"
 require "aws/cfn/dsl/fncall"
 
+require 'ap'
+
 module Aws
   module Cfn
     module Dsl
-      class Base < Aws::Cfn::DeCompiler::Base
+      class Base
+        attr_accessor :items
+        attr_reader   :output
+
+        require 'dldinternet/mixlib/logging'
+        include DLDInternet::Mixlib::Logging
 
         def initialize
+          super
           @output = []
+          @config ||= {}
+
+          lcs = ::Logging::ColorScheme.new( 'compiler', :levels => {
+              :trace => :blue,
+              :debug => :cyan,
+              :info  => :green,
+              :step  => :green,
+              :warn  => :yellow,
+              :error => :red,
+              :fatal => :red,
+              :todo  => :purple,
+          })
+          scheme = lcs.scheme
+          scheme['trace'] = "\e[38;5;33m"
+          scheme['fatal'] = "\e[38;5;89m"
+          scheme['todo']  = "\e[38;5;55m"
+          lcs.scheme scheme
+          @config[:log_opts] = lambda{|mlll| {
+              :pattern      => "%#{mlll}l: %m %C\n",
+              :date_pattern => '%Y-%m-%d %H:%M:%S',
+              :color_scheme => 'compiler'
+          }
+          }
+          @config[:log_level] = :info
+          @logger = getLogger(@config)
+
+        end
+
+        def save(path=nil,parts=@items)
+          pprint(simplify(parts))
         end
 
         def simplify(val)
@@ -17,32 +55,34 @@ module Aws
               val
             else
               k, v = val.entries[0]
-              case
-                # CloudFormation functions
-                # when k == 'Fn::Base64'
-                #   FnCall.new 'base64', [v], true
-                # when k == 'Fn::FindInMap'
-                #   FnCall.new 'find_in_map', v
-                # when k == 'Fn::GetAtt'
-                #   FnCall.new 'get_att', v
-                # when k == 'Fn::GetAZs'
-                #   FnCall.new 'get_azs', v != '' ? [v] : []
-                # when k == 'Fn::Join'
-                #   FnCall.new 'join', [v[0]] + v[1], true
-                # when k == 'Fn::Select'
-                #   FnCall.new 'select', v
-                # when k == 'Ref' && v == 'AWS::Region'
-                #   FnCall.new 'aws_region', []
-                # when k == 'Ref' && v == 'AWS::StackName'
-                #   FnCall.new 'aws_stack_name', []
-                # CloudFormation internal references
-                # when k == 'Ref'
-                #   FnCall.new 'ref', [v]
-                # Aws::Cfn::DSL functions
-                when k.match(%r'^Aws::Cfn::DSL')
-                  FnCall.new k, [v]
-                else
-                  val
+              case @opts[:functions]
+              when /1|on|set|enable|yes|true/ then
+                case
+                  # CloudFormation functions
+                  when k == 'Fn::Base64'
+                    FnCall.new 'base64', [v], true
+                  when k == 'Fn::FindInMap'
+                    FnCall.new 'find_in_map', v
+                  when k == 'Fn::GetAtt'
+                    FnCall.new 'get_att', v
+                  when k == 'Fn::GetAZs'
+                    FnCall.new 'get_azs', v != '' ? [v] : []
+                  when k == 'Fn::Join'
+                    FnCall.new 'join', [v[0]] + v[1], true
+                  when k == 'Fn::Select'
+                    FnCall.new 'select', v
+                  when k == 'Ref' && v == 'AWS::Region'
+                    FnCall.new 'aws_region', []
+                  when k == 'Ref' && v == 'AWS::StackName'
+                    FnCall.new 'aws_stack_name', []
+                  # CloudFormation internal references
+                  when k == 'Ref'
+                    FnCall.new 'ref', [v]
+                  else
+                    val
+                end
+              else
+                val
               end
             end
           elsif val.is_a?(Array)
@@ -71,6 +111,12 @@ module Aws
 
         protected
 
+        def abort!(msg=nil,rc=1)
+          @logger.error msg if msg
+          @logger.fatal '!!! Aborting !!!'
+          exit rc
+        end
+
         def write(*s)
           if s.is_a?(Array)
             s = s.join('')
@@ -205,18 +251,22 @@ module Aws
         def pprint_cfn_resource(name, options)
           subdir = 'Resources'
           open_output(subdir,name)
-          write "  resource #{fmt_string(name)}"
+          writeln '# noinspection RubyStringKeysInHashInspection'
+          writeln "resource #{fmt_string(name)},"
           indent = '  '
           options.each do |k, v|
+            case k
+            when /^(Metadata|Properties)$/
+              write   "#{indent}#{fmt_key(k)} => "
+              pprint_value options[k], indent
+              writeln ','
+            else
+              write   "#{indent}#{fmt_key(k)} => "
+              writeln "#{fmt(v)},"
+            end
             unless k == 'Properties'
-              write ", #{fmt_key(k)} => #{fmt(v)}"
             end
           end
-          if options.key?('Properties')
-            write ", #{fmt_key('Properties')} => "
-            pprint_value options['Properties'], indent
-          end
-          writeln
           writeln
           close_output
           add_brick(subdir,name)
@@ -252,7 +302,7 @@ module Aws
             end
             write "#{indent}]"
 
-          elsif val.is_a?(FnCall) && val.multiline
+          elsif val.is_a?(FnCall) && val.multiline && @opts[:functions] != 'raw'
             write val.name, "("
             args = val.arguments
             sep = ''

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

@@ -14,14 +14,12 @@ module Aws
           end
 
           unless @opts[:template]
-            puts @opts
-            exit
+            abort! @opts
           end
 
-          load @opts[:template]
-
-          pprint(simplify(@items))
+          load(@opts[:template])
 
+          save(@opts[:output])
 
         end
       end

data/lib/aws/cfn/dsl/template.rb

@@ -70,9 +70,26 @@ module Aws
           end
         end
 
-        # def output_file(p)
-        #   file "Outputs/#{p}.rb"
-        # end
+        def hash_refs(line)
+          match = line.match %r/^(.*?)(\{\s*:\S+\s*=>.*?\}|\{\s*\S+:\s*.*?\})(.*)$/
+          if match
+            h = nil
+            eval "h = #{match[2]}", binding
+            k = h.keys[0]
+            v = h.delete(k)
+            v = if v.is_a?Array
+                  v.map{|e| e.to_s }
+                else
+                  v.to_s
+                end
+
+            h[k.to_s] = v
+            VARS[:logger].debug h
+            [match[1], h, hash_refs(match[3]) ]
+          else
+            "#{line}\n"
+          end
+        end
 
         def exec!(argv=ARGV)
           @opts = Slop.parse(help: true) do

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

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module Dsl
-      VERSION = "0.2.0"
+      VERSION = "0.5.0"
     end
   end
 end

metadata

@@ -1,75 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-dsl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Christo DeLange
 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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cloudformation-ruby-dsl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby DSL for creating Cloudformation templates
@@ -80,7 +80,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE
 - LICENSE.txt
@@ -125,12 +125,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []