cloudformation-ruby-dsl 0.4.3 → 0.4.4

data/README.md

@@ -29,7 +29,7 @@ To convert existing JSON templates to use the DSL, run
 You may need to preface this with `bundle exec` if you installed via Bundler.
 
 Make the resulting file executable (`chmod +x [NEW_NAME.rb]`). It can respond to the following subcommands (which are listed if you run without parameters):
-- `expand`: output the JSON template to the command line (takes optional `--minify true` to minimize the output)
+- `expand`: output the JSON template to the command line (takes optional `--nopretty` to minimize the output)
 - `diff`: compare output with existing JSON for a stack
 - `cfn-validate-template`: run validation against the stack definition
 - `cfn-create-stack`: create a new stack from the output

data/lib/cloudformation-ruby-dsl/cfntemplate.rb

@@ -36,19 +36,18 @@ end
 def cfn_parse_args
   parameters = {}
   region = ENV['EC2_REGION'] || ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
-  minify = false
+  nopretty = false
   ARGV.slice_before(/^--/).each do |name, value|
-    next unless value
     case name
     when '--parameters'
       parameters = Hash[value.split(/;/).map { |pair| pair.split(/=/, 2) }]
     when '--region'
       region = value
-    when '--minify'
-      minify = value === "true"
+    when '--nopretty'
+      nopretty = true
     end
   end
-  [parameters, region, minify]
+  [parameters, region, nopretty]
 end
 
 def cfn_cmd(template)
@@ -71,21 +70,25 @@ def cfn_cmd(template)
   # The command line string looks like: --tag "Key=key; Value=value" --tag "Key2=key2; Value2=value"
   cfn_tags_options = cfn_tags.sort.map { |tag| ["--tag", "Key=%s; Value=%s" % tag.split('=')] }.flatten
 
+  # example: <template.rb> cfn-create-stack my-stack-name --parameters "Env=prod" --region eu-west-1
+  # Execute the AWS CLI cfn-cmd command to validate/create/update a CloudFormation stack.
+  if action == 'diff' or (action == 'expand' and not template.nopretty)
+    template_string = JSON.pretty_generate(template)
+  else
+    template_string = JSON.generate(template)
+  end
+
   if action == 'expand'
-    # Write the pretty-printed JSON template to stdout and exit.  [--minify true] option writes minified output
-    # example: <template.rb> expand --parameters "Env=prod" --region eu-west-1 --minify true
-    if template.minify
-      puts JSON.generate(template)
+    # Write the pretty-printed JSON template to stdout and exit.  [--nopretty] option writes output with minimal whitespace
+    # example: <template.rb> expand --parameters "Env=prod" --region eu-west-1 --nopretty
+    if template.nopretty
+      puts template_string
     else
-      puts JSON.pretty_generate(template)
+      puts template_string
     end
-
     exit(true)
   end
 
-  # example: <template.rb> cfn-create-stack my-stack-name --parameters "Env=prod" --region eu-west-1
-  # Execute the AWS CLI cfn-cmd command to validate/create/update a CloudFormation stack.
-  template_string = JSON.generate(template)
   temp_file = File.absolute_path("#{$PROGRAM_NAME}.expanded.json")
   File.write(temp_file, template_string)
 
@@ -110,7 +113,10 @@ def cfn_cmd(template)
 
     # Run CloudFormation commands to describe the existing stack
     cfn_options_string           = cfn_options.map { |arg| "'#{arg}'" }.join(' ')
-    old_template_string          = exec_capture_stdout("cfn-cmd cfn-get-template #{cfn_options_string}")
+    old_template_raw             = exec_capture_stdout("cfn-cmd cfn-get-template #{cfn_options_string}")
+    # ec2 template output is not valid json: TEMPLATE  "<json>\n"\n
+    old_template_object          = JSON.parse(old_template_raw[11..-3])
+    old_template_string          = JSON.pretty_generate(old_template_object)
     old_stack_attributes         = exec_describe_stack(cfn_options_string)
     old_tags_string              = old_stack_attributes["TAGS"]
     old_parameters_string        = old_stack_attributes["PARAMETERS"]
@@ -127,7 +133,7 @@ def cfn_cmd(template)
     old_temp_file = File.absolute_path("#{$PROGRAM_NAME}.current.json")
     new_temp_file = File.absolute_path("#{$PROGRAM_NAME}.expanded.json")
     File.write(old_temp_file, old_tags_string + old_parameters_string + old_template_string)
-    File.write(new_temp_file, tags_string + parameters_string + %Q(TEMPLATE  "#{template_string}\n"\n))
+    File.write(new_temp_file, tags_string + parameters_string + template_string)
 
     # Compare templates
     system(*["diff"] + diff_options + [old_temp_file, new_temp_file])
@@ -261,10 +267,10 @@ end
 
 # Core interpreter for the DSL
 class TemplateDSL < JsonObjectDSL
-  attr_reader :parameters, :aws_region, :minify
+  attr_reader :parameters, :aws_region, :nopretty
 
   def initialize()
-    @parameters, @aws_region, @minify = cfn_parse_args
+    @parameters, @aws_region, @nopretty = cfn_parse_args
     super
   end
 

data/lib/cloudformation-ruby-dsl/version.rb

@@ -15,7 +15,7 @@
 module Cfn
   module Ruby
     module Dsl
-      VERSION = "0.4.3"
+      VERSION = "0.4.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-ruby-dsl
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: detabulator