lono 7.0.5 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 978e40e7263ef0cc011601eec42c5581e580c4bc7c74feea55658776d2f60f61
-  data.tar.gz: b8ef03d604d0145577c58a9b2aef532d7e0ac033145bba7b56e5182314f2fef6
+  metadata.gz: 6c82050fbf233130f2fda69d2bc32fe20d8887a1d32658875522cc11a8cc3df6
+  data.tar.gz: 0e5a9f4657820d9104410ba5b35c3c2383a2967c5b3145f03ea9927a4413eb12
 SHA512:
-  metadata.gz: 6df32378a05c9d8279cafb2f6e379b39bfdc3aba799371c1fafd7318fcd1d68aed09f75a01817723b3de2852917d3e7ac9b1c5cec86a2617aa19d56a814a82ab
-  data.tar.gz: 02c7f8fc999daecb2a87889123ce49ced93cc72bdbf0ff2e6b9d1880ea40fa2e8d5d565229d941dee0c746d829f5dd841fc084f41aa42f04392386214d35a722
+  metadata.gz: 4fa72e2ed20267512962e1b4ff0cab8962186fd8bb0b1be9a07e478577aaeedae7ec4cded6e1bee7c1c77bffe1a93ad126e3a60601ff0fe1381fea30ccb15fb8
+  data.tar.gz: e0388dd38dbbae9483088d07bb630585b779b167f3cdae4f36b861e72cc5c24a8ba39797fabb4296da8550d73b1277459645a1972564f9e4baffee40d08d51b7

data/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [7.1.0]
+- #42 introduce configset dsl
+- #43 improve layering behavior
+- #44 metadata fixes:  lono_strategy
+- #45 lono_type fix
+- #46 require bundler 2 at least: fixes Gemfile.lock generation
+- #47 use with_unbundled_env
+
 ## [7.0.5]
 - #41 sort parameter with required at top
 

data/lib/lono.rb

@@ -3,6 +3,7 @@ $stdout.sync = true unless ENV["LONO_STDOUT_SYNC"] == "0"
 require "active_support/core_ext/class"
 require 'active_support/core_ext/hash'
 require 'active_support/core_ext/string'
+require 'cfn_camelizer'
 require 'fileutils'
 require 'json'
 require 'memoist'
@@ -10,7 +11,6 @@ require 'plissken'
 require 'rainbow/ext/string'
 require 'render_me_pretty'
 require 'yaml'
-require 'cfn_camelizer'
 
 gem_root = File.dirname(__dir__)
 $:.unshift("#{gem_root}/lib")

data/lib/lono/blueprint/meta.rb

@@ -8,13 +8,13 @@ class Lono::Blueprint
       @blueprint = blueprint
     end
 
-    def config
+    def jadespec
       Lono::Finder::Blueprint.find(@blueprint)
     end
-    memoize :config
+    memoize :jadespec
 
     def auto_camelize?(target_section)
-      auto_camelize = config.auto_camelize
+      auto_camelize = jadespec.auto_camelize
       # auto_camelize.nil? for backward compatibility
       return true if auto_camelize.nil? || auto_camelize == true
 

data/lib/lono/cfn/base.rb

@@ -151,7 +151,7 @@ class Lono::Cfn
     def stack_status
       return true if testing_update?
       return false if @options[:noop]
-      resp = cfn.describe_stacks(stack_name: @stack_name)
+      resp = cfn.describe_stacks(stack_name: @stack)
       resp.stacks[0].stack_status
     end
 
@@ -169,8 +169,10 @@ class Lono::Cfn
 
     def show_options(options, meth=nil)
       options = options.clone.compact
-      options[:template_body] = "Hidden due to size... View at: #{pretty_path(template_path)}"
-      options[:template_url] = options[:template_url].sub(/\?.*/,'')
+      if options[:template_body] # continue_update_rollback
+        options[:template_body] = "Hidden due to size... View at: #{pretty_path(template_path)}"
+        options[:template_url] = options[:template_url].sub(/\?.*/,'')
+      end
       to = meth || "AWS API"
       puts "Parameters passed to #{to}:"
       puts YAML.dump(options.deep_stringify_keys)

data/lib/lono/configset.rb

@@ -5,5 +5,12 @@ module Lono
       option(*args)
     end
     register(New, "new", "new NAME", "Generates new lono configset.")
+
+    desc "generate", "Generate configset from DSL"
+    long_desc Help.text(:generate)
+    option :resource, default: "PretendResource", desc: "Set the @resource instance variable availalbe in the configset"
+    def generate(configset)
+      Generator.new(options.merge(configset: configset)).run
+    end
   end
 end

data/lib/lono/configset/combiner.rb

