lono 6.1.11 → 7.0.0

data/lib/lono/template/{erb.rb → strategy/erb.rb}

@@ -1,9 +1,9 @@
-class Lono::Template
+module Lono::Template::Strategy
   class Erb < Base
-    include Evaluate
-    include Util
+    include Lono::Template::Evaluate
+    include Lono::Template::Util
 
-    def initialize(blueprint, options={})
+    def initialize(options={})
       super
       @templates = []
       @results = {}
@@ -67,7 +67,7 @@ class Lono::Template
         ensure_parent_dir(path)
         text = commented(text)
         IO.write(path, text) # write file first so validate method is simpler
-        validate_yaml(path)
+        Lono::Yamler::Validator.new(path).validate!
       end
     end
 

data/lib/lono/template/strategy/source.rb

@@ -0,0 +1,8 @@
+module Lono::Template::Strategy
+  # url or path
+  class Source < Base
+    def run
+      Lono::Cfn::Download.new(@options).run
+    end
+  end
+end

data/lib/lono/template/template.rb

@@ -49,6 +49,6 @@ class Lono::Template::Template
   # Context for ERB rendering.
   # This is where we control what references get passed to the ERB rendering.
   def context
-    @context ||= Lono::Template::Context.new(@blueprint, @options)
+    @context ||= Lono::Template::Context.new(@options)
   end
 end

data/lib/lono/template/upload.rb

@@ -4,16 +4,11 @@ require 'base64'
 require 'digest'
 
 class Lono::Template
-  class Upload
-    include Lono::Blueprint::Root
+  class Upload < Lono::AbstractBase
     include Lono::AwsServices
 
-    def initialize(blueprint, options={})
-      @blueprint, @options = blueprint, options
-      @template = @options[:template] || @blueprint
-      Lono::ProjectChecker.check
-      set_blueprint_root(@blueprint)
-
+    def initialize(options={})
+      super
       @checksums = {}
       @prefix = Lono.env # s3://s3-bucket/development
     end
@@ -99,7 +94,7 @@ class Lono::Template
       "https://s3.amazonaws.com/#{s3_bucket}/#{@prefix}/#{template_path}"
     end
 
-    # used for cfn/base.rb def set_template_body!(params)
+    # used for cfn/base.rb def set_template_url!(options)
     def s3_presigned_url(template_output_path)
       template_path = template_output_path.sub('output/templates/','')
       key = "#{@prefix}/#{template_path}"

data/lib/lono/template/util.rb

@@ -4,45 +4,5 @@ class Lono::Template
       dir = File.dirname(path)
       FileUtils.mkdir_p(dir) unless File.exist?(dir)
     end
-
-    def validate_yaml(path)
-      text = IO.read(path)
-      begin
-        YAML.load(text)
-      rescue Psych::SyntaxError => e
-        handle_yaml_syntax_error(e, path)
-      end
-    end
-
-    def handle_yaml_syntax_error(e, path)
-      io = StringIO.new
-      io.puts "Invalid yaml.  Output written to debugging: #{path}".color(:red)
-      io.puts "ERROR: #{e.message}".color(:red)
-
-      # Grab line info.  Example error:
-      #   ERROR: (<unknown>): could not find expected ':' while scanning a simple key at line 2 column 1
-      md = e.message.match(/at line (\d+) column (\d+)/)
-      line = md[1].to_i
-
-      lines = IO.read(path).split("\n")
-      context = 5 # lines of context
-      top, bottom = [line-context-1, 0].max, line+context-1
-      spacing = lines.size.to_s.size
-      lines[top..bottom].each_with_index do |line_content, index|
-        line_number = top+index+1
-        if line_number == line
-          io.printf("%#{spacing}d %s\n".color(:red), line_number, line_content)
-        else
-          io.printf("%#{spacing}d %s\n", line_number, line_content)
-        end
-      end
-
-      if ENV['TEST']
-        io.string
-      else
-        puts io.string
-        exit 1
-      end
-    end
   end
 end

data/lib/lono/upgrade.rb

@@ -1,18 +1,20 @@
 module Lono
-  class Upgrade < Command
-    desc "v3to4", "Upgrade from version 3 to 4."
-    def v3to4
-      Upgrade4.new(options).run
+  class Upgrade
+    def initialize(options)
+      @options = options
     end
 
