lono 8.0.0.pre.rc2 → 8.0.0.pre.rc5

data/lib/templates/helper/%underscore_name%_helper.rb.tt

@@ -1,6 +1,6 @@
 module <%= class_name %>Helper
   # Your code goes here
-  # def custom_dsl_method
+  # def custom_method
   # ...
   # end
 end

data/lib/templates/hook/config/hooks.rb.tt

@@ -0,0 +1,14 @@
+<%
+message = if blueprint
+  "app/blueprints/#{blueprint}/config/hooks.rb: test blueprint hook for build"
+else
+  "config/hooks.rb: test project hook for build"
+end
+-%>
+before("build",
+  execute: "echo '<%= message %> before hook'",
+)
+
+after("build",
+  execute: "echo '<%= message %> after hook'"
+)

data/lib/templates/project/Gemfile.tt

@@ -2,10 +2,5 @@ source "https://rubygems.org"
 
 # gem "lono", "~> <%= Lono::VERSION %>"
 
-if ENV['C9_USER']
-  gem "lono", path: "~/boltops-tools/lono"
-  gem "rspec-lono", path: "~/boltops-tools/rspec-lono"
-else
-  gem "lono", git: "https://github.com/boltops-tools/lono", branch: "v8"
-  gem "rspec-lono", git: "https://github.com/boltops-tools/rspec-lono", branch: "master"
-end
+gem "lono", git: "https://github.com/boltops-tools/lono", branch: "master"
+gem "rspec-lono", git: "https://github.com/boltops-tools/rspec-lono", branch: "master"

data/lono.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "cfn-status"
   spec.add_dependency "cfn_camelizer"
   spec.add_dependency "cli-format"
-  spec.add_dependency "dsl_evaluator"
+  spec.add_dependency "dsl_evaluator", ">= 0.3.0" # for DslEvaluator.print_code
   spec.add_dependency "filesize"
   spec.add_dependency "graph" # lono graph command dependency
   spec.add_dependency "hashie"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 8.0.0.pre.rc2
+  version: 8.0.0.pre.rc5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -487,6 +487,12 @@ files:
 - ".cody/acceptance/role.rb"
 - ".cody/shared/script/install.sh"
 - ".cody/shared/script/install/lono.sh"
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/documentation.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/ISSUE_TEMPLATE/question.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -502,31 +508,46 @@ files:
 - lib/lono/api/repos.rb
 - lib/lono/api/verify.rb
 - lib/lono/app.rb
+- lib/lono/app/callable_option.rb
+- lib/lono/app/callable_option/concern.rb
 - lib/lono/app/inits.rb
-- lib/lono/app_file/base.rb
-- lib/lono/app_file/build.rb
-- lib/lono/app_file/build/lambda_layer.rb
-- lib/lono/app_file/build/lambda_layer/ruby_packager.rb
-- lib/lono/app_file/registry.rb
-- lib/lono/app_file/registry/item.rb
-- lib/lono/app_file/upload.rb
 - lib/lono/autoloader.rb
 - lib/lono/aws_services.rb
 - lib/lono/aws_services/helper.rb
 - lib/lono/blueprint.rb
 - lib/lono/booter.rb
-- lib/lono/builder/context/generic.rb
-- lib/lono/builder/context/loaders.rb
-- lib/lono/builder/context/loaders/load_files.rb
-- lib/lono/builder/context/params.rb
-- lib/lono/builder/context/template.rb
+- lib/lono/builder.rb
+- lib/lono/builder/allow.rb
+- lib/lono/builder/allow/base.rb
+- lib/lono/builder/allow/env.rb
+- lib/lono/builder/allow/region.rb
+- lib/lono/builder/configset/combiner.rb
+- lib/lono/builder/configset/definition.rb
+- lib/lono/builder/configset/definition/base.rb
+- lib/lono/builder/configset/definition/context.rb
+- lib/lono/builder/configset/definition/dsl.rb
+- lib/lono/builder/configset/definition/dsl/syntax.rb
+- lib/lono/builder/configset/definition/dsl/syntax/auth.rb
+- lib/lono/builder/configset/definition/dsl/syntax/content.rb
+- lib/lono/builder/configset/definition/dsl/syntax/core.rb
+- lib/lono/builder/configset/definition/dsl/syntax/package.rb
+- lib/lono/builder/configset/definition/erb.rb
+- lib/lono/builder/configset/evaluator.rb
+- lib/lono/builder/configset/registration.rb
+- lib/lono/builder/context.rb
 - lib/lono/builder/dsl.rb
 - lib/lono/builder/dsl/evaluator.rb
 - lib/lono/builder/dsl/finalizer.rb
