lono 8.0.0.pre.rc3 → 8.0.0.pre.rc4

data/lib/lono/s3/uploader.rb

@@ -42,6 +42,10 @@ module Lono::S3
     end
 
     def presigned_url
+      # Here because want to lazily create this bucket only after user has confirmed lono up
+      # This is the first time bucket needs to exists
+      # Called at Deploy::Opts#template_url which gets passed to cfn.create and calls template_url
+      Lono::S3::Bucket.ensure_exist
       s3_presigner.presigned_url(:get_object, bucket: s3_bucket, key: s3_key)
     end
 

data/lib/lono/script/build.rb

@@ -63,10 +63,5 @@ module Lono::Script
       @md5sum ||= Digest::MD5.file("#{@blueprint.root}/scripts.tgz").to_s[0..7]
     end
 
-    def sh(command)
-      logger.info "=> #{command}"
-      system command
-    end
-
   end
 end

data/lib/lono/seeder.rb

@@ -43,7 +43,7 @@ module Lono
       end
 
       content = lines.join("\n")
-      dest_path = "#{dest_folder}/params/#{Lono.env}.txt" # only support environment level parameters for now
+      dest_path = "#{dest_folder}/params/#{Lono.env}.env" # only support environment level parameters for now
       create_file(dest_path, content) # Thor::Action
     end
 

data/lib/lono/utils/sh.rb

@@ -0,0 +1,32 @@
+module Lono::Utils
+  module Sh
+    def sh(command, options={})
+      on_fail = options[:on_fail].nil? ? "raise" : options[:on_fail]
+      strategy = options[:strategy].nil? ? "system" : options[:strategy] # system or backticks
+
+      logger.info "=> #{command}"
+
+      if strategy == "backticks"
+        out = `#{command}`
+        logger.debug out
+        success = $?.success?
+      else
+        success = system(command)
+      end
+
+      result = strategy == "backticks" ? out : success
+      return result if success
+
+      logger.error "ERROR: Running #{command}"
+      case on_fail.to_sym
+      when :raise
+        raise
+      when :exit
+        status = $?.exitstatus
+        exit status
+      end
+
+      result
+    end
+  end
+end

data/lib/lono/utils.rb

@@ -0,0 +1,5 @@
+module Lono
+  module Utils
+    include_modules "utils"
+  end
+end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "8.0.0-rc3"
+  VERSION = "8.0.0-rc4"
 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/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", ">= 0.2.5" # for DslEvaluator.print_code
+  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.rc3
+  version: 8.0.0.pre.rc4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        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
@@ -510,6 +516,7 @@ files:
 - lib/lono/aws_services/helper.rb
 - lib/lono/blueprint.rb
 - lib/lono/booter.rb
+- lib/lono/builder.rb
 - lib/lono/builder/allow.rb
 - lib/lono/builder/allow/base.rb
 - lib/lono/builder/allow/env.rb
@@ -566,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
@@ -651,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
@@ -672,8 +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/blueprint.md
-- lib/lono/cli/help/new/helper/project.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
@@ -688,15 +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/helper/blueprint.rb
-- lib/lono/cli/new/helper/project.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
@@ -711,6 +713,7 @@ files:
 - 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
@@ -729,19 +732,19 @@ files:
 - 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
@@ -761,10 +764,11 @@ files:
 - lib/lono/script/upload.rb
 - lib/lono/seeder.rb
 - lib/lono/user_data.rb
+- lib/lono/utils.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
@@ -773,15 +777,8 @@ files:
 - lib/templates/configset/configset.rb
 - lib/templates/examples/blueprint/template.rb
 - lib/templates/examples/configset/configset.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/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

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

data/lib/lono/cli/build.rb

@@ -1,47 +0,0 @@
-class Lono::CLI
-  class Build < Base
-    def all
-      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 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 upload_templates
-      return unless upload?
-      Lono::Builder::Template::Upload.new(@options).run
-    end
-
-    def param_builder
-      Lono::Builder::Param.new(@options)
-    end
-    memoize :param_builder
-
-    def template_builder
-      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/code.rb

@@ -1,22 +0,0 @@
-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 "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)
-      Lono::Importer::Converter.new(options.merge(source: source)).run
-    end
-  end
-end

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

@@ -1,56 +0,0 @@
-## Examples
-
-    lono blueprint new demo # skeleton blueprint with barebones structure
-
-## Example Output
-
-    $ lono blueprint new demo
-    => Creating new blueprint called demo.
-          create  blueprints/demo
-          create  blueprints/demo/demo.gemspec
-          create  blueprints/demo/.gitignore
-          create  blueprints/demo/CHANGELOG.md
-          create  blueprints/demo/Gemfile
-          create  blueprints/demo/README.md
-          create  blueprints/demo/Rakefile
-          create  blueprints/demo/seed/configs.rb
-           exist  blueprints/demo
-          create  blueprints/demo/app/templates/demo.rb
-          create  blueprints/demo/app/user_data/bootstrap.sh
-           exist  blueprints/demo/app/templates
-           exist
-          create  config/demo/params/development.txt
-          create  config/demo/params/production.txt
-          create  config/demo/variables/development.rb
-          create  config/demo/variables/production.rb
-    => Installing dependencies with: bundle install
-    Fetching gem metadata from https://rubygems.org/..........
-    ...
-    Bundle complete! 4 Gemfile dependencies, 9 gems now installed.
-    Use `bundle info [gemname]` to see where a bundled gem is installed.
-    ================================================================
-    Congrats  You have successfully created a lono blueprint.
-
-    Cd into your blueprint and check things out.
-
-        cd demo
-
-    More info: https://lono.cloud/docs/core/blueprints
-
-    Here is the structure of your blueprint:
-
-    .
-    ├── app
-    │   ├── templates
-    │   │   └── demo.rb
-    │   └── user_data
-    │       └── bootstrap.sh
-    ├── CHANGELOG.md
-    ├── demo.gemspec
-    ├── Gemfile
-    ├── Gemfile.lock
-    ├── Rakefile
-    ├── README.md
-    └── seed
-        └── configs.rb
-    $

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

