lono 0.4.4 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 413f2dec340c5b134b099eecfd6b9967de951392
+  data.tar.gz: 5b42248ae771ea16ab77813f58313aa88799d818
+SHA512:
+  metadata.gz: 4a996fe637be6f8c862604bc0036000f9218fe2be73f4446d0c56c05886b0bcc6acec28b6b9253bee7b2e3efcd06fbbfd6cbe9cf1957728cf2b9a3333ebb5870
+  data.tar.gz: 92d051f6da1e9e26d81eff2bac01eaf7f426caef827f27b836388552663e24c34631d3c5c3ca9757b3b37bb05d554f40e1adf6d7f0e66d8e85c005f294d5bf71

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/.ruby-version

@@ -1 +1 @@
-1.9.3
+2.3.1

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 cache: bundler
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.2.5
+  - 2.3.1

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
+
+## [0.5.0]
+
+- Update use newer ruby syntax.
+- Get rid of the core Hash extension that is causing issues with aws-sdk version 2.  I original did this because the output of the generated json files was no deterministic with ruby 1.8.7. No longer supporting ruby 1.8.7.  
+- Gem has been tested with ruby 2.2.5+

data/Gemfile

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

data/README.md

@@ -1,5 +1,6 @@
 # Lono
 
+[![ReadmeCI](http://www.readmeci.com/images/readmeci-badge.svg)](http://www.readmeci.com/tongueroo/lono)
 [![Gem Version](https://badge.fury.io/rb/lono.png)](http://badge.fury.io/rb/lono)
 [![Build History][2]][1]
 [![Code Climate][3]][4]
@@ -34,21 +35,21 @@ template "prod-api-app.json" do
   env,app,role = name.sub('.json','').split('-')
   source "app.json.erb"
   variables(
-    :env => env,
-    :app => app,
-    :role => role,
-    :ami => "ami-123",
-    :instance_type => "m1.small",
-    :port => "80",
-    :high_threshold => "15",
-    :high_periods => "4",
-    :low_threshold => "5",
-    :low_periods => "10",
-    :max_size => "24",
-    :min_size => "6",
-    :down_adjustment => "-3",
-    :up_adjustment => "3",
-    :ssl_cert => "arn:aws:iam::12345:server-certificate/wildcard"
+    env: env,
+    app: app,
+    role: role,
+    ami: "ami-123",
+    instance_type: "m1.small",
+    port: "80",
+    high_threshold: "15",
+    high_periods: "4",
+    low_threshold: "5",
+    low_periods: "10",
+    max_size: "24",
+    min_size: "6",
+    down_adjustment: "-3",
+    up_adjustment: "3",
+    ssl_cert: "arn:aws:iam::12345:server-certificate/wildcard"
   )
 end
 ```
@@ -61,12 +62,12 @@ There are helper methods that are available in templates.
 
 * 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
-  * partial('launch_config.json.erb', :foo => "bar", :hello => "world") - variables can be passed to the partial helper method and will be available to the partial as instance variables.  So, in this case @foo and @hello will be available in the launch_config.json.erb partial.
+  * partial('launch_config.json.erb', foo: "bar", hello: "world") - variables can be passed to the partial helper method and will be available to the partial as instance variables.  So, in this case @foo and @hello will be available in the launch_config.json.erb partial.
 
 * 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', :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.
+  * 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/Rakefile

@@ -2,6 +2,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-task :default => :spec
+task default: :spec
 
-RSpec::Core::RakeTask.new
+RSpec::Core::RakeTask.new

data/lib/lono.rb

@@ -1,12 +1,12 @@
 require 'json'
 require 'pp'
 require 'colorize'
+require 'fileutils'
 
 $:.unshift File.dirname(__FILE__)
-require 'ext/hash'
 require 'lono/version'
 require 'lono/cli'
 require 'lono/new'
 require 'lono/template'
 require 'lono/dsl'
-require 'lono/bashify'
+require 'lono/bashify'

data/lib/lono/cli.rb

@@ -6,18 +6,18 @@ module Lono
 
     desc "new [NAME]", "Generates lono starter project"
     Help.new_long_desc
-    option :force, :type => :boolean, :aliases => "-f", :desc => "override existing starter files"
-    option :quiet, :type => :boolean, :aliases => "-q", :desc => "silence the output"
+    option :force, type: :boolean, aliases: "-f", desc: "override existing starter files"
+    option :quiet, type: :boolean, aliases: "-q", desc: "silence the output"
     def new(project_root)
-      Lono::New.new(options.clone.merge(:project_root => project_root)).run
+      Lono::New.new(options.clone.merge(project_root: project_root)).run
     end
 
     desc "generate", "Generate the cloud formation templates"
     Help.generate
-    option :clean, :type => :boolean, :aliases => "-c", :desc => "remove all output files before generating"
-    option :project_root, :default => ".", :aliases => "-r", :desc => "project root"
-    option :quiet, :type => :boolean, :aliases => "-q", :desc => "silence the output"
-    option :pretty, :type => :boolean, :default => true, :desc => "json pretty the output"
+    option :clean, type: :boolean, aliases: "-c", desc: "remove all output files before generating"
+    option :project_root, default: ".", aliases: "-r", desc: "project root"
+    option :quiet, type: :boolean, aliases: "-q", desc: "silence the output"
+    option :pretty, type: :boolean, default: true, desc: "json pretty the output"
     def generate
       Lono::DSL.new(options.clone).run
     end
@@ -25,7 +25,7 @@ module Lono
     desc "bashify [URL-OR-PATH]", "Convert the UserData section of an existing Cloud Formation Template to a starter bash script that is compatiable with lono"
     Help.bashify
     def bashify(path)
-      Lono::Bashify.new(:path => path).run
+      Lono::Bashify.new(path: path).run
     end
 
     desc "version", "Prints version"
@@ -34,4 +34,4 @@ module Lono
     end
 
   end  
-end
+end

data/lib/lono/dsl.rb

@@ -15,13 +15,13 @@ module Lono
 
     # load any templates defined in project/config/lono/*
     def load_subfolder
-      Dir.glob("#{File.dirname(@path)}/lono/*").each do |path|
+      Dir.glob("#{File.dirname(@path)}/lono/**/*").select{ |e| File.file? e }.each do |path|
         instance_eval(File.read(path), path)
       end
     end
 
     def template(name, &block)
-      @templates << {:name => name, :block => block}
+      @templates << {name: name, block: block}
     end
 
     def build
@@ -39,7 +39,10 @@ module Lono
         path = "#{output_path}/#{name}"
         puts "  #{path}" unless @options[:quiet]
         validate(json, path)
-        File.open(path, 'w') {|f| f.write(output_json(json)) }
+        ensure_parent_dir(path)
+        File.open(path, 'w') do |f|
+          f.write(output_json(json))
+        end
       end
     end
 
@@ -57,10 +60,15 @@ module Lono
       @options[:pretty] ? JSON.pretty_generate(JSON.parse(json)) : json
     end
 
+    def ensure_parent_dir(path)
+      dir = File.dirname(path)
+      FileUtils.mkdir_p(dir) unless File.exist?(dir)
+    end
+
     def run(options={})
       evaluate
       build
       output
     end
   end
-end
+end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "0.4.4"
-end
+  VERSION = "0.5.0"
+end

data/lib/starter_project/Guardfile

@@ -7,6 +7,6 @@ guard "lono" do
 end
 
 # Commented out due to CF rate limiting
-# guard "cloudformation", :templates_path => "output" do
+# guard "cloudformation", templates_path: "output" do
 #   watch(%r{^output/.+\.json$})
-# end
+# end

data/lib/starter_project/config/lono.rb

@@ -2,19 +2,19 @@ template "prod-blog-app.json" do
   env,app,role = name.sub('.json','').split('-')
   source "app.json.erb"
   variables(
-    :env => env,
-    :app => app,
-    :role => role,
-    :ami => "ami-456",
-    :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"
+    env: env,
+    app: app,
+    role: role,
+    ami: "ami-456",
+    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"
   )
-end
+end

data/lib/starter_project/config/lono/api.rb

@@ -1,47 +1,58 @@
 template "prod-api-app.json" do
   source "app.json.erb"
   variables(
-    :ami => "ami-123",
-    :instance_type => "m1.small",
-    :port => "80",
-    :high_threshold => "15",
-    :high_periods => "4",
-    :low_threshold => "5",
-    :low_periods => "10",
-    :max_size => "24",
-    :min_size => "6",
-    :down_adjustment => "-3",
-    :up_adjustment => "3",
-    :ssl_cert => "arn:aws:iam::12345:server-certificate/wildcard"
+    ami: "ami-123",
+    instance_type: "m1.small",
+    port: "80",
+    high_threshold: "15",
+    high_periods: "4",
+    low_threshold: "5",
+    low_periods: "10",
+    max_size: "24",
+    min_size: "6",
+    down_adjustment: "-3",
+    up_adjustment: "3",
+    ssl_cert: "arn:aws:iam::12345:server-certificate/wildcard"
   )
 end
 
 template "prod-api-worker.json" do
   source "app.json.erb"
   variables(
-    :ami => "ami-123",
-    :instance_type => "m1.small",
-    :port => "80",
-    :high_threshold => "15",
-    :high_periods => "4",
-    :low_threshold => "5",
-    :low_periods => "10",
-    :max_size => "24",
-    :min_size => "6",
-    :down_adjustment => "-3",
-    :up_adjustment => "3",
-    :user_data_script => "ruby_script.rb.erb",
-    :ssl_cert => "arn:aws:iam::12345:server-certificate/wildcard"
+    ami: "ami-123",
+    instance_type: "m1.small",
+    port: "80",
+    high_threshold: "15",
+    high_periods: "4",
+    low_threshold: "5",
+    low_periods: "10",
+    max_size: "24",
+    min_size: "6",
+    down_adjustment: "-3",
+    up_adjustment: "3",
+    user_data_script: "ruby_script.rb.erb",
+    ssl_cert: "arn:aws:iam::12345:server-certificate/wildcard"
   )
 end
 
 template "prod-api-redis.json" do
   source "db.json.erb"
   variables(
-    :ami => "ami-456",
-    :instance_type => "m1.small",
-    :port => "80",
-    :volume_size => "20",
-    :availability_zone => "us-east-1e"
+    ami: "ami-456",
+    instance_type: "m1.small",
+    port: "80",
+    volume_size: "20",
+    availability_zone: "us-east-1e"
   )
-end
+end
+
+template "parent/db-stack.json" do
+  source "db.json.erb"
+  variables(
+    ami: "ami-456",
+    instance_type: "m1.small",
+    port: "80",
+    volume_size: "20",
+    availability_zone: "us-east-1e"
+  )
+end

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

@@ -179,7 +179,7 @@
       },
       "Type": "AWS::CloudWatch::Alarm"
     },
-    <%= partial("host_record.json.erb", :domain => "mydomain.com") %>
+    <%= partial("host_record.json.erb", domain: "mydomain.com") %>
     "LaunchConfig": {
       "Properties": {
         "BlockDeviceMappings": [

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

@@ -34,7 +34,7 @@
             "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/ruby_script.rb.erb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-ec2.tags.create(ec2.instances[my_instance_id], "Name", {:value => Facter.hostname})
+ec2.tags.create(ec2.instances[my_instance_id], "Name", {value: Facter.hostname})
 
-find_all{ |record_set| record_set[:name] == record_name }
+find_all{ |record_set| record_set[:name] == record_name }

data/spec/lib/lono_spec.rb

@@ -11,14 +11,14 @@ describe Lono do
   end
 
   after(:each) do
-    FileUtils.rm_rf(@project) unless ENV['LEAVE_TMP_PROJECT']
+    FileUtils.rm_rf(@project) unless ENV['KEEP_TMP_PROJECT']
   end
 
   describe "bashify" do
     it "should convert cfn user_data to bash script" do
       path = "#{$root}/spec/fixtures/cfn.json"
       out = execute("./bin/lono bashify #{path}")
-      out.should match /bash -lexv/
+      expect(out).to match /bash -lexv/
     end
   end
 
@@ -28,123 +28,123 @@ describe Lono do
       template = Lono::Template.new("foo", block)
 
       line = '0{2345}7'
-      template.bracket_positions(line).should == [[0,0],[1,6],[7,7]]
+      expect(template.bracket_positions(line)).to eq [[0,0],[1,6],[7,7]]
       line = '0{2}4{6}' # more than one bracket
-      template.bracket_positions(line).should == [[0,0],[1,3],[4,4],[5,7]]
+      expect(template.bracket_positions(line)).to eq [[0,0],[1,3],[4,4],[5,7]]
       line = '0{2}4{6{8}0}2' # nested brackets
-      template.bracket_positions(line).should == [[0,0],[1,3],[4,4],[5,11],[12,12]]
+      expect(template.bracket_positions(line)).to eq [[0,0],[1,3],[4,4],[5,11],[12,12]]
 
       line = '{'
-      template.decompose(line).should == ['{']
+      expect(template.decompose(line)).to eq ['{']
 
       ##########################
       line = '1{"Ref"=>"A"}{"Ref"=>"B"}'
-      template.decompose(line).should == ['1','{"Ref"=>"A"}','{"Ref"=>"B"}']
+      expect(template.decompose(line)).to eq ['1','{"Ref"=>"A"}','{"Ref"=>"B"}']
 
       line = '{"Ref"=>"A"}{"Ref"=>"B"}2'
-      template.decompose(line).should == ['{"Ref"=>"A"}','{"Ref"=>"B"}','2']
+      expect(template.decompose(line)).to eq ['{"Ref"=>"A"}','{"Ref"=>"B"}','2']
 
       line = '1{"Ref"=>"A"}{"Ref"=>"B"}2'
-      template.decompose(line).should == ['1','{"Ref"=>"A"}','{"Ref"=>"B"}','2']
+      expect(template.decompose(line)).to eq ['1','{"Ref"=>"A"}','{"Ref"=>"B"}','2']
 
       line = '{"Ref"=>"A"}{"Ref"=>"B"}'
-      template.decompose(line).should == ['{"Ref"=>"A"}','{"Ref"=>"B"}']
+      expect(template.decompose(line)).to eq ['{"Ref"=>"A"}','{"Ref"=>"B"}']
 
       line = 'Ref{"Ref"=>"B"}'
-      template.decompose(line).should == ['Ref','{"Ref"=>"B"}']
+      expect(template.decompose(line)).to eq ['Ref','{"Ref"=>"B"}']
       ##############################
 
       # only allow whitelist
       line = 'a{b}{"foo"=>"bar"}h'
-      template.decompose(line).should == ['a{b}{"foo"=>"bar"}h']
+      expect(template.decompose(line)).to eq ['a{b}{"foo"=>"bar"}h']
 
       line = 'a{b}{"Ref"=>"bar"}h'
-      template.decompose(line).should == ['a{b}','{"Ref"=>"bar"}','h']
+      expect(template.decompose(line)).to eq ['a{b}','{"Ref"=>"bar"}','h']
       line = 'a{"Ref"=>"bar"}c{"Ref"=>{"cat"=>"mouse"}}e' # nested brackets
-      template.decompose(line).should == ['a','{"Ref"=>"bar"}','c','{"Ref"=>{"cat"=>"mouse"}}','e']
+      expect(template.decompose(line)).to eq ['a','{"Ref"=>"bar"}','c','{"Ref"=>{"cat"=>"mouse"}}','e']
 
       line = 'test{"Ref"=>"world"}me' # nested brackets
       decomposition = template.decompose(line)
       result = template.recompose(decomposition)
-      result.should == ["test", {"Ref" => "world"}, "me"]
+      expect(result).to eq ["test", {"Ref" => "world"}, "me"]
 
       line = 'test{"Ref"=>"world"}me'
-      template.transform(line).should == ["test", {"Ref" => "world"}, "me\n"]
+      expect(template.transform(line)).to eq ["test", {"Ref" => "world"}, "me\n"]
       line = '{"Ref"=>"world"}'
-      template.transform(line).should == [{"Ref" => "world"}, "\n"]
+      expect(template.transform(line)).to eq [{"Ref" => "world"}, "\n"]
       line = '{'
-      template.transform(line).should == ["{\n"]
+      expect(template.transform(line)).to eq ["{\n"]
       line = 'Ref{"Ref"=>"B"}'
-      template.transform(line).should == ['Ref',{"Ref"=>"B"}, "\n"]
+      expect(template.transform(line)).to eq ['Ref',{"Ref"=>"B"}, "\n"]
     end
   end
 
   describe "ruby specs" do
     before(:each) do
-      @dsl = Lono::DSL.new(
-        :project_root => @project,
-        :quiet => true
+      dsl = Lono::DSL.new(
+        project_root: @project,
+        quiet: true
       )
-      @dsl.run
+      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'
+      expect(json['Description']).to eq "Api Stack"
+      expect(json['Mappings']['AWSRegionArch2AMI']['us-east-1']['64']).to eq 'ami-123'
     end
 
     it "should make trailing options pass to the partial helper available as instance variables" do
       raw = IO.read("#{@project}/output/prod-api-app.json")
       json = JSON.load(raw)
-      json['Resources']['HostRecord']['Properties']['Comment'].should == 'DNS name for mydomain.com'
+      expect(json['Resources']['HostRecord']['Properties']['Comment']).to eq '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"
+      expect(json['Description']).to eq "Api redis"
       user_data = json['Resources']['server']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
-      user_data.should include("VARTEST=foo\n")
+      expect(user_data).to 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"
+      expect(json['Description']).to eq "Api redis"
       user_data = json['Resources']['server']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
-      user_data.should include("DB2=test\n")
+      expect(user_data).to include("DB2=test\n")
     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"
+      expect(json['Description']).to eq "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"})
-      user_data.should include({
+      expect(user_data).to include({"Ref" => "AWS::StackName"})
+      expect(user_data).to include({"Ref" => "WaitHandle"})
+      expect(user_data).to include({
         "Fn::FindInMap" => [
           "EnvironmentMapping",
           "HostnamePrefix",
           {"Ref" => "Environment"}
         ]
       })
-      user_data.should include({
+      expect(user_data).to include({
         "Fn::FindInMap" => [
           "MapName",
           "TopLevelKey",
           "SecondLevelKey"
         ]
       })
-      user_data.should include({"Ref" => "DRINK"})
+      expect(user_data).to include({"Ref" => "DRINK"})
 
-      user_data.should include({"Fn::Base64" => "value to encode"})
-      user_data.should include({"Fn::GetAtt" => ["server", "PublicDnsName"]})
-      user_data.should include({"Fn::GetAZs" => "AWS::Region"})
-      user_data.should include({"Fn::Join" => [ ':', ['a','b','c']]})
-      user_data.should include({"Fn::Select" => [ '1', ['a','b','c']]})
+      expect(user_data).to include({"Fn::Base64" => "value to encode"})
+      expect(user_data).to include({"Fn::GetAtt" => ["server", "PublicDnsName"]})
+      expect(user_data).to include({"Fn::GetAZs" => "AWS::Region"})
+      expect(user_data).to include({"Fn::Join" => [ ':', ['a','b','c']]})
+      expect(user_data).to include({"Fn::Select" => [ '1', ['a','b','c']]})
     end
 
     it "should transform bash script to CF template user_data" do
@@ -153,45 +153,46 @@ describe Lono do
 
       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"]
+      expect(data).to eq ["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"]
+      expect(data).to eq ["echo ", {"Ref"=>"AWS::StackName"}, " > /tmp/stack_name\n"]
 
       line = 'echo {"Fn::FindInMap" => [ "A", "B", {"Ref"=>"AWS::StackName"} ]}'
       data = template.transform(line)
-      data.should == ["echo ", {"Fn::FindInMap" => ["A", "B", {"Ref"=>"AWS::StackName"}]}, "\n"]
+      expect(data).to eq ["echo ", {"Fn::FindInMap" => ["A", "B", {"Ref"=>"AWS::StackName"}]}, "\n"]
 
       line = 'echo {"Fn::FindInMap" => [ "A", "B", {"Ref"=>"AWS::StackName"} ]} > /tmp/stack_name ; {"Ref"=>"Ami"}'
       data = template.transform(line)
-      data.should == ["echo ", {"Fn::FindInMap" => ["A", "B", {"Ref"=>"AWS::StackName"}]}, " > /tmp/stack_name ; ", {"Ref"=>"Ami"}, "\n"]
+      expect(data).to eq ["echo ", {"Fn::FindInMap" => ["A", "B", {"Ref"=>"AWS::StackName"}]}, " > /tmp/stack_name ; ", {"Ref"=>"Ami"}, "\n"]
     end
 
     it "should not transform user_data ruby scripts" do
       raw = IO.read("#{@project}/output/prod-api-worker.json")
       json = JSON.load(raw)
       user_data = json['Resources']['LaunchConfig']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
-      user_data.should include(%Q|ec2.tags.create(ec2.instances[my_instance_id], "Name", {:value => Facter.hostname})\n|)
-      user_data.should include(%Q{find_all{ |record_set| record_set[:name] == record_name }\n})
+      expect(user_data).to include(%Q|ec2.tags.create(ec2.instances[my_instance_id], "Name", {value: Facter.hostname})\n|)
+      expect(user_data).to include(%Q{find_all{ |record_set| record_set[:name] == record_name }\n})
+    end
+
+    it "should create parent folders for parent/db-stack.json" do
+      directory_created = File.exist?("#{@project}/output/parent")
+      expect(directory_created).to be true
     end
 
     it "task should generate cloud formation templates" do
-      Lono::DSL.new(
-        :project_root => @project,
-        :quiet => true
-      ).run
       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'
+      expect(json['Description']).to eq "Api Stack"
+      expect(json['Mappings']['AWSRegionArch2AMI']['us-east-1']['64']).to eq 'ami-123'
     end
   end
 
   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/
+      expect(out).to match /Generating Cloud Formation templates/
     end
   end
-end
+end

metadata

@@ -1,190 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 0.4.4
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2016-09-29 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: 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: colorize
   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,17 +173,18 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/lono
-- lib/ext/hash.rb
 - lib/lono.rb
 - lib/lono/bashify.rb
 - lib/lono/cli.rb
@@ -234,30 +212,30 @@ files:
 homepage: http://github.com/tongueroo/lono
 licenses:
 - MIT
+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.23
+rubygems_version: 2.6.4
 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:
 - spec/fixtures/cfn.json
 - spec/lib/lono_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/lib/ext/hash.rb

@@ -1,11 +0,0 @@
-class Hash
-  alias hkeys keys
-
-  def keys
-    hkeys.sort {|a,b| a.to_s <=> b.to_s }
-  end
-
-  def each
-    keys.each { |k| yield k, self[k] }
-  end
-end