lono 8.0.0.pre.rc1 → 8.0.0.pre.rc2

data/lib/lono/bundler/component/props/extension.rb

@@ -16,4 +16,3 @@ class Lono::Bundler::Component::Props
     end
   end
 end
-

data/lib/lono/bundler/extract/tar.rb

@@ -31,4 +31,3 @@ class Lono::Bundler::Extract
     end
   end
 end
-

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

@@ -46,4 +46,3 @@ class Lono::Cfn::Deploy
     end
   end
 end
-

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

@@ -10,7 +10,8 @@ module Lono::Cfn::Plan::Diff
 
     def summary(existing_path, new_path)
       command = "diff #{existing_path} #{new_path} -u -s"
-      pretty_command = "diff #{pretty_path(existing_path)} #{pretty_path(new_path)}"
+      # actually use diff but show colordiff in pretty_command
+      pretty_command = "#{diff_viewer} #{pretty_path(existing_path)} #{pretty_path(new_path)}"
       logger.info "=> #{pretty_command}"
       out = `#{command}`
       lines = out.split("\n")

data/lib/lono/cli/abstract.rb

@@ -1,7 +1,7 @@
 class Lono::CLI
   class Abstract
     extend Memoist
-    include Lono::Utils::Context
+    include Lono::Utils::Contexts
     include Lono::Utils::Logging
     include Lono::Utils::Pretty
 

data/lib/lono/cli/build.rb

@@ -6,7 +6,7 @@ class Lono::CLI
     def all
       ensure_s3_bucket_exist unless build_only?
       pre_build
-      build_template # build with some placeholders for build_files IE: file://app/files/my.rb
+      template_builder.run # build with some placeholders for build_files IE: file://app/files/my.rb
       post_build
       upload unless build_only?
 
@@ -49,16 +49,6 @@ class Lono::CLI
       Lono::Configset::S3File::Build.new(@options).run # copies files to the output folder
     end
 
-    def build_template
-      template_builder.run
-      inject_configsets
-    end
-
-    def inject_configsets
-      # The inject_configsets reads it back from disk. Leaving as-is instead of reading all in memory in case there's a reason.
-      # TODO Lono::Builder::Template::ConfigsetInjector.new(@options).run
-    end
-
     def post_process_template
       # support for file://app/files/lambda_layer replacement
       # TODO: Lono::Builder::Template::PostProcessor.new(@options).run

data/lib/lono/cli/help/cfn/status.md

@@ -12,4 +12,3 @@ Shows the status of the stack. If the stack is in progress then tail the status
     11:52:33PM UPDATE_COMPLETE AWS::CloudWatch::Alarm HighCpu
     11:52:35PM UPDATE_COMPLETE_CLEANUP_IN_PROGRESS AWS::CloudFormation::Stack ecs-asg
     11:52:36PM UPDATE_COMPLETE AWS::CloudFormation::Stack ecs-asg
-

data/lib/lono/cli/help/seed.md

@@ -1,23 +1,24 @@
 ## Example
 
-    $ lono seed ecs-asg
-    Creating starter config files for ecs-asg
-          create  config/ecs-asg/params/development.txt
-    $ cat config/ecs-asg/params/development.txt
-    # Required parameters:
-    VpcId=vpc-111 # Find at vpc CloudFormation Outputs
-    Subnets=subnet-111,subnet-222,subnet-333 # Find at vpc CloudFormation Outputs
-    # Optional parameters:
-    # InstanceType=m5.large
-    # KeyName=...
-    # SshLocation=...
-    # EcsCluster=development
-    # TagName=ecs-asg-development
-    # ExistingIamInstanceProfile=...
-    # ExistingSecurityGroups=...
-    # EbsVolumeSize=50
-    # MinSize=1
-    # MaxSize=4
-    # MinInstancesInService=2
-    # MaxBatchSize=1
-    $
+    $ lono seed demo
+    Creating starter config files for ec2
+          create  config/blueprints/ec2/params/dev.txt
+          create  config/blueprints/ec2/vars/dev.rb
+
+To create the files in the top-level app folder
+
+    $ lono seed ec2 --where app
+    Creating starter config files for ec2
+          create  app/blueprints/ec2/config/params/dev.txt
+          create  app/blueprints/ec2/config/vars/dev.rb
+    $
+
+You can also set the default where option with
+
+config/app.rb
+
+```ruby
+Lono.configure do |config|
+  config.seed.where = "app"
+end
+```

data/lib/lono/cli/s3.rb

@@ -5,21 +5,21 @@ class Lono::CLI
     desc "deploy", "deploys lono managed s3 bucket"
     long_desc Help.text("s3/deploy")
     def deploy