+- lib/lono/builder/dsl/finalizer/base.rb
 - lib/lono/builder/dsl/finalizer/configsets.rb
+- lib/lono/builder/dsl/finalizer/files.rb
+- lib/lono/builder/dsl/finalizer/files/base.rb
+- lib/lono/builder/dsl/finalizer/files/build.rb
+- lib/lono/builder/dsl/finalizer/files/replace.rb
 - lib/lono/builder/dsl/finalizer/parameter_groups.rb
 - lib/lono/builder/dsl/helpers.rb
 - lib/lono/builder/dsl/helpers/ec2.rb
+- lib/lono/builder/dsl/helpers/files.rb
 - lib/lono/builder/dsl/helpers/partials.rb
 - lib/lono/builder/dsl/helpers/s3.rb
 - lib/lono/builder/dsl/helpers/ssm.rb
@@ -552,7 +573,6 @@ files:
 - lib/lono/builder/template/aws_service.rb
 - lib/lono/builder/template/bashify.rb
 - lib/lono/builder/template/output.rb
-- lib/lono/builder/template/post_processor.rb
 - lib/lono/builder/template/upload.rb
 - lib/lono/builder/util/stringify.rb
 - lib/lono/bundler.rb
@@ -637,15 +657,12 @@ files:
 - lib/lono/cli.rb
 - lib/lono/cli/abstract.rb
 - lib/lono/cli/base.rb
-- lib/lono/cli/build.rb
 - lib/lono/cli/bundle.rb
 - lib/lono/cli/cfn.rb
 - lib/lono/cli/cfn/opts.rb
 - lib/lono/cli/clean.rb
-- lib/lono/cli/code.rb
 - lib/lono/cli/completion.rb
 - lib/lono/cli/help.rb
-- lib/lono/cli/help/blueprint/new.md
 - lib/lono/cli/help/build.md
 - lib/lono/cli/help/cfn.md
 - lib/lono/cli/help/cfn/cancel.md
@@ -658,6 +675,8 @@ files:
 - lib/lono/cli/help/completion_script.md
 - lib/lono/cli/help/configsets.md
 - lib/lono/cli/help/down.md
+- lib/lono/cli/help/new/helper.md
+- lib/lono/cli/help/new/hook.md
 - lib/lono/cli/help/new/project.md
 - lib/lono/cli/help/param.md
 - lib/lono/cli/help/param/generate.md
@@ -672,13 +691,14 @@ files:
 - lib/lono/cli/help/template/generate.md
 - lib/lono/cli/help/up.md
 - lib/lono/cli/help/user_data.md
+- lib/lono/cli/iam.rb
 - lib/lono/cli/list.rb
 - lib/lono/cli/new.rb
 - lib/lono/cli/new/blueprint.rb
 - lib/lono/cli/new/concerns.rb
 - lib/lono/cli/new/configset.rb
-- lib/lono/cli/new/extension.rb
 - lib/lono/cli/new/helper.rb
+- lib/lono/cli/new/hook.rb
 - lib/lono/cli/new/project.rb
 - lib/lono/cli/new/sequence.rb
 - lib/lono/cli/new/shim.rb
@@ -692,44 +712,43 @@ files:
 - lib/lono/cli/script/build.rb
 - lib/lono/cli/script/upload.rb
 - lib/lono/cli/seed.rb