-    desc "v4to4_2", "Upgrade from version 4.0 to 4.2"
-    def v4to4_2
-      Upgrade42.start
+    def run
+      app_blueprints_move # v6 to v7
+      puts "Lono project upgraded"
     end
 
-    desc "v4to5", "Upgrade from version 4.2 to 5.0"
-    def v4to5
-      Upgrade5.start
+    def app_blueprints_move
+      return if File.exist?("#{Lono.root}/app/blueprints")
+      return unless File.exist?("#{Lono.root}/blueprints")
+
+      FileUtils.mv("#{Lono.root}/blueprints", "#{Lono.root}/app/blueprints")
+      puts "Move blueprints to app/blueprints"
     end
   end
 end

data/lib/lono/user_data.rb

@@ -5,9 +5,9 @@ module Lono
   #
   # Normally, the Lono::Erb#run method generates the CloudFormation templates
   # and embeds user-data script into the template.
-  class UserData
-    def initialize(blueprint, options)
-      @blueprint, @options = blueprint, options
+  class UserData < AbstractBase
+    def initialize(options={})
+      super
       @name = options[:name]
       @path = "#{Lono.root}/app/user_data/#{@name}.sh"
     end
@@ -25,7 +25,7 @@ module Lono
     # Context for ERB rendering.
     # This is where we control what references get passed to the ERB rendering.
     def context
-      @context ||= Lono::Template::Context.new(@blueprint, @options)
+      @context ||= Lono::Template::Context.new(@options)
     end
   end
 end

data/lib/lono/utils/pretty_time.rb

@@ -0,0 +1,14 @@
+module Lono::Utils
+  module PrettyTime
+    # http://stackoverflow.com/questions/4175733/convert-duration-to-hoursminutesseconds-or-similar-in-rails-3-or-ruby
+    def pretty_time(total_seconds)
+      minutes = (total_seconds / 60) % 60
+      seconds = total_seconds % 60
+      if total_seconds < 60
+        "#{seconds.to_i}s"
+      else
+        "#{minutes.to_i}m #{seconds.to_i}s"
+      end
+    end
+  end
+end

data/lib/lono/utils/sure.rb

@@ -0,0 +1,23 @@
+module Lono::Utils
+  module Sure
+    def sure?(message, desc=nil)
+      if @options[:sure]
+        sure = 'y'
+      else
+        out = message
+        if desc
+          out += "\n#{desc}\nAre you sure? (y/N) "
+        else
+          out += " (y/N) "
+        end
+        print out
+        sure = $stdin.gets
+      end
+
+      unless sure =~ /^y/
+        puts "Whew! Exiting."
+        exit 0
+      end
+    end
+  end
+end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "6.1.11"
+  VERSION = "7.0.0"
 end

data/lib/lono/yamler/loader.rb

@@ -0,0 +1,52 @@
+require "yaml"
+
+module Lono::Yamler
+  class Loader
+    def self.load(text)
+      new(text).load
+    end
+
+    def initialize(text)
+      @text = text
+    end
+
+    def load
+      add_domain_types!
+      YAML.load(@text)
+    end
+
+  private
+    def add_domain_types!
+      intrinsic_functions.each do |name|
+        YAML.add_domain_type('', name) do |type,val|
+          key = type.split('::').last
+          key = "Fn::" + key unless name == 'Ref'
+          { key => val }
+        end
+      end
+    end
+
+    def intrinsic_functions
+      %w[
+        And
+        Base64
+        Cidr
+        Equals
+        FindInMap
+        GetAtt
+        GetAZs
+        If
+        If
+        ImportValue
+        Join
+        Not
+        Or
+        Ref
+        Select
+        Split
+        Sub
+        Transform
+      ]
+    end
+  end
+end

data/lib/lono/yamler/validator.rb

