lono 8.0.0.pre.rc2 → 8.0.0.pre.rc3

data/lib/lono/builder/dsl/helpers/template_file.rb

@@ -15,8 +15,8 @@ module Lono::Builder::Dsl::Helpers
 
     # Caller lines are different for OSes:
     #
-    #   windows: "C:/Ruby31-x64/lib/ruby/gems/3.1.0/gems/terraspace-1.1.1/lib/terraspace/builder.rb:34:in `build'"
-    #   linux: "/home/ec2-user/.rvm/gems/ruby-3.0.3/gems/terraspace-1.1.1/lib/terraspace/compiler/dsl/syntax/mod.rb:4:in `<module:Mod>'"
+    #   windows: "C:/Ruby31-x64/lib/ruby/gems/3.1.0/gems/lono-1.1.1/lib/lono/builder.rb:34:in `build'"
+    #   linux: "/home/ec2-user/.rvm/gems/ruby-3.0.3/gems/lono-1.1.1/lib/lono/compiler/dsl/syntax/mod.rb:4:in `<module:Mod>'"
     #
     class TempleFileNotFoundError < StandardError; end
     def template_file_missing(path)
@@ -30,15 +30,27 @@ module Lono::Builder::Dsl::Helpers
     end
 
     def render_file(path)
-      RenderMePretty.result(path, context: template_context)
+      if File.exist?(path)
+        RenderMePretty.result(path, context: self)
+      else
+        lines = caller.select { |l| l.include?(Lono.root.to_s) } # TODO: show code itself
+        caller_line = pretty_path(lines.first)
+        message =<<~EOL
+          WARN: #{pretty_path(path)} does not exist
+          Called from: #{caller_line}
+        EOL
+        logger.info message.color(:yellow)
+        message
+      end
     end
-    memoize :render_file
+    alias_method :render_path, :render_file
 
     def user_data_script
       unless @user_data_script
+        script_example = pretty_path("#{@blueprint.root}/template/user_data.sh")
         return <<~EOL
-          # @user_data_script variable not set. IE: @user_data_script = "#{pretty_path(@blueprint.root)}/template/user_data.sh"
-          # Also, make sure that "config/#{@blueprint.name}/user_data/boostrap.sh" path you're using exists.
+          # @user_data_script variable not set. IE: @user_data_script = "#{script_example}"
+          # Also, make sure that "#{script_example}" exists.
         EOL
       end
 

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

@@ -1,15 +1,5 @@
-# Built-in helpers for the DSL form
 class Lono::Builder::Dsl
   module Helpers
-    extend Memoist
-
-    # Auto include all modules in helpers folder
-    # only load one level deep. IE: ssm/fetcher is a class
-    helpers_dir = File.expand_path("helpers", __dir__)
-    Dir.glob("#{helpers_dir}/*.rb").each do |path|
-      next unless File.file?(path)
-      klass = path.gsub(%r{.*/lib/},'').sub(".rb",'').camelize
-      include klass.constantize
-    end
+    include_modules("helpers")
   end
 end

data/lib/lono/builder/dsl/syntax/core/resource/property_mover.rb

@@ -5,8 +5,18 @@ class Lono::Builder::Dsl::Syntax::Core::Resource
       @resource, @logical_id, @properties = resource, logical_id, properties
     end
 
+    # AWS Docs: Resource attribute reference
+    # https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-product-attribute-reference.html
     def move!
-      %w[Condition DeletionPolicy DependsOn].each do |attribute_name|
+      %w[
+        Condition
+        CreationPolicy
+        DeletionPolicy
+        DependsOn
+        Metadata
+        UpdatePolicy
+        UpdateReplacePolicy
+      ].each do |attribute_name|
         # Account for camelize, underscore, String, and Symbol
         move(attribute_name.to_sym)
         move(attribute_name.camelize.to_sym)

data/lib/lono/builder/dsl/syntax/core/squeezer.rb

@@ -4,7 +4,7 @@ module Lono::Builder::Dsl::Syntax::Core
       @data = data
     end
 
-    def squeeze(new_data=nil)
+    def squeeze(new_data=nil, previous_key=nil)
       data = new_data.nil? ? @data : new_data
 
       case data
@@ -13,12 +13,26 @@ module Lono::Builder::Dsl::Syntax::Core
       when Hash
         data.each_with_object({}) do |(k,v), squeezed|
           # only remove nil and empty Array values within Hash structures
-          squeezed[k] = squeeze(v) unless v.nil? || v.is_a?(Array) && v.empty?
+          squeezed[k] = squeeze(v, k) unless v.nil? # || empty_array?(v, previous_key)
           squeezed
         end
       else
         data # do not transform
       end
     end
