lono 7.5.2 → 8.0.0.pre.rc1

data/lib/lono/{script.rb → cli/script.rb}

@@ -1,5 +1,5 @@
-module Lono
-  class Script < Command
+class Lono::CLI
+  class Script < Lono::Command
     desc "build", "Builds `output/scripts/scripts-md5sum.tgz` from `app/script` folder"
     long_desc Help.text("script/build")
     def build(blueprint)

data/lib/lono/cli/seed.rb

@@ -0,0 +1,9 @@
+class Lono::CLI
+  class Seed < Lono::CLI::Base
+    def create
+      logger.info "Creating starter config files for #{@blueprint.name}"
+      seeder = Lono::Seeder.new(@options)
+      seeder.run
+    end
+  end
+end

data/lib/lono/cli/test.rb

@@ -0,0 +1,35 @@
+class Lono::CLI
+  class Test
+    def initialize(options={})
+      @options = options
+    end
+
+    def run
+      config = Lono.config
+      test_command = config.test.framework
+      execute(test_command)
+    end
+
+    def execute(command)
+      command = adjust_command(command)
+      puts "=> #{command}"
+      Kernel.exec(command)
+    end
+
+    def adjust_command(command)
+      if cd_into_test?
+        command = "bundle exec #{command}" unless command.include?("bundle exec")
+        command = "cd test && #{command}"
+      else
+        command
+      end
+    end
+
+    # Automatically cd into the test folder in case running within the root of a module.
+    # Detect/guess that we're in a module folder vs the lono project
+    def cd_into_test?
+      !File.exist?("app") && File.exist?("test") &&
+      (File.exist?("template.rb") || File.exist?("template"))
+    end
+  end
+end

data/lib/lono/cli.rb

@@ -1,115 +1,118 @@
 module Lono
   class CLI < Command
+    include Help
     include Thor::Actions # for add_runtime_options
     opts = Opts.new(self)
+    cfn_opts = Lono::CLI::Cfn::Opts.new(self)
 
-    long_desc Help.text(:new)
-    New.cli_options.each do |args|
-      option(*args)
+    desc "build BLUEPRINT", "Build both CloudFormation template and parameters files"
+    long_desc Help.text(:build)
+    option :quiet, type: :boolean, desc: "silence the output"
+    opts.clean
+    def build(blueprint)
+      Build.new(options.merge(blueprint: blueprint, build_only: true)).all
     end
-    register(New, "new", "new NAME", "Generates new lono project.")
 
-    desc "blueprints", "Lists blueprints"
-    long_desc Help.text(:blueprints)
-    def blueprints
-      Finder::Blueprint.list
+    desc "bundle", "Bundle with Lonofile."
+    long_desc Help.text(:bundle)
+    def bundle(*args)
+      Bundle.new(options.merge(args: args)).run
     end
 
-    desc "configsets [BLUEPRINT]", "Lists configsets"
-    long_desc Help.text(:configsets)
-    opts.source
-    opts.stack
-    def configsets(blueprint=nil)
-      Configset::List.new(options.merge(blueprint: blueprint)).run
+    desc "clean", "Removes `output` folder."
+    opts.yes
+    def clean
+      Clean.new(options).run
     end
 
-    desc "extensions [BLUEPRINT]", "Lists extensions"
-    long_desc Help.text(:extensions)
-    opts.source
-    opts.stack
-    def extensions(blueprint=nil)
-      Extension::List.new(options.merge(blueprint: blueprint)).run
+    desc "down BLUEPRINT", "Delete CloudFormation blueprint"
+    long_desc Help.text(:down)
+    cfn_opts.delete
+    def down(blueprint)
+      Lono::Cfn::Delete.new(options.merge(blueprint: blueprint)).run
     end
 