@@ -0,0 +1,51 @@
+module Lono::Yamler
+  class Validator
+    def initialize(path)
+      @path = path
+    end
+
+    def validate!
+      validate_yaml(@path)
+    end
+
+    def validate_yaml(path)
+      text = IO.read(path)
+      begin
+        YAML.load(text)
+      rescue Psych::SyntaxError => e
+        handle_yaml_syntax_error(e, path)
+      end
+    end
+
+    def handle_yaml_syntax_error(e, path)
+      io = StringIO.new
+      io.puts "Invalid yaml. Output written for debugging: #{path}".color(:red)
+      io.puts "ERROR: #{e.message}".color(:red)
+
+      # Grab line info.  Example error:
+      #   ERROR: (<unknown>): could not find expected ':' while scanning a simple key at line 2 column 1
+      md = e.message.match(/at line (\d+) column (\d+)/)
+      line = md[1].to_i
+
+      lines = IO.read(path).split("\n")
+      context = 5 # lines of context
+      top, bottom = [line-context-1, 0].max, line+context-1
+      spacing = lines.size.to_s.size
+      lines[top..bottom].each_with_index do |line_content, index|
+        line_number = top+index+1
+        if line_number == line
+          io.printf("%#{spacing}d %s\n".color(:red), line_number, line_content)
+        else
+          io.printf("%#{spacing}d %s\n", line_number, line_content)
+        end
+      end
+
+      if ENV['LONO_TEST']
+        io.string
+      else
+        puts io.string
+        exit 1
+      end
+    end
+  end
+end

data/lib/templates/blueprint/%blueprint_name%.gemspec.tt

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   else
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
+
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
@@ -40,4 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+<% if @options[:type] != "dsl" %>
+  spec.metadata = {"template_type" => "erb"}
+<% end %>
 end

data/lib/templates/blueprint/README.md.tt

@@ -27,7 +27,7 @@ The generated files in `config/<%= blueprint_name %>` folder look something like
 
 ## Deploy
 
