lono 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beee9469d60a5a00f7e155dc2d8564ae63fe40f2
-  data.tar.gz: 92b0863abac2d2cef840d96f9a119847df5e8496
+  metadata.gz: 718e48960a1c3a862ff214236f1ca2a41e086074
+  data.tar.gz: 3d88df2849d2d0c140e1484bfd441de14cf9c477
 SHA512:
-  metadata.gz: 1aa6268aaf19d0d26d26076f164bff2753611150124dd1a7865bc4b20b167a43fdffecf24dfaf6ae1ffad42fd3f2591a877a37616c68b04f80827e4ebc460620
-  data.tar.gz: b18cf6fbc929256fff760c419fdc9abbac3df2ae275e9c1cd61c73a2ff744b11071a965a97b150e072be1b7657680121227a367c0c2528e738ad8ab7ff263cb4
+  metadata.gz: 028ceea2ac8e288fe9fbd4c720edd7ab21852b368b3d4b27ce30d523c1aaaf08722ceae4e9d6161f15d7382e4044d739015be252663f5283b3315497da364783
+  data.tar.gz: a726a5be3d63491b8af498a626b5e4322c9cb2c1453535f9511a90b6bba1fdc89e30a4bd14a52d28751510a407c9138a2502ea5f3416c030e189af816bcfb7fc

data/README.md

@@ -78,7 +78,9 @@ Here's how you would call it in the template.
   "Fn::Base64": {
     "Fn::Join": [
       "",
-      <%= user_data('db.sh.erb') %>
+      [
+        <%= user_data('db.sh.erb') %>
+      ]
     ]
   }
 ```

data/lib/lono/template.rb

@@ -44,7 +44,9 @@ module Lono
       result.split("\n").each do |line|
         output += transform(line)
       end
-      output.to_json
+      json = output.to_json
+      json[0] = '' # remove first char: [
+      json.chop!   # remove last char:  ]
     end
 
     def ref(name)

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

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

@@ -233,8 +233,10 @@
           "Fn::Base64": {
             "Fn::Join": [
               "",
-              <% script = @user_data_script || 'app.sh.erb' %>
-              <%= user_data(script) %>
+              [
+                <% script = @user_data_script || 'app.sh.erb' %>
+                <%= user_data(script) %>
+              ]
             ]
           }
         }

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

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

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

@@ -0,0 +1,2 @@
+DB2=test
+DB2A=hello

data/spec/lib/lono_spec.rb

@@ -106,6 +106,14 @@ describe Lono do
       user_data.should include("VARTEST=foo\n")
     end
 
+    it "should include multiple user_data scripts" 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("DB2=test\n")
+    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.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tung Nguyen
@@ -200,6 +200,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
 - lib/starter_project/templates/user_data/ruby_script.rb.erb
 - lono.gemspec
 - spec/fixtures/cfn.json