-      Lono::Bucket.new(options).deploy
+      Lono::S3::Bucket.new(options).deploy
     end
 
     desc "show", "shows lono managed s3 bucket"
     long_desc Help.text("s3/show")
     opts.yes
     def show
-      Lono::Bucket.new(options).show
+      Lono::S3::Bucket.new(options).show
     end
 
     desc "delete", "deletes lono managed s3 bucket"
     long_desc Help.text("s3/delete")
     opts.yes
     def delete
-      Lono::Bucket.new(options).delete
+      Lono::S3::Bucket.new(options).delete
     end
   end
 end

data/lib/lono/cli.rb

@@ -57,6 +57,7 @@ module Lono
     long_desc Help.text("seed")
     option :param, desc: "override convention and specify the param file to use"
     opts.runtime_options
+    option :where, desc: "Where to create file, you specify the top-level folder. Possible values: app, config, vendor. Defaults to config"
     def seed(blueprint)
       Seed.new(options.merge(blueprint: blueprint)).create
     end

data/lib/lono/importer/service/coder.rb

@@ -2,80 +2,84 @@ require 'base64'
 require 'json'
 require 'net/http'
 
-class Lono::Importer::Service::Coder
-  def initialize(template, options={})
-    @template, @options = template, options
-  end
-
-  def translate
-    url = "#{Lono::API}/code"
-    http = net_http_client(url)
-    req = net_http_request(url,
-      template: Base64.encode64(@template), # Base64 JSON for special chars that Rack::LintWrapper cannot process
-      lono_version: Lono::VERSION,
-      lono_command: lono_command,
-    )
-    res = http.request(req) # send request
+module Lono::Importer::Service
+  class Coder
+    include Lono::Utils::Logging
 
-    if res.code == "200"
-      data = JSON.load(res.body)
-      ruby_code = print(data) # returns data["ruby_code"] / passthrough
-      ruby_code
-    else
-      logger.info "Error: Unable to convert template to Ruby code."
-      logger.info "The error has been reported."
-      logger.info "Non-successful http response status code: #{res.code}"
-      # logger.info "headers: #{res.each_header.to_h.inspect}"
-      exit 1
+    def initialize(template, options={})
+      @template, @options = template, options
     end
-  end
 
-private
-  def print(data)
-    return if ENV['LONO_PRO_TEST']
+    def translate
+      url = "#{Lono::API}/code"
+      http = net_http_client(url)
+      req = net_http_request(url,
+        template: Base64.encode64(@template), # Base64 JSON for special chars that Rack::LintWrapper cannot process
+        lono_version: Lono::VERSION,
+        lono_command: lono_command,
+      )
+      res = http.request(req) # send request
 
-    if data["error"]
-      # Code was processed but there was this error with an HTTP 200 OK
-      $stderr.logger.info "ERROR: #{data["error"]}".color(:red)
-      if data["message"]
-        $stderr.logger.info data["message"]
+      if res.code == "200"
+        data = JSON.load(res.body)
+        ruby_code = print(data) # returns data["ruby_code"] / passthrough
+        ruby_code
+      else
+        logger.info "Error: Unable to convert template to Ruby code."
+        logger.info "The error has been reported."
+        logger.info "Non-successful http response status code: #{res.code}"
+        # logger.info "headers: #{res.each_header.to_h.inspect}"
+        exit 1
       end
-      return
     end
 
-    validity = data["valid_ruby"] ? "valid" : "invalid"
-    if validity == "valid"
-      $stderr.logger.info "INFO: The generated Ruby code is has #{validity} syntax."
-    else
-      $stderr.logger.info "WARN: The generated Ruby code is has #{validity} syntax. Providing because it may be small errors.".color(:yellow) # note redirection disables color
-    end
+  private
+    def print(data)
+      return if ENV['LONO_PRO_TEST']
 
-    $stderr.logger.info <<~EOL
-      Translated ruby code below:
+      if data["error"]
+        # Code was processed but there was this error with an HTTP 200 OK
+        logger.info "ERROR: #{data["error"]}".color(:red)
+        if data["message"]
+          logger.info data["message"]
+        end
+        return
+      end
 
-    EOL
-    ruby_code = data["ruby_code"]
-    logger.info ruby_code
-    ruby_code
-  end
+      validity = data["valid_ruby"] ? "valid" : "invalid"
+      if validity == "valid"
+        logger.info "INFO: The generated Ruby code is has #{validity} syntax."
+      else
+        logger.info "WARN: The generated Ruby code is has #{validity} syntax. Providing because it may be small errors.".color(:yellow) # note redirection disables color
+      end
 
