cloudformation-ruby-dsl 0.4.2 → 0.4.3

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
+- `expand`: output the JSON template to the command line (takes optional `--minify true` 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/examples/cloudformation-ruby-script.rb

@@ -70,11 +70,11 @@ template do
           }
 
   # Generates mappings from external files with various formats.
-  mapping 'JsonExampleMap', 'maps/json_map.json'
+  mapping 'JsonExampleMap', 'maps/map.json'
 
-  mapping 'RubyExampleMap', 'maps/ruby_map.rb'
+  mapping 'RubyExampleMap', 'maps/map.rb'
 
-  mapping 'YamlExampleMap', 'maps/yaml_map.yaml'
+  mapping 'YamlExampleMap', 'maps/map.yaml'
 
   # Loads JSON mappings dynamically from example directory.
   Dir.entries('maps/more_maps').each_with_index do |path, index|
@@ -85,7 +85,7 @@ template do
   # Selects all rows in the table which match the name/value pairs of the predicate object and returns a
   # set of nested maps, where the key for the map at level n is the key at index n in the specified keys,
   # except for the last key in the specified keys which is used to determine the value of the leaf-level map.
-  text = Table.load 'maps/text_table.txt'
+  text = Table.load 'maps/table.txt'
   mapping 'TableExampleMap',
       text.get_map({ :column0 => 'foo' }, :column1, :column2, :column3)
 

data/examples/maps/{json_map.json → map.json}

@@ -1,6 +1,6 @@
 {
     "Mappings": {
-        "bar": {
+        "JsonExampleMap": {
             "foo": "bar"
         }
     }

data/examples/maps/map.rb

@@ -0,0 +1,5 @@
+{
+  'Mappings' => {
+    'RubyExampleMap' => { 'baz' => 'blah' }
+  }
+}

data/examples/maps/{yaml_map.yaml → map.yaml}

@@ -1,5 +1,5 @@
 ---
 Mappings:
-  blah:
+  YamlExampleMap:
     foo:
       bar: yo

data/examples/maps/more_maps/map1.json

@@ -1,6 +1,6 @@
 {
     "Mappings": {
-        "john": {
+        "ExampleMap1": {
             "gregory": "smith"
         }
     }

data/examples/maps/more_maps/map2.json

@@ -1,6 +1,6 @@
 {
     "Mappings": {
-        "gregory": {
+        "ExampleMap2": {
             "smith": "john"
         }
     }

data/examples/maps/more_maps/map3.json

@@ -1,6 +1,6 @@
 {
     "Mappings": {
-        "smith": {
+        "ExampleMap3": {
             "john": "gregory"
         }
     }

data/initial_contributions.md

@@ -1,3 +1,5 @@
 Several people were instrumental in building this project during its incubation stage. Because the process of open sourcing involved squashing the repository to remove confidential information, some of their contributions have been lost from the history that Github displays.
 
+- [Shawn Smith](https://github.com/shawnsmith): initial implementation
 - [Nathaniel Eliot](https://github.com/temujin9): converted from raw library to gem, refactored table code, cleaned and prepared code for open sourcing
+- [Jona Fenocchi](http://github.com/jonaf): added support for CloudFormation tags

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

@@ -35,7 +35,8 @@ end
 # Parse command-line arguments based on cfn-cmd syntax (cfn-create-stack etc.) and return the parameters and region
 def cfn_parse_args
   parameters = {}
-  region = 'us-east-1'
+  region = ENV['EC2_REGION'] || ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
+  minify = false
   ARGV.slice_before(/^--/).each do |name, value|
     next unless value
     case name
@@ -43,9 +44,11 @@ def cfn_parse_args
       parameters = Hash[value.split(/;/).map { |pair| pair.split(/=/, 2) }]
     when '--region'
       region = value
+    when '--minify'
+      minify = value === "true"
     end
   end
-  [parameters, region]
+  [parameters, region, minify]
 end
 
 def cfn_cmd(template)
@@ -68,23 +71,27 @@ 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
 
-  template_string = JSON.pretty_generate(template)
+  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)
+    else
+      puts JSON.pretty_generate(template)
+    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)
 
   cmdline = ['cfn-cmd'] + ARGV + ['--template-file', temp_file] + cfn_tags_options
 
   case action
-  when 'expand'
-    # Write the pretty-printed JSON template to stdout.
-    # example: <template.rb> expand --parameters "Env=prod" --region eu-west-1
-    puts template_string
-    
-    exit(true)
-
   when 'diff'
     # example: <template.rb> diff my-stack-name --parameters "Env=prod" --region eu-west-1
     # Diff the current template for an existing stack with the expansion of this template.
@@ -190,7 +197,7 @@ def cfn_cmd(template)
 end
 
 def exec_describe_stack cfn_options_string
-  csv_data = exec_capture_stdout("cfn-cmd cfn-describe-stacks #{cfn_options_string} --headers --show-long")
+  csv_data = exec_capture_stdout("cfn-cmd cfn-describe-stacks --stack-name #{cfn_options_string} --headers --show-long")
   CSV.parse_line(csv_data, :headers => true, :converters => :nil_to_nil)
 end
 
@@ -254,10 +261,10 @@ end
 
 # Core interpreter for the DSL
 class TemplateDSL < JsonObjectDSL
-  attr_reader :parameters, :aws_region
+  attr_reader :parameters, :aws_region, :minify
 
   def initialize()
-    @parameters, @aws_region = cfn_parse_args
+    @parameters, @aws_region, @minify = cfn_parse_args
     super
   end
 
@@ -285,7 +292,7 @@ class TemplateDSL < JsonObjectDSL
     # if options is a string and a valid file then the script will process the external file.
     default(:Mappings, {})[name] = \
       if options.is_a?(Hash); options
-      elsif options.is_a?(String); load_from_file(options)['Mappings']
+      elsif options.is_a?(String); load_from_file(options)['Mappings'][name]
       else; raise("Options for mapping #{name} is neither a string or a hash.  Error!")
     end
   end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-ruby-dsl
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: detabulator
@@ -119,13 +119,13 @@ files:
 - bin/vendor-cfn-bin
 - cloudformation-ruby-dsl.gemspec
 - examples/cloudformation-ruby-script.rb
-- examples/maps/json_map.json
+- examples/maps/map.json
+- examples/maps/map.rb
+- examples/maps/map.yaml
 - examples/maps/more_maps/map1.json
 - examples/maps/more_maps/map2.json
 - examples/maps/more_maps/map3.json
-- examples/maps/ruby_map.rb
-- examples/maps/text_table.txt
-- examples/maps/yaml_map.yaml
+- examples/maps/table.txt
 - examples/userdata.sh
 - initial_contributions.md
 - lib/cloudformation-ruby-dsl.rb

data/examples/maps/ruby_map.rb

@@ -1,5 +0,0 @@
-{
-  'Mappings' => {
-    'blah' => { 'baz' => 'blah' }
-  }
-}