aws-cfn-dsl 0.0.4 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDJlMWZlNmRjMmZjNmRiMjk3MzU5Zjk5MTYxZTVhNzk1NmE0YjU0Nw==
-  data.tar.gz: !binary |-
-    ZWFiMGM1NzE2NTExNDliMDVkZDA3NzliNmY2ZmY3NzBkYzkwMWRhYQ==
+SHA1:
+  metadata.gz: c40097a8abb684000122cdd14227aec38bcc416b
+  data.tar.gz: eaf401cf08d69d21f74d40de25f97474aa73d696
 SHA512:
-  metadata.gz: !binary |-
-    MzY1NzA5OTM3ZGFhOWM3NDM1NzEwMjIyMDA4MzNkNDAwODYwZjFkYjQ4MWIx
-    MzcyOGFlOGFhNTEzZjU3YTdmMDg0N2Q0NjYxODUwYTI4ZGI5OGNkOGExM2Yw
-    YzA5YjY3YjgxYzZjMTNkNjIyYmNiNTRhMjZlNmI1MmY5ODQ2ZjU=
-  data.tar.gz: !binary |-
-    ZDIzMTkxNzkzMzFmNTljMjJhNjA1MGI2Yzk2NTFkZmZhYjI2ZGMwZjNhZGRm
-    YzY0NmU2YWU1MWE4NThjMjRhZDFhZTI5MDU4NWE5NjI3NmFmMWU0ZGRiNjVi
-    Y2RmZjgxZDNkNjIyZDMwNDk1NDEyZmU1ZjhlZDE4MGZhZDQ5OWU=
+  metadata.gz: d80906483c8db621505162efbe96531e6c73b73b158b76e1e59a09687b8039a02dd45696006a8887502c07eee5404dc426ba6a96f2d2d90b377484b927219615
+  data.tar.gz: a413157cbdad632905f84e0f034bef262ebbaafd8cc00a128a4b8897ed65e4b648544c2e40a5006feebe6ef4ba99247ba5891de4f617347f4491f1bef3e1b664

data/Gemfile

@@ -2,3 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in aws-cfn-dsl.gemspec
 gemspec
+
+gem 'cloudformation-ruby-dsl', :path => '../cloudformation-ruby-dsl', :group => :development
+gem 'slop', :group => :development
+
+gem 'json_pure', :group => :development
+gem 'bundler', '~> 1.5', :group => :development
+gem 'rake', :group => :development

data/aws-cfn-dsl.gemspec

@@ -18,11 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "awesome_print"
-  spec.add_dependency "json"
-  spec.add_dependency 'cloudformation-ruby-dsl', "~> 0.4", ">= 0.4.2"
+  spec.add_dependency 'awesome_print'
+  spec.add_dependency 'json'
+  spec.add_dependency 'cloudformation-ruby-dsl', '~> 0.4', '>= 0.4.3'
+  spec.add_dependency "slop"
 
-  spec.add_development_dependency "json_pure"
-  spec.add_development_dependency 'bundler', "~> 1.5"
-  spec.add_development_dependency 'rake'
 end

data/aws-cfn-dsl.iml

@@ -3,24 +3,18 @@
   <component name="CompassSettings">
     <option name="compassSupportEnabled" value="true" />
   </component>
-  <component name="FacetManager">
-    <facet type="gem" name="Ruby Gem">
-      <configuration>
-        <option name="GEM_APP_ROOT_PATH" value="$MODULE_DIR$" />
-        <option name="GEM_APP_TEST_PATH" value="$MODULE_DIR$/test" />
-        <option name="GEM_APP_LIB_PATH" value="$MODULE_DIR$/lib" />
-      </configuration>
-    </facet>
-  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="RVM: ruby-1.9.3-p545 [aws-cfn-dsl]" jdkType="RUBY_SDK" />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.6.1, RVM: ruby-1.9.3-p545 [aws-cfn-dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v0.9.2.2, RVM: ruby-1.9.3-p545 [aws-cfn-dsl]) [gem]" level="application" />
+    <orderEntry type="module" module-name="cloudformation-ruby-dsl" />
+    <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="detabulator (v0.1.0, 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="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>
 </module>
 

data/bin/cfn-dsl

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+
+path = File.dirname(__FILE__)
+if File.exists?("#{path}/../.gitignore")
+  %w(aws-cfn-decompiler aws-cfn-compiler cloudformation-ruby-dsl).each do |mod|
+    add_path = File.expand_path(File.join(path, "../../#{mod}", "lib"))
+    $:.unshift(add_path)
+  end
+else
+# Borrowing from "whiches" gem ...
+  cmd  = File.basename(__FILE__, '.rb')
+  exes = []
+  exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+  ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+    exts.each { |ext|
+      exe = File.join(path, "#{cmd}#{ext}")
+      exes << exe if File.executable? exe
+    }
+  end
+  if exes.size > 0
+    path = File.dirname(exes[0])
+  end
+
+end
+add_path = File.expand_path(File.join(path, "..", "lib"))
+$:.unshift(add_path)
+
+require 'aws/cfn/dsl'
+Aws::Cfn::Dsl::Main.new.run