@@ -9,6 +9,11 @@ class Lono::Configset
       @map = {} # stores resource logical id => metadata cfn-init
     end
 
+    def generator_options(registry, options={})
+      o = @options.merge(configset: registry.name, resource: registry.resource)
+      o.merge(options)
+    end
+
     def metadata_map
       return {} unless additional_configsets?
 
@@ -17,12 +22,14 @@ class Lono::Configset
       end
 
       Register::Blueprint.configsets.each do |registry|
-        loader = Lono::Blueprint::Configset::Loader.new(registry, @options)
-        add(registry, loader.metdata_configset)
+        generator = Lono::Configset::Generator.new(generator_options(registry, type: "blueprint"))
+        cloudformation_init = generator.build
+        add(registry, cloudformation_init)
       end
       Register::Project.configsets.each do |registry|
-        loader = Loader.new(registry, @options)
-        add(registry, loader.metdata_configset)
+        generator = Lono::Configset::Generator.new(generator_options(registry, type: "project"))
+        cloudformation_init = generator.build
+        add(registry, cloudformation_init)
       end
 
       combine

data/lib/lono/configset/generator.rb

@@ -0,0 +1,52 @@
+class Lono::Configset
+  class Generator
+    def initialize(options)
+      @options = options
+      @configset = options[:configset]
+      @type = options[:type] || "project"
+    end
+
+    def run
+      check_configset_exist!
+      structure = build
+      puts YAML.dump(structure)
+    end
+
+    def check_configset_exist!
+      exist = !!Lono::Finder::Configset.find(@configset)
+      unless exist
+        puts "configset #{@configset.color(:green)} not found."
+        exit 1
+      end
+    end
+
+    def build
+      # Examples:
+      #   Erb.new(options).build
+      #   Dsl.new(options).build
+      generator_class = "Lono::Configset::Strategy::#{strategy.camelize}"
+      generator_class = Object.const_get(generator_class)
+      generator_class.new(@options.merge(root: configset_root)).build
+    end
+
+    def strategy
+      jadespec = Lono::Jadespec.new(configset_root, "unknown") # abusing Jadespec to get strategy
+      jadespec.lono_strategy
+    end
+
+    def configset_root
+      finder = finder_class.new
+      found = finder.find(@configset, local_only: false)
+      found.root if found
+    end
+
+    def finder_class
+      case @type
+      when "project"
+        Lono::Finder::Configset
+      when "blueprint"
+        Lono::Finder::Blueprint::Configset
+      end
+    end
+  end
+end

data/lib/lono/configset/materializer/gems_builder.rb

@@ -33,7 +33,7 @@ module Lono::Configset::Materializer
     end
 
     def bundle
-      Bundler.with_original_env do
+      Bundler.with_unbundled_env do
         bundle_install
       end
     end

data/lib/lono/configset/new.rb

@@ -35,8 +35,8 @@ class Lono::Configset
       if @demo
         options = {}
       else
-        create_file "#{@cwd}/#{configset_name}/lib/configset.yml"
-        options = {exclude_pattern: %r{configset\.yml}}
+        create_file "#{@cwd}/#{configset_name}/lib/configset.rb"
+        options = {exclude_pattern: %r{configset\.rb}}
       end
 
       directory ".", "#{@cwd}/#{configset_name}", options

data/lib/lono/configset/register/project.rb

@@ -4,9 +4,10 @@ module Lono::Configset::Register
     self.validations = []
 
     def evaluate
-      location = Lono::ConfigLocation.new("configsets", @options, Lono.env)
-      evaluate_file(location.lookup_base) if location.lookup_base
-      evaluate_file(location.lookup) if location.lookup # config file
+      layering = Lono::Layering.new("configsets", @options, Lono.env)
+      layering.locations.each do |path|
+        evaluate_file(path)
+      end
     end
   end
 end

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