+- lib/lono/cli/status.rb
+- lib/lono/cli/summary.rb
 - lib/lono/cli/test.rb
 - lib/lono/command.rb
 - lib/lono/completer.rb
 - lib/lono/completer/script.rb
 - lib/lono/completer/script.sh
-- lib/lono/configset/builder.rb
-- lib/lono/configset/combiner.rb
-- lib/lono/configset/evaluate_file.rb
-- lib/lono/configset/meta.rb
-- lib/lono/configset/meta/dsl.rb
-- lib/lono/configset/s3_file/build.rb
-- lib/lono/configset/s3_file/item.rb
-- lib/lono/configset/s3_file/registry.rb
-- lib/lono/configset/s3_file/upload.rb
-- lib/lono/configset/strategy/base.rb
-- lib/lono/configset/strategy/dsl.rb
-- lib/lono/configset/strategy/erb.rb
-- lib/lono/configset/strategy/helpers/dsl.rb
-- lib/lono/configset/strategy/helpers/dsl/auth.rb
-- lib/lono/configset/strategy/helpers/dsl/core.rb
-- lib/lono/configset/strategy/helpers/dsl/package.rb
-- lib/lono/configset/strategy/helpers/dsl/syntax.rb
-- lib/lono/configset/strategy/helpers/erb.rb
+- lib/lono/component.rb
+- lib/lono/concerns/aws_info.rb
+- lib/lono/concerns/names.rb
+- lib/lono/configset.rb
 - lib/lono/core.rb
+- lib/lono/ext.rb
+- lib/lono/ext/bundler.rb
+- lib/lono/ext/core/module.rb
+- lib/lono/ext/core/object.rb
+- lib/lono/ext/core/string.rb
+- lib/lono/files.rb
+- lib/lono/files/base.rb
+- lib/lono/files/builder.rb
+- lib/lono/files/builder/lambda_layer.rb
+- lib/lono/files/builder/lambda_layer/rsync.rb
+- lib/lono/files/builder/lambda_layer/ruby_packager.rb
+- lib/lono/files/builder/lambda_layer/ruby_version.rb
+- lib/lono/files/compressor.rb
+- lib/lono/files/concerns/post_processing.rb
+- lib/lono/files/concerns/registration.rb
+- lib/lono/files/registry.rb
+- lib/lono/hooks/builder.rb
+- lib/lono/hooks/concern.rb
+- lib/lono/hooks/dsl.rb
+- lib/lono/hooks/runner.rb
 - lib/lono/importer.rb
-- lib/lono/importer/base.rb
-- lib/lono/importer/converter.rb
-- lib/lono/importer/download.rb
-- lib/lono/importer/dsl.rb
-- lib/lono/importer/params.rb
-- lib/lono/importer/service/coder.rb
-- lib/lono/inspector/base.rb
-- lib/lono/inspector/summary.rb
 - lib/lono/layering.rb
 - lib/lono/layering/layer.rb
 - lib/lono/logger.rb
 - lib/lono/logger/formatter.rb
-- lib/lono/lookup.rb
 - lib/lono/md5.rb
 - lib/lono/names.rb
 - lib/lono/plugin.rb
@@ -744,15 +763,13 @@ files:
 - lib/lono/script/build.rb
 - lib/lono/script/upload.rb
 - lib/lono/seeder.rb
-- lib/lono/seeder/service_role.rb
 - lib/lono/user_data.rb
-- lib/lono/utils/contexts.rb
-- lib/lono/utils/item/file_methods.rb
-- lib/lono/utils/item/zip.rb
+- lib/lono/utils.rb
+- lib/lono/utils/call_line.rb
 - lib/lono/utils/logging.rb
 - lib/lono/utils/pretty.rb
 - lib/lono/utils/quit.rb
-- lib/lono/utils/rsync.rb
+- lib/lono/utils/sh.rb
 - lib/lono/utils/sure.rb
 - lib/lono/version.rb
 - lib/lono/yamler/loader.rb
