lono 0.2.1 → 0.2.2

data/.gitignore

@@ -5,3 +5,4 @@ Gemfile.lock
 pkg
 tmp
 output
+spec/project

data/Guardfile

@@ -1,6 +1,6 @@
-# guard 'bundler' do
-#   watch('Gemfile')
-# end
+guard 'bundler' do
+  watch('Gemfile')
+end
 
 guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})

data/README.md

@@ -11,29 +11,31 @@ Lono is a Cloud Formation Template ruby generator.  Lono generates Cloud Formati
 
 <pre>
 $ gem install lono
-$ mkdir lono_project
-$ lono init 
+$ mkdir lono
+$ cd lono
+$ lono init
 </pre>
 
-This sets up the basic lono project with an example template in source/app.json.erb.
+This sets up a starter lono project with example templates.
 
 <pre>
 $ lono generate
 </pre>
 
-This generates the templates that have been defined in config/lono.rb.
+This generates the templates that have been defined in config folder of the lono project.
 
-The example starter config/lono.rb looks like this:
+The one of starter lono config files looks like this:
 
 ```ruby
 template "prod-api-app.json" do
+  env,app,role = name.sub('.json','').split('-')
   source "app.json.erb"
   variables(
-    :env => 'prod',
-    :app => 'api',
-    :role => "app",
+    :env => env,
+    :app => app,
+    :role => role,
     :ami => "ami-123",
-    :instance_type => "c1.xlarge",
+    :instance_type => "m1.small",
     :port => "80",
     :high_threshold => "15",
     :high_periods => "4",
@@ -46,35 +48,20 @@ template "prod-api-app.json" do
     :ssl_cert => "arn:aws:iam::12345:server-certificate/wildcard"
   )
 end
-template "prod-br-app.json" do
-  source "app.json.erb"
-  variables(
-    :env => "prod",
-    :app => 'br',
-    :role => "app",
-    :ami => "ami-456",
-    :instance_type => "m1.medium",
-    :port => "80",
-    :high_threshold => "35",
-    :high_periods => "4",
-    :low_threshold => "20",
-    :low_periods => "2",
-    :max_size => "6",
-    :min_size => "3",
-    :down_adjustment => "-1",
-    :up_adjustment => "2"
-  )
-end
 ```
 
-The example ERB template file is in templates/app.json.erb.
+The corresponding ERB template example file is [here](lib/starter_project/templates/app.json.erb).
+
+## Template helper methods
 
-## User Data Helper
+There are helper methods that available in templates.
 
-In the template files, there's user_data helper method available which can be used to include a user data script.  The user data script should be in in the templates/user_data folder of the project.  So:
+* 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
 
-* user_data('bootstrap.sh.erb') -> templates/user_data/bootstrap.sh.erb
-* user_data('db.sh.erb') -> templates/user_data/db.sh.erb
+* 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
 
 Here's how you would call it in the template.
 