@@ -0,0 +1,63 @@
+# Subclasses must implement:
+#
+#   find_evaluation_path - use to set @evaluation_path
+#   load
+#
+# Notable instance variables:
+#
+#   @evaluation_path - IE: lib/configset.rb or lib/configset.yml
+#   @root - IE: /path/to/root/of/configset
+#
+module Lono::Configset::Strategy
+  class Base
+    extend Memoist
+    include Lono::Configset::EvaluateFile
+
+    def initialize(options={})
+      @options = options
+      @configset = options[:configset]
+      @root = options[:root]
+      @resource = options[:resource] || "FakeResource"
+      @blueprint = Lono::Conventions.new(options).blueprint
+    end
+
+    def build
+      @evaluation_path = find_evaluation_path # implemented by subclass
+      copy_instance_variables
+      load_configset_helpers
+      load # implemented by subclass
+    end
+    memoize :build
+
+    def copy_instance_variables
+      load_blueprint_predefined_variables
+      load_project_predefined_variables
+    end
+
+    def load_blueprint_predefined_variables
+      evaluate_file("#{@root}/lib/variables.rb")
+    end
+
+    def load_project_predefined_variables
+      paths = [
+        "#{Lono.root}/configs/#{@blueprint}/configsets/variables.rb", # global
+        "#{Lono.root}/configs/#{@blueprint}/configsets/#{@configset}/variables.rb", # configset specific
+      ]
+      paths.each do |path|
+        evaluate_file(path)
+      end
+    end
+
+    def load_configset_helpers
+      paths = Dir.glob("#{@root}/lib/helpers/**/*.rb")
+      paths.sort_by! { |p| p.size } # load possible namespaces first
+      paths.each do |path|
+        filename = path.sub(%r{.*/lib/helpers/},'').sub('.rb','')
+        module_name = filename.camelize
+
+        require path
+        self.class.send :include, module_name.constantize
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Lono::Configset::Strategy
+  class Dsl < Base
+    include Helpers
+    include Syntax
+
+    def initialize(options={})
+      super
+      @structure = {} # holds in memory the configset hash structure
+      @current = "main" # current configset
+      @tracked = []
+    end
+
+    def find_evaluation_path
+      "#{@root}/lib/configset.rb"
+    end
+
+    def load
+      evaluate_file(@evaluation_path)
+      configsets = @configsets || @tracked.uniq
+      configsets = ["main"] if configsets.empty?
+      init = {"configSets" => {"default" => configsets}}.merge(@structure)
+      full_structure = { "AWS::CloudFormation::Init" => init }
+      full_structure.deep_stringify_keys!
+    end
+  end
+end

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

@@ -0,0 +1,4 @@
+class Lono::Configset::Strategy::Dsl
+  module Helpers
+  end
+end

data/lib/lono/configset/strategy/dsl/syntax.rb

@@ -0,0 +1,32 @@
+# Core syntax
+class Lono::Configset::Strategy::Dsl
+  module Syntax
+    extend Memoist
+
+    %w[package group user resource file command service].each do |meth|
+      section = meth.pluralize
+      define_method(meth) do |k, props|
+        init_empty(@current, section)
+        current_structure(@current)[section].deep_merge!(k => props)
+      end
+    end
+
+    def configset(current)
+      @tracked << current
+      previous, @current = @current, current
+      yield
+      @current = previous
+    end
+
+  private
+    def current_structure(configset)
+      @structure[configset] ||= {}
+    end
+    memoize :current_structure
+
+    def init_empty(configset, section)
+      current = current_structure(configset)
+      current[section] ||= {}
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require "json"
+
+module Lono::Configset::Strategy
+  class Erb < Base
+    include Helpers
+
+    def find_evaluation_path
+      paths = %w[configset.yml configset.json].map { |p| "#{@root}/lib/#{p}" }
+      paths.find { |p| File.exist?(p) }
+    end
+
+    def load
+      content = RenderMePretty.result(@evaluation_path, context: self)
+      if File.extname(@evaluation_path) == ".yml"
+        load_yaml(content)
+      else
+        JSON.load(content)
+      end
+    end
+
+    def load_yaml(content)
+      # Write to file so can use Yamler::Validator
+      path = "/tmp/lono/configset.yml"
+      FileUtils.mkdir_p(File.dirname(path))
+      IO.write(path, content)
+      Lono::Yamler::Validator.new(path).validate!
+      Lono::Yamler::Loader.new(content).load
+    end
+  end
+end

data/lib/lono/configset/{loader/dsl.rb → strategy/erb/helpers.rb}

@@ -1,5 +1,5 @@
-class Lono::Configset::Loader
-  module Dsl
+class Lono::Configset::Strategy::Erb
+  module Helpers
     def indent(text, indentation_amount)
       text.split("\n").map do |line|
         " " * indentation_amount + line

data/lib/lono/conventions.rb

@@ -12,6 +12,7 @@ module Lono
       blueprint = o[:blueprint] || o[:stack]
       template = o[:template] || blueprint
       param = o[:param] || template || blueprint
+      stack ||= blueprint # fallback for commands that dont take stack name. IE: lono generate
       [stack, blueprint, template, param]
     end
 

data/lib/lono/finder/base.rb

@@ -78,7 +78,7 @@ module Lono::Finder
       table = Text::Table.new
       table.head = ["Name", "Path", "Type"]
 
