lono 0.2.1 → 0.2.2

data/{spec/project → lib/starter_project}/templates/app.json.erb

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

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

@@ -0,0 +1,211 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Description": "<%= @app.capitalize %> <%= @role %>",
+  "Outputs": {
+    "DBHostname": {
+      "Description": "Hostname for Redis",
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "",
+            {
+              "Fn::GetAtt": [
+                "server",
+                "PublicDnsName"
+              ]
+            }
+          ]
+        ]
+      }
+    }
+  },
+  "Parameters": {
+    "Ami": {
+      "Default": "<%= @ami %>",
+      "Description": "deploy ami",
+      "Type": "String"
+    },
+    "Application": {
+      "Default": "<%= @app %>",
+      "Description": "foo, bar, etc",
+      "Type": "String"
+    },
+    "Environment": {
+      "Default": "<%= @env %>",
+      "Description": "stag, prod etc",
+      "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"
+      ],
+      "ConstraintDescription": "must be a valid EC2 instance type.",
+      "Default": "<%= @instance_type %>",
+      "Description": "server EC2 instance type",
+      "Type": "String"
+    },
+    "KeyName": {
+      "AllowedPattern": "[-_ a-zA-Z0-9]*",
+      "ConstraintDescription": "can contain only alphanumeric characters, spaces, dashes and underscores.",
+      "Default": "default",
+      "Description": "Name of an existing EC2 KeyPair to enable SSH access to the instances",
+      "MaxLength": "64",
+      "MinLength": "1",
+      "Type": "String"
+    },
+    "Role": {
+      "Default": "<%= @role %>",
+      "Description": "redis, psql, app, etc",
+      "Type": "String"
+    },
+    "StackNumber": {
+      "Default": "<%= @stack_number %>",
+      "Description": "s1, s2, s3, etc",
+      "Type": "String"
+    },
+    "VolumeSize": {
+      "ConstraintDescription": "must be between 5 and 1024 Gb.",
+      "Default": "<%= @volume_size %>",
+      "Description": "Size of Volume",
+      "MaxValue": "1024",
+      "MinValue": "5",
+      "Type": "Number"
+    }
+  },
+  "Resources": {
+    "CfnUser": {
+      "Properties": {
+        "Path": "/",
+        "Policies": [
+          {
+            "PolicyDocument": {
+              "Statement": [
+                {
+                  "Action": "cloudformation:DescribeStackResource",
+                  "Effect": "Allow",
+                  "Resource": "*"
+                }
+              ]
+            },
+            "PolicyName": "root"
+          }
+        ]
+      },
+      "Type": "AWS::IAM::User"
+    },
+    "DataVolume": {
+      "DeletionPolicy": "Snapshot",
+      "Properties": {
+        "AvailabilityZone": {
+          "Fn::GetAtt": [
+            "server",
+            "AvailabilityZone"
+          ]
+        },
+        "Size": {
+          "Ref": "VolumeSize"
+        },
+        "Tags": [
+          {
+            "Key": "Usage",
+            "Value": "Data Volume"
+          }
+        ]
+      },
+      "Type": "AWS::EC2::Volume"
+    },
+    "HostKeys": {
+      "Properties": {
+        "UserName": {
+          "Ref": "CfnUser"
+        }
+      },
+      "Type": "AWS::IAM::AccessKey"
+    },
+    "HostRecord": {
+      "Properties": {
+        "Comment": "DNS name for my stack.",
+        "HostedZoneName": ".mydomain.net.",
+        "Name": {
+          "Fn::Join": [
+            "",
+            [
+              {
+                "Ref": "AWS::StackName"
+              },
+              ".mydomain.net."
+            ]
+          ]
+        },
+        "ResourceRecords": [
+          {
+            "Fn::GetAtt": [
+              "server",
+              "PublicDnsName"
+            ]
+          }
+        ],
+        "TTL": "60",
+        "Type": "CNAME"
+      },
+      "Type": "AWS::Route53::RecordSet"
+    },
+    "MountPoint": {
+      "Properties": {
+        "Device": "/dev/sdf",
+        "InstanceId": {
+          "Ref": "server"
+        },
+        "VolumeId": {
+          "Ref": "DataVolume"
+        }
+      },
+      "Type": "AWS::EC2::VolumeAttachment"
+    },
+    "ServiceSecurityGroup": {
+      "Properties": {
+        "GroupDescription": "Enable SSH access.",
+        "SecurityGroupIngress": [
+          {
+            "CidrIp": "0.0.0.0/0",
+            "FromPort": "22",
+            "IpProtocol": "tcp",
+            "ToPort": "22"
+          }
+        ]
+      },
+      "Type": "AWS::EC2::SecurityGroup"
+    },
+    "WaitCondition": {
+      "DependsOn": "MountPoint",
+      "Metadata": {
+        "Comment1": "Note that the WaitCondition is dependent on the volume mount point allowing the volume to be created and attached to the EC2 instance",
+        "Comment2": "The instance bootstrap script waits for the volume to be attached to the instance prior to signalling completion."
+      },
+      "Properties": {
+        "Handle": {
+          "Ref": "WaitHandle"
+        },
+        "Timeout": "3000"
+      },
+      "Type": "AWS::CloudFormation::WaitCondition"
+    },
+    "WaitHandle": {
+      "Type": "AWS::CloudFormation::WaitConditionHandle"
+    },
+    <%= partial("server.json.erb") %>
+  }
+}

