lono 0.3.4 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: beee9469d60a5a00f7e155dc2d8564ae63fe40f2
+  data.tar.gz: 92b0863abac2d2cef840d96f9a119847df5e8496
+SHA512:
+  metadata.gz: 1aa6268aaf19d0d26d26076f164bff2753611150124dd1a7865bc4b20b167a43fdffecf24dfaf6ae1ffad42fd3f2591a877a37616c68b04f80827e4ebc460620
+  data.tar.gz: b18cf6fbc929256fff760c419fdc9abbac3df2ae275e9c1cd61c73a2ff744b11071a965a97b150e072be1b7657680121227a367c0c2528e738ad8ab7ff263cb4

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 *.gem
 .bundle
+coverage
 Gemfile.lock
 pkg
 tmp

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+cache: bundler
 rvm:
-  - 1.9.2
-  - 1.9.3
+  - 1.9.3
+  - 2.0.0

data/Gemfile

@@ -1,2 +1,6 @@
 source "https://rubygems.org"
-gemspec
+gemspec
+
+group :development do
+  gem 'coveralls', :require => false
+end

data/README.md

@@ -1,9 +1,15 @@
 # Lono
 
+[![Gem Version](https://badge.fury.io/rb/lono.png)](http://badge.fury.io/rb/lono)
 [![Build History][2]][1]
+[![Code Climate][3]][4]
+[![Dependency Status](https://gemnasium.com/tongueroo/lono.png)](https://gemnasium.com/tongueroo/lono)
+[![Coverage Status](https://coveralls.io/repos/tongueroo/lono/badge.png)](https://coveralls.io/r/tongueroo/lono)
 
 [1]: http://travis-ci.org/tongueroo/lono
 [2]: https://secure.travis-ci.org/tongueroo/lono.png?branch=master
+[3]: https://codeclimate.com/repos/51d7f1407e00a4042c010ab4/badges/5273fe6cdb5a13e58554/gpa.png)
+[4]: https://codeclimate.com/repos/51d7f1407e00a4042c010ab4/feed
 
 Lono is a Cloud Formation Template ruby generator.  Lono generates Cloud Formation templates based on ERB templates.
 
@@ -63,7 +69,7 @@ There are helper methods that are available in templates.
 * 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
+  * user_data('script1.sh.erb', :foo => "bar", :hello => "world") - variables can be passed to the user_data helper method and will be available to the partial as instance variables.  So, in this case @foo and @hello will be available in script1.sh.erb.
 
 Here's how you would call it in the template.
 

data/lib/lono/template.rb

@@ -35,15 +35,14 @@ module Lono
       ERB.new(template).result(binding)
     end
 
-    def user_data(*paths)
+    def user_data(path, vars={})
+      path = "#{@options[:project_root]}/templates/user_data/#{path}"
+      template = IO.read(path)
+      variables(vars)
+      result = ERB.new(template).result(binding)
       output = []
-      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
+      result.split("\n").each do |line|
+        output += transform(line)
       end
       output.to_json
     end
@@ -186,17 +185,11 @@ module Lono
     end
 
     def cfn_object?(s)
-      whitelist = %w[
-        Ref
-        Fn::FindInMap
-        Fn::Base64
-        Fn::GetAtt
-        Fn::GetAZs
-        Fn::Join
-        Fn::Select
-      ]
-      whitelisted = !!whitelist.detect {|word| s.include?(word)}
-      whitelisted && s =~ /^{/ && s =~ /=>/
+      exact = %w[Ref]
+      pattern = %w[Fn::]
+      exact_match = !!exact.detect {|word| s.include?(word)}
+      pattern_match = !!pattern.detect {|p| s =~ Regexp.new(p)}
+      (exact_match || pattern_match) && s =~ /^{/ && s =~ /=>/
     end
 
     def recompose(decomposition)

data/lib/lono/version.rb

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

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

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

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

@@ -11,6 +11,8 @@ GET_AZS=<%= get_azs %>
 JOIN=<%= join(":", ['a','b','c']) %>
 SELECT=<%= select("1", ['a','b','c']) %>
 
+VARTEST=<%= @vartest %>
+
 echo <%= ref("AWS::StackName") %> > /tmp/stack_name
 # Helper function
 function error_exit

data/spec/lib/lono_spec.rb

@@ -98,6 +98,14 @@ describe Lono do
       json['Resources']['HostRecord']['Properties']['Comment'].should == 'DNS name for mydomain.com'
     end
 
+    it "should generate user data with variables" 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("VARTEST=foo\n")
+    end
+
     it "should generate db template" do
       raw = IO.read("#{@project}/output/prod-api-redis.json")
       json = JSON.load(raw)

data/spec/spec_helper.rb

@@ -7,6 +7,9 @@ $root = File.expand_path('../../', __FILE__)
 
 require "#{$root}/lib/lono"
 
+require 'coveralls'
+Coveralls.wear!
+
 module Helpers
   def execute(cmd)
     puts "Running: #{cmd}" if ENV['DEBUG']

metadata

@@ -1,190 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 0.3.4
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-cloudformation
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-lono
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Lono is a Cloud Formation Template ruby generator.  Lono generates Cloud
@@ -196,6 +173,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - .ruby-version
 - .travis.yml
@@ -222,7 +200,6 @@ 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
@@ -230,27 +207,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/tongueroo/lono
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Lono is a Cloud Formation Template ruby generator.  Lono generates Cloud
   Formation templates based on ERB templates.
 test_files:

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

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