@@ -760,15 +777,9 @@ files:
 - lib/templates/blueprint/template.rb
 - lib/templates/configset/configset.rb
 - lib/templates/examples/blueprint/template.rb
-- lib/templates/extension/lib/%extension_name%.rb.tt
-- lib/templates/extension/lib/%extension_name%/autoloader.rb.tt
-- lib/templates/extension/lib/%extension_name%/helpers/mappings.rb.tt
-- lib/templates/extension/lib/%extension_name%/helpers/outputs.rb.tt
-- lib/templates/extension/lib/%extension_name%/helpers/parameters.rb.tt
-- lib/templates/extension/lib/%extension_name%/helpers/resources/resource.rb.tt
-- lib/templates/extension/lib/%extension_name%/helpers/variables.rb.tt
-- lib/templates/extension/lib/%extension_name%/version.rb.tt
+- lib/templates/examples/configset/configset.rb
 - lib/templates/helper/%underscore_name%_helper.rb.tt
+- lib/templates/hook/config/hooks.rb.tt
 - lib/templates/project/.gitignore
 - lib/templates/project/Gemfile.tt
 - lib/templates/project/README.md
@@ -797,7 +808,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.12
 signing_key: 
 specification_version: 4
 summary: 'Lono: The CloudFormation Framework'

data/lib/lono/app_file/base.rb

@@ -1,28 +0,0 @@
-# Naming AppFile instead of File so we dont to use ::File for normal regular File class
-module Lono::AppFile
-  class Base < Lono::CLI::Base
-    # What's needed for a Thor::Group or "Sequence". Gives us Thor::Actions commands like create_file
-    # Must be included before `def initialize` as we override the Thor initialize
-    include Thor::Actions
-    include Thor::Base
-    # Override Thor::Base initialize
-    def initialize(options={})
-      reinitialize(options)
-      initialize_variables
-    end
-
-    def initialize_variables
-    end
-
-  private
-    # Hack Thor to be able to dynamically set the source_paths at runtime instance methods
-    def override_source_paths(*paths)
-      # Using string with instance_eval because block doesnt have access to path at runtime.
-      self.class.instance_eval %{
-        def self.source_paths
-          #{paths.flatten.inspect}
-        end
-      }
-    end
-  end
-end

data/lib/lono/app_file/build/lambda_layer.rb

@@ -1,20 +0,0 @@
-class Lono::AppFile::Build
-  class LambdaLayer
-    def initialize(blueprint, registry_item)
-      @blueprint.name, @registry_item = blueprint, registry_item
-    end
-
-    def build
-      lang = @registry_item.options[:lang]
-      unless lang =~ /ruby/
-        logger.info "WARN: Currently only support ruby lambda layers".color(:yellow)
-        return
-      end
-
-      klass_name = "Lono::AppFile::Build::LambdaLayer::#{lang.camelize}Packager"
-      klass = klass_name.constantize
-      packager = klass.new(@blueprint.name, @registry_item)
-      packager.build
-    end
-  end
-end

data/lib/lono/app_file/build.rb

