lono 8.0.0.pre.rc2 → 8.0.0.pre.rc5

data/lib/lono/builder.rb

@@ -0,0 +1,39 @@
+module Lono
+  class Builder < Lono::CLI::Base
+    include Lono::Hooks::Concern
+
+    def all
+      check_allow!
+
+      parameters = nil
+      run_hooks("build") do
+        clean
+        template_builder.run # build with placeholders IE: LONO://app/files/index.rb
+        parameters = param_builder.build  # Writes the json file in CamelCase keys format
+      end
+
+      logger.info "" # newline
+      parameters
+    end
+    memoize :all
+    alias_method :parameters, :all
+
+    def clean
+      Lono::CLI::Clean.new(@options.merge(mute: true)).run
+    end
+
+    def check_allow!
+      Lono::Builder::Allow.new(@options).check!
+    end
+
+    def param_builder
+      Lono::Builder::Param.new(@options)
+    end
+    memoize :param_builder
+
+    def template_builder
+      Lono::Builder::Template.new(@options) # write templates to disk
+    end
+    memoize :template_builder
+  end
+end

data/lib/lono/bundler/util/git.rb

@@ -1,22 +1,7 @@
 module Lono::Bundler::Util
   module Git
     include Logging
-
-    def sh(command)
-      command = "#{command} 2>&1" # always need output for the sha
-      logger.debug "=> #{command}"
-      out = `#{command}`
-      unless $?.success?
-        if command.include?("git")
-          raise LB::GitError.new("#{command}\n#{out}")
-        else
-          logger.error "ERROR: running #{command}".color(:red)
-          logger.error out
-          exit $?.exitstatus
-        end
-      end
-      out
-    end
+    include Lono::Utils::Sh
 
     def git(command)
       sh("git #{command}")
@@ -33,5 +18,22 @@ module Lono::Bundler::Util
       end
       exit 1
     end
+
+    # Different from Lono::Utils::Sh
+    def sh(command)
+      command = "#{command} 2>&1" # always need output for the sha
+      logger.debug "=> #{command}"
+      out = `#{command}`
+      unless $?.success?
+        if command.include?("git")
+          raise LB::GitError.new("#{command}\n#{out}")
+        else
+          logger.error "ERROR: running #{command}".color(:red)
+          logger.error out
+          exit $?.exitstatus
+        end
+      end
+      out
+    end
   end
 end

data/lib/lono/cfn/base.rb

@@ -1,12 +1,12 @@
 module Lono::Cfn
   class Base < Lono::CLI::Base
     extend Memoist
-
     include Lono::AwsServices
-    include Lono::Utils::Sure
+    include Lono::Hooks::Concern
     include Lono::Utils::Logging
     include Lono::Utils::Pretty
     include Lono::Utils::Quit
+    include Lono::Utils::Sure
 
     include Concerns
 

data/lib/lono/cfn/cancel.rb

@@ -1,19 +1,19 @@
 module Lono::Cfn
   class Cancel < Base
     def run
-      stack = find_stack(@stack)
+      stack = find_stack(@stack_name)
       unless stack
-        logger.info "The '#{@stack}' stack does not exist. Unable to cancel"
+        logger.info "The '#{@stack_name}' stack does not exist. Unable to cancel"
         quit 1
       end
 
-      logger.info "Canceling updates to #{@stack}."
+      logger.info "Canceling updates to #{@stack_name}."
       logger.info "Current stack status: #{stack.stack_status}"
       if stack.stack_status == "CREATE_IN_PROGRESS"
-        cfn.delete_stack(stack_name: @stack)
+        cfn.delete_stack(stack_name: @stack_name)
         logger.info "Canceling stack creation."
       elsif stack.stack_status == "UPDATE_IN_PROGRESS"
-        cfn.cancel_update_stack(stack_name: @stack)
+        cfn.cancel_update_stack(stack_name: @stack_name)
         logger.info "Canceling stack update."
         status.wait if @options[:wait]
       else

data/lib/lono/cfn/concerns/build.rb

@@ -3,7 +3,7 @@ module Lono::Cfn::Concerns
     extend Memoist
 
     def build
