lono 3.5.0 → 4.0.0

data/spec/lib/lono/template/dsl_spec.rb

@@ -1,183 +1,59 @@
-require "spec_helper"
-
 describe Lono::Template::DSL do
-  before(:each) do
-    @saved_root = ENV['LONO_ROOT']
-    ENV['LONO_ROOT'] = ENV['TMP_LONO_ROOT']
-  end
-  after(:each) do
-    ENV['LONO_ROOT'] = @saved_root
-    FileUtils.rm_rf(ENV['TMP_LONO_ROOT']) unless ENV['KEEP_TMP_PROJECT']
-  end
-
-  context "json starter project" do
-    before(:each) do
-      new_project = Lono::New.new(
-        force: true,
-        quiet: true,
-        format: 'json',
-        project_root: ENV['TMP_LONO_ROOT'],
-      )
-      new_project.run
-    end
-
-    it "json" do
+  context "tmp/lono_project" do
+    it "#evaluate_templates" do
       dsl = Lono::Template::DSL.new(
         quiet: true
       )
-      dsl.evaluate_templates # run the dependent instance_eval and load_subfoler so @templates is assigned
-      detected_format = dsl.detect_format
-      expect(detected_format).to eq 'json'
+      dsl.evaluate_templates
+      templates = dsl.instance_variable_get(:@templates)
+      template_names = templates.map { |h| h[:name] }
+      expect(template_names).to include("example")
     end
   end
 
-  context "yaml starter project" do
+  context "lono generate" do
     before(:each) do
-      new_project = Lono::New.new(
-        force: true,
-        quiet: true,
-        format: 'yaml',
-        project_root: ENV['TMP_LONO_ROOT'],
-      )
-      new_project.run
-    end
-
-    it "yaml" do
-      dsl = Lono::Template::DSL.new(
-        quiet: true
-      )
-      dsl.evaluate_templates # run the dependent instance_eval and load_subfoler so @templates is assigned
-      detected_format = dsl.detect_format
-      expect(detected_format).to eq 'yml'
-    end
-  end
-
-  context "multiple format starter project" do
-    # it "yaml" do
-    #   dsl = Lono::Template::DSL.new(
-    #     project_root: @project,
-    #     quiet: true
-    #   )
-    #   detected_format = dsl.detect_format
-    #   expect(detected_format).to eq 'yaml'
-    # end
-  end
-
-  context "json starter project" do
-    before(:each) do
-      new_project = Lono::New.new(
-        force: true,
-        quiet: true,
-        format: 'json',
-        project_root: ENV['TMP_LONO_ROOT'],
-      )
-      new_project.run
-
-      dsl = Lono::Template::DSL.new(
-        quiet: true
-      )
+      dsl = Lono::Template::DSL.new(quiet: true)
       dsl.run
     end
 
     it "should generate cloudformation template" do
-      raw = IO.read("#{Lono.root}/output/api-web.json")
-      json = JSON.load(raw)
-      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("#{Lono.root}/output/api-web.json")
-      json = JSON.load(raw)
-      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("#{Lono.root}/output/api-redis.json")
-      json = JSON.load(raw)
-      expect(json['Description']).to eq "Api redis"
-      user_data = json['Resources']['server']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
-      expect(user_data).to include("VARTEST=foo\n")
+      template = YAML.load_file("#{Lono.root}/output/templates/example.yml")
+      expect(template['Description']).to include "AWS CloudFormation Sample Template"
     end
 
-    it "should include multiple user_data scripts" do
-      raw = IO.read("#{Lono.root}/output/api-redis.json")
-      json = JSON.load(raw)
-      expect(json['Description']).to eq "Api redis"
-      user_data = json['Resources']['server']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
-      expect(user_data).to include("DB2=test\n")
+    # <%= partial("security_group", desc: "whatever", port: 22)
+    it "partial local variables become instance variables in partial view" do
+      template = YAML.load_file("#{Lono.root}/output/templates/example.yml")
+      desc = template['Resources']['InstanceSecurityGroup']['Properties']['GroupDescription']
+      expect(desc).to eq 'Enable SSH access via port 22'
     end
 
