lono 4.2.7 → 5.0.1

data/lib/lono/script/upload.rb

@@ -1,8 +1,9 @@
-require "aws-sdk-s3"
 require "filesize"
 
 class Lono::Script
   class Upload < Base
+    include Lono::AwsServices
+
     def run
       Lono::ProjectChecker.check
       return unless scripts_built?
@@ -33,19 +34,12 @@ class Lono::Script
       "#{dest_folder}/#{File.basename(tarball_path)}"
     end
 
-    # Example:
-    #   s3_folder: s3://infra-bucket/cloudformation
-    #   bucket_name: infra-bucket
     def bucket_name
-      s3_folder.sub('s3://','').split('/').first
+      Lono::S3::Bucket.name
     end
 
-    # Removes s3://bucket-name and adds Lono.env. Example:
-    #   s3_folder: s3://infra-bucket/cloudformation
-    #   bucket_name: cloudformation/development/scripts
     def dest_folder
-      folder = s3_folder.sub('s3://','').split('/')[1..-1].join('/')
-      "#{folder}/#{Lono.env}/scripts"
+      "#{Lono.env}/scripts"
     end
 
     # Scripts are only built if the app/scripts folder is non empty
@@ -57,16 +51,6 @@ class Lono::Script
       IO.read(SCRIPTS_INFO_PATH).strip
     end
 
-    # s3_folder example:
-    def s3_folder
-      setting = Lono::Setting.new
-      setting.s3_folder
-    end
-
-    def s3_resource
-      @s3_resource ||= Aws::S3::Resource.new
-    end
-
     # http://stackoverflow.com/questions/4175733/convert-duration-to-hoursminutesseconds-or-similar-in-rails-3-or-ruby
     def pretty_time(total_seconds)
       minutes = (total_seconds / 60) % 60

data/lib/lono/sequence.rb

@@ -6,27 +6,30 @@ require 'bundler'
 class Lono::Sequence < Thor::Group
   include Thor::Actions
 
-  def self.template_name
-    ENV['TEMPLATE'] || 'skeleton'
-  end
-
   def self.source_root
-    starter_projects = File.expand_path("../starter_projects", File.dirname(__FILE__))
-    template_folder = "#{starter_projects}/#{template_name}"
-    unless File.exist?(template_folder)
-      templates = Dir.glob("#{starter_projects}/*")
-        .select { |f| File.directory?(f) }
-        .map { |f| "  #{File.basename(f)}" }
-        .sort
-      puts "The TEMPLATE=#{ENV['TEMPLATE']} you specified does not exist.".color(:red)
-      puts "The available templates are:\n#{templates.join("\n")}"
-      exit
-    end
-    template_folder
+    File.expand_path("../templates/skeleton", File.dirname(__FILE__))
   end
 
 private
   def git_installed?
     system("type git > /dev/null")
   end
+
+  def run_git?
+    options[:git] && git_installed?
+  end
+
+  def run_git_init
+    return unless run_git?
+    puts "=> Initialize git repo"
+    run("git init")
+  end
+
+  def run_git_commit
+    return unless run_git?
+
+    puts "=> Commit git repo"
+    run("git add .")
+    run("git commit -m 'first commit'")
+  end
 end

data/lib/lono/setting.rb

@@ -12,10 +12,7 @@ module Lono
     def data
       return @@data if @@data
 
-      if @check_lono_project && !File.exist?(project_settings_path)
-        puts "ERROR: No settings file at #{project_settings_path}.  Are you sure you are in a project with lono setup?".color(:red)
-        exit 1
-      end
+      project_settings_path = lookup_project_settings_path
 
       # project based settings files
       project = load_file(project_settings_path)
@@ -31,26 +28,25 @@ module Lono
       @@data = all_envs[Lono.env] || all_envs["base"] || {}
     end
 