-    desc "generate BLUEPRINT", "Generate both CloudFormation templates and parameters files."
-    long_desc Help.text(:generate)
-    option :quiet, type: :boolean, desc: "silence the output"
-    opts.clean
-    opts.source
-    opts.stack
-    opts.template
-    def generate(blueprint)
-      o = options.merge(
-        blueprint: blueprint,
-        generate_only: true,
-      )
-      Lono::Generate.new(o).all
-    end
-
-    desc "user_data NAME", "Generates user_data script for debugging."
-    long_desc Help.text(:user_data)
-    opts.clean
-    def user_data(blueprint, name)
-      Script::Build.new(blueprint, options).run
-      UserData.new(blueprint, options.merge(name: name)).generate
+    desc "list", "List blueprints, configsets, extensions, etc"
+    long_desc Help.text(:list)
+    option :type, aliases: :t, desc: "Type: IE: blueprint, configset, extension. Defaults to all"
+    def list
+      List.new(options).run
     end
 
-    desc "summary BLUEPRINT", "Prints summary of CloudFormation templates."
-    long_desc Help.text("summary")
-    opts.source
-    opts.template
-    def summary(blueprint)
-      Lono::Inspector::Summary.new(options.merge(blueprint: blueprint)).run
+    desc "output BLUEPRINT", "output or preview of the deploy"
+    long_desc Help.text(:output)
+    option :format, desc: "Output formats: #{CliFormat.formats.join(', ')}"
+    def output(blueprint)
+      Lono::Cfn::Output.new(options.merge(blueprint: blueprint)).run
     end
 
-    desc "xgraph STACK", "Graphs dependencies tree of CloudFormation template resources."
-    long_desc Help.text("xgraph")
-    option :display, type: :string, desc: "graph or text", default: "graph"
-    option :noop, type: :boolean, desc: "noop mode"
-    opts.source
-    opts.template
-    def xgraph(blueprint)
-      Lono::Inspector::Graph.new(options.merge(blueprint: blueprint)).run
+    desc "plan BLUEPRINT", "Plan or preview of the deploy"
+    long_desc Help.text(:plan)
+    option :out, aliases: :o, desc: "Write Change Set info to path"
+    def plan(blueprint)
+      Lono::Cfn::Plan.new(options.merge(blueprint: blueprint)).run
     end
 
-    desc "seed BLUEPRINT", "Generates starter configs for a blueprint."
+    desc "seed BLUEPRINT", "Builds starter configs for a blueprint."
     long_desc Help.text("seed")
     option :param, desc: "override convention and specify the param file to use"
-    opts.source
-    opts.template
-    add_runtime_options! # Thor::Action options like --force
+    opts.runtime_options
     def seed(blueprint)
       Seed.new(options.merge(blueprint: blueprint)).create
     end
 
-    desc "app_files BLUEPRINT", "Builds app files", hide: true
-    long_desc Help.text("app_files")
-    add_runtime_options! # Thor::Action options like --force
-    def app_files(blueprint)
-      Lono::AppFile::Build.new(blueprint, options).run
+    desc "show BLUEPRINT", "Deploy CloudFormation stack"
+    long_desc Help.text(:show)
+    def show(blueprint)
+      Lono::Cfn::Show.new(options.merge(blueprint: blueprint)).run
     end
 
-    desc "clean", "Removes `output` folder."
-    def clean
-      Clean.new(options).run
+    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
+    end
+
+    desc "summary BLUEPRINT", "Prints summary of CloudFormation template"
+    long_desc Help.text("summary")
+    def summary(blueprint)
+      Lono::Inspector::Summary.new(options.merge(blueprint: blueprint)).run
+    end
+
+    desc "test", "Run test."
+    long_desc Help.text(:test)
+    def test
+      Test.new(options).run
     end
 
-    desc "upgrade", "Upgrade lono"
-    long_desc Help.text("upgrade")
-    def upgrade
-      Upgrade.new(options).run
+    desc "up BLUEPRINT", "Deploy CloudFormation stack"
+    long_desc Help.text(:up)
+    cfn_opts.deploy
+    def up(blueprint)
+      Lono::Cfn::Deploy.new(options.merge(blueprint: blueprint)).run
+    end
+
+    desc "user_data BLUEPRINT NAME", "Generates user_data script for debugging."
+    long_desc Help.text(:user_data)
+    opts.clean
+    def user_data(blueprint, name)
+      Script::Build.new(options.merge(blueprint: blueprint)).run
+      UserData.new(options.merge(blueprint: blueprint, name: name)).generate
     end
 