-      components = find_all
+      components = find_all.sort_by { |jadespec| jadespec.name }
       components.each do |jadespec|
         pretty_path = jadespec.root.sub("#{Lono.root}/", "")
         unless options[:filter_materialized] && jadespec.source_type == "materialized"

data/lib/lono/importer/base.rb

@@ -38,17 +38,6 @@ class Lono::Importer
       path.sub("#{Lono.root}/",'')
     end
 
-    def create_dot_lono(type)
-      dot_lono = "#{Lono.blueprint_root}/.meta"
-      FileUtils.mkdir_p(dot_lono)
-      config = {
-        "blueprint_name" => @blueprint,
-        "template_type" => "#{type}",
-      }
-      text = YAML.dump(config)
-      IO.write("#{dot_lono}/config.yml", text)
-    end
-
     def blueprint_name
       return @options[:name] if @options[:name]
       # Else infer name from the original source.

data/lib/lono/jade.rb

@@ -7,7 +7,7 @@ module Lono
     class_attribute :downloaded
     self.downloaded = []
 
-    delegate :template_type, :auto_camelize, :source_type, to: :jadespec
+    delegate :source_type, to: :jadespec
 
     attr_accessor :dependencies, :from, :depends_ons
     attr_reader :name, :type, :registry, :jadespec

data/lib/lono/jadespec.rb

@@ -25,16 +25,27 @@ module Lono
       Dir.glob("#{@root}/*.gemspec").first
     end
 
-    def template_type
-      metadata[:template_type] || "dsl"
+    def lono_type
+      metadata["lono_type"] || detect_type
     end
 
+    def detect_type
+      configset = Dir.glob("#{@root}/lib/configset.*").size > 0
+      configset ? "configset" : "blueprint"
+    end
+
+    def lono_strategy
+      return metadata["lono_strategy"] if metadata["lono_strategy"]
+      lono_type == "blueprint" ? "dsl" : "erb" # TODO: default to dsl for configset also in next major release
+    end
+
+    # backward-compatiable for now
     def auto_camelize
-      metadata[:auto_camelize] || false
+      metadata["lono_auto_camelize"] || false
     end
 
     def metadata
-      gemspec.metadata.deep_symbolize_keys
+      gemspec.metadata || {}
     end
     memoize :metadata
   end

data/lib/lono/{config_location.rb → layering.rb}

@@ -1,5 +1,5 @@
 module Lono
-  class ConfigLocation < AbstractBase
+  class Layering < AbstractBase
     extend Memoist
 
     def initialize(config, options={}, env=Lono.env, root=Lono.root)
@@ -9,61 +9,45 @@ module Lono
       @requested = determine_requested
     end
 
-    def lookup
-      levels = []
-      levels += direct_levels
-      # Standard lookup paths
-      template_level = "#{@root}/configs/#{@blueprint}/#{@config}/#{@env}/#{@template}/#{@requested}"
-      env_level = "#{@root}/configs/#{@blueprint}/#{@config}/#{@env}/#{@requested}"
-      config_level = "#{@root}/configs/#{@blueprint}/#{@config}/#{@requested}"
-      generic_env = "#{@root}/configs/#{@blueprint}/#{@config}/#{@env}"
-      levels += [template_level, env_level, config_level, generic_env]
-
-      print_levels(levels)
-
-      found = levels.find do |level|
-        requested_file(level)
-      end
-      if found
-        file = requested_file(found)
-        using_message(file, @env)
-        file
-      end
-    end
-
-    def direct_levels
-      [
-        @requested, # IE: absolute full path
-        "#{@root}/#{@requested}", # IE : relative path within lono project
-      ]
+    def locations
+      paths = always + requested
+      layers = paths.map do |path|
+        requested_file(path)
+      end.compact
+      print_layers(layers)
+      layers
     end
 
-    def lookup_base
+    def always
       base = "#{@root}/configs/#{@blueprint}/#{@config}/base"
-      file = requested_file(base)
-      if file
-        using_message(file, "base")
-        file
-      end
+      env = "#{@root}/configs/#{@blueprint}/#{@config}/#{@env}"
+      [base, env]
     end
 
-    def print_levels(levels)
-      return unless ENV["LONO_DEBUG_CONFIG"]
-      puts "levels #{@config}:"
-      pp levels
+    def requested
+      standard_layers + direct_layers
     end
 
-    @@using_message_displayed = {}
-    def using_message(file, type)
-      return if @@using_message_displayed[file]
-
-      pretty_file = file.sub("#{Lono.root}/", "")
-      puts "Using #{@config} for #{type}: #{pretty_file}"
+    def standard_layers
+      config_level = "#{@root}/configs/#{@blueprint}/#{@config}/#{@requested}"
+      env_level = "#{@root}/configs/#{@blueprint}/#{@config}/#{@env}/#{@requested}"
+      template_level = "#{@root}/configs/#{@blueprint}/#{@config}/#{@env}/#{@template}/#{@requested}"
+      [config_level, env_level, template_level]
+    end
 