@@ -83,20 +70,19 @@ Here's how you would call it in the template.
   "Fn::Base64": {
     "Fn::Join": [
       "",
-      [
-        <%= user_data('bootstrap.sh.erb') %>
-      ]
+      <%= user_data('bootstrap.sh.erb') %>
     ]
   }
 ```
 
-## Breaking up config/lono.rb
+Within a user_data script you can call another helper method called ref.
 
-If you have a lot of templates, the config/lono.rb file can get unwieldy long.  You can break up the lono.rb file and put template defintions in the config/lono directory.  Any file in this directory will be automatically loaded. 
+* ref - can be use to reference other parameter or resource value within the cloud formation template.  An [example](lib/starter_project/templates/user_data/db.sh.erb) is in the [starter_project](lib/starter_project).
+
+## Breaking up config/lono.rb
 
-An example is in the spec/project folder:
+If you have a lot of templates, the config/lono.rb file can get unwieldy long.  You can break up the lono.rb file and put template defintions in the config/lono directory.  Any file in this directory will be automatically loaded. An [example](lib/starter_project/config/lono/api.rb) is in the starter project.
 
-* config/lono/api.rb
 
 ## Generate
 
@@ -104,6 +90,7 @@ You can generate the CF templates by running:
 
 <pre>
 $ lono generate
+$ lono g -c # shortcut
 </pre>
 
 The lono init command also sets up guard-lono.  Guard-lono continuously generates the cloud formation templates.  Just run guard.

data/lib/lono.rb

@@ -4,4 +4,5 @@ $:.unshift File.dirname(__FILE__)
 require 'ext/hash'
 require 'lono/cli'
 require 'lono/task'
+require 'lono/template'
 require 'lono/dsl'

data/lib/lono/cli.rb

@@ -3,10 +3,13 @@ require 'thor'
 module Lono
   class CLI < Thor
 
-    desc "init", "Setup lono project"
+    desc "init", "Setup lono starter project"
     long_desc "Sets up config/lono.rb"
+    method_option :force, :type => :boolean, :aliases => "-f", :desc => "override existing starter files"
+    method_option :project_root, :default => ".", :aliases => "-r", :desc => "project root"
+    method_option :quiet, :type => :boolean, :aliases => "-q", :desc => "silence the output"
     def init
-      Lono::Task.init
+      Lono::Task.init(options)
     end
 
     desc "generate", "Generate the cloud formation templates"
@@ -14,12 +17,15 @@ module Lono
 Examples:
 
 1. lono generate
+2. lono g -c # shortcut
 
 Builds the cloud formation templates files based on config/lono.rb and writes them to the output folder on the filesystem.
 EOL
     method_option :clean, :type => :boolean, :aliases => "-c", :desc => "remove all output files before generating"
+    method_option :project_root, :default => ".", :aliases => "-r", :desc => "project root"
+    method_option :quiet, :type => :boolean, :aliases => "-q", :desc => "silence the output"
     def generate
-      Lono::Task.generate(options.dup.merge(:verbose => true))
+      Lono::Task.generate(options)
     end
   end
   

data/lib/lono/dsl.rb

@@ -1,11 +1,9 @@
-require 'erb'
-require 'json'
-
 module Lono
   class DSL
     def initialize(options={})
       @options = options
-      @path = options[:config_path] || 'config/lono.rb'
+      @options[:project_root] ||= '.'
+      @path = "#{@options[:project_root]}/config/lono.rb"
       @templates = []
       @results = {}
     end
@@ -32,14 +30,14 @@ module Lono
       end
     end
 
-    def output(options={})
-      output_path = options[:output_path] || 'output'
-      FileUtils.rm_rf(output_path) if options[:clean]
+    def output
+      output_path = "#{@options[:project_root]}/output"
+      FileUtils.rm_rf(output_path) if @options[:clean]
       FileUtils.mkdir(output_path) unless File.exist?(output_path)
-      puts "Generating Cloud Formation templates:" if options[:verbose]
+      puts "Generating Cloud Formation templates:" unless @options[:quiet]
       @results.each do |name,json|
         path = "#{output_path}/#{name}"
-        puts "  #{path}" if options[:verbose]
+        puts "  #{path}" unless @options[:quiet]
         pretty_json = JSON.pretty_generate(JSON.parse(json))
         File.open(path, 'w') {|f| f.write(pretty_json) }
       end
@@ -48,46 +46,7 @@ module Lono
     def run(options={})
       evaluate
       build
-      options.empty? ? output : output(options)
-    end
-  end
-
-  class Template
-    include ERB::Util
-
-    def initialize(name, block, options={})
-      @name = name
-      @block = block
-      @options = options
-      @options[:project_root] ||= '.'
-    end
-
-    def build
-      instance_eval(&@block)
-      template = IO.read(@source)
-      ERB.new(template).result(binding)
-    end
-
-    def source(path)
-      @source = "#{@options[:project_root]}/templates/#{path}"
-    end
-
-    def variables(vars={})
-      vars.each do |var,value|
-        instance_variable_set("@#{var}", value)
-      end
-    end
-
-    def partial(path)
-      path = "#{@options[:project_root]}/templates/partial/#{path}"
-      template = IO.read(path)
-      ERB.new(template).result(binding)
-    end
-
-    def user_data(path)
-      path = "#{@options[:project_root]}/templates/user_data/#{path}"
-      template = IO.read(path)
-      ERB.new(template).result(binding).split("\n").collect {|l| "#{l}\n"}.to_json
+      output
     end
   end
 end

data/lib/lono/task.rb

@@ -3,19 +3,23 @@ module Lono
     def self.init(options={})
       project_root = options[:project_root] || '.'
       puts "Setting up lono project" unless options[:quiet]
-      %w[Guardfile config/lono.rb templates/app.json.erb].each do |name|
-        source = File.expand_path("../../files/#{name}", __FILE__)
-        dirname = File.dirname(name)
-        FileUtils.mkdir(dirname) unless File.exist?(dirname)
-        dest = "#{project_root}/#{name}"
+      source_root = File.expand_path("../../starter_project", __FILE__)
+      paths = Dir.glob("#{source_root}/**/*").
+                select {|p| File.file?(p) }
+      paths.each do |src|
+        dest = src.gsub(%r{.*starter_project/},'')
+        dest = "#{project_root}/#{dest}"
 
-        if File.exist?(dest)
+        if File.exist?(dest) and !options[:force]
           puts "already exists: #{dest}" unless options[:quiet]
         else
           puts "creating: #{dest}" unless options[:quiet]
-          FileUtils.cp(source, dest)
+          dirname = File.dirname(dest)
+          FileUtils.mkdir_p(dirname) unless File.exist?(dirname)
+          FileUtils.cp(src, dest)
         end
       end
+      puts "Starter lono project created"
     end
     def self.generate(options)
       new(options).generate
@@ -23,11 +27,7 @@ module Lono
 
     def initialize(options={})
       @options = options
-      if options.empty?
-        @dsl = DSL.new
-      else
-        @dsl = DSL.new(options)
-      end
+      @dsl = options.empty? ? DSL.new : DSL.new(options)
     end
     def generate
       @dsl.run(@options)

data/lib/lono/template.rb

@@ -0,0 +1,66 @@
+require 'erb'
+require 'json'
+
+module Lono
+  class Template
+    include ERB::Util
+
+    attr_reader :name
+    def initialize(name, block, options={})
+      @name = name
+      @block = block
+      @options = options
+    end
+
+    def build
+      instance_eval(&@block)
+      template = IO.read(@source)
+      ERB.new(template).result(binding)
+    end
+
+    def source(path)
+      @source = path[0..0] == '/' ? path : "#{@options[:project_root]}/templates/#{path}"
+    end
+
+    def variables(vars={})
+      vars.each do |var,value|
+        instance_variable_set("@#{var}", value)
+      end
+    end
+
+    def partial(path)
+      path = "#{@options[:project_root]}/templates/partial/#{path}"
+      template = IO.read(path)
+      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)
+      output = []
+      lines = result.split("\n")
+      lines.each do |line|
+        output += transform(line)
+      end
+      output.to_json
+    end
+
+    def ref(name)
+      %Q|{"Ref"=>"#{name}"}|
+    end
+
+    # transform each line of the bash script into a UserData compatiable with CF template.
+    #   any {"Ref"=>"..."} string get turned into CF Hash elements
+    def transform(line)
+      regex = /({"Ref"=>".*?"})/
+      data = line.split(regex)
+      data.map! {|l| l.match(regex) ? eval(l) : l }
+      if data[-1].is_a?(String)
+        data[0..-2] + ["#{data[-1]}\n"] 
+      else
+        data + ["\n"]
+      end
+    end
+  end
+end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/{spec/project → lib/starter_project}/config/lono.rb

@@ -1,11 +1,12 @@
-template "prod-br-app.json" do
+template "prod-blog-app.json" do
+  env,app,role = name.sub('.json','').split('-')
   source "app.json.erb"
   variables(
-    :env => "prod",
-    :app => 'br',
-    :role => "app",
+    :env => env,
+    :app => app,
+    :role => role,
     :ami => "ami-456",
-    :instance_type => "m1.medium",
+    :instance_type => "m1.small",
     :port => "80",
     :high_threshold => "35",
     :high_periods => "4",

data/lib/{files/config/lono.rb → starter_project/config/lono/api.rb}

@@ -1,11 +1,12 @@
 template "prod-api-app.json" do
+  env,app,role = name.sub('.json','').split('-')
   source "app.json.erb"
   variables(
-    :env => 'prod',
-    :app => 'api',
-    :role => "app",
+    :env => env,
+    :app => app,
+    :role => role,
     :ami => "ami-123",
-    :instance_type => "c1.xlarge",
+    :instance_type => "m1.small",
     :port => "80",
     :high_threshold => "15",
     :high_periods => "4",
@@ -18,22 +19,18 @@ template "prod-api-app.json" do
     :ssl_cert => "arn:aws:iam::12345:server-certificate/wildcard"
   )
 end
-template "prod-br-app.json" do
-  source "app.json.erb"
+
+template "prod-api-redis.json" do
+  env,app,role = name.sub('.json','').split('-')
+  source "db.json.erb"
   variables(
-    :env => "prod",
-    :app => 'br',
-    :role => "app",
+    :env => env,
+    :app => app,
+    :role => role,
     :ami => "ami-456",
-    :instance_type => "m1.medium",
+    :instance_type => "m1.small",
     :port => "80",
-    :high_threshold => "35",
-    :high_periods => "4",
-    :low_threshold => "20",
-    :low_periods => "2",
-    :max_size => "6",
-    :min_size => "3",
-    :down_adjustment => "-1",
-    :up_adjustment => "2"
+    :volume_size => "20",
+    :availability_zone => "us-east-1e"
   )
 end