+
+    # Special case do not squeeze empty Array when previous_key is "yum". Handles:
+    #
+    #   Metadata:
+    #     AWS::CloudFormation::Init:
+    #       config:
+    #         packages:
+    #           yum:
+    #             httpd: []
+    #
+    def empty_array?(v, previous_key)
+      return false if previous_key.to_s == "yum"
+      v.is_a?(Array) && v.empty?
+    end
   end
 end

data/lib/lono/builder/dsl.rb

@@ -8,7 +8,7 @@ module Lono::Builder
 
     def build_template
       evaluator = Evaluator.new(@options)
-      evaluator.build
+      evaluator.evaluate
     end
   end
 end

data/lib/lono/builder/param.rb

@@ -1,6 +1,9 @@
 module Lono::Builder
   class Param < Lono::CLI::Base
     attr_reader :env_path, :base_path # set when build is called
+    include Lono::Builder::Dsl::Syntax
+    # Overriding output resource DSL method
+    alias_method :output, :stack_output
 
     def build
       logger.info "Building parameters"
@@ -36,7 +39,7 @@ module Lono::Builder
     def render_erb(path)
       return unless path
       if File.exist?(path)
-        RenderMePretty.result(path, context: params_context)
+        RenderMePretty.result(path, context: self)
       end
     end
 

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

@@ -1,21 +1,8 @@
-require 'erb'
-require 'json'
-require 'base64'
-require 'digest'
-
 class Lono::Builder::Template
   class Upload < Lono::CLI::Base
-    def initialize(options={})
-      super
-      @checksums = {}
-      @prefix = Lono.env # s3://s3-bucket/development
-    end
-
     def run
-      paths = Dir.glob("#{Lono.root}/output/#{@blueprint.name}/template.yml")
-      paths.select { |p| File.file?(p) }.each do |path|
-        Lono::S3::Uploader.new(path).upload
-      end
+      path = "#{Lono.root}/output/#{@blueprint.name}/template.yml"
+      Lono::S3::Uploader.new(path).upload
     end
   end
 end

data/lib/lono/cfn/cancel.rb

@@ -1,19 +1,19 @@
 module Lono::Cfn
   class Cancel < Base
     def run
-      stack = find_stack(@stack)
+      stack = find_stack(@stack_name)
       unless stack
-        logger.info "The '#{@stack}' stack does not exist. Unable to cancel"
+        logger.info "The '#{@stack_name}' stack does not exist. Unable to cancel"
         quit 1
       end
 
-      logger.info "Canceling updates to #{@stack}."
+      logger.info "Canceling updates to #{@stack_name}."
       logger.info "Current stack status: #{stack.stack_status}"
       if stack.stack_status == "CREATE_IN_PROGRESS"
-        cfn.delete_stack(stack_name: @stack)
+        cfn.delete_stack(stack_name: @stack_name)
         logger.info "Canceling stack creation."
       elsif stack.stack_status == "UPDATE_IN_PROGRESS"
-        cfn.cancel_update_stack(stack_name: @stack)
+        cfn.cancel_update_stack(stack_name: @stack_name)
         logger.info "Canceling stack update."
         status.wait if @options[:wait]
       else

data/lib/lono/cfn/deploy/iam.rb

@@ -23,7 +23,7 @@ class Lono::Cfn::Deploy
 
             #{command_with_iam(capabilities)}
 
-        You can also avoid this prompt with config.up.capabilities in config/app.rb.
+        You can also avoid this prompt by setting config.up.capabilities in config/app.rb
         See: https://lono.cloud/docs/config/reference/
 
       EOL

data/lib/lono/cfn/deploy.rb

@@ -20,20 +20,37 @@ module Lono::Cfn
       yes = iam.rerun?(e)
       retry if yes
     rescue Aws::CloudFormation::Errors::ValidationError => e
-      if e.message.include?("No updates") # No updates are to be performed.
+      case e.message
+      when /No updates/ # No updates are to be performed.
         logger.info "WARN: #{e.message}".color(:yellow)
-      elsif e.message.include?("UPDATE_ROLLBACK_FAILED") # https://amzn.to/2IiEjc5
+      when /UPDATE_ROLLBACK_FAILED/ # https://amzn.to/2IiEjc5
         rollback.continue_update
+      when /YAML not well-formed/ # happens if a value is a serialize Ruby Object. See: https://gist.github.com/tongueroo/737531d0bc8c92d92b5cd00493e15d9e
+        # e.message: Template format error: YAML not well-formed. (line 207, column 9)
+        print_code(e)
       else
         logger.info "ERROR: #{e.message}".color(:red)