-      @@using_message_displayed[file] = true
+    def direct_layers
+      if @requested.starts_with?('/')
+        [@requested] # IE: absolute full path
+      else
+        ["#{@root}/#{@requested}"] # IE : relative path within lono project]
+      end
     end
 
-    # Some switching logic between variable and param below
+    def print_layers(layers)
+      return unless ENV["LONO_DEBUG_LAYERING"]
+      puts "layers #{@config}:"
+      pp layers
+    end
 
     def determine_requested
       # param is usually set from the convention. when set from convention stack name takes higher precedence

data/lib/lono/opts.rb

@@ -32,6 +32,8 @@ module Lono
     def template
       with_cli_scope do
         option :template, desc: "override convention and specify the template file to use"
+        option :param, desc: "override convention and specify the param file to use"
+        option :variable, desc: "override convention and specify the variable file to use"
       end
     end
 

data/lib/lono/param/generator.rb

@@ -5,27 +5,22 @@ class Lono::Param
     def generate
       puts "Generating parameter files for blueprint #{@blueprint.color(:green)}:"
 
-      @base_path, @env_path = config_locations
-
-      return {} unless @base_path || @env_path
-
-      # useful option for lono cfn, since some templates dont require params
-      return {} if @options[:allow_not_exists] && !params_exist?
-
-      if params_exist?
-        contents = process_erb
-        data = convert_to_cfn_format(contents)
-        camel_data = convert_to_cfn_format(contents, :camel)
-        json = JSON.pretty_generate(camel_data)
-        write_output(json)
-        unless @options[:mute]
-          short_output_path = output_path.sub("#{Lono.root}/","")
-          puts "  #{short_output_path}"
-        end
-      else
-        puts "#{@base_path} or #{@env_path} could not be found?  Are you sure it exist?"
-        exit 1
+      contents = []
+      layering = Lono::Layering.new("params", @options, Lono.env)
+      layering.locations.each do |path|
+        contents << render_erb(path)
       end
+      contents = contents.compact.join("\n") # result
+
+      data = convert_to_cfn_format(contents)
+      camel_data = convert_to_cfn_format(contents, :camel)
+      json = JSON.pretty_generate(camel_data)
+      write_output(json)
+      unless @options[:mute]
+        short_output_path = output_path.sub("#{Lono.root}/","")
+        puts "  #{short_output_path}"
+      end
+
       data
     end
 
@@ -33,66 +28,6 @@ class Lono::Param
       generate
     end
 
-    def config_locations
-      @base_path = lookup_config_location("base")
-      @env_path = lookup_config_location(Lono.env)
-
-      if ENV['LONO_DEBUG_PARAM']
-        puts "LONO_DEBUG_PARAM enabled"
-        puts "  @base_path #{@base_path.inspect}"
-        puts "  @env_path #{@env_path.inspect}"
-      end
-
-      [@base_path, @env_path]
-    end
-
-    def lookup_config_location(env)
-      location = Lono::ConfigLocation.new("params", @options, env)
-      env == "base" ? location.lookup_base : location.lookup
-    end
-
-    def puts_param_message(type)
-      path = send("#{type}_path")
-      return unless path
-      if param_file?(path)
-        pretty_path = path.sub("#{Lono.root}/",'')
-        puts "Using param for #{type}: #{pretty_path}".color(:yellow)
-      end
-    end
-
-    # Checks both base and source path for existing of the param file.
-    # Example:
-    #   params/base/mystack.txt - base path
-    #   params/production/mystack.txt - source path
-    def params_exist?
-      @base_path && File.exist?(@base_path) ||
-      @env_path && File.exist?(@env_path)
-    end
-
-    # Reads both the base source and env source and overlay the two
-    # Example 1:
-    #   params/base/mystack.txt - base path
-    #   params/production/mystack.txt - env path
-    #
-    #   the base/mystack.txt gets combined with the prod/mystack.txt
-    #   it produces a final prod/mystack.txt
-    #
-    # Example 2:
-    #   params/base/mystack.txt - base path
-    #
-    #   the base/mystack.txt is used to produced a prod/mystack.txt
-    #
-    # Example 3:
-    #   params/production/mystack.txt - env path
-    #
-    #   the prod/mystack.txt is used to produced a prod/mystack.txt
-    def process_erb
-      contents = []
-      contents << render_erb(@base_path)
-      contents << render_erb(@env_path)
-      contents.compact.join("\n") # result
-    end
-
     def render_erb(path)
       return unless path
       if File.exist?(path)
