lono 7.5.2 → 8.0.0.pre.rc1

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/helpers/file_helper.rb

@@ -1,20 +1,16 @@
-module Lono::Template::Strategy::Dsl::Builder::Helpers
+module Lono::Builder::Template::Dsl::Evaluator::Helpers
   module FileHelper
     extend Memoist
 
-    def content(path)
-      render_file(Lono.config.content_path, path)
-    end
-
     def user_data(path)
-      render_file(Lono.config.user_data_path, path)
+      render_file(Lono.config.paths.user_data, path)
     end
 
     def user_data_script
       unless @user_data_script
         return <<~EOL
-          # @user_data_script variable not set. IE: @user_data_script = "configs/#{@blueprint}/user_data/boostrap.sh"
-          # Also, make sure that "configs/#{@blueprint}/user_data/boostrap.sh" path you're using exists.
+          # @user_data_script variable not set. IE: @user_data_script = "config/#{@blueprint.name}/user_data/boostrap.sh"
+          # Also, make sure that "config/#{@blueprint.name}/user_data/boostrap.sh" path you're using exists.
         EOL
       end
 
@@ -22,7 +18,7 @@ module Lono::Template::Strategy::Dsl::Builder::Helpers
         render_path(@user_data_script)
       else
         message = "WARN: #{@user_data_script} not found"
-        puts message.color(:yellow)
+        logger.info message.color(:yellow)
         "# #{message}"
       end
     end
@@ -33,9 +29,9 @@ module Lono::Template::Strategy::Dsl::Builder::Helpers
         render_path(path)
       else
         message = "WARNING: path #{path} not found"
-        puts message.color(:yellow)
-        puts "Called from:"
-        puts caller[2]
+        logger.info message.color(:yellow)
+        logger.info "Called from:"
+        logger.info caller[2]
         message
       end
     end

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/helpers/s3_helper.rb

@@ -1,4 +1,4 @@
-module Lono::Template::Strategy::Dsl::Builder::Helpers
+module Lono::Builder::Template::Dsl::Evaluator::Helpers
   module S3Helper
     def s3_bucket
       Lono::S3::Bucket.name
@@ -8,7 +8,7 @@ module Lono::Template::Strategy::Dsl::Builder::Helpers
     def s3_key(name, options={})
       default = {type: "file"}
       options.reverse_merge!(default)
-      Lono::AppFile::Registry.register(name, @blueprint, options)
+      Lono::AppFile::Registry.register(name, @blueprint.name, options)
       "file://app/files/#{options[:type]}/#{name}" # placeholder for post processing
     end
     alias_method :file_s3_key, :s3_key

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/helpers/stack_helper.rb

@@ -1,10 +1,11 @@
-module Lono::Template::Strategy::Dsl::Builder::Helpers
+module Lono::Builder::Template::Dsl::Evaluator::Helpers
   module StackHelper
     extend Memoist
     include Lono::AwsServices
 
     def stack_output(name)
       stack_name, key = name.split(".")
+      stack_name = stack_name(stack_name)
       resp = describe_stacks(stack_name: stack_name)
       stack = resp.stacks.first
       if stack
@@ -14,27 +15,29 @@ module Lono::Template::Strategy::Dsl::Builder::Helpers
       if o
         o.output_value
       else
-        "NOT FOUND: output #{key} for stack #{stack_name}"
+        logger.info "WARN: NOT FOUND: output #{key} for stack #{stack_name}"
       end
     end
 
     def stack_resource(name)
       stack_name, logical_id = name.split(".")
+      stack_name = stack_name(stack_name)
       resp = describe_stack_resources(stack_name: stack_name)
       resources = resp.stack_resources
       resource = resources.find { |r| r.logical_resource_id == logical_id }
       if resource
         resource.physical_resource_id
       else
-        "NOT FOUND: logical_id #{logical_id} for stack #{stack_name}"
+        logger.info "WARN: NOT FOUND: logical_id #{logical_id} for stack #{stack_name}"
       end
     end
 