@@ -1,79 +0,0 @@
-require "thor"
-
-module Lono::AppFile
-  class Build < Base
-    include Lono::Utils::Item::Zip
-
-    def initialize_variables
-      @output_files_path = "#{Lono.root}/output/#{@blueprint.name}/files"
-    end
-
-    def run
-      return unless detect_files?
-      logger.info "Building app/files"
-      build_all
-    end
-
-    def build_all
-      clean_output
-      validate_files!
-      copy_to_output
-      build_layers
-      compress_output
-    end
-
-    def validate_files!
-      items = Registry.items + Registry.layers
-      missing = items.select do |item|
-        !File.exist?(item.src_path)
-      end
-      missing_paths = missing.map { |item| item.src_path }.uniq
-      unless missing_paths.empty?
-        logger.info "ERROR: These app/files are missing were used by the s3_key method but are missing".color(:red)
-        missing_paths.each do |path|
-          logger.info "    #{path}"
-        end
-        logger.info "Please double check that they exist."
-        exit 1
-      end
-    end
-
-    def build_layers
-      layer_items = Registry.layers
-      layer_items.each do |item|
-        LambdaLayer.new(@blueprint, item).build
-      end
-    end
-
-    def compress_output
-      Registry.items.each do |item|
-        # type can be lambda_layer or file
-        if item.type == "lambda_layer" || item.exist?
-          zip(item)
-        else
-          logger.info "WARN: #{item.src_path} does not exist. Double check that the path is correct in the s3_key call.".color(:yellow)
-        end
-      end
-    end
-
-    def copy_to_output
-      override_source_paths("#{@blueprint.root}/app/files")
-      self.destination_root = @output_files_path
-      directory(".", verbose: false, context: template_context.get_binding) # Thor::Action
-    end
-
-    def clean_output
-      FileUtils.rm_rf(@output_files_path)
-    end
-
-    def detect_files?
-      app_files = Dir["#{@blueprint.root}/app/files/*"]
-      if app_files.empty?
-        false
-      else
-        logger.info "Detected app/files"
-        true
-      end
-    end
-  end
-end

data/lib/lono/app_file/registry/item.rb

@@ -1,24 +0,0 @@
-class Lono::AppFile::Registry
-  # Holds metadata about the item in the regsitry.
-  class Item
-    include Lono::Utils::Item::FileMethods
-
-    attr_reader :name, :options, :type
-    def initialize(name, blueprint, options={})
-      @name, @blueprint.name, @options = name, blueprint, options
-      @type = options[:type] || "file"
-    end
-
-    def src_path
-      "#{@blueprint.root}/app/files/#{@name}"
-    end
-
-    def output_path
-      if @type == "file"
-        "#{Lono.root}/output/#{@blueprint.name}/files/#{@name}"
-      else
-        "#{Lono.root}/output/#{@blueprint.name}/lambda_layers/#{@name}/opt"
-      end
-    end
-  end
-end

data/lib/lono/app_file/registry.rb

@@ -1,16 +0,0 @@
-module Lono::AppFile
-  class Registry
-    cattr_reader :items
-    @@items = []
-
-    class << self
-      def register(name, blueprint, options={})
-        @@items << Item.new(name, blueprint, options) unless @@items.detect { |i| i.name == name && i.type == options[:type] }
-      end
-
-      def layers
-        @@items.select { |i| i.type == "lambda_layer" }
-      end
-    end
-  end
-end

data/lib/lono/app_file/upload.rb

@@ -1,12 +0,0 @@
-module Lono::AppFile
-  class Upload < Base
-    def upload
-      return unless Registry.items.size > 0
-      logger.info "Uploading app/files..."
-
-      Registry.items.each do |item|
-        Lono::S3::Uploader.new(item.zip_file_path).upload
-      end
-    end
-  end
-end

data/lib/lono/builder/context/generic.rb

@@ -1,11 +0,0 @@
-module Lono::Builder::Context
-  class Generic < Lono::CLI::Base
-    include Lono::Builder::Dsl::Syntax
-
-    # For Lono::AppFile::Build usage of Thor::Action directory
-    # For some reason a send(:binding) doesnt work but get_binding like this works.
-    def get_binding
-      binding
-    end
-  end
-end

data/lib/lono/builder/context/loaders/load_files.rb

@@ -1,23 +0,0 @@
-module Lono::Builder::Context::Loaders
-  module LoadFiles
-    # Load custom helper methods from project
-    def load_files(dir)
-      paths = Dir.glob("#{dir}/**/*.rb")
-      paths.sort_by! { |p| p.size } # so namespaces are loaded first
-      paths.each do |path|
-        # helpers = blueprint or project extensions
-        filename = path.sub(%r{.*/helpers/},'').sub('.rb','')
-        module_name = filename.camelize
-
-        # Prepend a period so require works LONO_ROOT is set to a relative path without a period.
-        #
-        # Example: LONO_ROOT=tmp/lono_project
-        first_char = path[0..0]
-        path = "./#{path}" unless %w[. /].include?(first_char)
-
-        require path
-        self.class.send :include, module_name.constantize
-      end
-    end
-  end
-end