@@ -106,17 +41,6 @@ class Lono::Param
       @context ||= Lono::Template::Context.new(@options)
     end
 
-    def parse_contents(contents)
-      lines = contents.split("\n")
-      # remove comment at the end of the line
-      lines.map! { |l| l.sub(/#.*/,'').strip }
-      # filter out commented lines
-      lines = lines.reject { |l| l =~ /(^|\s)#/i }
-      # filter out empty lines
-      lines = lines.reject { |l| l.strip.empty? }
-      lines
-    end
-
     def convert_to_cfn_format(contents, casing=:underscore)
       lines = parse_contents(contents)
 
@@ -151,6 +75,17 @@ class Lono::Param
       params
     end
 
+    def parse_contents(contents)
+      lines = contents.split("\n")
+      # remove comment at the end of the line
+      lines.map! { |l| l.sub(/#.*/,'').strip }
+      # filter out commented lines
+      lines = lines.reject { |l| l =~ /(^|\s)#/i }
+      # filter out empty lines
+      lines = lines.reject { |l| l.strip.empty? }
+      lines
+    end
+
     def remove_surrounding_quotes(s)
       if s =~ /^"/ && s =~ /"$/
         s.sub(/^["]/, '').gsub(/["]$/,'') # remove surrounding double quotes
@@ -162,14 +97,7 @@ class Lono::Param
     end
 
     def output_path
-      output = Lono.config.output_path.sub("#{Lono.root}/","")
-      path = if @base_path && !@env_path
-               # Handle case when base config exist but the env config does not
-               @base_path.sub("configs", output).sub("base", Lono.env)
-             else
-               @env_path.sub("configs", output)
-             end
-      path.sub(/\.txt$/,'.json')
+      "#{Lono.root}/output/#{@blueprint}/params/#{@stack}.json"
     end
 
     def write_output(json)

data/lib/lono/sets/instances/sync.rb

@@ -141,12 +141,15 @@ class Lono::Sets::Instances
 
     def lookup(config_type)
       config_type = config_type.to_s
-      base_path = lookup_config_location(config_type, "base")
-      env_path = lookup_config_location(config_type, Lono.env)
-      items = load_config(base_path)
-      items += load_config(env_path)
+
+      items = []
+      layering = Lono::Layering.new(config_type, @options, Lono.env)
+      layering.locations.each do |path|
+        items += load_config(path)
+      end
       items = items.sort.uniq
-      if config_type == :accounts
+
+      if config_type == "accounts"
         @accounts = items
       else
         @regions = items
@@ -166,11 +169,6 @@ class Lono::Sets::Instances
       items
     end
 
-    def lookup_config_location(config_type, env)
-      location = Lono::ConfigLocation.new(config_type, @options, env)
-      env == "base" ? location.lookup_base : location.lookup
-    end
-
     def validate!
       invalid = regions.blank? || accounts.blank?
       if invalid

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

@@ -11,9 +11,10 @@ class Lono::Template::Context
       options = ActiveSupport::HashWithIndifferentAccess.new(@options.dup)
       options[:blueprint] = @blueprint
       options[:stack] ||= @blueprint
-      location = Lono::ConfigLocation.new("variables", options, Lono.env)
-      evaluate_variables_file(location.lookup_base) if location.lookup_base
-      evaluate_variables_file(location.lookup) if location.lookup # config file
+      layering = Lono::Layering.new("variables", options, Lono.env)
+      layering.locations.each do |path|
+        evaluate_variables_file(path)
+      end
     end
 
     # Load the variables defined in config/variables/* to make available in lono scope.
@@ -27,9 +28,9 @@ class Lono::Template::Context
 
     # 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
+      Dir.glob("#{Lono.config.helpers_path}/**/*.rb").each do |path|
+        filename = path.sub("#{Lono.config.helpers_path}/",'').sub('.rb','')
+        module_name = filename.camelize
 
         # Prepend a period so require works LONO_ROOT is set to a relative path
         # without a period.

data/lib/lono/template/generator.rb

@@ -4,9 +4,9 @@ class Lono::Template
   class Generator < Lono::AbstractBase
     def run
       # Examples:
-      #   Erb.new(b, options.dup).run
-      #   Dsl.new(b, options.dup).run
-      generator_class = "Lono::Template::Strategy::#{template_type.camelize}"
+      #   Erb.new(options).run
+      #   Dsl.new(options).run
+      generator_class = "Lono::Template::Strategy::#{lono_strategy.camelize}"
       generator_class = Object.const_get(generator_class)
       generator_class.new(@options).run
       # The generator strategy class writes template to disk. The inject_configsets reads it back from disk.
@@ -14,12 +14,12 @@ class Lono::Template
       inject_configsets
     end
 
-    def template_type
+    def lono_strategy
       if @options[:source]
         "source"
       else
-        jadespec = Lono::Jadespec.new(Lono.blueprint_root, "unknown") # abusing Jadespec to get template_type
-        jadespec.template_type
+        jadespec = Lono::Jadespec.new(Lono.blueprint_root, "unknown") # abusing Jadespec to get lono_strategy
+        jadespec.lono_strategy
       end
     end
 

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "7.0.5"
+  VERSION = "7.1.0"
 end

data/lib/templates/blueprint/%blueprint_name%.gemspec.tt

@@ -10,11 +10,16 @@ Gem::Specification.new do |spec|
   spec.summary       = "Write a short summary because it's required."  # TODO: Change me
   spec.description   = "Write a longer description or delete this line."  # TODO: Change me
   spec.homepage      = "<%= ENV['LONO_ORG'] || "https://github.com/USER" %>/<%= blueprint_name %>"
-  spec.license       = "<%= ENV['LONO_LICENSE'] || 'MIT' %>"
+  spec.license       = "<%= ENV['LONO_LICENSE'] || '' %>"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
+    spec.metadata["lono_type"] = "blueprint"
+  <% if @options[:type] != "dsl" %>
+    spec.metadata["lono_strategy"] = "erb"
+  <% end %>
+
     spec.metadata["allowed_push_host"] = "<%= ENV['LONO_ALLOWED_PUSH_HOST'] || "TODO: Set to 'http://mygemserver.com'"%>"
 
     spec.metadata["homepage_uri"] = spec.homepage
@@ -41,7 +46,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-<% if @options[:type] != "dsl" %>
-  spec.metadata = {"template_type" => "erb"}
-<% end %>
 end

data/lib/templates/configset/%configset_name%.gemspec.tt

@@ -7,11 +7,13 @@ Gem::Specification.new do |spec|
   spec.summary       = "Write a short summary because it's required."  # TODO: Change me
   spec.description   = "Write a longer description or delete this line."  # TODO: Change me
   spec.homepage      = "<%= ENV['LONO_ORG'] || "https://github.com/USER" %>/<%= configset_name %>"
-  spec.license       = "<%= ENV['LONO_LICENSE'] || 'MIT' %>"
+  spec.license       = "<%= ENV['LONO_LICENSE'] || '' %>"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
+    spec.metadata["lono_type"] = "configset"
+    spec.metadata["lono_strategy"] = "dsl"
     spec.metadata["allowed_push_host"] = "<%= ENV['LONO_ALLOWED_PUSH_HOST'] || "TODO: Set to 'http://mygemserver.com'"%>"
 
     spec.metadata["homepage_uri"] = spec.homepage

data/lib/templates/configset/.gitignore

@@ -9,3 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
+Gemfile.lock

data/lib/templates/configset/lib/configset.rb

@@ -0,0 +1,16 @@
+configset("config1") do
+  command("test",
+    command: 'echo "$CFNTEST" > test1.txt',
+    env: {
+      CFNTEST: "I come from config1"
+    }
+  )
+end
+configset("config2") do
+  command("test",
+    command: 'echo "$CFNTEST" > test2.txt',
+    env: {
+      CFNTEST: "I come from config2"
+    }
+  )
+end

data/lono.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "aws-sdk-iam" # lono seed
   gem.add_dependency "aws-sdk-s3"
   gem.add_dependency "aws-sdk-ssm"
+  gem.add_dependency "bundler", "~> 2"
   gem.add_dependency "cfn_camelizer"
   gem.add_dependency "filesize"
   gem.add_dependency "graph" # lono xgraph command dependency

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 7.0.5
+  version: 7.1.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: cfn_camelizer
   requirement: !ruby/object:Gem::Requirement
@@ -460,13 +474,11 @@ files:
 - lib/lono/completer/script.rb
 - lib/lono/completer/script.sh
 - lib/lono/completion.rb
-- lib/lono/config_location.rb
 - lib/lono/configset.rb
 - lib/lono/configset/combiner.rb
 - lib/lono/configset/evaluate_file.rb
+- lib/lono/configset/generator.rb
 - lib/lono/configset/list.rb
-- lib/lono/configset/loader.rb
-- lib/lono/configset/loader/dsl.rb
 - lib/lono/configset/materializer/final.rb
 - lib/lono/configset/materializer/gems_builder.rb
 - lib/lono/configset/materializer/jade.rb
@@ -481,6 +493,12 @@ files:
 - lib/lono/configset/register/project.rb
 - lib/lono/configset/registry.rb
 - lib/lono/configset/resolver.rb
+- lib/lono/configset/strategy/base.rb
+- lib/lono/configset/strategy/dsl.rb
+- lib/lono/configset/strategy/dsl/helpers.rb
+- lib/lono/configset/strategy/dsl/syntax.rb
+- lib/lono/configset/strategy/erb.rb
+- lib/lono/configset/strategy/erb/helpers.rb
 - lib/lono/conventions.rb
 - lib/lono/core.rb
 - lib/lono/core/config.rb
@@ -545,6 +563,7 @@ files:
 - lib/lono/jade.rb
 - lib/lono/jade/circular.rb
 - lib/lono/jadespec.rb
+- lib/lono/layering.rb
 - lib/lono/md5.rb
 - lib/lono/new.rb
 - lib/lono/new/helper.rb
@@ -668,7 +687,7 @@ files:
 - lib/templates/configset/Gemfile
 - lib/templates/configset/README.md.tt
 - lib/templates/configset/Rakefile.tt
-- lib/templates/configset/lib/configset.yml
+- lib/templates/configset/lib/configset.rb
 - lib/templates/skeleton/.gitignore
 - lib/templates/skeleton/Gemfile
 - lib/templates/skeleton/README.md

data/lib/lono/configset/loader.rb

@@ -1,98 +0,0 @@
-require "json"
-
-class Lono::Configset
-  class Loader
-    extend Memoist
-    include Dsl
-    include EvaluateFile
-
-    def initialize(registry={}, options={})
-      @registry, @options = registry, options
-      @name, @resource = registry.name, registry.resource
-      @blueprint = Lono::Conventions.new(options).blueprint
-    end
-
-    def metdata_configset
-      load
-    end
-
-    def load
-      path = find_path
-      copy_instance_variables
-      content = RenderMePretty.result(path, context: self)
-      if File.extname(path) == ".yml"
-        load_yaml(content)
-      else
-        JSON.load(content)
-      end
-    end
-    memoize :load
-
-    def load_yaml(content)
-      # Write to file so can use Yamler::Validator
-      path = "/tmp/lono/configset.yml"
-      FileUtils.mkdir_p(File.dirname(path))
-      IO.write(path, content)
-      Lono::Yamler::Validator.new(path).validate!
-      Lono::Yamler::Loader.new(content).load
-    end
-
-    def find_path
-      paths = %w[configset.yml configset.json].map { |p| "#{configset_root}/lib/#{p}" }
-      paths.find { |p| File.exist?(p) }
-    end
-
-    def configset_root
-      config = finder_class.find(@name)
-      unless config
-        puts "finder_class #{finder_class}"
-        raise "Unable to find configset #{@name.inspect}"
-      end
-      config.root
-    end
-
-    # Allow overriding in subclasses
-    def finder_class
-      Lono::Finder::Configset
-    end
-
-    def copy_instance_variables
-      load_blueprint_predefined_variables
-      load_project_predefined_variables
-      load_inline_project_variables
-    end
-
-    def load_blueprint_predefined_variables
-      path = "#{configset_root}/lib/variables.rb"
-      evaluate_file(path)
-    end
-
-    def load_project_predefined_variables
-      paths = [
-        "#{Lono.root}/configs/#{@blueprint}/configsets/variables.rb", # global
-        "#{Lono.root}/configs/#{@blueprint}/configsets/#{@name}/variables.rb", # configset specific
-      ]
-      paths.each do |path|
-        evaluate_file(path)
-      end
-    end
-
-    # Copy options from the original configset call as instance variables so its available. So:
-    #
-    #   configset("ssm", resource: "Instance", some_var: "test")
-    #
-    # Stores in the Configset::Registry
-    #
-    #   register = {name: "ssm", resource: "Instance", some_var: "test"}
-    #
-    # That has is passed into Loader.new(register, options)
-    #
-    # So these @registry varibles are copied over to instance variables.
-    #
-    def load_inline_project_variables
-      @registry.vars.each do |k,v|
-        instance_variable_set("@#{k}", v)
-      end
-    end
-  end
-end

data/lib/templates/configset/lib/configset.yml

@@ -1,20 +0,0 @@
----
-AWS::CloudFormation::Init:
-  configSets:
-    default:
-    - config1
-    - config2
-  config1:
-    commands:
-      test:
-        command: echo "$CFNTEST" > test.txt
-        env:
-          CFNTEST: I come from config1.
-        cwd: "~"
-  config2:
-    commands:
-      test:
-        command: echo "$CFNTEST" > test.txt
-        env:
-          CFNTEST: I come from config2
-        cwd: "~"