-    it "should generate db template" do
-      raw = IO.read("#{Lono.root}/output/api-redis.json")
-      json = JSON.load(raw)
-      expect(json['Description']).to eq "Api redis"
-      user_data = json['Resources']['server']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
-      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"}
-        ]
-      })
-      expect(user_data).to include({
-        "Fn::FindInMap" => [
-          "MapName",
-          "TopLevelKey",
-          "SecondLevelKey"
-        ]
-      })
-      expect(user_data).to include({"Ref" => "DRINK"})
-
-      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']]})
+    it "partials should have access to variables" do
+      text = IO.read("#{Lono.root}/output/templates/example.yml")
+      expect(text).to include("override_test=overridden-by-development")
     end
 
-    it "should transform bash script to CF template user_data" do
-      block = Proc.new { }
-      template = Lono::Template::Template.new("foo", block)
-
-      line = 'echo {"Ref"=>"AWS::StackName"} > /tmp/stack_name ; {"Ref"=>"Ami"}'
-      data = template.transform(line)
-      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)
-      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)
-      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)
-      expect(data).to eq ["echo ", {"Fn::FindInMap" => ["A", "B", {"Ref"=>"AWS::StackName"}]}, " > /tmp/stack_name ; ", {"Ref"=>"Ami"}, "\n"]
+    it "should have access to custom helpers" do
+      text = IO.read("#{Lono.root}/output/templates/example.yml")
+      expect(text).to include("custom_helper value")
     end
+  end
 
-    it "should not transform user_data ruby scripts" do
-      raw = IO.read("#{Lono.root}/output/api-worker.json")
-      json = JSON.load(raw)
-      user_data = json['Resources']['LaunchConfig']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
-      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})
+  context "yaml parse error" do
+    let(:dsl) do
+      Lono::Template::DSL.new(quiet: true)
     end
 
-    it "should create parent folders for parent/db-stack.json" do
-      directory_created = File.exist?("#{Lono.root}/output/parent")
-      expect(directory_created).to be true
+    it "show exact line of error code when yaml is invalid" do
+      IO.write("tmp/bad.yml", <<EOL)
+test: 1
+foo
+  test
+EOL
+      out = dsl.validate("tmp/bad.yml")
+      expect(out).to include("2 foo")
     end
 
-    it "task should generate CloudFormation templates" do
-      raw = IO.read("#{Lono.root}/output/api-web.json")
-      json = JSON.load(raw)
-      expect(json['Description']).to eq "Api Stack"
-      expect(json['Mappings']['AWSRegionArch2AMI']['us-east-1']['64']).to eq 'ami-123'
-    end
   end
-
 end

data/spec/lib/lono/template_spec.rb

@@ -1,32 +1,20 @@
-require "spec_helper"
-
 describe Lono do
-  before(:each) do
-    @env = "LONO_ROOT=tmp/foo"
-    lono_bin = File.expand_path("../../../../bin/lono", __FILE__)
-    execute("cd tmp && #{lono_bin} new foo -f -q --format json")
-  end
-
-  after(:each) do
-    # FileUtils.rm_rf("foo") 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 template bashify #{path}")
+      path = "spec/fixtures/cfn.json"
+      out = execute("exe/lono template bashify #{path}")
       expect(out).to match /bash -lexv/
     end
   end
 
   describe "cli specs" do
     it "should generate templates" do
-      out = execute("#{@env} ./bin/lono template generate -c")
+      out = execute("exe/lono template generate --clean")
       expect(out).to match /Generating CloudFormation templates/
     end
 
     it "should upload templates" do
-      out = execute("#{@env} ./bin/lono template upload --noop")
+      out = execute("exe/lono template upload --noop")
       expect(out).to match /Templates uploaded to s3/
     end
   end

data/spec/spec_helper.rb

@@ -1,31 +1,62 @@
 ENV['TEST'] = '1'
 # Ensures aws api never called. Fixture home folder does not contain ~/.aws/credentails
 ENV['HOME'] = "spec/fixtures/home"