-    def lookup_output(name)
-      result = stack_output(name)
-      return unless ENV['LONO_DEPRECATION_SOFT']
-      puts "DEPRECATION WARNING: lookup_output is deprecated. Please use stack_output instead".color(:yellow)
-      result
+    def stack_name(blueprint)
+      return blueprint unless Lono.config.names.output.expand
+      names = Lono::Names.new(blueprint: blueprint)
+      # explicit expansion pattern provided by user
+      pattern = blueprint.include?(':') ? blueprint : Lono.config.names.output.stack
+      names.expansion(pattern)
     end
 
   private

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/helpers/tags_helper.rb

@@ -1,4 +1,4 @@
-module Lono::Template::Strategy::Dsl::Builder::Helpers
+module Lono::Builder::Template::Dsl::Evaluator::Helpers
   module TagsHelper
     def tags(hash={})
       if hash.empty?

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/helpers.rb

@@ -1,5 +1,5 @@
 # Built-in helpers for the DSL form
-class Lono::Template::Strategy::Dsl::Builder
+class Lono::Builder::Template::Dsl::Evaluator
   module Helpers
     extend Memoist
 
@@ -11,6 +11,6 @@ class Lono::Template::Strategy::Dsl::Builder
       include klass.constantize
     end
 
-    include Lono::Template::Strategy::Common::Helpers
+    include Lono::Builder::Template::Helpers
   end
 end

data/lib/lono/builder/template/dsl/evaluator/section/base.rb

@@ -0,0 +1,23 @@
+module Lono::Builder::Template::Dsl::Evaluator::Section
+  class Base
+    include Lono::Builder::Template::Dsl::Evaluator::Fn
+    include Lono::Builder::Template::Dsl::Evaluator::Helpers
+    include Lono::Builder::Template::Dsl::Evaluator::Stringify
+
+    def initialize(blueprint, *definition)
+      @blueprint = blueprint
+      @definition = definition.flatten
+    end
+
+  private
+    def camelize(attributes)
+      data = stringify!(attributes)
+      clean(data)
+    end
+
+    # Remove items with nil value automatically
+    def clean(data)
+      Lono::Builder::Template::Dsl::Evaluator::Squeezer.new(data).squeeze
+    end
+  end
+end

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/section/condition.rb

@@ -2,7 +2,7 @@
 #
 #   template - uses @definition to build a CloudFormation template section
 #
-module Lono::Template::Strategy::Dsl::Builder::Section
+module Lono::Builder::Template::Dsl::Evaluator::Section
   class Condition < Base
     def template
       camelize(standarize(@definition))

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/section/mapping.rb

@@ -2,7 +2,7 @@
 #
 #   template - uses @definition to build a CloudFormation template section
 #
-module Lono::Template::Strategy::Dsl::Builder::Section
+module Lono::Builder::Template::Dsl::Evaluator::Section
   class Mapping < Base
     def template
       camelize(standarize(@definition))

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/section/methods.rb

@@ -1,5 +1,5 @@
 # Organize core section method syntax here
-module Lono::Template::Strategy::Dsl::Builder::Section
+module Lono::Builder::Template::Dsl::Evaluator::Section
   module Methods
     def aws_template_format_version(version_date)
       @cfn["AWSTemplateFormatVersion"] = version_date
@@ -20,7 +20,7 @@ module Lono::Template::Strategy::Dsl::Builder::Section
 
     def parameter(*definition)
       @cfn["Parameters"] ||= {}
-      param = Parameter.new(@blueprint, definition)
+      param = Parameter.new(@blueprint.name, definition)
       @cfn["Parameters"].merge!(param.template)
 
       # Additional decorations
@@ -33,32 +33,32 @@ module Lono::Template::Strategy::Dsl::Builder::Section
 
     def mapping(*definition)
       @cfn["Mappings"] ||= {}