-    # Special helper method to support multiple formats for s3_folder setting.
-    # Format 1: Simple String
-    #
-    #   development:
-    #     s3_folder: mybucket/path/to/folder
-    #
-    # Format 2: Hash
-    #
-    #   development:
-    #     s3_folder:
-    #       default: mybucket/path/to/folder
-    #       dev_profile1: mybucket/path/to/folder
-    #       dev_profile1: another-bucket/storage/path
-    #
-    def s3_folder
-      s3_folder = data['s3_folder']
-      return s3_folder if s3_folder.nil? or s3_folder.is_a?(String)
+    def lookup_project_settings_path
+      standalone_path = "#{Lono.root}/config/settings.yml"
+      multimode_path = "#{Lono.root}/configs/settings.yml"
+      parent_multimode_path = "#{Lono.root}/../../configs/settings.yml"
+
+      settings_path = if File.exist?(standalone_path)
+                        standalone_path
+                      elsif File.exist?(multimode_path)
+                        multimode_path
+                      elsif File.exist?(parent_multimode_path)
+                        parent_multimode_path
+                      end
+
+      if @check_lono_project && !settings_path
+        puts "ERROR: No lono settings file found.  Are you sure you are in a project with lono setup?".color(:red)
+        exit 1
+      end
 
-      # If reach here then the s3_folder is a Hash
-      s3_folder[ENV['AWS_PROFILE']] || s3_folder["default"]
+      settings_path
     end
 
   private
@@ -75,9 +71,5 @@ module Lono
       end
       all_envs
     end
-
-    def project_settings_path
-      "#{Lono.root}/config/settings.yml"
-    end
   end
 end

data/lib/lono/template.rb

@@ -1,33 +1,29 @@
 require "thor"
 require_relative "command"
 
-class Lono::Template < Lono::Command
-  autoload :Context, 'lono/template/context'
-  autoload :Helper, 'lono/template/helper'
-  autoload :Bashify, 'lono/template/bashify'
-  autoload :DSL, 'lono/template/dsl'
-  autoload :Template, 'lono/template/template'
-  autoload :Upload, 'lono/template/upload'
-  autoload :AwsService, 'lono/template/aws_service'
+module Lono
+  class Template < Lono::Command
+    class_option :quiet, type: :boolean, desc: "silence the output"
+    class_option :noop, type: :boolean, desc: "noop mode, do nothing destructive"
 
-  class_option :quiet, type: :boolean, desc: "silence the output"
-  class_option :noop, type: :boolean, desc: "noop mode, do nothing destructive"
+    desc "generate", "Generate the CloudFormation templates"
+    long_desc Lono::Help.text("template/generate")
+    option :clean, type: :boolean, desc: "remove all output files before generating"
+    def generate(blueprint=nil)
+      Blueprint::Find.one_or_all(blueprint).each do |b|
+        Generator.new(b, options).run
+      end
+    end
 
-  desc "generate", "Generate the CloudFormation templates"
-  long_desc Lono::Help.text("template/generate")
-  option :clean, type: :boolean, desc: "remove all output files before generating"
-  def generate
-    DSL.new(options.clone).run
-  end
-
-  desc "upload", "Uploads templates to configured s3 folder"
-  def upload
-    Upload.new(options.clone).run
-  end
+    desc "upload", "Uploads templates to configured s3 folder"
+    def upload(blueprint)
+      Upload.new(blueprint, options.clone).run
+    end
 
-  desc "bashify URL-OR-PATH", "Convert the UserData section of an existing CloudFormation Template to a starter bash script that is compatiable with lono"
-  long_desc Lono::Help.text("template/bashify")
-  def bashify(path)
-    Bashify.new(path: path).run
+    desc "bashify URL-OR-PATH", "Convert the UserData section of an existing CloudFormation Template to a starter bash script that is compatiable with lono"
+    long_desc Lono::Help.text("template/bashify")
+    def bashify(path)
+      Bashify.new(path: path).run
+    end
   end
-end
+end

data/lib/lono/template/base.rb

@@ -0,0 +1,13 @@
+class Lono::Template
+  class Base
+    include Lono::Blueprint::Root
+
+    def initialize(blueprint, options={})
+      @blueprint, @options = blueprint, options
+      @template = @options[:template] || @blueprint
+      Lono::ProjectChecker.check
+      set_blueprint_root(@blueprint)
+      Lono::ProjectChecker.empty_templates
+    end
+  end
+end

data/lib/lono/template/context.rb

@@ -1,11 +1,11 @@
-# Encapsulates helper methods and instance variables to be rendered in the ERB
-# templates.
+# Encapsulates helper methods and instance variables to be rendered in the ERB templates.
 class Lono::Template
   class Context
     include Lono::Template::Helper
+    include Loader
 
-    def initialize(options={})
-      @options = options
+    def initialize(blueprint, options={})
+      @blueprint, @options = blueprint, options
       load_variables
       load_project_helpers
     end
