lono 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6375e08e65be7c8a3a1eec9356454c1975a40400
-  data.tar.gz: 753b81d7bc5b3d1b5dd6fab7ed01858db6aeb7e0
+  metadata.gz: 106d4c92c775431a3051cc004dfe7725b2733b53
+  data.tar.gz: b690d54d0f64f80807aabda7506b415685899c2c
 SHA512:
-  metadata.gz: c1e1f22813a7e5ab6444aafc53d21fc6dfec39b71ea2992d027e832429283a196360a4e9dabbc839b9b1d7e24800c322ffb49df9627662e6687e8c543008d2c7
-  data.tar.gz: 05f0f728a8e87110ee5641ce3f0da27ebbcb12719e3b619eccb2dc634b9df156536ebbccc1a95581be1f300280a291c3d332f23cc4bb3a2e3abb5e387926ff5a
+  metadata.gz: 2af3a0be29c29ed36cca3d399050405a4867b1a0a7ca0d61d35678216b4f319d4bea2917b31928809b199fb5ddb203c35c1a281f61f600f8888434a23094bcf6
+  data.tar.gz: d7aa6c1712326065dc041b544219ddd85f4237ec0c15880bb28b80b3b2f6eab7470c0a18412ab830b423624c0795c1386698c216b5f989994690603ac86a72cb

data/.travis.yml

@@ -2,4 +2,4 @@ language: ruby
 cache: bundler
 rvm:
   - 2.2.5
-  - 2.3.1
+  - 2.3.3

data/CHANGELOG.md

@@ -3,11 +3,13 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [1.0.1]
+- update starter project instance type allowed values
+
 ## [1.0.0]
 - Yaml support added!  Makes for much more clean and concise templates.  The `lono new` command defaults to yaml format.
 - The starter project is app centric instead of env centric.  Example: blog-web-prod vs prod-blog-web.
 
-
 ## [0.5.2]
 - Add helper encode_base64 method in case you want to base64 encode a string in the ERB template and you are using lono outside of the context of CloudFormation where you will not have access to the FN::Base64 Function.
 