-      mapping = Mapping.new(@blueprint, definition)
+      mapping = Mapping.new(@blueprint.name, definition)
       @cfn["Mappings"].merge!(mapping.template)
     end
 
     def resource(*definition)
       @cfn["Resources"] ||= {}
-      resource = Resource.new(@blueprint, definition)
+      resource = Resource.new(@blueprint.name, definition)
       @cfn["Resources"].merge!(resource.template)
     end
 
     def condition(*definition)
       @cfn["Conditions"] ||= {}
-      condition = Condition.new(@blueprint, definition)
+      condition = Condition.new(@blueprint.name, definition)
       @cfn["Conditions"].merge!(condition.template)
     end
 
     def output(*definition)
       @cfn["Outputs"] ||= {}
-      output = Output.new(@blueprint, definition)
+      output = Output.new(@blueprint.name, definition)
       @cfn["Outputs"].merge!(output.template)
     end
 
     # Generic section method in case CloudFormation adds a new future section.
     # The generic section method adds a new top-level key
     def section(key, definition)
-      @cfn[key] = Section.new(@blueprint, definition).template
+      @cfn[key] = Section.new(@blueprint.name, definition).template
     end
   end
 end

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/section/output.rb

@@ -2,7 +2,7 @@
 #
 #   template - uses @definition to build a CloudFormation template section
 #
-module Lono::Template::Strategy::Dsl::Builder::Section
+module Lono::Builder::Template::Dsl::Evaluator::Section
   class Output < Base
     def template
       camelize(standarize(@definition))

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/section/parameter.rb

@@ -2,7 +2,7 @@
 #
 #   template - uses @definition to build a CloudFormation template section
 #
-module Lono::Template::Strategy::Dsl::Builder::Section
+module Lono::Builder::Template::Dsl::Evaluator::Section
   class Parameter < Base
     attr_accessor :group_label
     attr_reader :conditional, :label

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/section/resource/property_mover.rb

@@ -1,4 +1,4 @@
-class Lono::Template::Strategy::Dsl::Builder::Section::Resource
+class Lono::Builder::Template::Dsl::Evaluator::Section::Resource
   # Moves the property to the top-level attributes *destructively*
   class PropertyMover
     def initialize(resource, logical_id, properties)

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/section/resource.rb

@@ -2,7 +2,7 @@
 #
 #   template - uses @definition to build a CloudFormation template section
 #
-module Lono::Template::Strategy::Dsl::Builder::Section
+module Lono::Builder::Template::Dsl::Evaluator::Section
   class Resource < Base
     def template
       camelize(standarize(@definition))

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/section/section.rb

@@ -2,7 +2,7 @@
 #
 #   template - uses @definition to build a CloudFormation template section
 #
-module Lono::Template::Strategy::Dsl::Builder::Section
+module Lono::Builder::Template::Dsl::Evaluator::Section
   class Section < Base
     def template
       hash, _ = @definition

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/squeezer.rb

@@ -1,4 +1,4 @@
-class Lono::Template::Strategy::Dsl::Builder
+class Lono::Builder::Template::Dsl::Evaluator
   class Squeezer
     def initialize(data)
       @data = data

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/stringify.rb

@@ -1,4 +1,4 @@
-class Lono::Template::Strategy::Dsl::Builder
+class Lono::Builder::Template::Dsl::Evaluator
   module Stringify
     # Accounts for Arrays also. ActiveSupport only works for Hashes.
     def stringify!(data)

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/syntax/extend_with.rb

@@ -1,4 +1,4 @@
-module Lono::Template::Strategy::Dsl::Builder::Syntax
+module Lono::Builder::Template::Dsl::Evaluator::Syntax
   module ExtendWith
     def extend_with(extension)
       # Do nothing during the main DSL evaluation. The extend_with logical actual runs during during the

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/syntax/parameter_group.rb

@@ -1,4 +1,4 @@
-module Lono::Template::Strategy::Dsl::Builder::Syntax
+module Lono::Builder::Template::Dsl::Evaluator::Syntax
   module ParameterGroup
     def parameter_group(label)
       @group_label = label