-Use the [lono cfn deploy](http://lono.cloud/reference/lono-cfn-deploy/) command to deploy. Example:
+Use the [lono cfn deploy](https://lono.cloud/reference/lono-cfn-deploy/) command to deploy. Example:
 
     LONO_ENV=development lono cfn deploy <%= blueprint_name %>-development --blueprint <%= blueprint_name %> --sure
     LONO_ENV=production  lono cfn deploy <%= blueprint_name %>-production  --blueprint <%= blueprint_name %> --sure

data/lib/templates/blueprint/seed/configs.rb

@@ -21,8 +21,8 @@ class Lono::Seed::Configs < Lono::Seed::Base
   # Return String with the content of the config/BLUEPRINT/variables file.
   # def variables
   #   <<~EOL
-  #     @variable1=starter_value1
-  #     @variable2=starter_value2
+  #     @variable1 = "starter_value1"
+  #     @variable2 = "starter_value2"
   #   EOL
   # end
 end

data/lib/templates/blueprint_types/dsl/app/templates/%blueprint_name%.rb

@@ -1,33 +1,32 @@
-# Starter Demo Example
 aws_template_format_version "2010-09-09"
 description "Demo stack"
 
 parameter("InstanceType", "t3.micro")
 
 mapping("AmiMap",
-  "ap-northeast-1": { Ami: "ami-0f9ae750e8274075b" },
-  "ap-northeast-2": { Ami: "ami-047f7b46bd6dd5d84" },
-  "ap-south-1":     { Ami: "ami-0889b8a448de4fc44" },
-  "ap-southeast-1": { Ami: "ami-0b419c3a4b01d1859" },
-  "ap-southeast-2": { Ami: "ami-04481c741a0311bbb" },
-  "ca-central-1":   { Ami: "ami-03338e1f67dae0168" },
-  "eu-central-1":   { Ami: "ami-09def150731bdbcc2" },
-  "eu-north-1":     { Ami: "ami-d16fe6af" },
-  "eu-west-1":      { Ami: "ami-07683a44e80cd32c5" },
-  "eu-west-2":      { Ami: "ami-09ead922c1dad67e4" },
-  "eu-west-3":      { Ami: "ami-0451ae4fd8dd178f7" },
-  "sa-east-1":      { Ami: "ami-0669a96e355eac82f" },
-  "us-east-1":      { Ami: "ami-0de53d8956e8dcf80" },
-  "us-east-2":      { Ami: "ami-02bcbb802e03574ba" },
-  "us-west-1":      { Ami: "ami-0019ef04ac50be30f" },
-  "us-west-2":      { Ami: "ami-061392db613a6357b" }
+  "ap-northeast-1": { Ami: "ami-068a6cefc24c301d2" },
+  "ap-northeast-2": { Ami: "ami-0d59ddf55cdda6e21" },
+  "ap-south-1":     { Ami: "ami-0ce933e2ae91880d3" },
+  "ap-southeast-1": { Ami: "ami-07539a31f72d244e7" },
+  "ap-southeast-2": { Ami: "ami-0119aa4d67e59007c" },
+  "ca-central-1":   { Ami: "ami-0ff24797826ebbcd5" },
+  "eu-central-1":   { Ami: "ami-0d4c3eabb9e72650a" },
+  "eu-north-1":     { Ami: "ami-006cda581cf39451b" },
+  "eu-west-1":      { Ami: "ami-01f14919ba412de34" },
+  "eu-west-2":      { Ami: "ami-05f37c3995fffb4fd" },
+  "eu-west-3":      { Ami: "ami-0e9e6ba6d3d38faa8" },
+  "sa-east-1":      { Ami: "ami-07820a4443539a2b0" },
+  "us-east-1":      { Ami: "ami-00068cd7555f543d5" },
+  "us-east-2":      { Ami: "ami-0dacb0c129b49f529" },
+  "us-west-1":      { Ami: "ami-0b2d8d1abb76a53d8" },
+  "us-west-2":      { Ami: "ami-0c5204531f799e0c6" }
 )
 
 resource("Instance", "AWS::EC2::Instance",
   InstanceType: ref("InstanceType"),
   ImageId: find_in_map("AmiMap", ref("AWS::Region"), "Ami"),
   SecurityGroupIds: [get_att("SecurityGroup.GroupId")],
-  UserData: base64(user_data("bootstrap.sh"))
+  UserData: base64(sub(user_data("bootstrap.sh")))
 )
 resource("SecurityGroup", "AWS::EC2::SecurityGroup",
   GroupDescription: "demo security group",

data/lib/templates/blueprint_types/erb/app/templates/%blueprint_name%.yml

@@ -1,8 +1,67 @@
 ---
-# Simple Starter Example
+AWSTemplateFormatVersion: '2010-09-09'
+Description: Demo stack
+Parameters:
+  InstanceType:
+    Default: t3.micro
+    Type: String
+Mappings:
+  AmiMap:
+    ap-northeast-1:
+      Ami: ami-068a6cefc24c301d2
+    ap-northeast-2:
+      Ami: ami-0d59ddf55cdda6e21
+    ap-south-1:
+      Ami: ami-0ce933e2ae91880d3
+    ap-southeast-1:
+      Ami: ami-07539a31f72d244e7
+    ap-southeast-2:
+      Ami: ami-0119aa4d67e59007c
+    ca-central-1:
+      Ami: ami-0ff24797826ebbcd5
+    eu-central-1:
+      Ami: ami-0d4c3eabb9e72650a
+    eu-north-1:
+      Ami: ami-006cda581cf39451b
+    eu-west-1:
+      Ami: ami-01f14919ba412de34
+    eu-west-2:
+      Ami: ami-05f37c3995fffb4fd
+    eu-west-3:
+      Ami: ami-0e9e6ba6d3d38faa8
+    sa-east-1:
+      Ami: ami-07820a4443539a2b0
+    us-east-1:
+      Ami: ami-00068cd7555f543d5
+    us-east-2:
+      Ami: ami-0dacb0c129b49f529
+    us-west-1:
+      Ami: ami-0b2d8d1abb76a53d8
+    us-west-2:
+      Ami: ami-0c5204531f799e0c6
 Resources:
-  EC2Instance:
+  Instance:
     Type: AWS::EC2::Instance
     Properties:
-      InstanceType: t3.micro
-      ImageId: ami-05b186cbeb4bd0170 # us-west-2 Amazon Linux 2 AMI (HVM), SSD Volume Type
+      InstanceType:
+        Ref: InstanceType
+      ImageId:
+        Fn::FindInMap:
+        - AmiMap
+        - Ref: AWS::Region
+        - Ami
+      SecurityGroupIds:
+      - Fn::GetAtt:
+        - SecurityGroup
+        - GroupId
+      UserData:
+        Fn::Base64:
+          Fn::Sub:
+          - |-
+            #!/bin/bash
+            echo "hello world"
+          - {}
+  SecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: demo security group