data/lib/aws/cfn/dsl.rb

@@ -1,9 +1,7 @@
-require "aws/cfn/dsl/version"
+require 'json'
+require 'ap'
+require 'yaml'
 
-module Aws
-  module Cfn
-    module Dsl
-      # Your code goes here...
-    end
-  end
-end
+require "aws/cfn/dsl/version"
+require "aws/cfn/dsl/base"
+require "aws/cfn/dsl/main"

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

@@ -0,0 +1,355 @@
+require "aws/cfn/decompiler"
+require "aws/cfn/dsl/fncall"
+
+module Aws
+  module Cfn
+    module Dsl
+      class Base < Aws::Cfn::DeCompiler::Base
+
+        def initialize
+          @output = []
+        end
+
+        def simplify(val)
+          if val.is_a?(Hash)
+            val = Hash[val.map { |k,v| [k, simplify(v)] }]
+            if val.length != 1
+              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
+              end
+            end
+          elsif val.is_a?(Array)
+            val.map { |v| simplify(v) }
+          else
+            val
+          end
+        end
+
+        def pprint(val)
+          case detect_type(val)
+            when :template
+              pprint_cfn_template(val)
+            when :parameter
+              pprint_cfn_section 'parameter', 'TODO', val, 'Parameters'
+            when :resource
+              pprint_cfn_resource 'TODO', val
+            when :parameters
+              val.each { |k, v| pprint_cfn_section 'parameter', k, v, 'Parameters' }
+            when :resources
+              val.each { |k, v| pprint_cfn_resource k, v }
+            else
+              pprint_value(val, '')
+          end
+        end
+
+        protected
+
+        def write(*s)
+          if s.is_a?(Array)
+            s = s.join('')
+          end
+          if @output.size > 0
+            @output[0].write s
+          else
+            print s
+          end
+        end
+
+        def writeln(s='')
+          if @output.size > 0
+            @output[0].puts s
+          else
+            puts s
+          end
+        end
+
+        # Attempt to figure out what fragment of the template we have.  This is imprecise and can't
+        # detect Mappings and Outputs sections reliably, so it doesn't attempt to.
+        def detect_type(val)
+          if val.is_a?(Hash) && val['AWSTemplateFormatVersion']
+            :template
+          elsif val.is_a?(Hash) && /^(String|Number)$/ =~ val['Type']
+            :parameter
+          elsif val.is_a?(Hash) && val['Type']
+            :resource
+          elsif val.is_a?(Hash) && val.values.all? { |v| detect_type(v) == :parameter }
+            :parameters
+          elsif val.is_a?(Hash) && val.values.all? { |v| detect_type(v) == :resource }
+            :resources
+          end
+        end
+
+        def pprint_cfn_template(tpl)
+          open_output('',File.basename(@opts[:template].gsub(%r'\.(json|yaml|rb)'i,'')))
+          writeln "#!/usr/bin/env ruby"
+          writeln
+          if @opts[:output]
+            writeln "$:.unshift(File.dirname(__FILE__))"
+            # noinspection RubyExpressionInStringInspection
+            writeln '$:.unshift File.absolute_path("#{File.dirname(__FILE__)}/../lib")'
+          end
+          writeln "require 'bundler/setup'"
+          writeln "require 'aws/cfn/dsl/template'"
+          #writeln "require 'cloudformation-ruby-dsl/spotprice'"
+          # writeln "require 'cloudformation-ruby-dsl/table'"
+          writeln
+          writeln "template do"
+          writeln
+          tpl.each do |section, v|
+            case section
+              when 'Parameters'
+              when 'Mappings'
+              when 'Resources'
+              when 'Outputs'
+              else
+                write "  value #{fmt_key(section)} => "
+                pprint_value v, '  '
+                writeln
+                writeln
+            end
+          end
+          %w(Mappings Parameters Resources Outputs).each do |section|
+            writeln "  # #{section}"
+            v = tpl[section]
+            case section
+              when 'Parameters'
+                v.each { |name, options| pprint_cfn_section 'parameter', name, options, 'Parameters' }
+              when 'Mappings'
+                v.each { |name, options| pprint_cfn_section 'mapping', name, options, 'Mappings' }
+              when 'Resources'
+                v.each { |name, options| pprint_cfn_resource name, options }
+              when 'Outputs'
+                v.each { |name, options| pprint_cfn_section 'output', name, options, 'Outputs' }
+              else
+                raise "Internal Error: Unexpected section '#{section}'"
+            end
+            writeln
+          end
+          writeln "end.exec!"
+        end
+
+        def open_output(subdir,name)
+          if @opts[:output]
+            file = rb_file(subdir, name)
+
+            @output.unshift File.open(file, 'w')
+          end
+        end
+
+        def add_brick(subdir,name)
+          if @opts[:output]
+            #file = rb_file(subdir, name).gsub(%r'^#{@opts[:output]}/','')
+            #writeln "  file '#{file}'"
+            s = subdir.downcase.gsub(%r's$','')
+            writeln "  #{s} '#{name}'"
+          end
+        end
+
+        def rb_file(subdir, name)
+          path = File.join(@opts[:output], subdir)
+          unless File.directory? path
+            Dir.mkdir path
+          end
+          file = File.join(path, "#{name}.rb")
+        end
+
+        def close_output()
+          if @opts[:output] and @output.size > 0
+            fp = @output.shift
+            fp.close
+          end
+        end
+
+        def pprint_cfn_section(section, name, options, subdir)
+          open_output(subdir,name)
+          write "  #{section} #{fmt_string(name)}"
+          indent = '  ' + (' ' * section.length) + ' '
+          options.each do |k, v|
+            writeln ","
+            write indent, fmt_key(k), " => "
+            pprint_value v, indent
+          end
+          writeln
+          writeln
+          close_output
+          add_brick(subdir,name)
+        end
+
+        def pprint_cfn_resource(name, options)
+          subdir = 'Resources'
+          open_output(subdir,name)
+          write "  resource #{fmt_string(name)}"
+          indent = '  '
+          options.each do |k, v|
+            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)
+        end
+
+        def pprint_value(val, indent)
+          # Prefer to write the value on a single line if it's reasonable to do so
+          single_line = is_single_line(val) || is_single_line_hack(val)
+          if single_line && !is_multi_line_hack(val)
+            s = fmt(val)
+            if s.length < 120 || is_single_line_hack(val)
+              write s
+              return
+            end
+          end
+
+          # Print the value across multiple lines
+          if val.is_a?(Hash)
+            writeln "{"
+            val.each do |k, v|
+              write "#{indent}    #{fmt_key(k)} => "
+              pprint_value v, indent + '    '
+              writeln ","
+            end
+            write "#{indent}}"
+
+          elsif val.is_a?(Array)
+            writeln "["
+            val.each do |v|
+              write "#{indent}    "
+              pprint_value v, indent + '    '
+              writeln ","
+            end
+            write "#{indent}]"
+
+          elsif val.is_a?(FnCall) && val.multiline
+            write val.name, "("
+            args = val.arguments
+            sep = ''
+            sub_indent = indent + '    '
+            if val.name == 'join' && args.length > 1
+              pprint_value args[0], indent + '  '
+              args = args[1..-1]
+              sep = ','
+              sub_indent = indent + '     '
+            end
+            unless args.empty?
+              args.each do |v|
+                writeln sep
+                write sub_indent
+                pprint_value v, sub_indent
+                sep = ','
+              end
+              if val.name == 'join' && args.length > 1
+                write ","
+              end
+              writeln
+              write indent
+            end
+            write ")"
+
+          else
+            write fmt(val)
+          end
+        end
+
+        def is_single_line(val)
+          if val.is_a?(Hash)
+            is_single_line(val.values)
+          elsif val.is_a?(Array)
+            val.empty? ||
+                (val.length == 1 && is_single_line(val[0]) && !val[0].is_a?(Hash)) ||
+                val.all? { |v| v.is_a?(String) }
+          else
+            true
+          end
+        end
+
+        # Emo-specific hacks to force the desired output formatting
+        def is_single_line_hack(val)
+          is_array_of_strings_hack(val)
+        end
+
+        # Emo-specific hacks to force the desired output formatting
+        def is_multi_line_hack(val)
+          val.is_a?(Hash) && val['email']
+        end
+
+        # Emo-specific hacks to force the desired output formatting
+        def is_array_of_strings_hack(val)
+          val.is_a?(Array) && val.all? { |v| v.is_a?(String) } && val.grep(/\s/).empty? && (
+          val.include?('autoscaling:EC2_INSTANCE_LAUNCH') ||
+              val.include?('m1.small')
+          )
+        end
+
+        def fmt(val)
+          if val == {}
+            '{}'
+          elsif val == []
+            '[]'
+          elsif val.is_a?(Hash)
+            '{ ' + (val.map { |k,v| fmt_key(k) + ' => ' + fmt(v) }).join(', ') + ' }'
+          elsif val.is_a?(Array) && is_array_of_strings_hack(val)
+            '%w(' + val.join(' ') + ')'
+          elsif val.is_a?(Array)
+            '[ ' + (val.map { |v| fmt(v) }).join(', ') + ' ]'
+          elsif val.is_a?(FnCall) && val.arguments.empty?
+            val.name
+          elsif val.is_a?(FnCall)
+            val.name + '(' + (val.arguments.map { |v| fmt(v) }).join(', ') + ')'
+          elsif val.is_a?(String)
+            fmt_string(val)
+          elsif val == nil
+            'null'
+          else
+            val.to_s  # number, boolean
+          end
+        end
+
+        def fmt_key(s)
+          ':' + (/^[a-zA-Z_]\w+$/ =~ s ? s : fmt_string(s))  # returns a symbol like :Foo or :'us-east-1'
+        end
+
+        def fmt_string(s)
+          if /[^ -~]/ =~ s
+            s.dump  # contains, non-ascii or control char, return double-quoted string
+          else
+            '\'' + s.gsub(/([\\'])/, '\\\\\1') + '\''  # return single-quoted string, escape \ and '
+          end
+        end
+
+      end
+    end
+  end
+end