data/lib/lono/{template/strategy/dsl/builder → builder/template/dsl/evaluator}/syntax.rb

@@ -1,8 +1,8 @@
-# Encapsulates syntax methods so they can be included in both the Builder and Context scope
-class Lono::Template::Strategy::Dsl::Builder
+# Encapsulates syntax methods so they can be included in both the Evaluator and Context scope
+class Lono::Builder::Template::Dsl::Evaluator
   module Syntax
     include Fn
-    include Lono::Template::Evaluate
+    include Lono::Builder::Template::Evaluate
     include Section::Methods
     include ParameterGroup
     include ExtendWith

data/lib/lono/builder/template/dsl/evaluator.rb

@@ -0,0 +1,45 @@
+class Lono::Builder::Template::Dsl
+  class Evaluator
+    include Lono::Extensions::Loader
+    include Lono::Utils::Context
+    include Lono::Builder::Context::Loader
+
+    include Syntax
+    extend Memoist
+
+    def initialize(options={})
+      @options = options
+      @blueprint = Lono::Blueprint.new(options)
+      @template_path = "#{@blueprint.root}/template.rb"
+      @parameters = [] # registry
+      @cfn = {}
+    end
+
+    def build
+      # TODO: load_all_extension_helpers # after Extensions::Preparer#run
+      load_variables unless seed? # both blueprint and project variables
+      load_blueprint_helpers
+      evaluate_template_paths(@template_path) # modifies @cfn
+      finalize
+      to_yaml
+      @cfn
+    end
+
+    def finalize
+      o = @options.merge(parameters: @parameters)
+      @cfn = Finalizer.new(@cfn, o).run
+    end
+
+    def to_yaml
+      # https://stackoverflow.com/questions/24508364/how-to-emit-yaml-in-ruby-expanding-aliases
+      # Trick to prevent YAML from emitting aliases
+      @cfn = YAML.load(@cfn.to_json)
+    end
+
+    # Dont want any existing files to prevent building the blueprint.
+    # This means that parameters cannot be based on vars. It's a trade-off.
+    def seed?
+      ARGV[0] == "seed"
+    end
+  end
+end

data/lib/lono/{template/strategy → builder/template}/dsl/finalizer/parameter_groups.rb

@@ -1,7 +1,7 @@
-class Lono::Template::Strategy::Dsl::Finalizer
+class Lono::Builder::Template::Dsl::Finalizer
   class ParameterGroups
     extend Memoist
-    include Lono::Template::Strategy::Dsl::Builder::Stringify
+    include Lono::Builder::Template::Dsl::Evaluator::Stringify
 
     def initialize(cfn, parameters)
       @cfn, @parameters = cfn, parameters

data/lib/lono/{template/strategy → builder/template}/dsl/finalizer.rb

@@ -1,4 +1,4 @@
-class Lono::Template::Strategy::Dsl
+class Lono::Builder::Template::Dsl
   class Finalizer
     def initialize(cfn, options={})
       @cfn, @options = cfn, options

data/lib/lono/builder/template/dsl.rb

@@ -0,0 +1,14 @@
+class Lono::Builder::Template
+  class Dsl < Lono::CLI::Base
+    attr_reader :results
+    def run
+      logger.info "Building template" unless @options[:quiet]
+      build_template
+    end
+
+    def build_template
+      evaluator = Evaluator.new(@options)
+      evaluator.build
+    end
+  end
+end

data/lib/lono/{template → builder/template}/evaluate.rb

@@ -1,13 +1,25 @@
-class Lono::Template
+class Lono::Builder::Template
   module Evaluate
+    include Lono::Utils::Logging
+
+    # Example path: /full/path/to/project/app/blueprints/demo/template.rb
+    def evaluate_template_paths(path)
+      ext = File.extname(path)
+      folder = path.sub(ext, '')
+      expr = "#{folder}/**/*.rb"
+      evaluate_template_path(path) # process top-level template.rb first
+      Dir.glob(expr).each do |path|
+        evaluate_template_path(path)
+      end
+    end
+
     def evaluate_template_path(path)
       return unless File.exist?(path)
