lono 2.1.0 → 3.0.0

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "2.1.0"
+  VERSION = "3.0.0"
 end

data/lib/starter_projects/json_project/config/{lono.rb → templates/base/blog.rb}

@@ -1,6 +1,6 @@
-template "blog-web-prod.json" do
-  app,role,env = name.sub('.json','').split('-')
-  source "web.json.erb"
+template "blog-web-prod" do
+  app,role,env = name.split('-')
+  source "web"
   variables(
     env: env,
     app: app,

data/lib/starter_projects/{yaml_project/config/lono/api.rb → json_project/config/templates/base/stacks.rb}

@@ -1,5 +1,5 @@
-template "api-web-prod.yml" do
-  source "web.yml.erb"
+template "api-web-prod" do
+  source "web"
   variables(
     ami: "ami-123",
     instance_type: "t2.small",
@@ -16,8 +16,8 @@ template "api-web-prod.yml" do
   )
 end
 
-template "api-worker-prod.yml" do
-  source "web.yml.erb"
+template "api-worker-prod" do
+  source "web"
   variables(
     ami: "ami-123",
     instance_type: "t2.small",
@@ -30,13 +30,13 @@ template "api-worker-prod.yml" do
     min_size: "6",
     down_adjustment: "-3",
     up_adjustment: "3",
-    user_data_script: "ruby_script.rb.erb",
+    user_data_script: "ruby_script.rb",
     ssl_cert: "arn:aws:iam::12345:server-certificate/wildcard"
   )
 end
 
-template "api-redis-prod.yml" do
-  source "db.yml.erb"
+template "api-redis-prod" do
+  source "db"
   variables(
     ami: "ami-456",
     instance_type: "t2.small",
@@ -46,8 +46,8 @@ template "api-redis-prod.yml" do
   )
 end
 
-template "parent/db-stack.yml" do
-  source "db.yml.erb"
+template "parent/db-stack" do
+  source "db"
   variables(
     ami: "ami-456",
     instance_type: "t2.small",

data/lib/starter_projects/json_project/templates/{db.json.erb → db.json}

@@ -207,6 +207,6 @@
     "WaitHandle": {
       "Type": "AWS::CloudFormation::WaitConditionHandle"
     },
-    <%= partial("server.json.erb") %>
+    <%= partial("server") %>
   }
 }

data/lib/starter_projects/json_project/templates/partial/{server.json.erb → server.json}

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

data/lib/starter_projects/json_project/templates/{web.json.erb → web.json}

@@ -179,7 +179,7 @@
       },
       "Type": "AWS::CloudWatch::Alarm"
     },