-  def net_http_client(url)
-    uri = URI(url)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.open_timeout = http.read_timeout = 30
-    http.use_ssl = true if uri.scheme == 'https'
-    http
-  end
+      logger.info <<~EOL
+        Translated ruby code below:
 
-  def net_http_request(url, data)
-    req = Net::HTTP::Post.new(url) # url includes query string and uri.path does not, must used url
-    text = JSON.dump(data)
-    req.body = text
-    req.content_length = text.bytesize
-    req
-  end
+      EOL
+      ruby_code = data["ruby_code"]
+      logger.info ruby_code
+      ruby_code
+    end
+
+    def net_http_client(url)
+      uri = URI(url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.open_timeout = http.read_timeout = 30
+      http.use_ssl = true if uri.scheme == 'https'
+      http
+    end
+
+    def net_http_request(url, data)
+      req = Net::HTTP::Post.new(url) # url includes query string and uri.path does not, must used url
+      text = JSON.dump(data)
+      req.body = text
+      req.content_length = text.bytesize
+      req
+    end
 
-  def lono_command
-    "#{$0} #{ARGV.join(' ')}"
+    def lono_command
+      "#{$0} #{ARGV.join(' ')}"
+    end
   end
 end

data/lib/lono/logger.rb

@@ -29,5 +29,6 @@ module Lono
     end
 
     public :print
+    public :printf
   end
 end

data/lib/lono/s3/bucket.rb

@@ -1,41 +1,23 @@
 module Lono::S3
   class Bucket
-    STACK_NAME = ENV['LONO_STACK_NAME'] || "lono"
     include Lono::AwsServices
+    include Lono::Cfn::Concerns
     include Lono::Utils::Logging
     extend Lono::AwsServices
     extend Memoist
 
-    class << self
-      @@name = nil
-      def name
-        return @@name if @@name # only memoize once bucket has been created
-
-        check_aws_setup!
-
-        stack = new.find_stack
-        return unless stack
-
-        stack_resources = find_stack_resources(STACK_NAME)
-        bucket = stack_resources.find { |r| r.logical_resource_id == "Bucket" }
-        @@name = bucket.physical_resource_id # actual bucket name
-      end
-
-      def check_aws_setup!
-        AwsSetup.new.check!
-      end
-    end
-
+    STACK_NAME = ENV['LONO_STACK_NAME'] || "lono"
     def initialize(options={})
       @options = options
     end
 
     def deploy
+      stack = find_stack
       if rollback.complete?
         logger.info "Existing '#{STACK_NAME}' stack in ROLLBACK_COMPLETE state. Deleting stack before continuing."
+        disable_termination_protection
         cfn.delete_stack(stack_name: STACK_NAME)
         status.wait
-        status.reset
         stack = nil
       end
 
@@ -71,7 +53,6 @@ module Lono::S3
         enable_termination_protection: true,
       )
       success = status.wait
-      status.reset
       unless success
         logger.info "ERROR: Unable to create lono stack with managed s3 bucket".color(:red)
         exit 1
@@ -89,12 +70,12 @@ module Lono::S3
       are_you_sure?
 
       logger.info "Deleting #{STACK_NAME} stack with the s3 bucket"
-      disable_termination_protect
+      disable_termination_protection
       empty_bucket!
       cfn.delete_stack(stack_name: STACK_NAME)
     end
 