-
       begin
         instance_eval(File.read(path), path)
       rescue Exception => e
         template_evaluation_error(e)
-        puts "\nFull error:"
+        logger.error "\nFull error:"
         raise
       end
     end
@@ -18,9 +30,9 @@ class Lono::Template
       error_info = lines.first
       path, line_no, _ = error_info.split(':')
       line_no = line_no.to_i
-      puts "Error evaluating #{path}:".color(:red)
-      puts e.message
-      puts "Here's the line in #{path} with the error:\n\n"
+      logger.error "Error evaluating #{path}:".color(:red)
+      logger.error e.message
+      logger.error "Here's the line in #{path} with the error:\n\n"
 
       contents = IO.read(path)
       content_lines = contents.split("\n")

data/lib/lono/builder/template/helpers.rb

@@ -0,0 +1,149 @@
+require "aws-sdk-core"
+
+class Lono::Builder::Template
+  module Helpers
+    def template_s3_path(template_name)
+      # hi-jacking Uploader for https_url
+      template_path = "output/#{@blueprint.name}/templates/#{template_name}.yml"
+      Lono::S3::Uploader.new(template_path).s3_https_url
+    end
+
+    def template_params(param_name)
+      o = {
+        allow_not_exists: true
+      }.merge(@options)
+      o["param"] = param_name
+      generator = Lono::CLI::Param::Generator.new(o)
+      # do not generate because lono cfn calling logic already generated it we only need the values
+      parameters = generator.parameters    # Returns Array in underscore keys format
+      # convert Array to simplified hash structure
+      parameters.inject({}) do |h, param|
+        h.merge(param[:parameter_key] => param[:parameter_value])
+      end
+    end
+
+    # Adjust the partial path so that it will use app/user_data
+    def user_data(path,vars={}, options={})
+      options.merge!(user_data: true)
+      partial(path,vars, options)
+    end
+
+    def current_region
+      region = Aws.config[:region]
+      region ||= ENV['AWS_REGION']
+      return region if region
+
+      default_region = 'us-east-1' # fallback if default not found in ~/.aws/config
+      if ENV['AWS_PROFILE']
+        path = "#{ENV['HOME']}/.aws/config"
+        if File.exist?(path)
+          lines = IO.readlines(path)
+          capture_default, capture_current = false, false
+          lines.each do | line|
+            if line.include?('[default]')
+              capture_default = true # next line
+              next
+            end
+            if capture_default && line.match(/region = /)
+              # over default from above
+              default_region = line.split(' = ').last.strip
+              capture_default = false
+            end
+
+            md = line.match(/\[profile (.*)\]/)
+            if md && md[1] == ENV['AWS_PROFILE']
+              capture_current = true
+              next
+            end
+            if capture_current && line.match(/region = /)
+              region = line.split(' = ').last.strip
+              capture_current = false
+            end
+          end
+        end
+
+        region ||= default_region
+        return region if region
+      end
+
+      'us-east-1' # default
+    end
+
+  private
+    def render_path(path)
+      RenderMePretty.result(path, context: self)
+    end
+
+    def user_data_path_for(path)
+      "#{Lono.config.paths.user_data}/#{path}"
+    end
+
+    def auto_add_format(path)
+      # Return immediately if user provided explicit extension
+      extension = File.extname(path) # current extension
+      return path if !extension.empty?
+
+      # Else let's auto detect
+      paths = Dir.glob("#{path}.*")
+
+      if paths.size == 1 # non-ambiguous match
+        return paths.first
+      end
+
+      if paths.size > 1 # ambiguous match
+        logger.info "ERROR: Multiple possible partials found:".color(:red)
+        paths.each do |path|
+          logger.info "  #{path}"
+        end
+        logger.info "Please specify an extension in the name to remove the ambiguity.".color(:green)
+        exit 1
+      end
+
+      # Account for case when user wants to include a file with no extension at all
+      return path if File.exist?(path) && !File.directory?(path)
+
+      path # original path if this point is reached
+    end
+
+    # Bash code that is meant to included in user-data
+    def extract_scripts(options={})
+      settings = Lono.config.extract_scripts
+      options = settings.merge(options)
+      # defaults also here in case they are removed from settings
+      to = options[:to] || "/opt"
+      user = options[:as] || "ec2-user"
+
+      if Dir.glob("#{Lono.config.paths.scripts}/*").empty?
+        logger.info "WARN: you are using the extract_scripts helper method but you do not have any scripts.".color(:yellow)
+        calling_line = caller[0].split(':')[0..1].join(':')
+        logger.info "Called from: #{calling_line}"
+        return ""
+      end
+
+      <<~BASH_CODE
+        # Generated from the lono extract_scripts helper.
+        # Downloads scripts from s3, extract them, and setup.
+        mkdir -p #{to}
+        aws s3 cp #{scripts_s3_path} #{to}/
+        (
+          cd #{to}
+          tar zxf #{to}/#{scripts_name}
+          chown -R #{user}:#{user} #{to}/scripts
+        )
+      BASH_CODE
+    end
+
+    def scripts_name
+      File.basename(scripts_s3_path)
+    end
+
+    def scripts_s3_path
+      upload = Lono::Script::Upload.new(@options)
+      upload.s3_dest
+    end
+
+    def setting
+      @setting ||= Lono::Setting.new
+    end
+  end
+end

