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

data/lib/lono/files.rb

@@ -0,0 +1,37 @@
+# Class name is Lono::Files because can represent a single file or a directory.
+# Also, it avoids conflicting with the stdlib File class name.
+# Files is like a "FileList". Using shorter Files name.
+module Lono
+  class Files < Lono::CLI::Base
+    include Concerns::Registration
+    include Concerns::PostProcessing
+
+    attr_reader :path
+    def initialize(options={})
+      super
+      @path = options[:path]
+      @caller = options[:caller] # original caller stack at registration time
+    end
+
+    def full_path
+      "#{@blueprint.root}/#{@path}"
+    end
+
+    class << self
+      def register(options={})
+        path = options[:path]
+        file = files.find { |f| f.path == path }
+        unless file
+          file = Files.new(options.merge(caller: caller))
+          files << file
+        end
+        file.marker
+      end
+
+      delegate :empty?, :files, to: :files
+      def files
+        Registry.files
+      end
+    end
+  end
+end

data/lib/lono/importer/base.rb

@@ -5,7 +5,7 @@ class Lono::Importer
     include Thor::Base
 
     def initialize(options)
-      reinitialize(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

data/lib/lono/inspector/summary.rb

@@ -5,10 +5,7 @@ module Lono::Inspector
     def perform(template)
       # little dirty but @template is used in data method so we dont have to pass it to the data method
       @template = template
-
       logger.info "=> CloudFormation Template Summary for template #{@template.color(:sienna)}:"
-      return if ENV['LONO_NOOP']
-
       print_parameters_summary
       logger.info "# Resources:"
       print_resource_types

data/lib/lono/layering/layer.rb

@@ -14,10 +14,9 @@ module Lono::Layering
     include Lono::Layering
     include Lono::Utils::Logging
     include Lono::Utils::Pretty
+    include Lono::Concerns::AwsInfo
     extend Memoist
 
-    delegate :region, to: :aws_data
-
     def initialize(blueprint, type)
       @blueprint, @type = blueprint, type
     end
@@ -81,15 +80,8 @@ module Lono::Layering
       ext = exts[@type.to_sym]
 
       paths.map! do |path|
-        if path.include?("teams")
-          puts "path: #{path}"
-        end
-
-        if path.ends_with?('/')
-          "#{path.sub(/\/$/,'')}.#{ext}"
-        else
-          "#{path}.#{ext}"
-        end
+        path = path.sub(/\/$/,'') if path.ends_with?('/')
+        "#{path}.#{ext}"
       end
     end
 
@@ -116,11 +108,5 @@ module Lono::Layering
       logger.debug ""
       @@shown_layers[@type] = true
     end
-
-  private
-    def aws_data
-      AwsData.new
-    end
-    memoize :aws_data
   end
 end

data/lib/lono/logger.rb

@@ -17,9 +17,7 @@ module Lono
       line =~ /\n$/ ? line : "#{line}\n"
     end
 
-    # Used to allow terraform output to always go to stdout
-    # Terraspace output goes to stderr by default
-    # See: terraspace/shell.rb
+    # Used to allow output to always go to stdout
     def stdout(msg, newline: true)
       if newline
         puts msg

data/lib/lono/names.rb

@@ -9,7 +9,7 @@ module Lono
     end
 
     def stack
-      expansion(Lono.config.names.stack)
+      expansion(Lono.config.names.stack) # IE: :APP-:BLUEPRINT-:ENV
     end
     memoize :stack
 

data/lib/lono/s3/uploader.rb

@@ -3,53 +3,46 @@ module Lono::S3
     extend Memoist
     include Lono::AwsServices
     include Lono::Utils::Logging
+    include Lono::Utils::Pretty
 
-    attr_reader :path
-    def initialize(path, options={})
-      @path, @options = path, options
+    attr_reader :local_path
+    def initialize(local_path, options={})
+      @local_path, @options = local_path, options
       @checksums = {}
     end
 
     # Inputs:
     #
-    #   path: can be full path or relative path
+    #   local_path: can be full path or relative path
     #
     def upload
-      path = @path.gsub("#{Lono.root}/",'') # remove Lono.root
-      key = "#{Lono.env}/#{path}"
+      logger.debug "May upload   #{local_path}"
+      logger.debug "To           #{s3_path}"
 
-      pretty_path = path.sub(/^\.\//, '')
-      s3_path = "s3://#{s3_bucket}/#{key}"
-
-      local_checksum = Digest::MD5.hexdigest(IO.read(@path))
-      remote_checksum = remote_checksum(key)
+      local_checksum = Digest::MD5.hexdigest(IO.read(local_path))
       if local_checksum == remote_checksum
-        logger.debug "Not modified: #{pretty_path} to #{s3_path}"
+        logger.debug "Not modified #{s3_path}"
         return # do not upload unless the checksum has changed
       else
         # Example output:
-        # Uploaded: app/files/docker.yml to s3://boltops-dev/s3_folder/templates/development/docker.yml
-        # Uploaded: app/files/ecs/private.yml to s3://boltops-dev/s3_folder/templates/development/ecs/private.yml
-        message = "Uploading #{pretty_path} to #{s3_path}"
-        logger.debug message
+        # Uploaded: files/ecs/private.yml to s3://bucket/output/demo/files/ecs/private.yml
+        logger.debug "Uploading #{pretty_path(local_path)} to #{s3_path}"
       end
 
       s3.put_object(
-        body: IO.read(@path),
+        body: IO.read(local_path),
         bucket: s3_bucket,
-        key: key,
+        key: s3_key,
       )
     end
 
     # https://s3.amazonaws.com/mybucket/development/output/blueprint/templates/blueprint.yml
     def https_url
-      key = "#{Lono.env}/#{@path}"
-      "https://s3.amazonaws.com/#{s3_bucket}/#{key}"
+      "https://s3.amazonaws.com/#{s3_bucket}/#{s3_key}"
     end
 
     def presigned_url
-      key = "#{Lono.env}/#{@path}"
-      s3_presigner.presigned_url(:get_object, bucket: s3_bucket, key: key)
+      s3_presigner.presigned_url(:get_object, bucket: s3_bucket, key: s3_key)
     end
 
     # used for file_s3_key helper
@@ -62,7 +55,7 @@ module Lono::S3
       resp = s3.list_objects(bucket: s3_bucket, prefix: prefix)
       resp.contents.each do |object|
         # key does not include the bucket name
-        #    full path = s3://my-bucket/s3_folder/files/production/my-template.yml
+        #    full path = s3://my-bucket/files/production/my-template.yml
         #    key = s3_folder/files/production/my-template.yml
         # etag is the checksum as long as the file is not a multi-part file upload
         # it has extra double quotes wrapped around it.
@@ -74,17 +67,25 @@ module Lono::S3
     memoize :load_checksums!
 
     # key example: cloudformation/production/files/lifecycle-0719ab81.zip
-    # s3 path: s3://boltops-dev/cloudformation/production/files/lifecycle-0719ab81.zip
-    # s3_folder: s3://boltops-dev/cloudformation
-    def remote_checksum(key)
-      load_checksums!(key)
-      @checksums[key]
+    # s3 path: s3://bucket/cloudformation/production/files/lifecycle-0719ab81.zip
+    # s3_folder: s3://bucket/cloudformation
+    def remote_checksum
+      load_checksums!(s3_key)
+      @checksums[s3_key]
     end
 
     def strip_surrounding_quotes(string)
       string.sub(/^"/,'').sub(/"$/,'')
     end
 
+    def s3_path
+      "s3://#{s3_bucket}/#{s3_key}"
+    end
+
+    def s3_key
+      "#{Lono.env}/#{pretty_path(local_path)}"
+    end
+
     def s3_bucket
       Lono::S3::Bucket.name
     end

data/lib/lono/seeder.rb

@@ -5,37 +5,21 @@ require "yaml"
 
 module Lono
   class Seeder < Lono::CLI::Base
+    extend Memoist
     include Lono::AwsServices
     include Lono::Cfn::Concerns::TemplateOutput
-    include ServiceRole
-
-    # What's needed for a Thor::Group or "Sequence"
-    # Gives us Thor::Actions commands like create_file
-    include Thor::Actions
-    include Thor::Base
-    # Override Thor::Base initialize
-    def initialize(options={})
-      reinitialize(options)
-    end
-
-    extend Memoist
 
     def run
       build_template
-      self.destination_root = Dir.pwd # Thor::Actions require destination_root to be set
-      create_params
-      create_variables
+      build_params
+      build_vars
     end
 
     def build_template
       Lono::Builder::Template.new(@options).run
     end
 
-    def create_params
-      create_param_file
-    end
-
-    def create_param_file
+    def build_params
       if template_output.parameters.empty?
         logger.info "Template has no parameters."
         return
@@ -83,11 +67,7 @@ module Lono
       md[2]
     end
 
-    def self.source_root
-      Lono.root
-    end
-
-    def create_variables
+    def build_vars
       src = "#{@blueprint.root}/seed/vars"
       dest = "#{dest_folder}/vars"
       directory(src, dest) if File.exist?(src)
@@ -112,8 +92,19 @@ module Lono
     end
 
   private
-    def env
-      Lono.env # allows for seed/vars/%env%.rb.tt
+    def create_file(dest_path, content) # Thor::Action)
+      sequence.create_file(dest_path, content)
+    end
+
+    def directory(src, dest)
+      sequence.send(:set_template_paths, src)
+      sequence.destination_root = Lono.root
+      sequence.directory(".", dest, context: binding) # Thor::Action
+    end
+
+    def sequence
+      sequence = Lono::CLI::New::Sequence.new(@options)
     end
+    memoize :sequence
   end
 end

data/lib/lono/user_data.rb

@@ -6,6 +6,8 @@ module Lono
   # Normally, the Lono::Erb#run method generates the CloudFormation template
   # and embeds user-data script into the template.
   class UserData < Lono::CLI::Base
+    include Lono::Builder::Dsl::Syntax
+
     def initialize(options={})
       super
       @name = options[:name]
@@ -16,7 +18,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: template_context)
+        logger.info RenderMePretty.result(@path, context: self)
       else
         logger.info "ERROR: #{pretty_path} does not exist".color(:red)
         exit 1

data/lib/lono/version.rb

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

data/lib/lono/yamler/validator.rb

@@ -1,5 +1,8 @@
 module Lono::Yamler
   class Validator
+    include Lono::Utils::Logging
+    include Lono::Utils::Pretty
+
     def initialize(path)
       @path = path
     end
@@ -18,34 +21,16 @@ module Lono::Yamler
     end
 
     def handle_yaml_syntax_error(e, path)
-      io = StringIO.new
-      io.puts "Invalid yaml. Output written for debugging: #{path}".color(:red)
-      io.puts "ERROR: #{e.message}".color(:red)
+      logger.error "ERROR: Invalid YAML. #{e.message}".color(:red)
+      logger.error "Template for debugging: #{pretty_path(path)}"
 
       # Grab line info.  Example error:
       #   ERROR: (<unknown>): could not find expected ':' while scanning a simple key at line 2 column 1
       md = e.message.match(/at line (\d+) column (\d+)/)
       line = md[1].to_i
 
-      lines = IO.read(path).split("\n")
-      context = 5 # lines of context
-      top, bottom = [line-context-1, 0].max, line+context-1
-      spacing = lines.size.to_s.size
-      lines[top..bottom].each_with_index do |line_content, index|
-        line_number = top+index+1
-        if line_number == line
-          io.printf("%#{spacing}d %s\n".color(:red), line_number, line_content)
-        else
-          io.printf("%#{spacing}d %s\n", line_number, line_content)
-        end
-      end
-
-      if ENV['LONO_TEST']
-        io.string
-      else
-        puts io.string
-        exit 1
-      end
+      DslEvaluator.print_code(path, line)
+      exit 1
     end
   end
 end

data/lib/lono.rb

@@ -11,6 +11,7 @@ require 'cli-format'
 require 'dsl_evaluator'
 require 'fileutils'
 require 'json'
+require 'lono/ext'
 require 'memoist'
 require 'plissken'
 require 'rainbow/ext/string'
@@ -27,4 +28,11 @@ module Lono
   extend Core
 end
 
+DslEvaluator.configure do |config|
+  config.backtrace.select_pattern = Lono.root.to_s
+  config.logger = Lono.logger
+  config.on_exception = :exit
+  config.root = Lono.root
+end
+
 Lono::Booter.boot

data/lib/templates/configset/configset.rb

@@ -1,16 +1,2 @@
-configset("config1") do
-  command("test",
-    command: 'echo "$CFNTEST" > test1.txt',
-    env: {
-      CFNTEST: "I come from config1"
-    }
-  )
-end
-configset("config2") do
-  command("test",
-    command: 'echo "$CFNTEST" > test2.txt',
-    env: {
-      CFNTEST: "I come from config2"
-    }
-  )
-end
+# This is where you write your configset code
+# Docs: https://lono.cloud/docs/configsets/

data/lib/templates/examples/configset/configset.rb

@@ -0,0 +1,16 @@
+configset("config1") do
+  command("test",
+    command: 'echo "$CFNTEST" > test1.txt',
+    env: {
+      CFNTEST: "I come from config1"
+    }
+  )
+end
+configset("config2") do
+  command("test",
+    command: 'echo "$CFNTEST" > test2.txt',
+    env: {
+      CFNTEST: "I come from config2"
+    }
+  )
+end

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/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.2.5" # 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.rc3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-03-07 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.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -502,31 +502,45 @@ 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/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
@@ -658,6 +672,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/project.md
 - lib/lono/cli/help/param.md
 - lib/lono/cli/help/param/generate.md
@@ -679,6 +695,8 @@ files:
 - 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/project.rb
 - lib/lono/cli/new/sequence.rb
 - lib/lono/cli/new/shim.rb
@@ -692,30 +710,29 @@ 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/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/compressor.rb
+- lib/lono/files/concerns/post_processing.rb
+- lib/lono/files/concerns/registration.rb
+- lib/lono/files/registry.rb
 - lib/lono/importer.rb
 - lib/lono/importer/base.rb
 - lib/lono/importer/converter.rb
@@ -729,7 +746,6 @@ files:
 - 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,11 +760,7 @@ 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/logging.rb
 - lib/lono/utils/pretty.rb
 - lib/lono/utils/quit.rb
@@ -760,6 +772,7 @@ files:
 - lib/templates/blueprint/template.rb
 - 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

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