lono 0.2.2 → 0.2.3

data/lib/lono/template.rb

@@ -50,17 +50,39 @@ module Lono
       %Q|{"Ref"=>"#{name}"}|
     end
 
+    # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-ref.html
+    def findinmap(*args)
+      args.map! {|x| x =~ /=>/ ? x : x.inspect }
+      %Q|{"Fn::FindInMap" => [ #{args.join(',')} ]}|
+    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 }
+      # Fn::FindInMap transform, also takes care of nested Ref transform
+      data = evaluate(line,/({"Fn::FindInMap" => \[ .* \]})/)
+
+      # Ref transform
+      already_transformed = data.size > 1
+      unless already_transformed
+        data = evaluate(line,/({"Ref"=>".*?"})/)
+      end
+
+      # add newline at the end
       if data[-1].is_a?(String)
         data[0..-2] + ["#{data[-1]}\n"] 
       else
         data + ["\n"]
       end
     end
+
+    # if regex found in line, the match is eval into ruby code
+    #   returns array of evaluated items
+    # if regex pattern not found
+    #   returns array with original line
+    def evaluate(line, regex)
+      data = line.split(regex)
+      data.map {|l| l.is_a?(String) && l.match(regex) ? eval(l) : l }
+    end
   end
 end

data/lib/lono/version.rb

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

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

@@ -1,6 +1,9 @@
 #!/bin/bash -lexv
 exec > >(tee /var/log/user-data.log|logger -t user-data -s 2>/dev/console) 2>&1
 
+FINDINMAP_TEST=<%= findinmap("MapName", "TopLevelKey", "SecondLevelKey") %>
+HOSTNAME_PREFIX=<%= findinmap("EnvironmentMapping", "HostnamePrefix", ref("Environment")) %>
+
 echo <%= ref("AWS::StackName") %> > /tmp/stack_name
 # Helper function
 function error_exit

data/spec/lib/lono_spec.rb

@@ -34,6 +34,20 @@ describe Lono do
       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"})
+      user_data.should include({
+        "Fn::FindInMap" => [
+          "EnvironmentMapping",
+          "HostnamePrefix",
+          {"Ref" => "Environment"}
+        ]
+      })
+      user_data.should include({
+        "Fn::FindInMap" => [
+          "MapName",
+          "TopLevelKey",
+          "SecondLevelKey"
+        ]
+      })
     end
 
     it "should transform bash script to CF template user_data" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Lono is a Cloud Formation Template ruby generator.  Lono generates Cloud