@@ -1,17 +0,0 @@
-## 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

@@ -1,16 +0,0 @@
-## 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/new/extension.rb

@@ -1,57 +0,0 @@
-class Lono::CLI::New
-  class Extension < Sequence
-    argument :extension_name
-
-    def self.source_root
-      templates = File.expand_path("../../templates", File.dirname(__FILE__))
-      "#{templates}/extension"
-    end
-
-    def self.cli_options
-      [
-        [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files."],
-      ]
-    end
-
-    cli_options.each do |args|
-      class_option(*args)
-    end
-
-    # for specs
-    def set_cwd
-      @cwd = ENV['LONO_TEST'] ? File.dirname(Lono.root) : "#{Dir.pwd}/app/extensions"
-    end
-
-    def create_project
-      puts "=> Creating new extension called #{extension_name}."
-      directory ".", "#{@cwd}/#{extension_name}", options
-    end
-
-    def create_license
-      return unless ENV['LONO_LICENSE_FILE']
-      copy_file ENV['LONO_LICENSE_FILE'], "#{@cwd}/#{extension_name}/LICENSE.txt"
-    end
-
-    # After this commands are executed with the newly created project
-    def set_destination_root
-      destination_root = "#{@cwd}/#{extension_name}"
-      self.destination_root = destination_root
-      @old_dir = Dir.pwd # for reset_current_dir
-      FileUtils.cd(self.destination_root)
-    end
-
-    def welcome_message
-      puts <<~EOL
-        #{"="*64}
-        Congrats 🎉 You have successfully created a lono extension.
-
-        Cd into your extension and check things out.
-
-            cd #{extension_name}
-
-        More info: https://lono.cloud/docs/extensions
-
-      EOL
-    end
-  end
-end

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

@@ -1,26 +0,0 @@
-class Lono::CLI::New::Helper
-  class Blueprint < Lono::CLI::New::Sequence
-    def self.cli_options
-      # required for name => underscore_name => app/blueprints/demo/helpers/%underscore_name%_helper.rb.tt
-      argument :name, default: "custom", desc: "Helper name"
-
-      [
-        [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
-        [:blueprint, required: true, desc: "Blueprint name"],
-      ]
-    end
-    cli_options.each do |args|
-      class_option(*args)
-    end
-
-    def set_source
-      set_template_source "helper"
-    end
-
-    def create_blueprint
-      @blueprint = @options[:blueprint] # allows %underscore_name%_helper.rb.tt to access @blueprint
-      logger.info "=> Generating #{underscore_name}_helper.rb"
-      directory ".", "app/blueprints/#{@blueprint}/helpers"
-    end
-  end
-end

data/lib/lono/cli/new/helper/project.rb

@@ -1,24 +0,0 @@
-class Lono::CLI::New::Helper
-  class Project < Lono::CLI::New::Sequence
-    def self.cli_options
-      # required for name => underscore_name => app/blueprints/demo/helpers/%underscore_name%_helper.rb.tt
-      argument :name, default: "custom", desc: "Helper name"
-
-      [
-        [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
-      ]
-    end
-    cli_options.each do |args|
-      class_option(*args)
-    end
-
-    def set_source
-      set_template_source "helper"
-    end
-
-    def create_blueprint
-      logger.info "=> Generating #{underscore_name}_helper.rb"
-      directory ".", "app/helpers/#{underscore_name}"
-    end
-  end
-end

data/lib/lono/importer/base.rb

@@ -1,48 +0,0 @@
-class Lono::Importer
-  class Base < Lono::CLI::Base
-    include Download
-    include Thor::Actions
-    include Thor::Base
-
-    def initialize(options)
-      super
-      @source = options[:source]
-      @tmp_path = "/tmp/lono/import/template.yml"
-      self.destination_root = Dir.pwd # Thor::Actions require destination_root to be set
-    end
-
-  private
-    def summarize
-      return unless @options[:summary]
-      logger.info "Template Summary:"
-      Lono::Inspector::Summary.new(@options).run
-    end
-
-    def create_params(template_path)
-      create_params_file(template_path, "development")
-      create_params_file(template_path, "production")
-    end
-
-    def create_params_file(template_path, env)
-      params_path = if @blueprint.name != @template
-                      "config/#{@blueprint.name}/params/#{env}/#{@template}.txt"
-                    else
-                      "config/#{@blueprint.name}/params/#{env}.txt"
-                    end
-      params = Params.new(template_path, params_path)
-      params.create
-    end
-
-    # removes the ./ at the beginning if it's there in the path
-    def pretty_path(path)
-      path.sub("#{Lono.root}/",'')
-    end
-
-    def blueprint_name
-      return @options[:name] if @options[:name]
-      # Else infer name from the original source.
-      name = File.basename(@source, ".*")
-      @options[:casing] == "camelcase" ? name.camelize : name.underscore.dasherize
-    end
-  end
-end