data/lib/lono/builder/context/loaders.rb

@@ -1,35 +0,0 @@
-module Lono::Builder::Context
-  module Loaders
-    include LoadFiles
-
-    # Variables in base.rb are overridden by their environment specific variables
-    # file.  Example, file LONO_ENV=dev:
-    #
-    #   config/vars/base.rb
-    #   config/vars/dev.rb - will override any variables in base.rb
-    #   config/vars/base.rb
-    #   config/vars/dev.rb - will override any variables in base.rb
-    #
-    def load_variables
-      layers = Lono::Layering::Layer.new(@blueprint, "vars").paths
-      layers.each do |layer|
-        evaluate_variables_file(layer)
-      end
-    end
-
-    # Load the variables defined in config/vars/* to make available in lono scope.
-    #
-    # NOTE: Was only able to make instance variables avaialble with instance_eval, wasnt able to make local variables
-    # available.
-    def evaluate_variables_file(path)
-      return unless File.exist?(path)
-      instance_eval(IO.read(path), path)
-    end
-
-    # Load blueprint helpers
-    # blueprint helpers override extension helpers
-    def load_blueprint_helpers
-      load_files("#{@blueprint.root}/#{Lono.config.paths.helpers}")
-    end
-  end
-end

data/lib/lono/builder/context/params.rb

@@ -1,6 +0,0 @@
-module Lono::Builder::Context
-  class Params < Generic
-    # Overriding output resource DSL method
-    alias_method :output, :stack_output
-  end
-end

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

@@ -1,4 +0,0 @@
-module Lono::Builder::Context
-  class Template < Generic
-  end
-end

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

@@ -1,67 +0,0 @@
-class Lono::Builder::Template
-  class PostProcessor < Lono::CLI::Base
-    def run
-      replacements.each do |placeholder, replacement|
-        update_template!(template)
-      end
-      write_template!
-    end
-
-    def write_template!
-      IO.write(template_path, YAML.dump(template)) # unless ENV['LONO_TEST'] # additional safeguard for testing
-    end
-
-    def replacements
-      map = {}
-
-      registry_items.each do |item|
-        if item.type == "lambda_layer"
-          placeholder = "file://app/files/lambda_layer/#{item.name}"
-        elsif item.directory? || item.file?
-          placeholder = "file://app/files/file/#{item.name}"
-        else
-          logger.info "WARN: PostProcessor replacements Cannot find file: #{item.output_path}"
-          next
-        end
-        map[placeholder] = item.s3_path
-      end
-
-      Lono::Configset::S3File::Registry.items.each do |item|
-        placeholder = "file://configset/#{item.configset}/#{item.name}"
-        # map[placeholder] = "https://s3.amazonaws.com/#{Lono::S3::Bucket.name}/#{item.s3_path}"
-        map[placeholder] = item.replacement_value
-      end
-
-      map
-    end
-
-    def update_template!(hash)
-      hash.each do |k, v|
-        if v.is_a?(String)
-          if v =~ %r{^file://}
-            v.replace(replacements[v]) # replace the placeholder
-          end
-        elsif v.is_a?(Hash)
-          update_template!(v) # recurse
-        elsif v.is_a?(Array)
-          v.each { |x| update_template!(x) if x.is_a?(Hash) }
-        end
-      end
-      hash
-    end
-
-    # Useful for specs
-    def registry_items
-      Lono::AppFile::Registry.items
-    end
-
-    def template
-      YAML.load_file(template_path)
-    end
-    memoize :template
-
-    def template_path
-      "#{Lono.root}/output/#{@blueprint.name}/templates/#{@template}.yml"
-    end
-  end
-end