-      Lono::CLI::Build.new(@options)
+      Lono::Builder.new(@options)
     end
     memoize :build
   end

data/lib/lono/cfn/delete.rb

@@ -1,9 +1,12 @@
 module Lono::Cfn
   class Delete < Base
     def run
+      logger.info "Will delete stack #{@stack.color(:green)}"
       plan.for_delete
-      sure?("Are you sure you want to delete the #{@stack} stack?")
-      cfn.delete_stack(stack_name: @stack)
+      sure?("Are you sure you want to delete the stack?")
+      run_hooks("down") do
+        cfn.delete_stack(stack_name: @stack)
+      end
       if @options[:wait]
         status.wait
       else

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

@@ -23,7 +23,7 @@ class Lono::Cfn::Deploy
 
             #{command_with_iam(capabilities)}
 
-        You can also avoid this prompt with config.up.capabilities in config/app.rb.
+        You can also avoid this prompt by setting config.up.capabilities in config/app.rb
         See: https://lono.cloud/docs/config/reference/
 
       EOL

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

@@ -3,7 +3,7 @@ class Lono::Cfn::Deploy
     def check!
       status = stack_status
       unless status =~ /_COMPLETE$/ || status == "UPDATE_ROLLBACK_FAILED"
-        logger.info "Cannot create run operation on stack #{@stack} is not in an updatable state.  Stack status: #{status}".color(:red)
+        logger.info "Cannot run operation on stack #{@stack} is not in an updatable state.  Stack status: #{status}".color(:red)
         quit 1
       end
     end

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

@@ -11,10 +11,8 @@ class Lono::Cfn::Deploy
 
     def continue_update
       continue_update?
-      options = {stack_name: @stack}
-      show_options(options, "continue_update_rollback")
       begin
-        cfn.continue_update_rollback(options)
+        cfn.continue_update_rollback(stack_name: @stack)
       rescue Aws::CloudFormation::Errors::ValidationError => e
         logger.info "ERROR: Continue update: #{e.message}".color(:red)
         quit 1

data/lib/lono/cfn/deploy.rb

@@ -2,7 +2,9 @@ module Lono::Cfn
   class Deploy < Base
     def run
       start_message
-      perform # create or update
+      run_hooks("up") do
+        perform # create or update
+      end
       success = status.wait
       if success
         finish_message
@@ -20,20 +22,36 @@ module Lono::Cfn
       yes = iam.rerun?(e)
       retry if yes
     rescue Aws::CloudFormation::Errors::ValidationError => e
-      if e.message.include?("No updates") # No updates are to be performed.
+      case e.message
+      when /No updates/ # No updates are to be performed.
         logger.info "WARN: #{e.message}".color(:yellow)
-      elsif e.message.include?("UPDATE_ROLLBACK_FAILED") # https://amzn.to/2IiEjc5
+      when /UPDATE_ROLLBACK_FAILED/ # https://amzn.to/2IiEjc5
         rollback.continue_update
+      when /YAML not well-formed/ # happens if a value is a serialize Ruby Object. See: https://gist.github.com/tongueroo/737531d0bc8c92d92b5cd00493e15d9e
+        # e.message: Template format error: YAML not well-formed. (line 207, column 9)
+        print_code(e)
       else
-        logger.info "ERROR: #{e.message}".color(:red)
+        logger.info "ERROR: Deploy#perform #{e.class} #{e.message}".color(:red)
+        logger.info "Check: #{pretty_path(@blueprint.output_path)}"
         quit 1
       end
     end
 
+    def print_code(exception)
+      md = exception.message.match(/line (\d+),/)
+      line_number = md[1]
+      logger.error "Template for debugging: #{pretty_path(@blueprint.output_path)}"
+      if md
+        DslEvaluator.print_code(@blueprint.output_path, line_number)
+        exit 1
+      else
+        raise
+      end
+    end
+
     def create
       plan.for_create
       @sure || sure?("Going to create stack #{@stack} with blueprint #{@blueprint.name}.")
