aws-must 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bc46bd401c62d97d7cd8171ebe4ba40ab529417
-  data.tar.gz: d9ee68d839c1892fd29d32a7384d046428c26bfb
+  metadata.gz: 83a3b8fd5dea520c1d5531c6346279f428945533
+  data.tar.gz: ff8eb51f3a9c3f0e07eb77356c58e3693ef03136
 SHA512:
-  metadata.gz: c52c2bb51dc2e9dbb9139cb5880840ed4b8646d999990e46d41f66d2c95b6a1bbdc8eb0a51171743d9e46a45d3ef1c8d62ccefefc024b43d38fa5f26c8a7cfac
-  data.tar.gz: 82226a0afeda175d83abeb84ba75083b729b321eab5885ab8f6b0c1a66dc683b8bb8653a3132c0757fb13eaf6ed0f93fd104c7732f7fb42ec00b283f27037bba
+  metadata.gz: f5cbb6189e5aa14f9cbc8e136ea0603e0a33919729edcbbe8705a9a0924a9a58e046b7cb1730be854b4f8d89ae82878994593a2b647408d52e2bcbc598042301
+  data.tar.gz: 7bf6fb2a8410596e44a0619d7e3a2baa938d36800c66a92d1a2ba0d3da0ec5b608680011a29502f2a320ef87ad522a5c410cf11652fa572d574d8c7afde9a98a

data/README.md

@@ -1,9 +1,9 @@
-# aws-must - Minimum Viable Solution to Manage CloudFormation Templates - $Release:0.0.3$
+# aws-must - Minimum Viable Solution to Manage CloudFormation Templates - $Release:0.0.4$
 
 `aws-must` is a tool, which allows separating infrastructure