@@ -17,57 +17,5 @@ class Lono::Template
         instance_variable_set('@' + key.to_s, value)
       end
     end
-
-  private
-    # Variables in base.rb are overridden by their environment specific variables
-    # file.  Example, file LONO_ENV=development:
-    #
-    #   config/variables/base.rb
-    #   config/variables/development.rb - will override any variables in base.rb
-    #
-    def load_variables
-      load_variables_file("base")
-      load_variables_file(Lono.env)
-    end
-
-    # Load custom helper methods from project
-    def load_project_helpers
-      Dir.glob("#{Lono.config.helpers_path}/**/*_helper.rb").each do |path|
-        filename = path.sub(%r{.*/},'').sub('.rb','')
-        module_name = filename.classify
-
-        # Prepend a period so require works 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)
-        require path
-        self.class.send :include, module_name.constantize
-      end
-    end
-
-    # Load the variables defined in config/variables/* to make available in the
-    # template blocks in config/templates/*.
-    #
-    # Example:
-    #
-    #   `config/variables/base.rb`:
-    #     @foo = 123
-    #
-    #   `app/definitions/base.rb`:
-    #      template "mytemplate.yml" do
-    #        source "mytemplate.yml.erb"
-    #        variables(foo: @foo)
-    #      end
-    #
-    # NOTE: Only able to make instance variables avaialble with instance_eval,
-    #   wasnt able to make local variables available.
-    def load_variables_file(name)
-      path = "#{Lono.config.variables_path}/#{name}.rb"
-      return unless File.exist?(path)
-
-      instance_eval(IO.read(path))
-    end
   end
 end

data/lib/lono/template/context/loader.rb

@@ -0,0 +1,70 @@
+class Lono::Template::Context
+  module Loader
+    private
+    # Variables in base.rb are overridden by their environment specific variables
+    # file.  Example, file LONO_ENV=development:
+    #
+    #   config/variables/base.rb
+    #   config/variables/development.rb - will override any variables in base.rb
+    #
+    def load_variables
+      load_variables_file(blueprint_path("base"))
+      load_variables_file(blueprint_path(Lono.env))
+      load_variables_file(project_path("base"))
+      load_variables_file(project_path(Lono.env))
+    end
+
+    def blueprint_path(name)
+      "#{Lono.blueprint_root}/config/variables/#{name}.rb"
+    end
+
+    def project_path(name)
+      "#{Lono.root}/configs/#{@blueprint}/variables/#{name}.rb"
+    end
+
+    # Load the variables defined in config/variables/* to make available in the
+    # template blocks in config/templates/*.
+    #
+    # Example:
+    #
+    #   `config/variables/base.rb`:
+    #     @foo = 123
+    #
+    #   `app/definitions/base.rb`:
+    #      template "mytemplate.yml" do
+    #        source "mytemplate.yml.erb"
+    #        variables(foo: @foo)
+    #      end
+    #
+    # NOTE: Only able to make instance variables avaialble with instance_eval,
+    #   wasnt able to make local variables available.
+    def load_variables_file(path)
+      # if File.exist?(path)
+      #   puts "context.rb loading #{path}"
+      # else
+      #   puts "context.rb file doesnt exist #{path}"
+      # end
+
+      return unless File.exist?(path)
+
+      instance_eval(IO.read(path), path)
+    end
+
+    # Load custom helper methods from project
+    def load_project_helpers
+      Dir.glob("#{Lono.config.helpers_path}/**/*_helper.rb").each do |path|
+        filename = path.sub(%r{.*/},'').sub('.rb','')
+        module_name = filename.classify
+
+        # Prepend a period so require works 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)
+        require path
+        self.class.send :include, module_name.constantize
+      end
+    end
+  end
+end

data/lib/lono/template/dsl.rb