-
       options = {
         stack_name: @stack,
         parameters: build.parameters,

data/lib/lono/cfn/download.rb

@@ -6,7 +6,6 @@ module Lono::Cfn
     def run
       pretty_path = download_path.sub("#{Lono.root}/", '')
       logger.info "Downloading template to: #{pretty_path}"
-      return if ENV['LONO_NOOP']
       download_template
     end
 

data/lib/lono/cfn/plan/changeset.rb

@@ -8,7 +8,7 @@ class Lono::Cfn::Plan
     def create
       @build.all
       @changed = false
-      logger.info "Change Set Changes:".color(:green) if Lono.config.diff.changeset
+      logger.info "Change Set Changes:".color(:green) if Lono.config.plan.changeset
       preview_change_set
       logger.info "" # newline
     end
@@ -36,7 +36,7 @@ class Lono::Cfn::Plan
         change_set = describe_change_set
         sleep 1
         unless newline_needed
-          logger.print "Determining Change Set"
+          logger.print "Calculating Change Set"
         end
         newline_needed = true
         logger.print '.'
@@ -83,7 +83,7 @@ class Lono::Cfn::Plan
     end
 
     def display(change_set)
-      return unless Lono.config.diff.changeset
+      return unless Lono.config.plan.changeset
       case change_set.status
       when "CREATE_COMPLETE"
         display_changes(change_set)

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

@@ -29,7 +29,7 @@ module Lono::Cfn::Plan::Diff
       unless @modified_keys.empty?
         logger.info "Modified:"
         @modified_keys.each do |k|
-          logger.info "    #{k}: #{@old[k]} -> #{@new[k]}"
+          logger.info "    #{k}: #{show_old(@old[k])} -> #{@new[k]}"
         end
       end
 
@@ -38,6 +38,16 @@ module Lono::Cfn::Plan::Diff
       end
     end
 
+    def show_old(v)
+      if v.nil?
+        '(unset)'
+      elsif v == ''
+        "''"
+      else
+        v
+      end
+    end
+
     def calculate
       @added_keys = @new.keys - @old.keys
       @removed_keys = @old.keys - @new.keys

data/lib/lono/cfn/plan/param.rb

@@ -1,7 +1,7 @@
 class Lono::Cfn::Plan
   class Param < Base
     def run
-      return unless Lono.config.diff.params && stack_exists?(@stack)
+      return unless Lono.config.plan.params && stack_exists?(@stack)
       logger.info "Parameter Changes:".color(:green)
       write_to_tmp(existing_path, existing_params)
       write_to_tmp(new_path, new_params)

data/lib/lono/cfn/plan/template.rb

@@ -1,11 +1,11 @@
 class Lono::Cfn::Plan
   class Template < Base
     def run
-      return unless Lono.config.diff.template
+      return unless Lono.config.plan.template
       @build.all
       logger.info "Template Changes:".color(:green)
       download_existing_cfn_template
-      diff = Diff::File.new(mode: Lono.config.diff.template)
+      diff = Diff::File.new(mode: Lono.config.plan.template)
       diff.show(existing_template_path, new_cfn_template)
       logger.info "" # newline
     end

data/lib/lono/cfn/plan.rb

@@ -1,6 +1,7 @@
 module Lono::Cfn
   class Plan < Base
     def run
+      build.all
       if stack_exists?(@stack)
         for_update
       else
@@ -9,6 +10,7 @@ module Lono::Cfn
     end
 
     def for_update
+      upload_all
       # Allow passing down of the build object from Cfn::Deploy so build.all only runs once.
       # Fallback to creating new build object but still pass one build object instance down.
       @options[:build] ||= build
@@ -23,11 +25,35 @@ module Lono::Cfn
     end
 
     def for_create
+      upload_all
       New.new(@options).run
     end
 
     def for_delete
       Delete.new(@options).run
     end
+
+    # important to call before for_update and for_create
+    # since changeset requires the template to already be uploaded to s3
+    def upload_all
+      upload_templates
+      upload_files
+    end
+
+    def upload_templates
+      Lono::Builder::Template::Upload.new(@options).run
+    end
+
+    # Upload files right before create_stack or execute_change_set
+    # Its better to upload here as part of a deploy vs a build
+    # IE: lono build should try not to do a remote write to s3 if possible
+    def upload_files
+      # Files built and compressed in
+      #     Lono::Builder::Dsl::Finalizer::Files::Build#build_files
+      Lono::Files.files.each do |file| # using singular file, but is like a "file_list"
+        file.upload
+      end
+    end
+
   end
 end

data/lib/lono/cli/abstract.rb

@@ -1,16 +1,10 @@
 class Lono::CLI
   class Abstract
     extend Memoist
-    include Lono::Utils::Contexts
     include Lono::Utils::Logging
     include Lono::Utils::Pretty
 
     def initialize(options={})
-      reinitialize(options)
-    end
-
-    # Hack so that we can use include Thor::Base
-    def reinitialize(options)
       @options = options
     end
   end

data/lib/lono/cli/base.rb

@@ -1,9 +1,12 @@
 class Lono::CLI
   class Base < Abstract
-    def reinitialize(options={})
+    include Lono::Concerns::Names
+    include Lono::Utils::Sh
+
+    def initialize(options={})
       super
-      @blueprint = Lono::Blueprint.new(options)
-      @stack = Lono::Names.new(options).stack
+      @blueprint = Lono::Blueprint.new(options.merge(name: options[:blueprint]))
+      @stack = names.stack
     end
   end
 end

data/lib/lono/cli/clean.rb

@@ -8,15 +8,16 @@ class Lono::CLI
     attr_reader :options
     def initialize(options={})
       @options = options
+      @mute = options[:mute] # used by CLI::Build at beginning to clear out the output folder
     end
 
     def run
       folders = %w[output tmp]
-      sure?("Will remove folders: #{folders.join(' ')}")
+      @mute || sure?("Will remove folders: #{folders.join(' ')}")
       folders.each do |folder|
         FileUtils.rm_rf("#{Lono.root}/#{folder}")
       end
-      logger.info "Removed folders: #{folders.join(' ')}"
+      logger.info "Removed folders: #{folders.join(' ')}" unless @mute
     end
   end
 end

data/lib/lono/cli/help/new/helper.md

@@ -0,0 +1,27 @@
+## Blueprint Helpers
+
+When the `--blueprint` option is used a blueprint helper is generated.
+
+The default name is custom
+
+    $ lono new helper --blueprint demo
+          create  app/blueprints/demo/helpers/custom_helper.rb
+
+Here's an example with a helper named vars.
+
+    $ lono new helper vars --blueprint demo
+          create  app/blueprints/demo/helpers/vars_helper.rb
+
+## Project Helpers
+
+When no `--blueprint` option is used a project helper is generated.
+
+The default name is custom.
+
+    $ lono new helper
+          create  app/helpers/custom/custom_helper.rb
+
+Here's an example with a helper named common.
+
+    $ lono new helper common
+          create  app/helpers/common/common_helper.rb

data/lib/lono/cli/help/new/hook.md

@@ -0,0 +1,14 @@
+## Blueprint Hooks
+
+When the `--blueprint` option is used a blueprint hook is generated.
+
+    $ lono new helper --blueprint demo
+          create  app/blueprints/demo/config/hooks.rb
+
+## Project Helpers
+
+When no `--blueprint` option is used a project hook is generated.
+
+    $ lono new helper
+          create  app/config/hooks.rb
+

data/lib/lono/cli/help/new/project.md

@@ -1,22 +1,15 @@
 ## Example
 
     $ lono new project infra
+    Other infra
     => Creating new project called infra.
           create  infra
           create  infra/.gitignore
           create  infra/Gemfile
           create  infra/README.md
           create  infra/config/app.rb
-    => Initialize git repo
-             run  git init from "."
-    Initialized empty Git repository in /home/ec2-user/environment/infra/.git/
     => Installing dependencies with: bundle install
-    Resolving dependencies...Fetching gem metadata from https://rubygems.org/.......
-    ............................
-    Using concurrent-ruby 1.1.9
-    ...
-    Bundle complete! 1 Gemfile dependency, 40 gems now installed.
-    Use `bundle info [gemname]` to see where a bundled gem is installed.
+    Bundle complete! 2 Gemfile dependencies, 47 gems now installed.
     ================================================================
     Congrats 🎉 You have successfully created a lono project.
 
@@ -31,4 +24,4 @@
         lono up demo
 
     More info: https://lono.cloud/
-    $
+    $

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