-    desc "completion *PARAMS", "Prints words for auto-completion."
+    desc "completion *PARAMS", "Prints words for auto-completion"
     long_desc Help.text("completion")
     def completion(*params)
       Completer.new(CLI, *params).run
     end
 
-    desc "completion_script", "Generates a script that can be eval to setup auto-completion."
+    desc "completion_script", "Builds a script that can be eval to setup auto-completion"
     long_desc Help.text("completion_script")
     def completion_script
-      Completer::Script.generate
+      Completer::Script.build
     end
 
     desc "version", "Prints version"
@@ -117,10 +120,6 @@ module Lono
       puts "Lono: #{VERSION}"
     end
 
-    desc "blueprint SUBCOMMAND", "blueprint subcommands"
-    long_desc Help.text(:blueprint)
-    subcommand "blueprint", Blueprint
-
     desc "cfn SUBCOMMAND", "cfn subcommands"
     long_desc Help.text(:cfn)
     subcommand "cfn", Cfn
@@ -129,25 +128,9 @@ module Lono
     long_desc Help.text(:code)
     subcommand "code", Code
 
-    desc "configset SUBCOMMAND", "configset subcommands"
-    long_desc Help.text(:configset)
-    subcommand "configset", Configset
-
-    desc "extension SUBCOMMAND", "extension subcommands"
-    long_desc Help.text(:extension)
-    subcommand "extension", Extension
-
-    desc "param SUBCOMMAND", "param subcommands"
-    long_desc Help.text(:param)
-    subcommand "param", Param
-
-    desc "pro SUBCOMMAND", "pro subcommands"
-    long_desc Help.text(:pro)
-    subcommand "pro", Pro
-
-    desc "registration SUBCOMMAND", "registration subcommands"
-    long_desc Help.text(:registration)
-    subcommand "registration", Registration
+    desc "new SUBCOMMAND", "new subcommands"
+    long_desc Help.text(:new)
+    subcommand "new", New
 
     desc "s3 SUBCOMMAND", "s3 subcommands"
     long_desc Help.text(:s3)
@@ -156,17 +139,5 @@ module Lono
     desc "script SUBCOMMAND", "script subcommands"
     long_desc Help.text(:script)
     subcommand "script", Script
-
-    desc "sets SUBCOMMAND", "sets subcommands"
-    long_desc Help.text(:sets)
-    subcommand "sets", Sets
-
-    desc "set_instances SUBCOMMAND", "set_instances subcommands"
-    long_desc Help.text(:set_instances)
-    subcommand "set_instances", SetInstances
-
-    desc "template SUBCOMMAND", "template subcommands"
-    long_desc Help.text(:template)
-    subcommand "template", Template
   end
 end

data/lib/lono/command.rb

@@ -31,7 +31,14 @@ end
 module Lono
   class Command < Thor
     class << self
+      include Lono::Utils::Logging
+
       def dispatch(m, args, options, config)
+        # Lono.argv provides consistency when lono is being called by rspec-lono test harness
+        Lono.argv = args.clone # important to clone since Thor removes the first argv
+
+        check_project!(args.first)
+
         # Allow calling for help via:
         #   lono command help
         #   lono command -h
@@ -58,6 +65,26 @@ module Lono
         super
       end
 
+      def check_project!(command_name)
+        return if subcommand?
+        return if command_name.nil?
+        return if help_flags.include?(Lono.argv.last) # IE: -h help
+        return if %w[-h -v --version completion completion_script help new test version].include?(command_name)
+        return if File.exist?("#{Lono.root}/config/app.rb")
+        return unless Lono.check_project
+        logger.error "ERROR: It doesnt look like this is a lono project. Are you sure you are in a lono project?".color(:red)
+        ENV['LONO_TEST'] ? raise : exit(1)
+      end
+
+      def help_flags
+        Thor::HELP_MAPPINGS + ["help"]
+      end
+      private :help_flags
+
+      def subcommand?
+        !!caller.detect { |l| l.include?('in subcommand') }
+      end
+
       # Override command_help to include the description at the top of the
       # long_description.
       def command_help(shell, command_name)