-configuration and Amazon related syntax using
-[YAML](http://learnxinyminutes.com/docs/yaml) and
-[Mustache templates](https://mustache.github.io/). 
+configuration and Amazon related syntax in CloudFormation JSON
+templates using [YAML](http://learnxinyminutes.com/docs/yaml) and
+[Mustache templates](https://mustache.github.io/).
 
 
 ## The Problem
@@ -89,9 +89,9 @@ template `./mustache/root.mustache` issue the command
 
 	aws-must.rb gen yaml_file
 
-To extract documentation between **++start++**
-**++close++** -tags from template
-`./mustache/root.mustache` issue the command
+To extract documentation between **++start++** and
+**++close++** -tags starting with template
+`./mustache/root.mustache`, issue the command
 
 	aws-must.rb doc 
 
@@ -148,19 +148,15 @@ line argument `browser`, e.g. `rake demo:html-3[chromium-browser]`.
 
 #### Use Demo to Bootstrap Own Configuration
 
-To create a copy templates and YAML configuration for demo case `i`,
-run rake task `demo:bootstrap-i` and pass command line arguments
-defining template directory and configuration directory. For example,
-to copy demo case `3` templates to directory `tmp/tmpl` and
-configurations to `tmp/conf`, run
+To create a copy of templates and YAML configuration for demo case
+`i`, run rake task `demo:bootstrap-i`, and pass template and
+configuration directories as command line arguments. For example, to
+copy demo case `3` templates to directory `tmp/tmpl`, and
+configurations to directory `tmp/conf`, run
 
     rake demo:bootstrap-3[tmp/tmpl,tmp/conf]
 	
 
-After this command `tmp/tmpl` contains `root.mustache`, which is the
-starting point of mustache template rendering, and `tmp/conf` contains
-a YAML file `conf.yaml` for demo configuration data.
-
 
 #### Demo Usage on Amazon platform
 
@@ -220,10 +216,15 @@ To delete `demo` stack
 
 	rake  demo:stack-delete
 
-
 	
+## Development
+
+See [RELEASES](RELEASES.md)
+
 	
+## License 
 
+MIT
 
 
 	 

data/bin/aws-must.rb

@@ -44,19 +44,48 @@ LONGDESC
   # ------------------------------------------------------------------
   # action 'json'
 
-  desc "json <yaml_file>", "Dump configuration in JSON format"
+  desc "json <yaml_file> [with_adjust]", "Dump configuration in JSON format (with or without adjustment)"
 
   long_desc <<-LONGDESC
 
-  Reads <yaml_file> and dumps it to stdout in JSON format.
+  Reads <yaml_file> and dumps it to stdout in JSON format
+  'with_adjust' (yes/no)
+
+  By default 'adjusts' data, i.e. adds property "_comma" with the
+  value "," to each sub document expect the last one in an array.
+
+  The "_comma" -property helps in generating valid json arrays in
+  mustache templates. For example, YAML construct
+
+    tags:
+       - Key: key1
+         Value: value1
+
+       - Key: key2
+         Value: value2
+
+  and Mustache template snippet
+
+  { "Tags" : [ 
+       {{#tags}}
+           { "Key" : "{{Key}}",  "Value" : "{{Value}}"{{_comma}} }
+       {{/tags}} 
+  ]}
+
+  results to valid JSON document
+
+  { "Tags" : [ 
+           { "Key" : "key1",  "Value" : "value1", 
+           { "Key" : "key2",  "Value" : "value2"
+  ]}
 
 LONGDESC
 
 
-  def json( yaml_file )
+  def json( yaml_file, with_adjust="true" )
 
     app = ::AwsMust::AwsMust.new( options )
-    app.json( yaml_file )
+    app.json( yaml_file, with_adjust =~ /^true$/ || with_adjust =~ /^yes$/  ? true : false  )
 
   end
 

data/demo/4/conf.yaml

@@ -17,6 +17,6 @@ parameters:
 resources:
 
         -  Instance: 
-                 Name: &Resource_1 MyEC2Instance
+                 Name: MyEC2Instance
                  ImageId: ami-00dae61d
-                 InstanceType: *Param_InstanceType
+                 InstanceType: t2.micro

data/demo/8/conf.yaml

@@ -0,0 +1,61 @@
+-- demo/2 : added description property
+
+
+description: "demo/8 - A simple Amazon EC2 instance created using aws-must tool
+             - Minimum Viable Solution to Manage CloudFormation
+             Templates. Adds support installing Chef"
+
+parameters:
+
+        -  Name: InstanceType
+           Type: String
+           Description: EC2 reousrce instance type
+           Value: &Param_InstanceType t2.micro
+
+        -  Name: &Param_KeyName KeyName
+           Type: "AWS::EC2::KeyPair::KeyName"
+           Description: Name of an existing EC2 KeyPair to enable SSH access to the instance
+           Value: demo-key
+
+        -  Name: &Param_SSHLocation  SSHLocation
+           Type: String
+           Description: The IP address range that can be used to SSH to the EC2 instances
+           Value: "0.0.0.0/0"
+
+        -  Name: ChefVersion
+           Type: String
+           Description: Chef version to install
+           Value: &Param_ChefVersion 11.18
+
+
+resources:
+
+        - InstanceSecurityGroup:
+                 Name: &DefaultSG MyDefaultSecurityGroup
+                 IngressRef: *Param_SSHLocation
+
+        -  Instance: 
+                 Name: &Resource_1 MyEC2Instance
+                 InstanceType: *Param_InstanceType
+                 KeyName: *Param_KeyName
+                 SecurityGroup: *DefaultSG
+                 InstallChef: 
+                    - Version: *Param_ChefVersion
+                 tags:
+                    - Key: demotag1
+                      Value: demotag1 value
+
+
+outputs:
+
+        -  Name: Instance1
+           Description: InstanceId of the newly created EC2 instance
+           Ref:  *Resource_1
+
+
+        -  Name: IP1
+           Description: Public IP address of the newly created EC2 instance
+           Attr: 
+                 Ref: *Resource_1
+                 Name: PublicIp
+

data/demo/8/mappings.mustache

@@ -0,0 +1,67 @@
+{{!
+
+++start++
+
+## <a id="mappings.mustache"></a>mappings.mustache <a class='navigator' href='#top'">[top]</a>
+
+
+Create fixed lookup tables `AWSInstanceType2Arch` and
+`AWSRegionArch2AMI` implementing the table below
+
+<code><pre>
+ap-northeast-1    trusty    14.04 LTS    amd64    hvm:ebs-ssd    20150528    ami-90815290    hvm
+ap-southeast-1    trusty    14.04 LTS    amd64    hvm:ebs-ssd    20150528    ami-0accf458    hvm
+ap-southeast-2    trusty    14.04 LTS    amd64    hvm:ebs-ssd    20150528    ami-1dc8b127    hvm
+cn-north-1        trusty    14.04 LTS    amd64    hvm:ebs-ssd    20150528    ami-eae27fd3    hvm
+eu-central-1      trusty    14.04 LTS    amd64    hvm:ebs-ssd    20150528    ami-3248712f    hvm
+eu-west-1         trusty    14.04 LTS    amd64    hvm:ebs-ssd    20150528    ami-d74437a0    hvm
+sa-east-1         trusty    14.04 LTS    amd64    hvm:ebs-ssd    20150528    ami-0f6ced12    hvm
+us-east-1         trusty    14.04 LTS    amd64    hvm:ebs-ssd    20150528    ami-83c525e8    hvm
+us-gov-west-1     trusty    14.04 LTS    amd64    hvm:ebs-ssd    20150528    ami-51513172    hvm
+us-west-1         trusty    14.04 LTS    amd64    hvm:ebs-ssd    20150528    ami-61b25925    hvm
+us-west-2         trusty    14.04 LTS    amd64    hvm:ebs-ssd    20150528    ami-57e8d767    hvm
+</pre></code>
+
+
+**Attributes**: context=  `.`
+
+* none
+
+
+**Actions**:
+
+* **AWSInstanceType2Arch**: fixed key/value mapping, currently only
+    **t2.micro** --> **64bit**
+
+* **AWSRegionArch2AMI**: fixed key/value mapping created, currently
+    architectures only for **64bits**
+
+
+++close++
+
+
+==================================================================
+The template
+==================================================================
+
+}}
+
+
+
+      "AWSInstanceType2Arch" : {
+      "t2.micro"    : { "Arch" : "64" }
+      },
+      "AWSRegionArch2AMI" : {
+           "ap-northeast-1" : { "64" : "ami-90815290" },
+           "ap-southeast-1" : { "64" : "ami-0accf458" },
+           "ap-southeast-2" : { "64" : "ami-1dc8b127" },
+           "cn-north-1" : { "64" : "ami-eae27fd3" },
+           "eu-central-1" : { "64" : "ami-3248712f" },
+           "eu-west-1" : { "64" : "ami-d74437a0" },
+           "sa-east-1" : { "64" : "ami-0f6ced12" },
+           "us-east-1" : { "64" : "ami-83c525e8" },
+           "us-west-1" : { "64" : "ami-61b25925" },
+           "us-gov-west-1" : { "64" : "ami-51513172" },
+           "us-west-2" : { "64" : "ami-57e8d767" }
+      }
+

data/demo/8/output.mustache

@@ -0,0 +1,40 @@
+{{!
+
+
+++start++
+
+## <a id="output.mustache"></a>output.mustache <a class='navigator' href='#top'">[top]</a>
+
+Create one output entry to CloudFormation JSON output section
+
+**Attributes**: context= `./outputs`
+
+* `Name` : of the ouput entry
+* `Description`: of the output entry
+* `Ref`: name of refernece
+* `Attr`
+  * `Ref`: name of attribute reference
+  * `Name`: name of the attribute
+
+
+
+**Actions**:
+
+* **Name**: `Name`
+* **Description**: `Description`
+* **Value**: **Ref** if `Ref`
+* **Value**: `Attr.Ref`, `Attr.Name` if `Attr`
+
+
+
+++close++
+
+}}
+
+
+    "{{Name}}": {
+      "Description" : "{{Description}}"
+      {{#Ref}}, "Value" : { "Ref" : "{{Ref}}" }{{/Ref}}
+      {{#Attr}}, "Value" : { "Fn::GetAtt" : [ "{{Ref}}", "{{Name}}" ] }{{/Attr}}
+    }{{_comma}}
+

data/demo/8/parameter.mustache

@@ -0,0 +1,38 @@
+{{!
+
+
+++start++
+
+## <a id="parameter.mustache"></a>parameter.mustache <a class='navigator' href='#top'">[top]</a>
+
+Create one parameter entry to CloudFormation JSON parameter section
+
+**Attributes**: context= `./parameters`
+
+* `Name` : of the ouput entry
+* `Description`: of the parameter entry
+* `Type`: The data type of [CloudFormation
+  Parameter](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/parameters-section-structure.html),
+  e.g. `String`, `AWS::EC2::KeyPair::KeyName`
+* `Value`: value of the parameter
+
+
+**Actions**:
+
+* **Name**: `Name`
+* **Description**: `Description`
+* **Type**: `Type`
+* **Default**: `Value`
+
+++close++
+
+}}
+
+
+
+
+    "{{Name}}": {
+      "Description" : "{{Description}}{{^Description}}No description given{{/Description}}",
+      "Type": "{{Type}}",
+      "Default" : "{{Value}}"
+    }{{_comma}}

data/demo/8/resource.mustache

@@ -0,0 +1,38 @@
+{{!
+
+    resource.mustache
+
+++start++
+
+## <a id="resource.mustache"></a>resource.mustache <a class='navigator' href='#top'">[top]</a>
+
+
+Dispatches resource sub-type templates based resource Type propertys
+
+**Attributes**: context=  `./resources`
+
+* `Instance`: sub-document defining an EC instance
+* `SecurityGroup`: sub-document defining an <a href="http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html">AWS::EC2::SecurityGroup</a>
+
+
+**Actions**:
+
+* **include** <a href="#resourceInstance.mustache">resourceInstance.mustache</a> **if** `Instance` 
+* **include** <a href="#resourceSecurityGroup.mustache">resourceSecurityGroup.mustache</a> **if** `SecurityGroup` 
+
+
+**Included resources**
+
+* `resourceInstance`
+
+> resourceInstance
+> resourceSecurityGroup.mustache
+
+++close++
+
+
+
+}}
+
+{{# Instance }}{{> resourceInstance}}{{/ Instance }}
+{{# InstanceSecurityGroup }}{{> resourceSecurityGroup}}{{/ InstanceSecurityGroup }}

data/demo/8/resourceInstance.mustache

@@ -0,0 +1,50 @@
+{{!
+
+
+++start++
+
+
+## <a id="resourceInstance.mustache"></a>resourceInstance.mustache <a class='navigator' href='#top'">[top]</a>
+
+Create an EC2 instance
+
+**Attributes**: context=  `./resources/Instance`
+
+* `Name`: name of the EC2 instance to create
+* `InstanceType` : The instance type, such as t2.micro. 
+* `tags` : array of tag sub-documents for EC2 instance
+* `InstallChef`: add UserData to install Chef
+
+
+**Actions**:
+
+* **Name**:  `Name`
+* **Type**: 'AWS::EC2::Instance'
+* **for** `tag` **in** `tags` **include**  <a href="#tag.mustache">tag.mustache</a>
+* **SecurityGroups.Ref**: `SecurityGroup` if `SecurityGroup`
+* **ImageId**: **AWSRegionArch2AMI**( 'AWS::Region', **AWSInstanceType2Arch**(`InstanceType`))
+* **KeyName**: `KeyName` if `KeyName`
+* **include** <a href="#resourceInstanceChef.mustache">resourceInstanceChef.mustache</a> if `InstallChef`
+
+> tag
+> resourceInstanceChef
+
+++close++
+
+}}
+
+
+    "{{Name}}" : {
+      "Type" : "AWS::EC2::Instance",
+      "Properties" : {
+        "ImageId" : { "Fn::FindInMap" : [ "AWSRegionArch2AMI", { "Ref" : "AWS::Region" },
+	 	    { "Fn::FindInMap" : [ "AWSInstanceType2Arch", "{{InstanceType}}", "Arch" ] } ] }
+        , "InstanceType" : "{{InstanceType}}"
+        , "Tags" : [ {{#tags}}{{>tag}}{{/tags}} ]
+        {{#SecurityGroup}}, "SecurityGroups" : [ { "Ref" : "{{SecurityGroup}}" } ]{{/SecurityGroup}}
+        {{#KeyName}}, "KeyName" : { "Ref" : "{{KeyName}}" }{{/KeyName}}
+        {{#InstallChef }}, "UserData": { {{> resourceInstanceChef }} }{{/ InstallChef }}
+      } {{! Propertites }}
+            
+
+    }{{_comma}}

data/demo/8/resourceInstanceChef.mustache

@@ -0,0 +1,48 @@
+{{!
+
+
+++start++
+
+
+## <a id="resourceInstanceChef.mustache"></a>resourceInstanceChef.mustache<a class='navigator' href='#top'"> [top]</a>
+
+UserData -script to install Chef
+
+**Attributes**: context=  `./resources/Instance/InstallChef`
+
+* `Version`: Chef version to install
+
+**Actions**:
+
+* /bin/bash
+  * CHEF_VERSION=`Version`
+  * LOG="/tmp/install.log"
+  * `curl -L https://www.chef.io/chef/install.sh | sudo bash -s -- -v $CHEF_VERSION  >>$LOG 2>&1`
+
+
+++close++
+
+}}
+
+
+
+        "Fn::Base64": { "Fn::Join": [
+                "\n",
+                [
+                    "#!/bin/bash",
+                    "set -x\n",
+                    "set -o pipefail\n",
+		    "LOG=/tmp/install.log\n",
+                    "function finish() {\n",
+		          "echo \"$(date): chef installation finished\" >> $LOG\n",
+                    "}\n",
+                    "trap finish EXIT\n",
+           	    "CHEF_VERSION={{Version}}\n",
+                    "echo $(date): starting to install chef  > $LOG\n",
+		    "curl -L https://www.chef.io/chef/install.sh | sudo bash -s -- -v $CHEF_VERSION  >>$LOG 2>&1\n",
+                    "echo $(date): chef installed successfully >> $LOG\n"
+               ]
+             ]}
+
+
+

data/demo/8/resourceSecurityGroup.mustache

@@ -0,0 +1,37 @@
+{{!
+
+
+++start++
+
+
+## <a id="resourceSecurityGroup.mustache"></a>resourceSecurityGroup.mustache <a class='navigator' href='#top'">[top]</a>
+
+Create an EC2 Security Group
+
+**Attributes**: context=  `./resources/InstanceSecurityGroup`
+
+* `Name` : of the security group
+* `IngressRef`: A refernce to parameter, which defined CIDR for to inbound traffic (ingress)
+
+**Actions**:
+
+* **Name**:  `Name`
+* **Type**: "AWS::EC2::SecurityGroup"
+* **Properties.SecurityGroupIngress[0].CidrIp**: `IngressRef`
+
+++close++
+
+}}
+
+    "{{Name}}" : {
+      "Type" : "AWS::EC2::SecurityGroup",
+      "Properties" : {
+        "GroupDescription" : "Enable SSH access via port 22",
+        "SecurityGroupIngress" : [ {
+          "IpProtocol" : "tcp",
+          "FromPort" : "22",
+          "ToPort" : "22",
+          "CidrIp" : { "Ref" : "{{IngressRef}}"}
+        } ]
+      }
+    }{{_comma}}

data/demo/8/resources.mustache

@@ -0,0 +1,35 @@
+{{! 
+
+++start++
+
+## <a id="resources.mustache"></a>resources.mustache <a class='navigator' href='#top'">[top]</a>
+
+Empty template.
+
+**Attributes**: context=  `.`
+
+* none
+
+
+**Actions**:
+
+* no action (i.e. empty template)
+
+
+++close++
+
+
+}}
+{{! 
+
+    Moved to YAML
+
+    "MyEC2Instance" : {
+      "Type" : "AWS::EC2::Instance",
+      "Properties" : {
+        "ImageId" : "ami-00dae61d",
+        "InstanceType" : "t2.micro"
+      }
+    }
+
+}}

data/demo/8/root.mustache

@@ -0,0 +1,160 @@
+{{!
+
+     root.mustache: root level template, 
+
+==================================================================
+STYLE section
+==================================================================
+
+++start++
+<style>
+h1 {
+    color:blue; 
+    font-size: 2.5em;
+   }
+h2 {
+      color:blue;
+      font-size: 1.5em;
+   }
+h3 {
+      color:blue;
+      font-size: 1.5em;
+   }
+.navigator {
+      font-size: 0.5em;
+   }
+body {
+    background-color: #b0c4de;
+} 
+</style>
+
+++close++
+
+
+==================================================================
+CONTENT section
+==================================================================
+
+++start++
+
+# <a id="top">aws-must demo 8 templates</a>
+
+This document is generated automically from `aws-must` -demo
+templates. 
+
+
+Output contains markdown syntax between
+**&plus;&plus;start&plus;&plus;** and
+**&plus;&plus;close&plus;&plus;** -tags from the template files. For
+each template, it
+
+* gives a general description of the template
+
+* documents the attribute context e.g. `.` or `./resources/Instance`,
+  and attributes referenced within the template
+
+* lists template actions, i.e.  output from template, or template
+  inclusion
+
+### Table of contents
+<ul>
+
+<li><a href="#root.mustache">root.mustache</a>: root template =
+starting point of template rendering</li>
+
+<li><a href="#parameter.mustache">parameter.mustache</a>: create one
+parameter entry to CloudFormation JSON parameter section</li>
+
+<li><a href="#mappings.mustache">mappings.mustache</a>matches a key to
+a corresponding set of named values</li>
+
+<li>Resources</li>
+
+<ul>
+
+<li><a href="#resources.mustache">resources.mustache</a>: fixed
+resources</li>
+
+<li><a href="#resource.mustache">resource.mustache</a>: dispatch
+resource based on resource type</li>
+
+<ul> <li><a
+href="#resourceSecurityGroup.mustache">resourceSecurityGroup.mustache.mustache</a>:
+create an security group for accessing EC2 instances</li>
+
+<li><a
+href="#resourceInstance.mustache">resourceInstance.mustache</a>:
+create an EC2 instance</li>
+
+<ul><li><a href="#tag.mustache">tag.mustache</a>: add key-value tag property
+to an</li>
+
+<li><a href="#resourceInstanceChef.mustache">resourceInstanceChef.mustache</a>: UserData -script to install Chef
+to an</li><ul>
+
+</ul></ul></ul></ul>
+
+<li><a href="#output.mustache">output.mustache</a>: values in
+response to describe stack calls </li> </ul>
+
+
+## <a id="root.mustache"></a>root.mustache <a class='navigator' href='#top'">[top]</a>
+
+Starting point of template rendering.
+
+**Attributes**: context= `.`
+
+* `description`: description for the CF template
+* `parameters`: array of parameter sub-documents for CloudFormation Parameters -section
+* `resources`: array of resource sub-documents for CloudFormation Resources -section
+* `outputs`: array of output sub-documents for CloudFormation Outputs -section
+
+
+**Actions**:
+
+* **Description**: `description`
+* **for** `parameter` **in** `parameters`  **include** <a href="#parameter.mustache">parameter.mustache</a>
+* **include** <a href="#mappings.mustache">mappings.mustache</a>
+* **include** <a href="#resources.mustache">resources.mustache</a>
+* **for** `resource` **in** `resource` **include** <a href="#resource.mustache">resource.mustache</a>
+* **for** `output` **in** `outputs` **include** <a href="#output.mustache">output.mustache</a>
+
+
+> parameter
+> mappings
+> resources
+> resource
+> output
+
+
+++close++
+
+}}
+
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+
+  "Description" : "{{description}}",
+
+  "Parameters" : {
+    {{# parameters }}{{> parameter }}{{/ parameters }}
+  },
+
+  "Mappings" : {
+    {{> mappings }}
+   },
+
+  "Resources" : {
+
+    {{> resources }}
+    {{# resources }}{{> resource }}{{/ resources }}
+
+  },
+
+  "Outputs" : {
+
+    {{# outputs }}{{> output }}{{/ outputs }}
+
+  }
+
+}

data/demo/8/tag.mustache

@@ -0,0 +1,30 @@
+{{!
+
+
+++start++
+
+## <a id="tag.mustache"></a>tag.mustache <a class='navigator' href='#top'">[top]</a>
+
+One key-value pair in EC2 instance Tags -array
+
+**Attributes**: context= `./resources/Instance/tags`
+
+* `Key`: of the tag entry
+* `Value`: of the tag entry
+
+**Actions**:
+
+* **Key**: `Name`
+* **Value**: `Value`
+
+
+
+++close++
+
+
+
+}}
+
+{ "Key" : "{{Key}}",  "Value" : "{{Value}}"{{_comma}} }
+
+

data/lib/aws-must/aws-must.rb

@@ -28,13 +28,16 @@ module AwsMust
     # ------------------------------------------------------------------
     # dump 'yaml_file' as json
 
-    def json( yaml_file ) 
+    def json( yaml_file, with_adjust=true ) 
 
       @logger.debug( "#{__method__}, template_name '#{yaml_file}'" )
 
       # 
       data = read_yaml_file( yaml_file )
 
+      # adjust optionanlly
+      data = adjust( data ) if with_adjust
+
       puts data.to_json
 
 

data/lib/tasks/demo.rake

@@ -26,8 +26,9 @@ namespace "demo" do |ns|
    { :id => "3", :desc=>"Use resources.mustache -partial to create EC2 intance", :region=>['eu-central-1'], :ssh => false    },
    { :id => "4", :desc=>"EC2 instance configuration using YAML-data", :region=>['eu-central-1'], :ssh => false    },
    { :id => "5", :desc=>"Add 'Outputs' -section with reference to EC2 instance", :region=>['eu-central-1'], :ssh => false    },
-   { :id => "6", :desc=>"Add 'Inputs' and 'Mappings' -sections to parametirize", :region=> all_regions, :ssh => false  },
-   { :id => "7", :desc=>"Added support for input parameters, EC2 tags, Instance security group", :region=>all_regions, :ssh => false  },
+   { :id => "6", :desc=>"Add 'Inputs' and 'Mappings' -sections to parametirize", :region=> all_regions, :ssh => true  },
+   { :id => "7", :desc=>"Added support for input parameters, EC2 tags, Instance security group", :region=>all_regions, :ssh => true  },
+   { :id => "8", :desc=>"Added support for installing Chef", :region=>all_regions, :ssh => true  },
 
 
   ].each do  |c|
@@ -37,9 +38,12 @@ namespace "demo" do |ns|
       sh "#{cmd} gen -t #{demo_dir}/#{c[:id]} #{demo_dir}/#{c[:id]}/conf.yaml"
     end
 
-    desc "Output configs in '#{demo_dir}/#{c[:id]}' in JSON to demonstrate '#{c[:desc]}'"
-    task "json-#{c[:id]}" do
-      sh "#{cmd} json #{demo_dir}/#{c[:id]}/conf.yaml"
+    desc "Output configs in '#{demo_dir}/#{c[:id]}' in JSON with/without adjustment (default: yes/no)"
+    task "json-#{c[:id]}", :with_adjust do |t, args|
+
+      args.with_defaults( with_adjust:  "yes" )
+
+      sh "#{cmd} json #{demo_dir}/#{c[:id]}/conf.yaml #{args.with_adjust}" 
     end
 
     desc "Check the difference between version '#{c[:id]}' and :prev (default '#{c[:id].to_i() -1}') "

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-must
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - jarjuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -72,6 +72,17 @@ files:
 - demo/7/resources.mustache
 - demo/7/root.mustache
 - demo/7/tag.mustache
+- demo/8/conf.yaml
+- demo/8/mappings.mustache
+- demo/8/output.mustache
+- demo/8/parameter.mustache
+- demo/8/resource.mustache
+- demo/8/resourceInstance.mustache
+- demo/8/resourceInstanceChef.mustache
+- demo/8/resourceSecurityGroup.mustache
+- demo/8/resources.mustache
+- demo/8/root.mustache
+- demo/8/tag.mustache
 - lib/aws-must.rb
 - lib/aws-must/aws-must.rb
 - lib/aws-must/docu.rb