-ENV['LONO_ROOT'] = "spec/fixtures/my_project" # this gets kept
-ENV['TMP_LONO_ROOT'] = "./tmp/lono_project" # need the period for the load_custom_helpers require , unsure if I should adjust the LOAD_PATH
+# We'll always re-generate a new lono project in tmp. It can be:
+#
+#   1. copied from spec/fixtures/lono_project
+#   2. generated from `lono new`
+#
+# This is done because changing LONO_ROOT for specs was a mess.
+ENV['LONO_ROOT'] = "tmp/lono_project" # this gets kept
 
 require "pp"
 require "byebug"
-require "bundler"
 
-Bundler.require(:development)
+# require "bundler"
+# Bundler.require(:development)
 
-$root = File.expand_path('../../', __FILE__)
+root = File.expand_path("../", File.dirname(__FILE__))
+require "#{root}/lib/lono"
 
-require "#{$root}/lib/lono"
-
-# require 'coveralls'
-# Coveralls.wear!
-
-module Helpers
+module Helper
   def execute(cmd)
-    puts "Running: #{cmd}" if ENV['DEBUG']
+    puts "Running: #{cmd}" if show_command?
     out = `#{cmd}`
-    puts out if ENV['DEBUG']
+    puts out if show_command?
     out
   end
+
+  # Added SHOW_COMMAND because DEBUG is also used by other libraries like
+  # bundler and it shows its internal debugging logging also.
+  def show_command?
+    ENV['DEBUG'] || ENV['SHOW_COMMAND']
+  end
+
+  def ensure_tmp_exists
+    FileUtils.mkdir_p("tmp")
+  end
+
+  # Copies spec/fixtures/lono_project to tmp/lono_project,
+  # Main fixture we'll use because it's faster
+  def copy_lono_project
+    destroy_lono_project # just in case KEEP_TMP_PROJECT is used
+    FileUtils.cp_r("spec/fixtures/lono_project", "tmp/lono_project")
+  end
+
+  def destroy_lono_project
+    # Only use KEEP_TMP_PROJECT if you are testing exactly 1 spec for debugging
+    # or it'll affect other tests.
+    FileUtils.rm_rf(Lono.root)
+  end
 end
 
 RSpec.configure do |c|
-  c.include Helpers
+  c.include Helper
+  c.before(:all) do
+    ensure_tmp_exists
+    copy_lono_project
+  end
+  c.after(:all) do
+    destroy_lono_project unless ENV['KEEP_TMP_PROJECT']
+  end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: aws-sdk-cloudformation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rb-fsevent
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-cloudformation
+  name: filesize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-lono
+  name: graph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-cloudformation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-lono
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-cloudformation
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-s3
+  name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: graph
+  name: render_me_pretty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -248,8 +276,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Lono is a CloudFormation Template ruby generator.  Lono generates CloudFormation
-  templates based on ERB templates.
+description: 
 email:
 - tongueroo@gmail.com
 executables:
@@ -258,7 +285,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
-- ".coveralls.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
@@ -266,105 +292,151 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
-- bin/lono
+- exe/lono
 - lib/lono.rb
 - lib/lono/cfn.rb
-- lib/lono/cfn/aws_services.rb
+- lib/lono/cfn/aws_service.rb
 - lib/lono/cfn/base.rb
 - lib/lono/cfn/create.rb
 - lib/lono/cfn/delete.rb
 - lib/lono/cfn/diff.rb
 - lib/lono/cfn/download.rb
-- lib/lono/cfn/help.rb
 - lib/lono/cfn/preview.rb
 - lib/lono/cfn/update.rb
 - lib/lono/cfn/util.rb
 - lib/lono/clean.rb
 - lib/lono/cli.rb
 - lib/lono/command.rb
+- lib/lono/completer.rb
+- lib/lono/completer/script.rb
+- lib/lono/completer/script.sh
+- lib/lono/completion.rb
 - lib/lono/core.rb
-- lib/lono/current_region.rb
+- lib/lono/core/config.rb
 - lib/lono/default/settings.yml
 - lib/lono/help.rb