data/lib/lono/configset/{generator.rb → builder.rb}

@@ -1,5 +1,7 @@
-class Lono::Configset
-  class Generator
+module Lono::Configset
+  class Builder
+    include Lono::Utils::Logging
+
     def initialize(options)
       @options = options
       @configset = options[:configset]
@@ -9,13 +11,13 @@ class Lono::Configset
     def run
       check_configset_exist!
       structure = build
-      puts YAML.dump(structure)
+      logger.info YAML.dump(structure)
     end
 
     def check_configset_exist!
       exist = !!Lono::Finder::Configset.find(@configset)
       unless exist
-        puts "configset #{@configset.color(:green)} not found."
+        logger.info "configset #{@configset.color(:green)} not found."
         exit 1
       end
     end
@@ -24,9 +26,9 @@ class Lono::Configset
       # Examples:
       #   Erb.new(options).build
       #   Dsl.new(options).build
-      generator_class = "Lono::Configset::Strategy::#{strategy.camelize}"
-      generator_class = Object.const_get(generator_class)
-      full = generator_class.new(@options.merge(root: configset_root)).build
+      builder_class = "Lono::Configset::Strategy::#{strategy.camelize}"
+      builder_class = Object.const_get(builder_class)
+      full = builder_class.new(@options.merge(root: configset_root)).build
       if @options[:cli]
         full["Metadata"] # contains AWS::CloudFormation::Init and optional AWS::CloudFormation::Authentication
       else

data/lib/lono/configset/combiner.rb

@@ -1,7 +1,9 @@
 require "yaml"
 
-class Lono::Configset
+module Lono::Configset
   class Combiner
+    include Lono::Utils::Logging
+
     def initialize(cfn, options={})
       @cfn, @options = cfn, options
 
@@ -33,8 +35,8 @@ class Lono::Configset
       end
 
       combine
-      Register::Blueprint.clear! # in case of lono generate for all templates
-      Register::Project.clear! # in case of lono generate for all templates
+      Register::Blueprint.clear! # in case of lono build for all templates
+      Register::Project.clear! # in case of lono build for all templates
       @map
     end
 
@@ -134,8 +136,8 @@ class Lono::Configset
     def validate_structure!(name, metadata)
       return if metadata.is_a?(Hash) && metadata.dig("Metadata", "AWS::CloudFormation::Init")
 
-      puts "ERROR: The #{name} configset does not appear to have a AWS::CloudFormation::Init key".color(:red)
-      puts "Please double check the #{name} configset.yml structure"
+      logger.info "ERROR: The #{name} configset does not appear to have a AWS::CloudFormation::Init key".color(:red)
+      logger.info "Please double check the #{name} configset.yml structure"
       exit 1
     end
 
@@ -153,7 +155,7 @@ class Lono::Configset
         if ENV['LONO_TEST']
           raise message
         else
-          puts message.color(:red)
+          logger.info message.color(:red)
           exit 1
         end
       end

data/lib/lono/configset/evaluate_file.rb

@@ -1,4 +1,4 @@
-class Lono::Configset
+module Lono::Configset
   module EvaluateFile
     def evaluate_file(path)
       return unless path && File.exist?(path)

data/lib/lono/configset/meta.rb

@@ -1,4 +1,4 @@
-class Lono::Configset
+module Lono::Configset
   class Meta
     extend Memoist
     include EvaluateFile

data/lib/lono/configset/s3_file/build.rb

@@ -1,7 +1,8 @@
 module Lono::Configset::S3File
-  class Build < Lono::AbstractBase
-    include Lono::Utils::Rsync
+  class Build < Lono::CLI::Base
     include Lono::Utils::Item::Zip