+        logger.info "Check: #{pretty_path(@blueprint.output_path)}"
         quit 1
       end
     end
 
+    def print_code(exception)
+      md = exception.message.match(/line (\d+),/)
+      line_number = md[1]
+      logger.error "Template for debugging: #{pretty_path(@blueprint.output_path)}"
+      if md
+        DslEvaluator.print_code(@blueprint.output_path, line_number)
+        exit 1
+      else
+        raise
+      end
+    end
+
     def create
       plan.for_create
       @sure || sure?("Going to create stack #{@stack} with blueprint #{@blueprint.name}.")
-
+      upload_files
       options = {
         stack_name: @stack,
         parameters: build.parameters,
@@ -53,9 +70,21 @@ module Lono::Cfn
       operable.check!
       changeset = plan.for_update
       !changeset.changed? || @sure || sure?("Are you sure you want to update the #{@stack} stack?")
+      upload_files
       changeset.execute_change_set
     end
 
+    # Upload files right before create_stack or execute_change_set
+    # Its better to upload here as part of a deploy vs a build
+    # IE: lono build should try not to do a remote write to s3 if possible
+    def upload_files
+      # Files built and compressed in
+      #     Lono::Builder::Dsl::Finalizer::Files::Build#build_files
+      Lono::Files.files.each do |file| # using singular file, but is like a "file_list"
+        file.upload
+      end
+    end
+
     def create?
       !stack_exists?(@stack)
     end

data/lib/lono/cfn/download.rb

@@ -6,7 +6,6 @@ module Lono::Cfn
     def run
       pretty_path = download_path.sub("#{Lono.root}/", '')
       logger.info "Downloading template to: #{pretty_path}"
-      return if ENV['LONO_NOOP']
       download_template
     end
 

data/lib/lono/cfn/plan/changeset.rb

@@ -8,7 +8,7 @@ class Lono::Cfn::Plan
     def create
       @build.all
       @changed = false
-      logger.info "Change Set Changes:".color(:green) if Lono.config.diff.changeset
+      logger.info "Change Set Changes:".color(:green) if Lono.config.plan.changeset
       preview_change_set
       logger.info "" # newline
     end
@@ -83,7 +83,7 @@ class Lono::Cfn::Plan
     end
 
     def display(change_set)
-      return unless Lono.config.diff.changeset
+      return unless Lono.config.plan.changeset
       case change_set.status
       when "CREATE_COMPLETE"
         display_changes(change_set)

data/lib/lono/cfn/plan/diff/data.rb

@@ -29,7 +29,7 @@ module Lono::Cfn::Plan::Diff
       unless @modified_keys.empty?
         logger.info "Modified:"
         @modified_keys.each do |k|
-          logger.info "    #{k}: #{@old[k]} -> #{@new[k]}"
+          logger.info "    #{k}: #{show_old(@old[k])} -> #{@new[k]}"
         end
       end
 
@@ -38,6 +38,16 @@ module Lono::Cfn::Plan::Diff
       end
     end
 
+    def show_old(v)
+      if v.nil?
+        '(unset)'
+      elsif v == ''
+        "''"
+      else
+        v
+      end
+    end
+
     def calculate
       @added_keys = @new.keys - @old.keys
       @removed_keys = @old.keys - @new.keys

data/lib/lono/cfn/plan/param.rb

@@ -1,7 +1,7 @@
 class Lono::Cfn::Plan
   class Param < Base
     def run
-      return unless Lono.config.diff.params && stack_exists?(@stack)
+      return unless Lono.config.plan.params && stack_exists?(@stack)
       logger.info "Parameter Changes:".color(:green)
       write_to_tmp(existing_path, existing_params)
       write_to_tmp(new_path, new_params)

data/lib/lono/cfn/plan/template.rb

@@ -1,11 +1,11 @@
 class Lono::Cfn::Plan
   class Template < Base
     def run
-      return unless Lono.config.diff.template
+      return unless Lono.config.plan.template
       @build.all
       logger.info "Template Changes:".color(:green)
       download_existing_cfn_template
-      diff = Diff::File.new(mode: Lono.config.diff.template)
+      diff = Diff::File.new(mode: Lono.config.plan.template)
       diff.show(existing_template_path, new_cfn_template)
       logger.info "" # newline
     end

data/lib/lono/cfn/plan.rb

@@ -1,6 +1,7 @@
 module Lono::Cfn
   class Plan < Base
     def run
+      build.all
       if stack_exists?(@stack)
         for_update
       else

data/lib/lono/cli/abstract.rb

@@ -1,16 +1,10 @@
 class Lono::CLI
   class Abstract
     extend Memoist
-    include Lono::Utils::Contexts
     include Lono::Utils::Logging
     include Lono::Utils::Pretty
 
     def initialize(options={})
-      reinitialize(options)
-    end
-
-    # Hack so that we can use include Thor::Base
-    def reinitialize(options)
       @options = options
     end
   end

data/lib/lono/cli/base.rb

@@ -1,9 +1,11 @@
 class Lono::CLI
   class Base < Abstract
-    def reinitialize(options={})
+    include Lono::Concerns::Names
+
+    def initialize(options={})
       super
-      @blueprint = Lono::Blueprint.new(options)
-      @stack = Lono::Names.new(options).stack
+      @blueprint = Lono::Blueprint.new(options.merge(name: options[:blueprint]))
+      @stack = names.stack
     end
   end
 end

data/lib/lono/cli/build.rb

@@ -1,85 +1,36 @@
 class Lono::CLI
   class Build < Base
-    delegate :param_path, to: :param_builder
-
-    # Use class variable to cache this only runs once across all classes. base.rb, diff.rb, preview.rb
     def all
-      ensure_s3_bucket_exist unless build_only?
-      pre_build
-      template_builder.run # build with some placeholders for build_files IE: file://app/files/my.rb
-      post_build
-      upload unless build_only?
-
+      check_allow!
+      Clean.new(@options.merge(mute: true)).run
+      ensure_s3_bucket_exist
+      template_builder.run # build with placeholders IE: file://app/files/index.rb
+      upload_templates
       parameters = param_builder.build  # Writes the json file in CamelCase keys format
       logger.info "" # newline
       parameters
     end
     memoize :all
+    alias_method :parameters, :all
 
-    def parameters
-      all
-    end
-
-    def build_only?
-      ENV['LONO_BUILD_ONLY'] || @options[:build_only]
-    end
-
-    def pre_build
-      build_scripts
-    end
-
-    def post_build
-      return if @options[:source]
-      build_files # builds app/files to output/BLUEPRINT/files
-      post_process_template
+    def check_allow!
+      Lono::Builder::Allow.new(@options).check!
     end
 
     def ensure_s3_bucket_exist
+      return unless upload?
       bucket = Lono::S3::Bucket.new
       return if bucket.exist?
       bucket.deploy
     end
 
-    def build_scripts
-      Lono::Script::Build.new(@options).run
-    end
-
-    def build_files
-      Lono::AppFile::Build.new(@options).run
-      Lono::Configset::S3File::Build.new(@options).run # copies files to the output folder
-    end
-
-    def post_process_template
-      # support for file://app/files/lambda_layer replacement
-      # TODO: Lono::Builder::Template::PostProcessor.new(@options).run
-    end
-
-    def upload
-      upload_files
-      upload_scripts
-      upload_templates
-    end
-
     def upload_templates
+      return unless upload?
       Lono::Builder::Template::Upload.new(@options).run
     end
 
-    def upload_scripts
-      Lono::Script::Upload.new(@options).run
-    end
-
-    def upload_files
-      Lono::AppFile::Upload.new(@options).upload
-      Lono::Configset::S3File::Upload.new(@options).upload
-    end
-
     def param_builder
-      o = {
-        regenerate: true,
-        allow_not_exists: true,
-      }.merge(@options)
-      o = HashWithIndifferentAccess.new(o)
-      Lono::Builder::Param.new(o)
+      Lono::Builder::Param.new(@options)
     end
     memoize :param_builder
 
@@ -87,5 +38,10 @@ class Lono::CLI
       Lono::Builder::Template.new(@options) # write templates to disk
     end
     memoize :template_builder
+
+    # Useful for dev and debugging
+    def upload?
+      ENV['LONO_UPLOAD'] != '0'
+    end
   end
 end

data/lib/lono/cli/clean.rb

@@ -8,15 +8,16 @@ class Lono::CLI
     attr_reader :options
     def initialize(options={})
       @options = options
+      @mute = options[:mute] # used by CLI::Build at beginning to clear out the output folder
     end
 
     def run
       folders = %w[output tmp]
-      sure?("Will remove folders: #{folders.join(' ')}")
+      @mute || sure?("Will remove folders: #{folders.join(' ')}")
       folders.each do |folder|
         FileUtils.rm_rf("#{Lono.root}/#{folder}")
       end
-      logger.info "Removed folders: #{folders.join(' ')}"
+      logger.info "Removed folders: #{folders.join(' ')}" unless @mute
     end
   end
 end

data/lib/lono/cli/code.rb

@@ -1,22 +1,22 @@
 class Lono::CLI
   class Code < Lono::Command
-    desc "import SOURCE", "Imports CloudFormation template and converts it to Ruby code."
-    long_desc Help.text("code/import")
-    option :blueprint, default: nil, desc: "final blueprint name"
-    option :casing, default: "as-is", desc: "Controls casing of logical ids. IE: as-is, camelcase or underscore"
-    option :summary, default: true, type: :boolean, desc: "provide template summary after import"
-    option :template, default: nil, desc: "final template name of downloaded template without extension"
-    option :template_name_casing, default: "dasherize", desc: "camelcase or dasherize the template name"
-    option :type, default: "dsl", desc: "import as a DSL or ERB template"
-    def import(source)
-      Importer.new(options.merge(source: source)).run
-    end
+    # desc "import SOURCE", "Imports CloudFormation template and converts it to Ruby code."
+    # long_desc Help.text("code/import")
+    # option :blueprint, default: nil, desc: "final blueprint name"
+    # option :casing, default: "as-is", desc: "Controls casing of logical ids. IE: as-is, camelcase or underscore"
+    # option :summary, default: true, type: :boolean, desc: "provide template summary after import"
+    # option :template, default: nil, desc: "final template name of downloaded template without extension"
+    # option :template_name_casing, default: "dasherize", desc: "camelcase or dasherize the template name"
+    # option :type, default: "dsl", desc: "import as a DSL or ERB template"
+    # def import(source)
+    #   Importer.new(options.merge(source: source)).run
+    # end
 
     desc "convert SOURCE", "Converts snippet of JSON or YAML CloudFormation template to Ruby code."
     long_desc Help.text("code/convert")
     option :casing, default: "as-is", desc: "Controls casing of logical ids. IE: as-is, camelcase or underscore"
     def convert(source)
-      Importer::Converter.new(options.merge(source: source)).run
+      Lono::Importer::Converter.new(options.merge(source: source)).run
     end
   end
 end

data/lib/lono/cli/help/new/helper/blueprint.md

@@ -0,0 +1,17 @@
+## Example
+
+The default helper name is `custom`.
+
+    $ lono new helper blueprint --blueprint demo
+    => Generating custom_helper.rb
+          create  app/blueprints/demo/helpers
+          create  app/blueprints/demo/helpers/custom_helper.rb
+
+
+You can override the helper name with the first argument.
+
+    $ lono new helper blueprint vars --blueprint demo
+    => Generating vars_helper.rb
+          create  app/blueprints/demo/helpers
+          create  app/blueprints/demo/helpers/vars_helper.rb
+    $

data/lib/lono/cli/help/new/helper/project.md

@@ -0,0 +1,16 @@
+## Examples
+
+The default helper name is `custom`.
+
+    $ lono new helper project
+    => Generating custom_helper.rb
+          create  app/helpers/custom
+          create  app/helpers/custom/custom_helper.rb
+
+You can override the helper name with the first argument.
+
+    $ lono new helper project asg
+    => Generating asg_helper.rb
+          create  app/helpers/asg
+          create  app/helpers/asg/asg_helper.rb
+    $

data/lib/lono/cli/list.rb

@@ -13,14 +13,11 @@ class Lono::CLI
 
   private
     def list_type(type)
-      lookup.list(type)
+      Dir.glob("#{Lono.root}/{app,vendor}/#{type}/*").each do |path|
+        logger.info pretty_path(path)
+      end
     end
 
-    def lookup
-      Lono::Lookup.new
-    end
-    memoize :lookup
-
     def show?(type)
       @options[:type] == type || @options[:type].nil? || @options[:type] == "all"
     end

data/lib/lono/cli/new/blueprint.rb

@@ -3,8 +3,8 @@ class Lono::CLI::New
     argument :name
     def self.cli_options
       [
-        [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
         [:examples, type: :boolean, desc: "Whether not to generate examples"],
+        [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
         [:project, desc: "Project name"],
       ]
     end
@@ -20,14 +20,10 @@ class Lono::CLI::New
       end
     end
 
-    # for specs
-    def set_dest
-      @dest = [@options[:project], "app/blueprints"].compact.join('/')
-    end
-
     def create_blueprint
       logger.info "=> Creating new blueprint called #{name}."
-      directory ".", "#{@dest}/#{name}"
+      dest = [@options[:project], "app/blueprints"].compact.join('/')
+      directory ".", "#{dest}/#{name}"
     end
   end
 end