lono 8.0.0.pre.rc1 → 8.0.0.pre.rc4

data/lib/lono/cli/iam.rb

@@ -0,0 +1,27 @@
+class Lono::CLI
+  class Iam < Base
+    include Lono::Cfn::Concerns::Build
+    include Lono::Cfn::Concerns::TemplateOutput
+
+    def run
+      build.template_builder.run
+      resources = template_output.data['Resources']
+      types = resources.map { |logical_id, attrs| attrs['Type'] }
+      actions = types.map do |t|
+        service = t.split('::')[1]
+        "#{service.downcase}:*"
+      end.uniq
+      text =<<~EOL
+        Version: 2012-10-17
+        Statement:
+        - Sid: #{@blueprint.name}
+          Effect: Allow
+          Resource: "*"
+      EOL
+      policy = YAML.load(text)
+      policy['Statement'][0]['Action'] = actions
+      puts "IAM Policy Example for blueprint #{@blueprint.name}".color(:green)
+      puts JSON.pretty_generate(policy)
+    end
+  end
+end

data/lib/lono/cli/list.rb

@@ -13,14 +13,11 @@ class Lono::CLI
 
   private
     def list_type(type)
-      lookup.list(type)
+      Dir.glob("#{Lono.root}/{app,vendor}/#{type}/*").each do |path|
+        logger.info pretty_path(path)
+      end
     end
 
-    def lookup
-      Lono::Lookup.new
-    end
-    memoize :lookup
-
     def show?(type)
       @options[:type] == type || @options[:type].nil? || @options[:type] == "all"
     end

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