+    include Lono::Utils::Logging
+    include Lono::Utils::Rsync
 
     def run
       Lono::Configset::S3File::Registry.items.each do |item|
@@ -16,7 +17,7 @@ module Lono::Configset::S3File
 
     def copy_to_output(item)
       src = "#{item.root}/lib/files/#{item.name}"
-      dest = "#{Lono.config.output_path}/#{@blueprint}/configsets/#{item.configset}/files/#{item.name}"
+      dest = "#{Lono.root}/output/#{@blueprint.name}/configsets/#{item.configset}/files/#{item.name}"
       rsync(src, dest)
     end
 
@@ -25,7 +26,7 @@ module Lono::Configset::S3File
         if item.exist?
           zip(item)
         else
-          puts "WARN: #{item.src_path} does not exist. Double check that the path is correct in the s3_key call.".color(:yellow)
+          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

data/lib/lono/configset/s3_file/item.rb

@@ -17,7 +17,7 @@ module Lono::Configset::S3File
     end
 
     def output_path
-      "#{Lono.config.output_path}/#{@blueprint}/configsets/#{@configset}/files/#{@name}"
+      "#{Lono.root}/output/#{@blueprint.name}/configsets/#{@configset}/files/#{@name}"
     end
 
     def replacement_value

data/lib/lono/configset/s3_file/upload.rb

@@ -1,8 +1,8 @@
 module Lono::Configset::S3File
-  class Upload < Lono::AbstractBase
+  class Upload < Lono::CLI::Base
     def upload
       return unless Registry.items.size > 0
-      puts "Uploading configset files..."
+      logger.info "Uploading configset files..."
 
       Registry.items.each do |item|
         Lono::S3::Uploader.new(item.zip_file_path).upload

data/lib/lono/configset/strategy/base.rb

@@ -14,7 +14,7 @@ module Lono::Configset::Strategy
     include Lono::Configset::EvaluateFile
 
     # All Lono DSL Helpers and Fn - so configsets have access to instrinic functions like ref
-    # Not including the Lono::Template::Strategy::Dsl::Builder::Syntax since dont need those methods
+    # Not including the Lono::Builder::Template::Strategy::Dsl::Evaluator::Syntax since dont need those methods
     #
     # Interesting note: must include these modules here so load_project_predefined_variables works.
     # Since load_project_predefined_variables calls evaluate_file / instance eval which seems to only be
@@ -22,15 +22,15 @@ module Lono::Configset::Strategy
     #
     # This allows methods like ref and sub to work in variables files.
     #
-    include Lono::Template::Strategy::Dsl::Builder::Helpers
-    include Lono::Template::Strategy::Dsl::Builder::Fn
+    include Lono::Builder::Template::Strategy::Dsl::Evaluator::Helpers
+    include Lono::Builder::Template::Strategy::Dsl::Evaluator::Fn
 
     def initialize(options={})
       @options = options
       @configset = options[:configset]
       @root = options[:root]
       @resource = options[:resource] || "FakeResource"
-      @blueprint = Lono::Conventions.new(options).blueprint
+      @blueprin = options[:blueprint]
     end
 
     def build
@@ -60,8 +60,8 @@ module Lono::Configset::Strategy
 
     def load_project_predefined_variables
       paths = [
-        "#{Lono.root}/configs/#{@blueprint}/configsets/variables.rb", # global
-        "#{Lono.root}/configs/#{@blueprint}/configsets/variables/#{@configset}.rb", # configset specific
+        "#{Lono.root}/config/#{@blueprint.name}/configsets/variables.rb", # global
+        "#{Lono.root}/config/#{@blueprint.name}/configsets/variables/#{@configset}.rb", # configset specific
       ]
       paths.each do |path|
         evaluate_file(path)

data/lib/lono/configset/strategy/helpers/dsl/core.rb

@@ -11,7 +11,7 @@ module Lono::Configset::Strategy::Helpers::Dsl
     end
 
     def s3_key(name)
