lono 0.3.2 → 0.3.3

data/README.md

@@ -22,7 +22,7 @@ This sets up a starter lono project with example templates.
 $ lono generate
 </pre>
 
-This generates the templates that have been defined in the config folder of the lono project.
+This generates the templates that have been defined in the config folder of the lono project 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:
 
@@ -58,10 +58,12 @@ There are helper methods that are available in templates.
 
 * partial - can be use to embed other files in a template.  The partial 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 and will be available to the partial as instance variables.  So, in this case @foo and @hello will be available in the launch_config.json.erb partial.
 
 * 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', 'script2.sh.erb') - multiple files can be used to build the user_data script, script1 and script2 will be combined
 
 Here's how you would call it in the template.
 
@@ -70,12 +72,102 @@ Here's how you would call it in the template.
   "Fn::Base64": {
     "Fn::Join": [
       "",
-      <%= user_data('bootstrap.sh.erb') %>
+      <%= user_data('db.sh.erb') %>
     ]
   }
 ```
 
-Within a user_data script you can user helper methods that correspond to Cloud Formation [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.  Examples of their usage are found in the starter [project template](https://github.com/tongueroo/lono/blob/master/lib/starter_project/templates/user_data/db.sh.erb)
+Within the user_data script you can use helper methods that correspond to Cloud Formation [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 Cloud Formation:
+
+```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/templates/user_data/db.sh.erb)
 
 ## Converting UserData scripts
 

data/lib/lono/template.rb

@@ -28,19 +28,22 @@ module Lono
       end
     end
 
-    def partial(path)
+    def partial(path,vars={})
       path = "#{@options[:project_root]}/templates/partial/#{path}"
       template = IO.read(path)
+      variables(vars)
       ERB.new(template).result(binding)
     end
 
-    def user_data(path)
-      path = "#{@options[:project_root]}/templates/user_data/#{path}"
-      template = IO.read(path)
-      result = ERB.new(template).result(binding)
+    def user_data(*paths)
       output = []
-      result.split("\n").each do |line|
-        output += transform(line)
+      paths.each do |path|
+        path = "#{@options[:project_root]}/templates/user_data/#{path}"
+        template = IO.read(path)
+        result = ERB.new(template).result(binding)
+        result.split("\n").each do |line|
+          output += transform(line)
+        end
       end
       output.to_json
     end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/starter_project/templates/app.json.erb

@@ -178,7 +178,7 @@
       },
       "Type": "AWS::CloudWatch::Alarm"
     },
-    <%= partial("host_record.json.erb") %>
+    <%= partial("host_record.json.erb", :domain => "mydomain.com") %>
     "LaunchConfig": {
       "Properties": {
         "BlockDeviceMappings": [

data/lib/starter_project/templates/partial/host_record.json.erb

@@ -1,6 +1,6 @@
     "HostRecord": {
       "Properties": {
-        "Comment": "DNS name for my stack.",
+        "Comment": "DNS name for <%= @domain %>",
         "HostedZoneName": ".mydomain.net.",
         "Name": {
           "Fn::Join": [
@@ -9,7 +9,7 @@
               {
                 "Ref": "AWS::StackName"
               },
-              ".mydomain.net"
+              ".<%= @domain %>"
             ]
           ]
         },

data/lib/starter_project/templates/partial/server.json.erb

@@ -33,7 +33,7 @@
           "Fn::Base64": {
             "Fn::Join": [
               "",
-              <%= user_data('db.sh.erb') %>
+              <%= user_data('db.sh.erb', 'db2.sh.erb') %>
             ]
           }
         }

data/lib/starter_project/templates/user_data/db2.sh.erb

@@ -0,0 +1 @@
+DB2="test"

data/spec/lib/lono_spec.rb

@@ -76,6 +76,12 @@ describe Lono do
       json['Mappings']['AWSRegionArch2AMI']['us-east-1']['64'].should == 'ami-123'
     end
 
+    it "should make trailing options pass to the partial helper available as instance variables" do
+      raw = IO.read("#{@project}/output/prod-api-app.json")
+      json = JSON.load(raw)
+      json['Resources']['HostRecord']['Properties']['Comment'].should == 'DNS name for mydomain.com'
+    end
+
     it "should generate db template" do
       raw = IO.read("#{@project}/output/prod-api-redis.json")
       json = JSON.load(raw)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -222,6 +222,7 @@ files:
 - lib/starter_project/templates/partial/server.json.erb
 - lib/starter_project/templates/user_data/app.sh.erb
 - lib/starter_project/templates/user_data/db.sh.erb
+- lib/starter_project/templates/user_data/db2.sh.erb
 - lono.gemspec
 - spec/fixtures/cfn.json
 - spec/lib/lono_spec.rb