@@ -3,9 +3,8 @@ class Lono::CLI::New
     argument :name
     def self.cli_options
       [
-        [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
         [:examples, type: :boolean, desc: "Whether not to generate examples"],
-        [:project, desc: "Project name"],
+        [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
       ]
     end
     cli_options.each do |args|
@@ -20,14 +19,9 @@ class Lono::CLI::New
       end
     end
 
-    # for specs
-    def set_dest
-      @dest = [@options[:project], "app/blueprints"].compact.join('/')
-    end
-
     def create_blueprint
-      logger.info "=> Creating new blueprint called #{name}."
-      directory ".", "#{@dest}/#{name}"
+      logger.info "=> Creating new blueprint: #{name}"
+      directory ".", "app/blueprints/#{name}"
     end
   end
 end

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.rb

@@ -1,10 +1,12 @@
 class Lono::CLI::New
-  class Helper < Sequence
+  class Helper < 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"],
-        [:name, default: "custom", desc: "Helper name"],
+        [:blueprint, aliases: :b, desc: "Blueprint name. Only use you want a blueprint helper. Otherwise a project helper is generated"],
       ]
     end
     cli_options.each do |args|
@@ -15,18 +17,24 @@ class Lono::CLI::New
       set_template_source "helper"
     end
 
-    def set_vars
-      @blueprint = @options[:blueprint]
-      @name = @options[:name]
+    def create_helper
+      if @options[:blueprint]
+        create_blueprint_helper
+      else
+        create_project_helper
+      end
     end
 
-    def create_blueprint
-      puts "underscore_name #{underscore_name}"
-      logger.info "=> Generating helper: #{@name}"
+  private
+    def create_blueprint_helper
+      @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
 
-  private
-    attr_reader :name # required for templates/helper/%name%_helper.rb.tt
+    def create_project_helper
+      logger.info "=> Generating #{underscore_name}_helper.rb"
+      directory ".", "app/helpers/#{underscore_name}"
+    end
   end
 end

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

@@ -0,0 +1,32 @@
+class Lono::CLI::New
+  class Hook < Lono::CLI::New::Sequence
+    def self.cli_options
+      [
+        [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
+        [:blueprint, aliases: :b, desc: "Blueprint name. Only use you want a blueprint helper. Otherwise a project helper is generated"],
+      ]
+    end
+    cli_options.each do |args|
+      class_option(*args)
+    end
+
+    def set_source
+      set_template_source "hook"
+    end
+
+    def create_hook
+      logger.info "=> Generating hook"
+      if blueprint
+        directory ".", "app/blueprints/#{blueprint}"
+      else
+        directory ".", "."
+      end
+    end
+
+  private
+    # So templates/hooks/config/hooks.rb.tt has access to blueprint
+    def blueprint
+      @options[:blueprint]
+    end
+  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,27 @@ 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.")
+    register(Configset, "configset", "configset NAME", "Generate new configset")
 
     long_desc Help.text("new/helper")
     Helper.cli_options.each { |args| option(*args) }
-    register(Helper, "helper", "helper NAME", "Generates new helper.")
+    register(Helper, "helper", "helper NAME", "Generate new helper")
+
+    long_desc Help.text("new/hook")
+    Hook.cli_options.each { |args| option(*args) }
+    register(Hook, "hook", "hook NAME", "Generate new hook")
 
     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 "test SUBCOMMAND", "test subcommands"
     long_desc Help.text(:test)

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/script/build.rb

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

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/{inspector → cli}/summary.rb

@@ -1,32 +1,27 @@
-module Lono::Inspector
+class Lono::CLI
   class Summary < Base
+    include Lono::Cfn::Concerns::Build
     include Lono::Cfn::Concerns::TemplateOutput
 
-    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']
-
+    def run
+      build.all
       print_parameters_summary
-      logger.info "# Resources:"
       print_resource_types
     end
 
     def print_parameters_summary
       parameters = template_output.parameters
+      logger.info "Parameters (#{parameters.size})".color(:green)
       parameter_groups = template_output.parameter_groups
 
       if parameters.empty?
-        logger.info "There are no parameters in this template."
+        logger.info "No parameters"
         return
       end
 
       shown = []
-      logger.info "# Parameters Total (#{parameters.size})"
-      parameter_groups.each do |label, parameters|
-        logger.info "# Parameter Group (#{parameters.size}): #{label}".color(:sienna)
+      parameter_groups.each do |parameter_group_label, parameters|
+        logger.info parameter_group_label
         parameters.each do |name|
           logger.info parameter_line(name)
           shown << name
@@ -40,13 +35,11 @@ module Lono::Inspector
 
     def parameter_line(name)
       data = template_output.parameters[name]
-      example = description_example(data["Description"])
       if data["Default"].nil?
-        line = "#{name}=#{example} # (required)"
+        line = "    #{name} (required)"
       else
         default = data["Default"]
-        line = "# #{name}=#{default}"
-        line = "#{line} # #{example}" if example
+        line = default.blank? ? "    #{name}" : "    #{name}=#{default}"
       end
       line
     end
@@ -59,18 +52,9 @@ module Lono::Inspector
       md[2]
     end
 
-    def resource_types
-      resources = template_output.data["Resources"]
-      return unless resources
-
-      types = Hash.new(0)
-      resources.each do |logical_id, resource|
-        types[resource["Type"]] += 1
-      end
-      types
-    end
-
     def print_resource_types
+      total = template_output.data["Resources"].size
+      logger.info "Resources (#{total})".color(:green)
       unless resource_types
         logger.info "No resources found."
         return
@@ -79,15 +63,21 @@ module Lono::Inspector
       types = resource_types.sort_by {|r| r[1] * -1} # Hash -> 2D Array
       types.each do |a|
         type, count = a
-        printf "%3s %s\n", count, type
+        printf "%5s %s\n", count, type
       end
       total = types.inject(0) { |sum,(type,count)| sum += count }
-      printf "%3s %s\n", total, "Total"
+      printf "%5s %s\n", total, "Total"
     end
 
-    def template_output
-      Lono::Builder::Template::Output.new(@blueprint)
+    def resource_types
+      resources = template_output.data["Resources"]
+      return unless resources
+
+      types = Hash.new(0)
+      resources.each do |logical_id, resource|
+        types[resource["Type"]] += 1
+      end
+      types
     end
-    memoize :template_output
   end
 end

data/lib/lono/cli.rb

@@ -5,12 +5,12 @@ 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
     def build(blueprint)
-      Build.new(options.merge(blueprint: blueprint, build_only: true)).all
+      Lono::Builder.new(options.merge(blueprint: blueprint, build_only: true)).all
     end
 
     desc "bundle", "Bundle with Lonofile."
@@ -25,14 +25,20 @@ 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 "iam BLUEPRINT", "Generate IAM policy"
+    long_desc Help.text(:down)
+    def iam(blueprint)
+      Iam.new(options.merge(blueprint: blueprint)).run
+    end
+
+    desc "list", "List blueprints"
     long_desc Help.text(:list)
     option :type, aliases: :t, desc: "Type: IE: blueprint, configset, extension. Defaults to all"
     def list
@@ -41,12 +47,12 @@ module Lono
 
     desc "output BLUEPRINT", "output or preview of the deploy"
     long_desc Help.text(:output)
-    option :format, desc: "Output formats: #{CliFormat.formats.join(', ')}"
+    option :format, aliases: :f, desc: "Output formats: #{CliFormat.formats.join(', ')}"
     def output(blueprint)
       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)
@@ -57,6 +63,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
@@ -70,16 +77,13 @@ 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"
     long_desc Help.text("summary")
     def summary(blueprint)
-      Lono::Inspector::Summary.new(options.merge(blueprint: blueprint)).run
+      Summary.new(options.merge(blueprint: blueprint)).run
     end
 
     desc "test", "Run test."
@@ -88,7 +92,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)
@@ -124,10 +128,6 @@ module Lono
     long_desc Help.text(:cfn)
     subcommand "cfn", Cfn
 
-    desc "code SUBCOMMAND", "code subcommands"
-    long_desc Help.text(:code)
-    subcommand "code", Code
-
     desc "new SUBCOMMAND", "new subcommands"
     long_desc Help.text(:new)
     subcommand "new", New

data/lib/lono/command.rb

@@ -37,6 +37,7 @@ module Lono
         # 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_version_structure!
         check_project!(args.first)
 
         # Allow calling for help via:
@@ -48,7 +49,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")
@@ -69,13 +69,39 @@ module Lono
         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 non_project_command?
         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
 
+      # Also, using ARGV instead of args because args is called by thor in multiple passes
+      # For `lono new project`:
+      # * 1st pass: "new"
+      # * 2nd pass: "project"
+      def non_project_command?
+        commands = %w[-h -v --version completion completion_script help new test version]
+        commands.include?(ARGV[0])
+      end
+
+      def check_version_structure!
+        return if non_project_command?
+        return unless File.exist?('configs')
+        puts "ERROR: Old lono project structure detected".color(:red)
+        puts <<~EOL
+          It looks like this Lono project with an old structure.
+          The old structure does not work with this version of Lono.
+
+          Current Installed Lono Version: #{Lono::VERSION}
+
+          Please upgrade the lono project structure.
+
+          See: https://lono.com/docs/upgrading/version8/
+        EOL
+        exit 1
+      end
+
       def help_flags
         Thor::HELP_MAPPINGS + ["help"]
       end

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