data/{spec/project → lib/starter_project}/templates/partial/host_record.json.erb

@@ -1,7 +1,7 @@
     "HostRecord": {
       "Properties": {
         "Comment": "DNS name for my stack.",
-        "HostedZoneName": "mydomain.net.",
+        "HostedZoneName": ".mydomain.net.",
         "Name": {
           "Fn::Join": [
             "",

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

@@ -0,0 +1,42 @@
+    "server": {
+      "Properties": {
+        "AvailabilityZone": "<%= @availability_zone %>",
+        "ImageId": {
+          "Ref": "Ami"
+        },
+        "InstanceType": {
+          "Ref": "InstanceType"
+        },
+        "KeyName": {
+          "Ref": "KeyName"
+        },
+        "SecurityGroups": [
+          "global",
+          {
+            "Fn::Join": [
+              "-",
+              [
+                {
+                  "Ref": "Environment"
+                },
+                {
+                  "Ref": "Application"
+                }
+              ]
+            ]
+          },
+          {
+            "Ref": "ServiceSecurityGroup"
+          }
+        ],
+        "UserData": {
+          "Fn::Base64": {
+            "Fn::Join": [
+              "",
+              <%= user_data('db.sh.erb') %>
+            ]
+          }
+        }
+      },
+      "Type": "AWS::EC2::Instance"
+    }

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

@@ -0,0 +1,27 @@
+#!/bin/bash -lexv
+exec > >(tee /var/log/user-data.log|logger -t user-data -s 2>/dev/console) 2>&1
+
+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") %>'
+cat /proc/uptime | cut -f1 -d'.' > /tmp/time-to-boot

data/spec/lib/lono_spec.rb

@@ -2,36 +2,69 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 describe Lono do
   before(:each) do
-    @project_root = File.expand_path("../../project", __FILE__)
-    @dsl = Lono::DSL.new(
-      :config_path => "#{@project_root}/config/lono.rb",
-      :project_root => @project_root
-    )
-    @dsl.evaluate
+    @project = File.expand_path("../../project", __FILE__)
+    FileUtils.mkdir(@project) unless File.exist?(@project)
+    execute("./bin/lono init -f -q --project-root #{@project}")
   end
 
   after(:each) do
-    FileUtils.rm_rf("#{@project_root}/output")
+    FileUtils.rm_rf(@project)
   end
 
-  it "should generate cloud formation template" do
-    @dsl.build
-    @dsl.output(:output_path => "#{@project_root}/output")
-    raw = IO.read("#{@project_root}/output/prod-api-app.json")
-    json = JSON.load(raw)
-    json['Description'].should == "Api Stack"
-    json['Mappings']['AWSRegionArch2AMI']['us-east-1']['64'].should == 'ami-123'
+  describe "ruby specs" do
+    before(:each) do
+      @dsl = Lono::DSL.new(
+        :project_root => @project,
+        :quiet => true
+      )
+      @dsl.run
+    end
+
+    it "should generate cloud formation template" do
+      raw = IO.read("#{@project}/output/prod-api-app.json")
+      json = JSON.load(raw)
+      json['Description'].should == "Api Stack"
+      json['Mappings']['AWSRegionArch2AMI']['us-east-1']['64'].should == 'ami-123'
+    end
+
+    it "should generate db template" do
+      raw = IO.read("#{@project}/output/prod-api-redis.json")
+      json = JSON.load(raw)
+      json['Description'].should == "Api redis"
+      user_data = json['Resources']['server']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
+      user_data.should include({"Ref" => "AWS::StackName"})
+      user_data.should include({"Ref" => "WaitHandle"})
+    end
+
+    it "should transform bash script to CF template user_data" do
+      block = Proc.new { }
+      template = Lono::Template.new("foo", block)
+
+      line = 'echo {"Ref"=>"AWS::StackName"} > /tmp/stack_name ; {"Ref"=>"Ami"}'
+      data = template.transform(line)
+      data.should == ["echo ", {"Ref"=>"AWS::StackName"}, " > /tmp/stack_name ; ", {"Ref"=>"Ami"}, "\n"]
+
+      line = 'echo {"Ref"=>"AWS::StackName"} > /tmp/stack_name'
+      data = template.transform(line)
+      data.should == ["echo ", {"Ref"=>"AWS::StackName"}, " > /tmp/stack_name\n"]
+    end
+
+    it "task should generate cloud formation templates" do
+      Lono::Task.generate(
+        :project_root => @project,
+        :quiet => true
+      )
+      raw = IO.read("#{@project}/output/prod-api-app.json")
+      json = JSON.load(raw)
+      json['Description'].should == "Api Stack"
+      json['Mappings']['AWSRegionArch2AMI']['us-east-1']['64'].should == 'ami-123'
+    end
   end
 
-  it "task should generate cloud formation templates" do
-    Lono::Task.generate(
-      :project_root => @project_root,
-      :config_path => "#{@project_root}/config/lono.rb",
-      :output_path => "#{@project_root}/output"
-    )
-    raw = IO.read("#{@project_root}/output/prod-api-app.json")
-    json = JSON.load(raw)
-    json['Description'].should == "Api Stack"
-    json['Mappings']['AWSRegionArch2AMI']['us-east-1']['64'].should == 'ami-123'
+  describe "cli specs" do
+    it "should generate templates" do
+      out = execute("./bin/lono generate -c --project-root #{@project}")
+      out.should match /Generating Cloud Formation templates/
+    end
   end
 end

data/spec/spec_helper.rb

@@ -5,4 +5,17 @@ Bundler.require(:development)
 
 $root = File.expand_path('../../', __FILE__)
 
-require "#{$root}/lib/lono"
+require "#{$root}/lib/lono"
+
+module Helpers
+  def execute(cmd)
+    puts "Running: #{cmd}" if ENV['DEBUG']
+    out = `#{cmd}`
+    puts out if ENV['DEBUG']
+    out
+  end
+end
+
+RSpec.configure do |c|
+  c.include Helpers
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -206,21 +206,23 @@ files:
 - Rakefile
 - bin/lono
 - lib/ext/hash.rb
-- lib/files/Guardfile
-- lib/files/config/lono.rb
-- lib/files/templates/app.json.erb
 - lib/lono.rb
 - lib/lono/cli.rb
 - lib/lono/dsl.rb
 - lib/lono/task.rb
+- lib/lono/template.rb
 - lib/lono/version.rb
+- lib/starter_project/Guardfile
+- lib/starter_project/config/lono.rb
+- lib/starter_project/config/lono/api.rb
+- lib/starter_project/templates/app.json.erb
+- lib/starter_project/templates/db.json.erb
+- lib/starter_project/templates/partial/host_record.json.erb
+- 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
 - lono.gemspec
 - spec/lib/lono_spec.rb
-- spec/project/config/lono.rb
-- spec/project/config/lono/api.rb
-- spec/project/templates/app.json.erb
-- spec/project/templates/partial/host_record.json.erb
-- spec/project/templates/user_data/app.sh.erb
 - spec/spec_helper.rb
 homepage: http://github.com/tongueroo/lono
 licenses: []
@@ -249,9 +251,4 @@ summary: Lono is a Cloud Formation Template ruby generator.  Lono generates Clou
   Formation templates based on ERB templates.
 test_files:
 - spec/lib/lono_spec.rb
-- spec/project/config/lono.rb
-- spec/project/config/lono/api.rb
-- spec/project/templates/app.json.erb
-- spec/project/templates/partial/host_record.json.erb
-- spec/project/templates/user_data/app.sh.erb
 - spec/spec_helper.rb