-      Lono::Configset::S3File::Registry.register(name, blueprint: @blueprint, configset: @configset, root: @root)
+      Lono::Configset::S3File::Registry.register(name, blueprint: @blueprint.name, configset: @configset, root: @root)
       "file://configset/#{@configset}/#{name}"
     end
   end

data/lib/lono/core.rb

@@ -4,79 +4,50 @@ module Lono
   module Core
     extend Memoist
 
-    def config
-      Config.new
-    end
-    memoize :config
+    cattr_accessor :argv
+    cattr_accessor :check_project, default: true
 
-    @@root = nil
+    # allow testing frameworks to switch root
+    cattr_writer :root
     def root
       path = @@root || ENV['LONO_ROOT'] || Dir.pwd
       Pathname.new(path)
     end
-    memoize :root
 
-    @@blueprint_root = nil
-    def blueprint_root; @@blueprint_root ; end
-    def blueprint_root=(v) ; @@blueprint_root = v ; end
+    def app
+      ENV['LONO_APP']
+    end
+    memoize :app
 
     def env
-      # 2-way binding
-      env = env_from_profile(ENV['AWS_PROFILE']) || 'development'
-      env = ENV['LONO_ENV'] if ENV['LONO_ENV'] # highest precedence
-      env
+      ENV['LONO_ENV'] || 'dev'
     end
     memoize :env
 
-    # Overrides AWS_PROFILE based on the Lono.env if set in configs/settings.yml
-    # 2-way binding.
-    def set_aws_profile!
-      return unless settings # Only load if within lono project and there's a settings.yml
-      data = settings[Lono.env] || {}
-      if data["aws_profile"]
-        # puts "Using AWS_PROFILE=#{data["aws_profile"]} from LONO_ENV=#{Lono.env} in configs/settings.yml"
-        ENV['AWS_PROFILE'] = data["aws_profile"]
-      end
+    def tmp_root
+      ENV['LONO_TMP_ROOT'] || "/tmp/lono"
     end
+    memoize :tmp_root
 
-    # Do not use the Setting#data to load the profile because it can cause an
-    # infinite loop then if we decide to use Lono.env from within settings class.
-    def settings
-      setting = Setting.new(false) # check_lono_project to account for `lono new`
-      settings_path = setting.lookup_project_settings_path
-      return unless settings_path # in case outside of lono project
-
-      YAML.load_file(settings_path)
+    def log_root
+      "#{root}/log"
     end
-    memoize :settings
 
-    def lono_pro_removal_check!
-      if lono_pro_installed?
-        puts "ERROR: A lono-pro gem installation has been detected.".color(:red)
-        puts <<~EOL
-          The lono-pro gem is now a part of lono itself. The lono-pro gem has been deprecated.
-          Please uninstall the lono-pro gem and remove it from your Gemfile to continue.
-        EOL
-        exit 1
-      end
+    def configure(&block)
+      App.instance.configure(&block)
     end
 
-    def lono_pro_installed?
-      Lono::Pro::VERSION
-      true
-    rescue NameError
-      false
+    # Generally, use the Terraspace.config instead of App.instance.config since it guarantees the load_project_config call
+    def config
+      App.instance.load_project_config
+      App.instance.config
     end
+    memoize :config
 
-  private
-    def env_from_profile(aws_profile)
-      return unless settings
-      env = settings.find do |_env, settings|
-        settings ||= {}
-        profiles = settings['aws_profile']
-        profiles && profiles == aws_profile
-      end
-      env.first if env
+    # allow different logger when running up all or rspec-lono
+    cattr_writer :logger
+    def logger
+      @@logger ||= config.logger
     end
   end
 end

data/lib/lono/extensions/dsl.rb

@@ -1,11 +1,8 @@
 class Lono::Extensions
   module Dsl
     def extend_with(*args, **options)
-      register_extension_helper(args, options)
-    end
-
-    def register_extension_helper(args, options={})
-      Lono::Jade::Registry.register_extension(args, options)
+      # puts "TODO: load extension straight up"
+      # register_extension_helper(args, options)
     end
   end
 end