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

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

@@ -1,56 +1,27 @@
 class Lono::CLI::New
   class Configset < Sequence
-    argument :configset_name
-
-    def self.source_root
-      templates = File.expand_path("../../templates", File.dirname(__FILE__))
-      "#{templates}/configset"
-    end
-
+    argument :name
     def self.cli_options
       [
-        [:demo, type: :boolean, default: true, desc: "Include demo template"],
-        [: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"],
       ]
     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/configsets"
-    end
-
-    def set_variables
-      @demo = @options[:demo]
-      @demo = false if ENV["LONO_ORG"] # overrides --demo CLI option
-    end
-
-    def create_project
-      puts "=> Creating new configset called #{configset_name}."
-      if @demo
-        options = {}
+    def set_source
+      if @options[:examples]
+        set_template_source "examples/configset"
       else
-        create_file "#{@cwd}/#{configset_name}/lib/configset.rb"
-        options = {exclude_pattern: %r{configset\.rb}}
+        set_template_source "configset"
       end
-
-      directory ".", "#{@cwd}/#{configset_name}", options
-    end
-
-    def create_license
-      return unless ENV['LONO_LICENSE_FILE']
-      copy_file ENV['LONO_LICENSE_FILE'], "#{@cwd}/#{configset_name}/LICENSE.txt"
     end
 
-    # After this commands are executed with the newly created project
-    def set_destination_root
-      destination_root = "#{@cwd}/#{configset_name}"
-      self.destination_root = destination_root
-      @old_dir = Dir.pwd # for reset_current_dir
-      FileUtils.cd(self.destination_root)
+    def create_configset
+      dest = "#{Lono.root}/app/configsets"
+      directory ".", "#{dest}/#{name}"
     end
 
     def welcome_message
@@ -58,11 +29,7 @@ class Lono::CLI::New
         #{"="*64}
         Congrats 🎉 You have successfully created a lono configset.
 
-        Cd into your configset and check things out.
-
-            cd #{configset_name}
-
-        More info: https://lono.cloud/docs/core/configsets
+        More info: https://lono.cloud/docs/configsets
 
       EOL
     end

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

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

@@ -0,0 +1,24 @@
+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/cli/new/helper.rb

@@ -1,32 +1,13 @@
 class Lono::CLI::New
-  class Helper < Sequence
-    def self.cli_options
-      [
-        [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
-        [:blueprint, required: true, desc: "Blueprint name"],
-        [:name, default: "custom", desc: "Helper name"],
-      ]
-    end
-    cli_options.each do |args|
-      class_option(*args)
-    end
+  class Helper < Lono::Command
+    Help = Lono::CLI::Help
 
-    def set_source
-      set_template_source "helper"
-    end
+    long_desc Help.text("new/helper/blueprint")
+    Blueprint.cli_options.each { |args| option(*args) }
+    register(Blueprint, "blueprint", "blueprint HELPER_NAME --blueprint", "Generates new blueprint helper")
 
-    def set_vars
-      @blueprint = @options[:blueprint]
-      @name = @options[:name]
-    end
-
-    def create_blueprint
-      puts "underscore_name #{underscore_name}"
-      logger.info "=> Generating helper: #{@name}"
-      directory ".", "app/blueprints/#{@blueprint}/helpers"
-    end
-
-  private
-    attr_reader :name # required for templates/helper/%name%_helper.rb.tt
+    long_desc Help.text("new/helper/project")
+    Project.cli_options.each { |args| option(*args) }
+    register(Project, "project", "project HELPER_NAME", "Generates new project helper")
   end
 end

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

@@ -12,7 +12,8 @@ class Lono::CLI::New
 
   private
     def self.set_template_source(folder)
-      source_root File.expand_path("../../../templates/#{folder}", __dir__)
+      path = File.expand_path("../../../templates/#{folder}", __dir__)
+      source_root path
     end
 
     def set_template_source(*paths)
@@ -47,5 +48,9 @@ class Lono::CLI::New
       puts "=> Initialize git repo"
       run("git init")
     end
+
+    def env
+      Lono.env # allows for seed/vars/%env%.rb.tt
+    end
   end
 end

data/lib/lono/cli/new.rb

@@ -2,27 +2,23 @@ class Lono::CLI
   class New < Lono::Command
     long_desc Help.text("new/blueprint")
     Blueprint.cli_options.each { |args| option(*args) }
-    register(Blueprint, "blueprint", "blueprint NAME", "Generates new blueprint.")
+    register(Blueprint, "blueprint", "blueprint NAME", "Generate new blueprint")
 
     long_desc Help.text("new/configset")
     Configset.cli_options.each { |args| option(*args) }
-    register(Configset, "configset", "configset NAME", "Generates new configset.")
-
-    long_desc Help.text("new/extension")
-    Extension.cli_options.each { |args| option(*args) }
-    register(Extension, "extension", "extension NAME", "Generates new extension.")
-
-    long_desc Help.text("new/helper")
-    Helper.cli_options.each { |args| option(*args) }
-    register(Helper, "helper", "helper NAME", "Generates new helper.")
+    register(Configset, "configset", "configset NAME", "Generate new configset")
 
     long_desc Help.text("new/project")
     Project.cli_options.each { |args| option(*args) }
-    register(Project, "project", "project NAME", "Generates new project.")
+    register(Project, "project", "project NAME", "Generate new project")
 
     long_desc Help.text("new/shim")
     Shim.cli_options.each { |args| option(*args) }
-    register(Shim, "shim", "shim NAME", "Generates new shim.")
+    register(Shim, "shim", "shim NAME", "Generate new shim")
+
+    desc "helper SUBCOMMAND", "helper subcommands"
+    long_desc Help.text(:helper)
+    subcommand "helper", Helper
 
     desc "test SUBCOMMAND", "test subcommands"
     long_desc Help.text(:test)

data/lib/lono/cli/status.rb

@@ -0,0 +1,18 @@
+class Lono::CLI
+  class Status < Lono::CLI::Base
+    include Lono::AwsServices
+
+    def run
+      names = Lono::Names.new(@options)
+      stack = find_stack(@stack)
+      if stack
+        status = Lono::Cfn::Status.new(@stack, @options)
+        success = status.run
+        exit 1 unless success
+      else
+        logger.error "ERROR: stack #{@stack} not found".color(:red)
+        exit 1
+      end
+    end
+  end
+end

data/lib/lono/cli.rb

@@ -5,7 +5,7 @@ module Lono
     opts = Opts.new(self)
     cfn_opts = Lono::CLI::Cfn::Opts.new(self)
 
-    desc "build BLUEPRINT", "Build both CloudFormation template and parameters files"
+    desc "build BLUEPRINT", "Build template"
     long_desc Help.text(:build)
     option :quiet, type: :boolean, desc: "silence the output"
     opts.clean
@@ -25,14 +25,14 @@ module Lono
       Clean.new(options).run
     end
 
-    desc "down BLUEPRINT", "Delete CloudFormation blueprint"
+    desc "down BLUEPRINT", "Delete stack"
     long_desc Help.text(:down)
     cfn_opts.delete
     def down(blueprint)
       Lono::Cfn::Delete.new(options.merge(blueprint: blueprint)).run
     end
 
-    desc "list", "List blueprints, configsets, extensions, etc"
+    desc "list", "List blueprints"
     long_desc Help.text(:list)
     option :type, aliases: :t, desc: "Type: IE: blueprint, configset, extension. Defaults to all"
     def list
@@ -46,7 +46,7 @@ module Lono
       Lono::Cfn::Output.new(options.merge(blueprint: blueprint)).run
     end
 
-    desc "plan BLUEPRINT", "Plan or preview of the deploy"
+    desc "plan BLUEPRINT", "Preview deploy"
     long_desc Help.text(:plan)
     option :out, aliases: :o, desc: "Write Change Set info to path"
     def plan(blueprint)
@@ -71,10 +71,7 @@ module Lono
     desc "status BLUEPRINT", "Shows current status of blueprint."
     long_desc Help.text(:status)
     def status(blueprint)
-      names = Lono::Names.new(blueprint: blueprint)
-      status = Lono::Cfn::Status.new(names.stack, options)
-      success = status.run
-      exit 3 unless success
+      Status.new(options.merge(blueprint: blueprint)).run
     end
 
     desc "summary BLUEPRINT", "Prints summary of CloudFormation template"
@@ -89,7 +86,7 @@ module Lono
       Test.new(options).run
     end
 
-    desc "up BLUEPRINT", "Deploy CloudFormation stack"
+    desc "up BLUEPRINT", "Deploy stack"
     long_desc Help.text(:up)
     cfn_opts.deploy
     def up(blueprint)

data/lib/lono/command.rb

@@ -48,7 +48,6 @@ module Lono
         # as well thor's normal way:
         #
         #   lono help command
-        help_flags = Thor::HELP_MAPPINGS + ["help"]
         if args.length > 1 && !(args & help_flags).empty?
           args -= help_flags
           args.insert(-2, "help")

data/lib/lono/component.rb

@@ -0,0 +1,29 @@
+module Lono
+  class Component
+    attr_reader :name
+    def initialize(options={})
+      @options = options
+      @name = options[:name]
+    end
+
+    def type
+      self.class.name.to_s.split('::').last.underscore # IE: blueprint
+    end
+
+    def exist?
+      !root.nil?
+    end
+
+    def type_dir
+      type.pluralize # IE: blueprints
+    end
+
+    def root
+      paths = Dir.glob("#{Lono.root}/{app,vendor}/#{type_dir}/*")
+      paths.find do |path|
+        found = path.sub(%r{.*/(app|vendor)/}, '')
+        found == "#{type_dir}/#{@name}" # exact match
+      end
+    end
+  end
+end

data/lib/lono/concerns/aws_info.rb

@@ -0,0 +1,14 @@
+# Dont name AwsData. Think prefer AwsInfo vs AwsConcern
+module Lono::Concerns
+  module AwsInfo
+    extend Memoist
+    delegate :region, to: :aws_data
+    alias_method :aws_region, :region
+    alias_method :current_region, :region
+
+    def aws_data
+      AwsData.new
+    end
+    memoize :aws_data
+  end
+end

data/lib/lono/concerns/names.rb

@@ -0,0 +1,9 @@
+module Lono::Concerns
+  module Names
+    extend Memoist
+    def names
+      Lono::Names.new(@options)
+    end
+    memoize :names
+  end
+end

data/lib/lono/configset.rb

@@ -0,0 +1,17 @@
+module Lono
+  class Configset < Component
+    attr_reader :resource
+    attr_accessor :metadata
+    def initialize(options={})
+      super
+      @resource = options[:resource]
+    end
+
+    def path
+      return unless root
+      exts = %w[rb yml json] # rb highest precedence
+      paths = exts.map { |ext| "#{root}/configset.#{ext}" }
+      paths.find { |p| File.exist?(p) }
+    end
+  end
+end

data/lib/lono/core.rb

@@ -37,7 +37,7 @@ module Lono
       App.instance.configure(&block)
     end
 
-    # Generally, use the Terraspace.config instead of App.instance.config since it guarantees the load_project_config call
+    # Generally, use the Lono.config instead of App.instance.config since it guarantees the load_project_config call
     def config
       App.instance.load_project_config
       App.instance.config

data/lib/lono/ext/bundler.rb

@@ -0,0 +1,7 @@
+# Bundler 2.0 does yet not have with_unbundled_env
+# Bundler 2.1 deprecates with_clean_env for with_unbundled_env
+
+require "bundler"
+def Bundler.with_unbundled_env(&block)
+  with_clean_env(&block)
+end unless Bundler.respond_to?(:with_unbundled_env)

data/lib/lono/ext/core/module.rb

@@ -0,0 +1,31 @@
+class Module
+  # Include all modules within the relative folder. IE: for dsl/syntax/mod/*
+  #
+  #    include Common
+  #    include Provider
+  #    # etc
+  #
+  # Caller lines are different for OSes:
+  #
+  #   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>'"
+  #
+  def include_modules(dir)
+    caller_line = caller[0]
+    parts = caller_line.split(':')
+    calling_file = caller_line.match(/^[a-zA-Z]:/) ? parts[1] : parts[0]
+    parent_dir = File.dirname(calling_file)
+
+    full_dir = "#{parent_dir}/#{dir}"
+    paths = Dir.glob("#{full_dir}/**/*.rb")
+    if paths.empty?
+      raise "Empty include_modules full_dir: #{full_dir}"
+    end
+    paths.each do |path|
+      regexp = Regexp.new(".*/lib/")
+      mod = path.sub(regexp, '').sub('.rb','').camelize
+      c = mod.constantize
+      include c if c.class == Module
+    end
+  end
+end

data/lib/lono/ext/core/object.rb

@@ -0,0 +1,32 @@
+class Object
+  # Load custom helper methods from project
+  def load_helper_files(dir, type: :blueprint)
+    paths = Dir.glob("#{dir}/**/*.rb")
+    paths.sort_by! { |p| p.size } # so namespaces are loaded first
+    paths.each do |path|
+      next unless File.file?(path)
+
+      filename = if type == :project
+                   path.sub(%r{.*/helpers/[a-zA-Z\-_]+/},'').sub('.rb','')
+                 else # blueprint, configset
+                   path.sub(%r{.*/helpers/},'').sub('.rb','')
+                 end
+      module_name = filename.camelize
+
+      # Prepend a period so require works when 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)
+
+      # Examples:
+      #   project:
+      #     path:        app/helpers/custom/custom_helper.rb
+      #     module_name: CustomHelper
+      #   blueprint:
+      #     path:        app/blueprints/demo/helpers/outputs.rb
+      #     module_name: Outputs
+      require path
+      self.class.send :include, module_name.constantize
+    end
+  end
+end

data/lib/lono/ext/core/string.rb

@@ -0,0 +1,9 @@
+module Lono
+  refine String do
+    def camelcase
+      self.underscore.camelize
+    end
+  end
+end
+
+using Lono

data/lib/lono/ext.rb

@@ -0,0 +1,4 @@
+require_relative "ext/bundler"
+require_relative "ext/core/module"
+require_relative "ext/core/object"
+require_relative "ext/core/string"

data/lib/lono/files/base.rb

@@ -0,0 +1,12 @@
+class Lono::Files
+  class Base < Lono::CLI::Base
+    delegate :full_path, :output_path, :zip_name, :zip_path, to: :files
+    attr_reader :files
+    def initialize(options={})
+      super
+      # @files is reference to Lono::Files self instance
+      # IE: Lono::Files instance is the caller
+      @files = options[:files]
+    end
+  end
+end

data/lib/lono/files/builder.rb

@@ -0,0 +1,37 @@
+class Lono::Files
+  class Builder < Base
+    extend Memoist
+    include Lono::Builder::Context
+    include Lono::Builder::Dsl::Syntax
+    # Tricky must define files again to avoid conflict with files from loading the Dsl::Syntax
+    attr_reader :files
+
+    def run
+      load_context
+      if File.directory?(full_path)
+        directory(@files)
+      else
+        template(@files)
+      end
+    end
+
+    def template(files)
+      sequence.send(:set_template_paths, @blueprint.root)
+      src = files.path
+      dest = files.output_path
+      sequence.template(src, dest)
+    end
+
+    def directory(files)
+      src = files.full_path
+      sequence.send(:set_template_paths, src)
+      sequence.destination_root = @files.output_path
+      sequence.directory(".", verbose: false, force: true, context: binding) # Thor::Action
+    end
+
+    def sequence
+      Lono::CLI::New::Sequence.new(@options)
+    end
+    memoize :sequence
+  end
+end

data/lib/lono/files/compressor.rb

@@ -0,0 +1,53 @@
+require 'fileutils'
+
+class Lono::Files
+  class Compressor < Base
+    def run
+      if File.directory?(output_path)
+        zip_directory
+      else
+        zip_file
+      end
+    end
+
+    def zip_file
+      logger.debug "Zipping file to #{pretty_path(zip_path)}"
+      # create zipfile at same level of file
+      command = "cd #{File.dirname(output_path)} && zip -q #{zip_name} #{File.basename(output_path)}"
+      execute_zip(command)
+    end
+
+    def zip_directory
+      logger.debug "Zipping folder to #{zip_path}"
+      command = "cd #{output_path} && zip --symlinks -rq #{zip_name} ." # create zipfile witih directory
+      execute_zip(command)
+      FileUtils.mv("#{output_path}/#{zip_name}", "#{File.dirname(output_path)}/#{zip_name}") # move zip back to the parent directory
+    end
+
+  private
+    def execute_zip(command)
+      check_zip_installed!
+      logger.debug "=> #{command}".color(:green)
+      `#{command}`
+      return if $?.success?
+      logger.info "ERROR: Fail trying to zip files".color(:red)
+      logger.info "Command: #{command}".color(:red)
+      exit 1
+    end
+
+    @@zip_installed = false
+    def check_zip_installed!
+      @@zip_installed = system("type zip > /dev/null 2>&1")
+      if @@zip_installed
+        @@zip_installed = true
+        return
+      end
+      logger.error "ERROR: The command 'zip' is not installed.".color(:red)
+      logger.error <<~EOL
+        The file helper requires the zip command.
+        Please install the zip command on this system.
+      EOL
+      exit 1
+    end
+  end
+end

data/lib/lono/files/concerns/post_processing.rb

@@ -0,0 +1,35 @@
+module Lono::Files::Concerns
+  module PostProcessing
+    extend Memoist
+
+    def build
+      Lono::Files::Builder.new(@options.merge(files: self)).run
+    end
+
+    def compress
+      Lono::Files::Compressor.new(@options.merge(files: self)).run
+    end
+
+    def upload
+      uploader.upload # Lono::S3::Uploader#upload
+    end
+
+    delegate :s3_path, :s3_key, to: :uploader
+    def uploader
+      Lono::S3::Uploader.new(zip_path)
+    end
+    memoize :uploader
+
+    def zip_name
+      "#{File.basename(full_path)}-#{Lono::Md5.sum(full_path)}.zip"
+    end
+
+    def zip_path
+      "#{File.dirname(output_path)}/#{zip_name}"
+    end
+
+    def output_path
+      "#{Lono.root}/output/#{@blueprint.name}/#{path}"
+    end
+  end
+end

data/lib/lono/files/concerns/registration.rb

@@ -0,0 +1,13 @@
+module Lono::Files::Concerns
+  module Registration
+    def call_line
+      @caller.find do |line|
+        line.include?(Lono.root.to_s)
+      end
+    end
+
+    def marker
+      "LONO://#{@path}"
+    end
+  end
+end

data/lib/lono/files/registry.rb

@@ -0,0 +1,6 @@
+class Lono::Files
+  class Registry
+    class_attribute :files
+    self.files = []
+  end
+end