+- lib/lono/help/cfn.md
+- lib/lono/help/cfn/create.md
+- lib/lono/help/cfn/delete.md
+- lib/lono/help/cfn/diff.md
+- lib/lono/help/cfn/download.md
+- lib/lono/help/cfn/preview.md
+- lib/lono/help/cfn/update.md
+- lib/lono/help/completion.md
+- lib/lono/help/completion_script.md
+- lib/lono/help/generate.md
+- lib/lono/help/hello.md
+- lib/lono/help/import.md
+- lib/lono/help/inspect.md
+- lib/lono/help/inspect/depends.md
+- lib/lono/help/inspect/summary.md
+- lib/lono/help/new.md
+- lib/lono/help/param.md
+- lib/lono/help/param/generate.md
+- lib/lono/help/script/build.md
+- lib/lono/help/script/upload.md
+- lib/lono/help/template.md
+- lib/lono/help/template/bashify.md
+- lib/lono/help/template/generate.md
+- lib/lono/help/user_data.md
 - lib/lono/importer.rb
 - lib/lono/inspector.rb
 - lib/lono/inspector/base.rb
-- lib/lono/inspector/depends.rb
-- lib/lono/inspector/help.rb
+- lib/lono/inspector/graph.rb
 - lib/lono/inspector/summary.rb
 - lib/lono/new.rb
+- lib/lono/new/helper.rb
+- lib/lono/new/message.rb
 - lib/lono/param.rb
 - lib/lono/param/generator.rb
-- lib/lono/param/help.rb
 - lib/lono/project_checker.rb
-- lib/lono/settings.rb
+- lib/lono/script.rb
+- lib/lono/script/base.rb
+- lib/lono/script/build.rb
+- lib/lono/script/upload.rb
+- lib/lono/sequence.rb
+- lib/lono/setting.rb
 - lib/lono/template.rb
-- lib/lono/template/aws_services.rb
+- lib/lono/template/aws_service.rb
 - lib/lono/template/bashify.rb
+- lib/lono/template/context.rb
 - lib/lono/template/dsl.rb
-- lib/lono/template/help.rb
-- lib/lono/template/helpers.rb
+- lib/lono/template/helper.rb
 - lib/lono/template/template.rb
 - lib/lono/template/upload.rb
+- lib/lono/upgrade4.rb
+- lib/lono/user_data.rb
 - lib/lono/version.rb