-    <%= partial("host_record.json.erb", domain: "mydomain.com") %>
+    <%= partial("host_record", domain: "mydomain.com") %>
     "LaunchConfig": {
       "Properties": {
         "BlockDeviceMappings": [
@@ -235,7 +235,7 @@
             "Fn::Join": [
               "",
               [
-                <% script = @user_data_script || 'app.sh.erb' %>
+                <% script = @user_data_script || 'app.sh' %>
                 <%= user_data(script) %>
               ]
             ]

data/lib/starter_projects/yaml_project/config/{lono.rb → templates/base/blog.rb}

@@ -1,15 +1,10 @@
-template "example.yml" do
-  source "example.yml.erb"
-end
-
-template "blog-web-prod.yml" do
-  app,role,env = name.sub('.yml','').split('-')
-  source "web.yml.erb"
+template "blog-web-prod" do
+  app,role,env = name.split('-')
+  source "web"
   variables(
     env: env,
     app: app,
     role: role,
-    ami: "ami-4836a428", # us-west-2
     instance_type: "t2.small",
     port: "80",
     high_threshold: "35",
@@ -22,3 +17,4 @@ template "blog-web-prod.yml" do
     up_adjustment: "2"
   )
 end
+

data/lib/starter_projects/{json_project/config/lono/api.rb → yaml_project/config/templates/base/stacks.rb}

@@ -1,7 +1,8 @@
-template "api-web-prod.json" do
-  source "web.json.erb"
+template "example"
+
+template "api-web-prod" do
+  source "web"
   variables(
-    ami: "ami-123",
     instance_type: "t2.small",
     port: "80",
     high_threshold: "15",
@@ -16,10 +17,9 @@ template "api-web-prod.json" do
   )
 end
 
-template "api-worker-prod.json" do
-  source "web.json.erb"
+template "api-worker-prod" do
+  source "web"
   variables(
-    ami: "ami-123",
     instance_type: "t2.small",
     port: "80",
     high_threshold: "15",
@@ -30,15 +30,14 @@ template "api-worker-prod.json" do
     min_size: "6",
     down_adjustment: "-3",
     up_adjustment: "3",
-    user_data_script: "ruby_script.rb.erb",
+    user_data_script: "ruby_script.rb",
     ssl_cert: "arn:aws:iam::12345:server-certificate/wildcard"
   )
 end
 
-template "api-redis-prod.json" do
-  source "db.json.erb"
+template "api-redis-prod" do
+  source "db"
   variables(
-    ami: "ami-456",
     instance_type: "t2.small",
     port: "80",
     volume_size: "20",
@@ -46,10 +45,9 @@ template "api-redis-prod.json" do
   )
 end
 
-template "parent/db-stack.json" do
-  source "db.json.erb"
+template "parent/db-stack" do
+  source "db"
   variables(
-    ami: "ami-456",
     instance_type: "t2.small",
     port: "80",
     volume_size: "20",

data/lib/starter_projects/yaml_project/config/templates/prod/stacks.rb

@@ -0,0 +1 @@
+# resources that only exist in the prod environment

data/lib/starter_projects/yaml_project/config/templates/stag/stacks.rb

@@ -0,0 +1 @@
+# resources that only exist in the stag environment

data/lib/starter_projects/yaml_project/config/variables/base/variables.rb

@@ -0,0 +1,4 @@
+@ami = "ami-123"
+@base_only = "base-only-test"
+@prod_override = "overridden-by-whats-in-prod"
+@stag_override = "overridden-by-whats-in-stag"

data/lib/starter_projects/yaml_project/config/variables/prod/variables.rb

@@ -0,0 +1 @@
+@prod_override = "prod-override-test"

data/lib/starter_projects/yaml_project/config/variables/stag/variables.rb

@@ -0,0 +1 @@
+@stag_override = "stag-override-test"

data/lib/starter_projects/yaml_project/helpers/my_custom_helper.rb

@@ -0,0 +1,17 @@
+# File must be name in underscore casing and the module name must be named in
+# CamelizeCasing.  The file must also end in _helper.rb by convention.
+# More info http://lono.cloud/docs/helpers
+# Custom Helpers are loaed into the same scope as built-in lono helpers and are
+# treated a first class citizens.  They have access to all the same methods
+# and instance variable as the built-in lono helpers.
+module MyCustomHelper
+  # This example helper method checks if the file path exists and fails gracefully
+  # the built-in partial fails hard.
+  def shared_partial(name, options={}, indent=0)
+    partial_name = "shared/#{name}.yml.erb"
+    if partial_exist?(partial_name) # partial_exist? is built-in lono helper
+      result << partial(partial_name, {}, indent: indent)
+      result.join("\n")
+    end
+  end
+end

data/lib/starter_projects/yaml_project/params/prod/example.txt

@@ -0,0 +1 @@
+InstanceType=m4.large

data/lib/starter_projects/yaml_project/params/stag/example.txt

@@ -0,0 +1 @@
+InstanceType=m4.small

data/lib/starter_projects/yaml_project/templates/{db.yml.erb → db.yml}

@@ -145,4 +145,4 @@ Resources:
     Type: AWS::CloudFormation::WaitCondition
   WaitHandle:
     Type: AWS::CloudFormation::WaitConditionHandle
-<%= partial("server.yml.erb") %>
+<%= partial("server") %>

data/lib/starter_projects/yaml_project/templates/{web.yml.erb → web.yml}

@@ -105,7 +105,7 @@ Resources:
       Statistic: Average
       Threshold: '<%= @low_threshold %>'
     Type: AWS::CloudWatch::Alarm
-<%= partial("host_record.yml.erb", domain: "mydomain.net") %>
+<%= partial("host_record", domain: "mydomain.net") %>
   LaunchConfig:
     Properties:
       BlockDeviceMappings:
@@ -124,7 +124,7 @@ Resources:
       - Ref: ServiceSecurityGroup
       UserData:
         Fn::Base64: !Sub | # No more Fn::Join needed
-<%= partial("user_data/bootstrap.sh.erb", {}, indent: 10) %>
+<%= partial("user_data/bootstrap.sh", {}, indent: 10) %>
     Type: AWS::AutoScaling::LaunchConfiguration
   ServiceSecurityGroup:
     Properties:

data/lono.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "colorize"
   gem.add_dependency "hashie"
   gem.add_dependency "aws-sdk"
+  gem.add_dependency "activesupport"
   # gem.add_dependency "plissken" # dependency for vendor/lono-params
   # using the vendor fork version: https://github.com/tongueroo/plissken
   # until https://github.com/futurechimp/plissken/pull/6 gets merged

data/spec/fixtures/params/baseonly/params/base/network.txt

@@ -0,0 +1 @@
+baseonly=foo

data/spec/fixtures/params/envonly/params/prod/network.txt

@@ -0,0 +1 @@
+envonly=bar

data/spec/fixtures/params/overlay/params/base/network.txt

@@ -0,0 +1 @@
+overlay=1

data/spec/fixtures/params/overlay/params/prod/network.txt

@@ -0,0 +1 @@
+overlay=2

data/spec/lib/lono/new_spec.rb

@@ -30,7 +30,7 @@ describe Lono::New do
     end
   end
 
-  context "yaml starter project" do
+  context "yml starter project" do
     before(:each) do
       new_project = Lono::New.new(
         force: true,

data/spec/lib/lono/param/generator_spec.rb

@@ -0,0 +1,34 @@
+require_relative "../../../spec_helper"
+
+describe Lono::Param::Generator do
+  def generate(project_root)
+    param = Lono::Param::Generator.new("network",
+      project_root: project_root,
+      mute: true
+    )
+    json = param.generate
+    data = JSON.load(json)
+    param_value = data.first["ParameterValue"]
+  end
+
+  context "overlay params" do
+    it "should combine params" do
+      param_value = generate("spec/fixtures/params/overlay")
+      expect(param_value).to eq "2"
+    end
+  end
+
+  context "only base param" do
+    it "should generate prod param from base param" do
+      param_value = generate("spec/fixtures/params/baseonly")
+      expect(param_value).to eq "foo"
+    end
+  end
+
+  context "only env param" do
+    it "should generate prod param from env param" do
+      param_value = generate("spec/fixtures/params/envonly")
+      expect(param_value).to eq "bar"
+    end
+  end
+end

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

@@ -48,7 +48,7 @@ describe Lono::Template::DSL do
       )
       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 'yaml'
+      expect(detected_format).to eq 'yml'
     end
   end
 

data/spec/lib/lono/template_spec.rb

@@ -27,5 +27,10 @@ describe Lono do
       out = execute("./bin/lono template generate -c --project-root #{@project_root}")
       expect(out).to match /Generating CloudFormation templates/
     end
+
+    it "should generate templates" do
+      out = execute("./bin/lono template upload --project-root #{@project_root} --noop")
+      expect(out).to match /Templates uploaded to s3/
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  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: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -244,51 +258,70 @@ files:
 - lib/lono/clean.rb
 - lib/lono/cli.rb
 - lib/lono/command.rb
+- lib/lono/default/settings.yml
+- lib/lono/env.rb
 - lib/lono/help.rb
 - lib/lono/new.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/template.rb
+- lib/lono/template/aws_services.rb
 - lib/lono/template/bashify.rb
 - lib/lono/template/dsl.rb
 - lib/lono/template/help.rb
+- lib/lono/template/helpers.rb
 - lib/lono/template/template.rb
+- lib/lono/template/upload.rb
 - lib/lono/version.rb
 - lib/starter_projects/json_project/Gemfile
 - lib/starter_projects/json_project/Guardfile
-- lib/starter_projects/json_project/config/lono.rb
-- lib/starter_projects/json_project/config/lono/api.rb
+- 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/api-web-prod.txt
-- lib/starter_projects/json_project/templates/db.json.erb
-- lib/starter_projects/json_project/templates/partial/host_record.json.erb
-- lib/starter_projects/json_project/templates/partial/server.json.erb
-- lib/starter_projects/json_project/templates/user_data/app.sh.erb
-- lib/starter_projects/json_project/templates/user_data/db.sh.erb
-- lib/starter_projects/json_project/templates/user_data/db2.sh.erb
-- lib/starter_projects/json_project/templates/user_data/ruby_script.rb.erb
-- lib/starter_projects/json_project/templates/web.json.erb
+- 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/Gemfile
 - lib/starter_projects/yaml_project/Guardfile
-- lib/starter_projects/yaml_project/config/lono.rb
-- lib/starter_projects/yaml_project/config/lono/api.rb
-- lib/starter_projects/yaml_project/params/api-web-prod.txt
-- lib/starter_projects/yaml_project/params/example.txt
-- lib/starter_projects/yaml_project/templates/db.yml.erb
-- lib/starter_projects/yaml_project/templates/example.yml.erb
-- lib/starter_projects/yaml_project/templates/partial/host_record.yml.erb
-- lib/starter_projects/yaml_project/templates/partial/server.yml.erb
-- lib/starter_projects/yaml_project/templates/partial/user_data/bootstrap.sh.erb
-- lib/starter_projects/yaml_project/templates/web.yml.erb
+- 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
 - lono.gemspec
 - spec/fixtures/cfn.json
 - spec/fixtures/my_project/config/lono.rb
 - spec/fixtures/my_project/params/my-stack.txt
 - spec/fixtures/my_project/templates/.gitkeep
 - spec/fixtures/my_project/templates/my-stack.yml.erb
+- spec/fixtures/params/baseonly/params/base/network.txt
+- spec/fixtures/params/envonly/params/prod/network.txt
+- spec/fixtures/params/overlay/params/base/network.txt
+- spec/fixtures/params/overlay/params/prod/network.txt
 - spec/lib/lono/cfn_spec.rb
 - spec/lib/lono/new_spec.rb
+- spec/lib/lono/param/generator_spec.rb
 - spec/lib/lono/param_spec.rb
 - spec/lib/lono/template/dsl_spec.rb
 - spec/lib/lono/template/template_spec.rb
@@ -339,8 +372,13 @@ test_files:
 - spec/fixtures/my_project/params/my-stack.txt
 - spec/fixtures/my_project/templates/.gitkeep
 - spec/fixtures/my_project/templates/my-stack.yml.erb
+- spec/fixtures/params/baseonly/params/base/network.txt
+- spec/fixtures/params/envonly/params/prod/network.txt
+- spec/fixtures/params/overlay/params/base/network.txt
+- spec/fixtures/params/overlay/params/prod/network.txt
 - spec/lib/lono/cfn_spec.rb
 - spec/lib/lono/new_spec.rb
+- spec/lib/lono/param/generator_spec.rb
 - spec/lib/lono/param_spec.rb
 - spec/lib/lono/template/dsl_spec.rb
 - spec/lib/lono/template/template_spec.rb