@@ -1,157 +1,21 @@
-class Lono::Template::DSL
-  def initialize(options={})
-    @options = options
-    Lono::ProjectChecker.check
-    Lono::ProjectChecker.empty_templates
-    @templates = []
-    @results = {}
-  end
-
-  def run(options={})
-    evaluate_templates
-    build_templates
-    write_output
-  end
-
-  # Instance eval's the template declarations in app/definitions in this order:
-  #
-  #   app/definitions/base.rb
-  #   app/definitions/base - all files in folder
-  #   app/definitions/[Lono.env].rb
-  #   app/definitions/[Lono.env] - all files in folder
-  #
-  # So Lono.env specific template declarations override base template declarations.
-  def evaluate_templates
-    evaluate_template("base")
-    evaluate_folder("base")
-    evaluate_template(Lono.env)
-    evaluate_folder(Lono.env)
-  end
-
-  def evaluate_template(name)
-    path = "#{Lono.config.definitions_path}/#{name}.rb"
-    evaluate_template_path(path)
-  end
-
-  def evaluate_template_path(path)
-    return unless File.exist?(path)
-
-    begin
-      instance_eval(File.read(path), path)
-    rescue Exception => e
-      template_evaluation_error(e)
-      puts "\nFull error:"
-      raise
-    end
-  end
-
-  def evaluate_folder(folder)
-    paths = Dir.glob("#{Lono.config.definitions_path}/#{folder}/**/*")
-    paths.select{ |e| File.file?(e) }.each do |path|
-      evaluate_template_path(path)
-    end
-  end
-
-  # Prints out a user friendly task_definition error message
-  def template_evaluation_error(e)
-    error_info = e.backtrace.first
-    path, line_no, _ = error_info.split(':')
-    line_no = line_no.to_i
-    puts "Error evaluating #{path}:".color(:red)
-    puts e.message
-    puts "Here's the line in #{path} with the error:\n\n"
-
-    contents = IO.read(path)
-    content_lines = contents.split("\n")
-    context = 5 # lines of context
-    top, bottom = [line_no-context-1, 0].max, line_no+context-1
-    spacing = content_lines.size.to_s.size
-    content_lines[top..bottom].each_with_index do |line_content, index|
-      line_number = top+index+1
-      if line_number == line_no
-        printf("%#{spacing}d %s\n".color(:red), line_number, line_content)
-      else
-        printf("%#{spacing}d %s\n", line_number, line_content)
+class Lono::Template
+  class Dsl < Base
+    attr_reader :results
+    def initialize(blueprint, options={})
+      super
+    end
+
+    def run
+      puts "Generating CloudFormation templates for blueprint #{@blueprint.color(:green)}:" unless @options[:quiet]
+      paths = Dir.glob("#{Lono.config.templates_path}/**/*.rb")
+      paths.select{ |e| File.file?(e) }.each do |path|
+        build_template(path)
       end
     end
-  end
-
-  def template(name, &block)
-    @templates << {name: name, block: block}
-  end
 
-  def build_templates
-    @templates.each do |t|
-      @results[t[:name]] = Lono::Template::Template.new(t[:name], t[:block], @options).build
+    def build_template(path)
+      builder = Builder.new(path, @blueprint, @options)
+      builder.build
     end
   end
-
-  def write_output
-    output_path = "#{Lono.config.output_path}/templates"
-    FileUtils.rm_rf(output_path) if @options[:clean]
-    FileUtils.mkdir_p(output_path)
-    puts "Generating CloudFormation templates:" unless @options[:quiet]
-    @results.each do |name,text|
-      path = "#{output_path}/#{name}".sub(/^\.\//,'') # strip leading '.'
-      path += ".yml"
-      puts "  #{path}" unless @options[:quiet]
-      ensure_parent_dir(path)
-      text = commented(text)
-      IO.write(path, text) # write file first so validate method is simpler
-      validate(path)
-    end
-  end
-
-  def validate(path)
-    text = IO.read(path)
-    begin
-      YAML.load(text)
-    rescue Psych::SyntaxError => e
-      handle_yaml_syntax_error(e, path)
-    end
-  end
-
-  def handle_yaml_syntax_error(e, path)
-    io = StringIO.new
-    io.puts "Invalid yaml.  Output written to debugging: #{path}".color(:red)
-    io.puts "ERROR: #{e.message}".color(:red)
-
-    # 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['TEST']
-      io.string
-    else
-      puts io.string
-      exit 1
-    end
-  end
-
-  def commented(text)
-    comment =<<~EOS
-      # This file was generated with lono. Do not edit directly, the changes will be lost.
-      # More info: http://lono.cloud
-    EOS
-    "#{comment}#{text}"
-  end
-
-  def ensure_parent_dir(path)
-    dir = File.dirname(path)
-    FileUtils.mkdir_p(dir) unless File.exist?(dir)
-  end
 end