-    def disable_termination_protect
+    def disable_termination_protection
       cfn.update_termination_protection(
         stack_name: STACK_NAME,
         enable_termination_protection: false,
@@ -111,7 +92,6 @@ module Lono::S3
     def status
       CfnStatus.new(STACK_NAME)
     end
-    memoize :status
 
   private
 
@@ -167,5 +147,25 @@ module Lono::S3
                   Value: lono
       YAML
     end
+
+    def rollback
+      Rollback.new(STACK_NAME)
+    end
+
+    class << self
+      @@name = nil
+      def name
+        return @@name if @@name # only memoize once bucket has been created
+
+        AwsSetup.new.check!
+
+        stack = new.find_stack
+        return unless stack
+
+        stack_resources = find_stack_resources(STACK_NAME)
+        bucket = stack_resources.find { |r| r.logical_resource_id == "Bucket" }
+        @@name = bucket.physical_resource_id # actual bucket name
+      end
+    end
   end
 end

data/lib/lono/s3/rollback.rb

@@ -0,0 +1,8 @@
+module Lono::S3
+  class Rollback < Lono::Cfn::Deploy::Rollback
+    # override initialize
+    def initialize(stack)
+      @stack = stack
+    end
+  end
+end

data/lib/lono/seeder.rb

@@ -59,7 +59,7 @@ module Lono
       end
 
       content = lines.join("\n")
-      dest_path = "config/blueprints/#{@blueprint.name}/params/#{Lono.env}.txt" # only support environment level parameters for now
+      dest_path = "#{dest_folder}/params/#{Lono.env}.txt" # only support environment level parameters for now
       create_file(dest_path, content) # Thor::Action
     end
 
@@ -89,10 +89,28 @@ module Lono
 
     def create_variables
       src = "#{@blueprint.root}/seed/vars"
-      dest = "#{Lono.root}/config/blueprints/#{@blueprint.name}/vars"
+      dest = "#{dest_folder}/vars"
       directory(src, dest) if File.exist?(src)
     end
 
+    # config structure:
+    #
+    #   config/blueprints/demo
+    #
+    # general structure:
+    #
+    #   app/blueprints/demo/config
+    #   vendor/blueprints/demo/config
+    #
+    def dest_folder
+      where = @options[:where] || Lono.config.seed.where
+      if where == "config"
+        "#{Lono.root}/config/blueprints/#{@blueprint.name}"
+      else # app or vendor
+        "#{Lono.root}/#{where}/blueprints/#{@blueprint.name}/config"
+      end
+    end
+
   private
     def env
       Lono.env # allows for seed/vars/%env%.rb.tt

data/lib/lono/user_data.rb

@@ -16,7 +16,7 @@ module Lono
       pretty_path = pretty_path(@path)
       logger.info "Building user_data for '#{@name}' at #{pretty_path}"
       if File.exist?(@path)
-        logger.info RenderMePretty.result(@path, context: context)
+        logger.info RenderMePretty.result(@path, context: template_context)
       else
         logger.info "ERROR: #{pretty_path} does not exist".color(:red)
         exit 1

data/lib/lono/utils/{context.rb → contexts.rb}

@@ -1,11 +1,11 @@
 module Lono::Utils
-  module Context
+  module Contexts
     extend Memoist
 
-    def context
-      Lono::Builder::Context.new(@options)
+    def template_context
+      Lono::Builder::Context::Template.new(@options)
     end
-    memoize :context
+    memoize :template_context
 
     def params_context
       Lono::Builder::Context::Params.new(@options)

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "8.0.0-rc1"
+  VERSION = "8.0.0-rc2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 8.0.0.pre.rc1
+  version: 8.0.0.pre.rc2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -515,48 +515,46 @@ files:
 - lib/lono/aws_services/helper.rb
 - lib/lono/blueprint.rb
 - lib/lono/booter.rb
-- lib/lono/builder/context.rb
-- lib/lono/builder/context/helpers.rb
-- lib/lono/builder/context/loader.rb
-- lib/lono/builder/context/loader/load_files.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/ssm_fetcher.rb
+- lib/lono/builder/context/template.rb
+- lib/lono/builder/dsl.rb
+- lib/lono/builder/dsl/evaluator.rb
+- lib/lono/builder/dsl/finalizer.rb
+- lib/lono/builder/dsl/finalizer/configsets.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/partials.rb
+- lib/lono/builder/dsl/helpers/s3.rb
+- lib/lono/builder/dsl/helpers/ssm.rb
+- lib/lono/builder/dsl/helpers/ssm/fetcher.rb
+- lib/lono/builder/dsl/helpers/stack.rb
+- lib/lono/builder/dsl/helpers/tags.rb
+- lib/lono/builder/dsl/helpers/template_file.rb
+- lib/lono/builder/dsl/syntax.rb
+- lib/lono/builder/dsl/syntax/core.rb
+- lib/lono/builder/dsl/syntax/core/base.rb
+- lib/lono/builder/dsl/syntax/core/condition.rb
+- lib/lono/builder/dsl/syntax/core/mapping.rb
+- lib/lono/builder/dsl/syntax/core/output.rb
+- lib/lono/builder/dsl/syntax/core/parameter.rb
+- lib/lono/builder/dsl/syntax/core/resource.rb
+- lib/lono/builder/dsl/syntax/core/resource/property_mover.rb
+- lib/lono/builder/dsl/syntax/core/section.rb
+- lib/lono/builder/dsl/syntax/core/squeezer.rb
+- lib/lono/builder/dsl/syntax/fn.rb
+- lib/lono/builder/dsl/syntax/parameter_group.rb
 - lib/lono/builder/param.rb
 - lib/lono/builder/template.rb
 - lib/lono/builder/template/aws_service.rb
 - lib/lono/builder/template/bashify.rb
-- lib/lono/builder/template/configset_injector.rb
-- lib/lono/builder/template/dsl.rb
-- lib/lono/builder/template/dsl/evaluator.rb
-- lib/lono/builder/template/dsl/evaluator/fn.rb
-- lib/lono/builder/template/dsl/evaluator/helpers.rb
-- lib/lono/builder/template/dsl/evaluator/helpers/core_helper.rb
-- lib/lono/builder/template/dsl/evaluator/helpers/ec2_helper.rb
-- lib/lono/builder/template/dsl/evaluator/helpers/file_helper.rb
-- lib/lono/builder/template/dsl/evaluator/helpers/s3_helper.rb
-- lib/lono/builder/template/dsl/evaluator/helpers/stack_helper.rb
-- lib/lono/builder/template/dsl/evaluator/helpers/tags_helper.rb
-- lib/lono/builder/template/dsl/evaluator/section/base.rb
-- lib/lono/builder/template/dsl/evaluator/section/condition.rb
-- lib/lono/builder/template/dsl/evaluator/section/mapping.rb
-- lib/lono/builder/template/dsl/evaluator/section/methods.rb
-- lib/lono/builder/template/dsl/evaluator/section/output.rb
-- lib/lono/builder/template/dsl/evaluator/section/parameter.rb
-- lib/lono/builder/template/dsl/evaluator/section/resource.rb
-- lib/lono/builder/template/dsl/evaluator/section/resource/property_mover.rb
-- lib/lono/builder/template/dsl/evaluator/section/section.rb
-- lib/lono/builder/template/dsl/evaluator/squeezer.rb
-- lib/lono/builder/template/dsl/evaluator/stringify.rb
-- lib/lono/builder/template/dsl/evaluator/syntax.rb
-- lib/lono/builder/template/dsl/evaluator/syntax/extend_with.rb
-- lib/lono/builder/template/dsl/evaluator/syntax/parameter_group.rb
-- lib/lono/builder/template/dsl/finalizer.rb
-- lib/lono/builder/template/dsl/finalizer/parameter_groups.rb
-- lib/lono/builder/template/evaluate.rb
-- lib/lono/builder/template/helpers.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
 - lib/lono/bundler/cli.rb
 - lib/lono/bundler/cli/base.rb
@@ -718,9 +716,6 @@ files:
 - lib/lono/configset/strategy/helpers/dsl/syntax.rb
 - lib/lono/configset/strategy/helpers/erb.rb
 - lib/lono/core.rb
-- lib/lono/extensions.rb
-- lib/lono/extensions/dsl.rb
-- lib/lono/extensions/loader.rb
 - lib/lono/importer.rb
 - lib/lono/importer/base.rb
 - lib/lono/importer/converter.rb
@@ -743,6 +738,7 @@ files:
 - lib/lono/registration.rb
 - lib/lono/s3/aws_setup.rb
 - lib/lono/s3/bucket.rb
+- lib/lono/s3/rollback.rb
 - lib/lono/s3/uploader.rb
 - lib/lono/script/base.rb
 - lib/lono/script/build.rb
@@ -750,7 +746,7 @@ files:
 - lib/lono/seeder.rb
 - lib/lono/seeder/service_role.rb
 - lib/lono/user_data.rb
-- lib/lono/utils/context.rb
+- lib/lono/utils/contexts.rb
 - lib/lono/utils/item/file_methods.rb
 - lib/lono/utils/item/zip.rb
 - lib/lono/utils/logging.rb

data/lib/lono/builder/context.rb

@@ -1,25 +0,0 @@
-# Encapsulates helper methods and instance variables to be rendered in the ERB templates.
-module Lono::Builder
-  class Context < Lono::CLI::Base
-    extend Memoist
-    include Lono::Builder::Template::Helpers
-    include Loader
-    include Helpers # ERB
-    include Template::Dsl::Evaluator::Syntax # DSL
-    include Lono::Utils::Context
-
-    # Take a hash and makes them instance variables in the current scope.
-    # Use this in custom helper methods to make variables accessible to ERB templates.
-    def instance_variables!(variables)
-      variables.each do |key, value|
-        instance_variable_set('@' + key.to_s, value)
-      end
-    end
-
-    # 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/template/dsl/evaluator/helpers/core_helper.rb

@@ -1,14 +0,0 @@
-module Lono::Builder::Template::Dsl::Evaluator::Helpers
-  module CoreHelper
-    extend Memoist
-
-    def stack_name
-      @options[:stack]
-    end
-
-    def setting
-      Lono::Setting.new
-    end
-    memoize :setting
-  end
-end