data/lib/lono/{output/template.rb → builder/template/output.rb}

@@ -1,9 +1,9 @@
-module Lono::Output
-  class Template
+class Lono::Builder::Template
+  class Output
     extend Memoist
 
-    def initialize(blueprint, template)
-      @blueprint, @template = blueprint, template
+    def initialize(blueprint)
+      @blueprint = blueprint
     end
 
     def required_parameters
@@ -34,8 +34,16 @@ module Lono::Output
       end
     end
 
+    def outputs
+      data["Outputs"] || {}
+    end
+
+    def resources
+      data["Resources"] || {}
+    end
+
     def data
-      template_path = "#{Lono.config.output_path}/#{@blueprint}/templates/#{@template}.yml"
+      template_path = "#{Lono.root}/output/#{@blueprint.name}/template.yml"
       check_template_exists!(template_path)
       YAML.load(IO.read(template_path))
     end
@@ -55,8 +63,7 @@ module Lono::Output
     # does not exist.
     def check_template_exists!(template_path)
       return if File.exist?(template_path)
-      puts "The template #{template_path} does not exist. Are you sure you use the right template name?  The template name does not require the extension.".color(:red)
-      exit 1
+      raise "The template #{template_path} does not exist. Are you sure you use the right template name?  The template name does not require the extension.".color(:red)
     end
   end
 end

data/lib/lono/{template → builder/template}/post_processor.rb

@@ -1,5 +1,5 @@
-class Lono::Template
-  class PostProcessor < Lono::AbstractBase
+class Lono::Builder::Template
+  class PostProcessor < Lono::CLI::Base
     def run
       replacements.each do |placeholder, replacement|
         update_template!(template)
@@ -20,7 +20,7 @@ class Lono::Template
         elsif item.directory? || item.file?
           placeholder = "file://app/files/file/#{item.name}"
         else
-          puts "WARN: PostProcessor replacements Cannot find file: #{item.output_path}"
+          logger.info "WARN: PostProcessor replacements Cannot find file: #{item.output_path}"
           next
         end
         map[placeholder] = item.s3_path
@@ -61,7 +61,7 @@ class Lono::Template
     memoize :template
 
     def template_path
-      "#{Lono.config.output_path}/#{@blueprint}/templates/#{@template}.yml"
+      "#{Lono.root}/output/#{@blueprint.name}/templates/#{@template}.yml"
     end
   end
 end