-- lib/starter_projects/json_project/.gitignore
-- lib/starter_projects/json_project/Gemfile
-- lib/starter_projects/json_project/Guardfile
-- lib/starter_projects/json_project/config/templates/base/blog.rb
-- lib/starter_projects/json_project/config/templates/base/stacks.rb
-- lib/starter_projects/json_project/params/base/api-web.txt
-- lib/starter_projects/json_project/templates/db.json
-- lib/starter_projects/json_project/templates/partial/host_record.json
-- lib/starter_projects/json_project/templates/partial/server.json
-- lib/starter_projects/json_project/templates/user_data/app.sh
-- lib/starter_projects/json_project/templates/user_data/db.sh
-- lib/starter_projects/json_project/templates/user_data/db2.sh
-- lib/starter_projects/json_project/templates/user_data/ruby_script.rb
-- lib/starter_projects/json_project/templates/web.json
-- lib/starter_projects/yaml_project/.gitignore
-- lib/starter_projects/yaml_project/Gemfile
-- lib/starter_projects/yaml_project/Guardfile
-- lib/starter_projects/yaml_project/config/templates/base/blog.rb
-- lib/starter_projects/yaml_project/config/templates/base/stacks.rb
-- lib/starter_projects/yaml_project/config/templates/prod/stacks.rb
-- lib/starter_projects/yaml_project/config/templates/stag/stacks.rb
-- lib/starter_projects/yaml_project/config/variables/base/variables.rb
-- lib/starter_projects/yaml_project/config/variables/prod/variables.rb
-- lib/starter_projects/yaml_project/config/variables/stag/variables.rb
-- lib/starter_projects/yaml_project/helpers/my_custom_helper.rb
-- lib/starter_projects/yaml_project/params/base/api-web-prod.txt
-- lib/starter_projects/yaml_project/params/base/example.txt
-- lib/starter_projects/yaml_project/params/prod/example.txt
-- lib/starter_projects/yaml_project/params/stag/example.txt
-- lib/starter_projects/yaml_project/templates/db.yml
-- lib/starter_projects/yaml_project/templates/example.yml
-- lib/starter_projects/yaml_project/templates/partial/host_record.yml
-- lib/starter_projects/yaml_project/templates/partial/server.yml
-- lib/starter_projects/yaml_project/templates/partial/user_data/bootstrap.sh
-- lib/starter_projects/yaml_project/templates/web.yml
+- lib/starter_projects/autoscaling/.gitignore
+- lib/starter_projects/autoscaling/Gemfile
+- lib/starter_projects/autoscaling/Guardfile
+- lib/starter_projects/autoscaling/README.md
+- lib/starter_projects/autoscaling/app/definitions/base.rb
+- lib/starter_projects/autoscaling/app/templates/autoscaling.yml
+- lib/starter_projects/autoscaling/config/params/base/autoscaling.txt
+- lib/starter_projects/autoscaling/config/settings.yml
+- lib/starter_projects/ec2/.gitignore
+- lib/starter_projects/ec2/Gemfile
+- lib/starter_projects/ec2/Guardfile
+- lib/starter_projects/ec2/README.md
+- lib/starter_projects/ec2/app/definitions/base.rb
+- lib/starter_projects/ec2/app/definitions/development.rb
+- lib/starter_projects/ec2/app/definitions/production.rb
+- lib/starter_projects/ec2/app/helpers/my_custom_helper.rb
+- lib/starter_projects/ec2/app/partials/user_data/bootstrap.sh
+- lib/starter_projects/ec2/app/templates/example.yml
+- lib/starter_projects/ec2/config/params/base/example.txt
+- lib/starter_projects/ec2/config/params/development/example.txt
+- lib/starter_projects/ec2/config/params/production/example.txt
+- lib/starter_projects/ec2/config/settings.yml
+- lib/starter_projects/ec2/config/variables/base.rb
+- lib/starter_projects/ec2/config/variables/development.rb
+- lib/starter_projects/ec2/config/variables/production.rb
+- lib/starter_projects/ec2/welcome.txt
+- lib/starter_projects/skeleton/.gitignore
+- lib/starter_projects/skeleton/Gemfile
+- lib/starter_projects/skeleton/Guardfile
+- lib/starter_projects/skeleton/README.md
+- lib/starter_projects/skeleton/app/definitions/base.rb
+- lib/starter_projects/skeleton/config/settings.yml
+- lib/starter_projects/skeleton/welcome.txt
 - lono.gemspec
 - spec/fixtures/cfn.json
-- spec/fixtures/my_project/config/templates/base/stacks.rb
-- spec/fixtures/my_project/params/my-stack.txt
-- spec/fixtures/my_project/templates/.gitkeep
-- spec/fixtures/my_project/templates/my-stack.yml
+- spec/fixtures/lono_project/.gitignore
+- spec/fixtures/lono_project/Gemfile
+- spec/fixtures/lono_project/Guardfile
+- spec/fixtures/lono_project/app/definitions/base.rb
+- spec/fixtures/lono_project/app/definitions/base/more.rb
+- spec/fixtures/lono_project/app/definitions/development.rb
+- spec/fixtures/lono_project/app/definitions/production.rb
+- spec/fixtures/lono_project/app/helpers/custom_helper.rb
+- spec/fixtures/lono_project/app/partials/security_group.yml
+- spec/fixtures/lono_project/app/partials/user_data/bootstrap.sh
+- spec/fixtures/lono_project/app/templates/example.yml
+- spec/fixtures/lono_project/config/params/base/example.txt
+- spec/fixtures/lono_project/config/params/development/example.txt
+- spec/fixtures/lono_project/config/params/production/example.txt
+- spec/fixtures/lono_project/config/settings.yml
+- spec/fixtures/lono_project/config/variables/base.rb
+- spec/fixtures/lono_project/config/variables/development.rb
+- spec/fixtures/lono_project/config/variables/production.rb
 - spec/fixtures/params/baseonly/params/base/network.txt
-- spec/fixtures/params/envonly/params/prod/network.txt
+- spec/fixtures/params/envonly/params/development/network.txt
 - spec/fixtures/params/overlay/params/base/network.txt
-- spec/fixtures/params/overlay/params/prod/network.txt
+- spec/fixtures/params/overlay/params/development/network.txt
 - spec/fixtures/raw_templates/aws-waf-security-automations.template
 - spec/lib/lono/cfn_spec.rb
+- spec/lib/lono/cli_spec.rb
+- spec/lib/lono/completion_spec.rb
 - spec/lib/lono/inspect_spec.rb
-- spec/lib/lono/new_spec.rb
 - spec/lib/lono/param/generator_spec.rb
 - spec/lib/lono/param_spec.rb
+- spec/lib/lono/setting_spec.rb
 - spec/lib/lono/template/dsl_spec.rb
-- spec/lib/lono/template/template_spec.rb
 - spec/lib/lono/template_spec.rb
-- spec/lib/lono_spec.rb
 - spec/spec_helper.rb
 - vendor/plissken/Gemfile
 - vendor/plissken/LICENSE.txt
@@ -406,22 +478,36 @@ summary: Lono is a CloudFormation Template ruby generator.  Lono generates Cloud
   templates based on ERB templates.
 test_files:
 - spec/fixtures/cfn.json
-- spec/fixtures/my_project/config/templates/base/stacks.rb
-- spec/fixtures/my_project/params/my-stack.txt
-- spec/fixtures/my_project/templates/.gitkeep
-- spec/fixtures/my_project/templates/my-stack.yml
+- spec/fixtures/lono_project/.gitignore
+- spec/fixtures/lono_project/Gemfile
+- spec/fixtures/lono_project/Guardfile
+- spec/fixtures/lono_project/app/definitions/base.rb
+- spec/fixtures/lono_project/app/definitions/base/more.rb
+- spec/fixtures/lono_project/app/definitions/development.rb
+- spec/fixtures/lono_project/app/definitions/production.rb
+- spec/fixtures/lono_project/app/helpers/custom_helper.rb
+- spec/fixtures/lono_project/app/partials/security_group.yml
+- spec/fixtures/lono_project/app/partials/user_data/bootstrap.sh
+- spec/fixtures/lono_project/app/templates/example.yml
+- spec/fixtures/lono_project/config/params/base/example.txt
+- spec/fixtures/lono_project/config/params/development/example.txt
+- spec/fixtures/lono_project/config/params/production/example.txt
+- spec/fixtures/lono_project/config/settings.yml
+- spec/fixtures/lono_project/config/variables/base.rb
+- spec/fixtures/lono_project/config/variables/development.rb
+- spec/fixtures/lono_project/config/variables/production.rb
 - spec/fixtures/params/baseonly/params/base/network.txt
-- spec/fixtures/params/envonly/params/prod/network.txt
+- spec/fixtures/params/envonly/params/development/network.txt
 - spec/fixtures/params/overlay/params/base/network.txt
-- spec/fixtures/params/overlay/params/prod/network.txt
+- spec/fixtures/params/overlay/params/development/network.txt
 - spec/fixtures/raw_templates/aws-waf-security-automations.template
 - spec/lib/lono/cfn_spec.rb
+- spec/lib/lono/cli_spec.rb
+- spec/lib/lono/completion_spec.rb
 - spec/lib/lono/inspect_spec.rb
-- spec/lib/lono/new_spec.rb
 - spec/lib/lono/param/generator_spec.rb
 - spec/lib/lono/param_spec.rb
+- spec/lib/lono/setting_spec.rb
 - spec/lib/lono/template/dsl_spec.rb
-- spec/lib/lono/template/template_spec.rb
 - spec/lib/lono/template_spec.rb
-- spec/lib/lono_spec.rb
 - spec/spec_helper.rb