@@ -17,5 +19,5 @@ This project *tries* to adhere to [Semantic Versioning](http://semver.org/), eve
 ## [0.5.0]
 
 - Update use newer ruby syntax.
-- Get rid of the core Hash extension that is causing issues with aws-sdk version 2.  I original did this because the output of the generated json files was no deterministic with ruby 1.8.7. No longer supporting ruby 1.8.7.  
+- Get rid of the core Hash extension that is causing issues with aws-sdk version 2.  I original did this because the output of the generated json files was no deterministic with ruby 1.8.7. No longer supporting ruby 1.8.7.
 - Gem has been tested with ruby 2.2.5+

data/README.md

@@ -12,7 +12,11 @@
 [3]: https://codeclimate.com/repos/51d7f1407e00a4042c010ab4/badges/5273fe6cdb5a13e58554/gpa.png
 [4]: https://codeclimate.com/repos/51d7f1407e00a4042c010ab4/feed
 
-Lono is a CloudFormation Template generator.  Lono generates CloudFormation templates based on ERB ruby templates.
+Lono is a CloudFormation Template generator.  Lono generates CloudFormation templates based on ERB ruby templates in either `yaml` or `json` format.
+
+**UPDATE**: lono now supports yaml format for CloudFormation! The old json format is still supported. For current projects, you do not have to change anything as the format is autodetected as part of `lono generate`.
+
+Newly generated projects with `lono new infra` will use the yaml format by default.  If you prefer the json format use `lono new --format json infra`. You cannot mix and match json and yaml format in one project, it's either all json or yaml. If any one has questions feel free to ping me: tongueroo@gmail.com.
 
 ## Usage
 
@@ -29,7 +33,7 @@ $ lono generate
 
 This generates the templates in the `config` and `templates` folders to the `output` folder.
 
-The starter lono template project config files looks like [this](lib/starter_project/config/lono.rb) and [this](lib/starter_project/config/lono/api.rb).  Here's a snippet from one of the config files with the template call:
+The starter lono template project config files looks like [this](lib/starter_project_yaml/config/lono.rb) and [this](lib/starter_project_yaml/config/lono/api.rb).  Here's a snippet from one of the config files: [config/lono.rb](lib/starter_project_yaml/config/lono.rb).
 
 ```ruby
 template "api-web-prod.yml" do
@@ -55,10 +59,10 @@ template "api-web-prod.yml" do
 end
 ```
 
-The corresponding ERB template looks like the following.  Note that some of the output has been shorten for brevity.
+Here is the corresponding ERB template [templates/web.yml.erb](lib/starter_project_yaml/templates/web.yml.erb).  Note that some of the source code has been shorten for brevity.
 
 ```yaml
-<% @app,@role,@env = name.sub('.yml','').split('-') %>
+<% @app,@role,@env = name.sub('.yml','').split('-') -%>
 ---
 AWSTemplateFormatVersion: '2010-09-09'
 Description: <%= @app.capitalize %> Stack
@@ -98,7 +102,7 @@ Resources:
 
 ```
 
-The output looks like this:
+The generated `output/blog-web-prod.yml` CloudFormation template looks like this:
 
 ```yaml
 ---
@@ -158,137 +162,12 @@ Resources:
 
 There are helper methods that are available in templates.
 
-* partial(relative_path, variables, options) - can be use to embed other files in a template.  The partial view should be placed in the `templates/partial` folder of the project.  So:
+* partial(relative_path, variables, options) - Can be use to embed other files in a template.  The partial view should be placed in the `templates/partial` folder of the project.  So:
   * partial('launch\_config.json.erb') -> `templates/partial/launch_config.json.erb`
   * partial('launch\_config.json.erb', foo: "bar", hello: "world") - variables can be passed to the partial helper method are available to the partial as instance variables.  So, in this case `@foo` and `@hello` will be available in the `launch_config.json.erb` partial.
   * partial('user_data/bootstrap.sh.erb', {}, indent: 10) - Indent the result partial by 10 spaces.  Useful for yaml format.
 
-## user\_data helper for json format
-
-The user\_data helper method is helpful for writting a script in bash form and having lono convert it to a json compatiable format. It is only really useful if you are using json as the CloudFormation format.  If you are using yaml as the format, which is recommended, then you should simply use raw yaml.
-
-* user\_data - can be used to include a user data script which is written in bash script form.  The user data script should be placed in the `templates/user_data` folder of the project.  So:
-  * user\_data('bootstrap.sh.erb') -> templates/user\_data/bootstrap.sh.erb
-  * user\_data('db.sh.erb') -> templates/user\_data/db.sh.erb
-  * user\_data('script1.sh.erb', foo: "bar", hello: "world") - variables can be passed to the user\_data helper method and will be available to the partial as instance variables.  So, in this case `@foo` and `@hello` will be available in `script1.sh.erb`.
-
-Here's how you would call it in the template.
-
-```json
-"UserData": {
-  "Fn::Base64": {
-    "Fn::Join": [
-      "",
-      [
-        <%= user_data('db.sh.erb') %>
-      ]
-    ]
-  }
-```
-
-Within the user\_data script you can use helper methods that correspond to CloudFormation [Instrinic Functions](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/concept-intrinsic-functions.html).  Currently, `base64`, `find_in_map`, `get_att`, `get_azs`, `join`, and `ref` are supported.  Here's a short example of a user\_data script using a helper method:
-
-If you have a `templates/user_data/db.sh.erb` that looks like this:
-
-```bash
-#!/bin/bash -lexv
-
-HOSTNAME_PREFIX=<%= find_in_map("EnvironmentMapping", "HostnamePrefix", ref("Environment")) %>
-
-echo <%= ref("AWS::StackName") %> > /tmp/stack_name
-# Helper function
-function error_exit
-{
-  /usr/local/bin/cfn-signal -e 1 -r "$1" '<%= ref("WaitHandle") %>'
-exit 1
-}
-# Wait for the EBS volume to show up
-while [ ! -e /dev/xvdf ]; do echo Waiting for EBS volume to attach; sleep 1; done
-/bin/mkdir /media/redis
-/sbin/mkfs -t ext4 /dev/xvdf
-echo "/dev/xvdf /media/redis auto defaults 0 0" >> /etc/fstab
-/bin/mount /media/redis
-/usr/bin/redis-cli shutdown
-sleep 10
-mv /var/lib/redis/* /media/redis/
-rm -r /var/lib/redis
-ln -s /media/redis /var/lib/redis
-chown -R redis:redis /var/lib/redis
-chown -R redis:redis /media/redis
-/usr/bin/redis-server
-# If all is well so signal success
-/usr/local/bin/cfn-signal -e $? -r "Ready to rock" '<%= ref("WaitHandle") %>'
-```
-
-The user\_data helper will transform the bash script into a json array of elements for CloudFormation:
-
-```json
-[
-  "#!/bin/bash -lexv\n",
-  "\n",
-  "HOSTNAME_PREFIX=",
-  {
-    "Fn::FindInMap": [
-      "EnvironmentMapping",
-      "HostnamePrefix",
-      {
-        "Ref": "Environment"
-      }
-    ]
-  },
-  "\n",
-  "\n",
-  "echo ",
-  {
-    "Ref": "AWS::StackName"
-  },
-  " > /tmp/stack_name\n",
-  "# Helper function\n",
-  "function error_exit\n",
-  "{\n",
-  "  /usr/local/bin/cfn-signal -e 1 -r \"$1\" '",
-  {
-    "Ref": "WaitHandle"
-  },
-  "'\n",
-  "exit 1\n",
-  "}\n",
-  "# Wait for the EBS volume to show up\n",
-  "while [ ! -e /dev/xvdf ]; do echo Waiting for EBS volume to attach; sleep 1; done\n",
-  "/bin/mkdir /media/redis\n",
-  "/sbin/mkfs -t ext4 /dev/xvdf\n",
-  "echo \"/dev/xvdf /media/redis auto defaults 0 0\" >> /etc/fstab\n",
-  "/bin/mount /media/redis\n",
-  "/usr/bin/redis-cli shutdown\n",
-  "sleep 10\n",
-  "mv /var/lib/redis/* /media/redis/\n",
-  "rm -r /var/lib/redis\n",
-  "ln -s /media/redis /var/lib/redis\n",
-  "chown -R redis:redis /var/lib/redis\n",
-  "chown -R redis:redis /media/redis\n",
-  "/usr/bin/redis-server\n",
-  "# If all is well so signal success\n",
-  "/usr/local/bin/cfn-signal -e $? -r \"Ready to rock\" '",
-  {
-    "Ref": "WaitHandle"
-  },
-  "'\n"
-]
-```
-
-More examples of user\_data and instrinic function helper method usage are found in the starter [project template](https://github.com/tongueroo/lono/blob/master/lib/starter_project_json/templates/user_data/db.sh.erb)
-
-## Converting UserData scripts
-
-You can convert UserData scripts in existing CloudFormation Templates to a starter bash script via:
-
-<pre>
-$ lono bashify cloud_formation_template.json
-$ lono bash cloud_formation_template.json # shorthand
-$ lono b https://s3.amazonaws.com/cloudformation-templates-us-east-1/LAMP_Single_Instance.template # shorthand and url
-</pre>
-
-This is useful if you want to take an existing json [CloudFormation Template example](http://aws.amazon.com/cloudformation/aws-cloudformation-templates/) and quicklly change the UserData section into a bash script. The bashify command will generate a snippet that is meant to be copied and pasted into a bash script and used with user\_data helper method.  The bash script should work right off the bat as lono will transform the generated CloudFormation object references to json objects, there's no need to manually change what is generated to the helper methods, though you can if you prefer the look of the helper methods.
+* user\_data - Helpful if you are using CloudFormation json format. More info on the [wiki page](https://github.com/tongueroo/lono/wiki/user_data-helper-for-json-format).
 
 ## Breaking up config/lono.rb
 
@@ -317,6 +196,8 @@ Running `lono generate` and building up the `aws cloudformation create-stack` co
 ```
 $ lono-cfn create mystack-$(date +%Y%m%d%H%M%S) --template mystack --params mystack
 $ lono-cfn create mystack-$(date +%Y%m%d%H%M%S) # shorthand if template and params file matches.
+$ lono-cfn update mystack-1493859659
+$ lono-cfn delete mystack-1493859659
 ```
 
 More info about lono-cfn here: [lono-cfn](https://github.com/tongueroo/lono-cfn) - Wrapper cfn tool to quickly create CloudFormation stacks from lono templates and params files.

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/starter_project_yaml/templates/web.yml.erb

@@ -27,19 +27,6 @@ Parameters:
     Type: String
   InstanceType:
     AllowedValues:
-    - t1.micro
-    - m1.small
-    - m1.medium
-    - m1.large
-    - m1.xlarge
-    - m2.xlarge
-    - m2.2xlarge
-    - m2.4xlarge
-    - c1.medium
-    - c1.xlarge
-    - cc1.4xlarge
-    - cc2.8xlarge
-    - cg1.4xlarge
     - t2.nano
     - t2.micro
     - t2.small
@@ -53,6 +40,20 @@ Parameters:
     - m4.4xlarge
     - m4.10xlarge
     - m4.16xlarge
+    - m3.medium
+    - m3.large
+    - m3.xlarge
+    - m3.2xlarge
+    - c4.large
+    - c4.xlarge
+    - c4.2xlarge
+    - c4.4xlarge
+    - c4.8xlarge
+    - c3.large
+    - c3.xlarge
+    - c3.2xlarge
+    - c3.4xlarge
+    - c3.8xlarge
     ConstraintDescription: must be a valid EC2 instance type.
     Default: <%= @instance_type %>
     Description: WebServer EC2 instance type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake