lono 3.4.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f97451bcb37fa800508e0130643bf8c4a200c4aa317bde4ea2a6f1b431b189d2
-  data.tar.gz: b157b16d9fef5381e4418ab5d80766d38338ccde2138461b0e9ec23d9a1870d9
+  metadata.gz: ea871b8860abb2c1fbfc39edeae04a90c43f46780dd8fd4c37a1b97ca6480370
+  data.tar.gz: d52b9f70968c615adb50d16b3c84327b2300123b049a48abfa3affd2e5d6699a
 SHA512:
-  metadata.gz: 219ff3616088cbc83f8d44f3b69c614fcb9419c5347d18715c890d5e6e369de85b5058757ba613287a9fd15ab8d73c8d26514e2d21a58d4e5482bcf25c6eb539
-  data.tar.gz: fb44035e6c219ce539ca23308491bf7097289c320b17eaadb8ef0cb068a7cb6ab228a3864941fb165d7f939484bebbfaddae3499ba8756c75665ce8f819cd53f
+  metadata.gz: 93bff1d68869ca94ba8ddc8014ceef8f403962d3f0f04261a6461c76e5e354fd2780e8c50e0a1cdcdb458ef5820ee2683014249a163b4d13e7a3f2e4afe0483b
+  data.tar.gz: cf812cbf0e9eb23190ddeb615d5d7471bcd19ea31b1094e80ec642ac3b04fa15a2123c8cf43431cf1e8331d41ae3b34e4bbd665167d7fbced8a22c4717a76526

data/.circleci/config.yml

@@ -28,7 +28,7 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "Gemfile.lock" }}
+          - v1-dependencies-{{ checksum "Gemfile" }}
           # fallback to using the latest cache if no exact match is found
           - v1-dependencies-
 
@@ -40,21 +40,13 @@ jobs:
       - save_cache:
           paths:
             - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
+          key: v1-dependencies-{{ checksum "Gemfile" }}
 
       # run tests!
       - run:
           name: run tests
           command: |
             mkdir /tmp/test-results
-
-            cat >.rspec <<EOL
-            --format documentation
-            --exclude-pattern spec/fixtures/apps/**/*
-            --format RspecJunitFormatter \
-            --out /tmp/test-results/rspec.xml
-            EOL
-
             bundle exec rspec
 
       # collect reports

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 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.
 
+## [3.5.0]
+- Using Lono.root instead of scattered project_root parameters
+- prefer use of Lono.env over LONO_ENV internally
+- do not remove blank lines from the generated template, it makes user-data scripts harder to read
+- remove adding of extra line to partials, causing issues with user data partials
+
 ## [3.4.1]
 - docs for lono settings
 

data/lib/lono.rb

@@ -27,6 +27,9 @@ module Lono
   autoload :Importer, 'lono/importer'
   autoload :Inspector, 'lono/inspector'
   autoload :CurrentRegion, 'lono/current_region'
+  autoload :Core, 'lono/core'
+
+  extend Core
 end
 
-Lono::Env.setup!
+Lono.setup!

data/lib/lono/cfn.rb

@@ -15,7 +15,6 @@ class Lono::Cfn < Lono::Command
 
   class_option :verbose, type: :boolean
   class_option :noop, type: :boolean
-  class_option :project_root, desc: "Project folder.  Defaults to current directory", default: "."
   class_option :region, desc: "AWS region"
 
   # common to create and update

data/lib/lono/cfn/base.rb

@@ -9,8 +9,7 @@ class Lono::Cfn::Base
     @randomize_stack_name = options[:randomize_stack_name]
     @stack_name = randomize(stack_name)
     @options = options
-    @project_root = options[:project_root] || '.'
-    Lono::ProjectChecker.check(@project_root) unless options[:lono] # already ran checker in lono generate
+    Lono::ProjectChecker.check unless options[:lono] # already ran checker in lono generate
 
     @template_name = options[:template] || derandomize(@stack_name)
     @param_name = options[:param] || @template_name
@@ -61,26 +60,19 @@ class Lono::Cfn::Base
   end
 
   def generate_templates
-    Lono::Template::DSL.new(
-      project_root: @project_root,
-      pretty: true
-    ).run
+    Lono::Template::DSL.new(pretty: true).run
   end
 
   def upload_templates
     # only upload templates if s3.path configured in settings
-    settings = Lono::Settings.new(@project_root)
+    settings = Lono::Settings.new
     return unless settings.s3_path
 
-    Lono::Template::Upload.new(
-      project_root: @project_root,
-      pretty: true
-    ).run
+    Lono::Template::Upload.new(pretty: true).run
   end
 
   def generate_params(options={})
     generator_options = {
-      project_root: @project_root,
       path: @param_path,
       allow_no_file: true
     }.merge(options)
@@ -111,7 +103,7 @@ class Lono::Cfn::Base
     #   @param_path = params/prod/ecs.txt
     #              => output/params/prod/ecs.json
     output_param_path = @param_path.sub(/\.txt/, '.json')
-    output_param_path = "#{@project_root}/output/#{output_param_path}"
+    output_param_path = "#{Lono.root}/output/#{output_param_path}"
     if @options[:param] && !File.exist?(output_param_path)
       warns << "Parameters file missing: could not find #{output_param_path}"
     end
@@ -136,9 +128,9 @@ class Lono::Cfn::Base
     path = case type
     when :template
       format = detect_format
-      "#{@project_root}/output/#{name}.#{format}"
+      "#{Lono.root}/output/#{name}.#{format}"
     when :param
-      "#{@project_root}/params/#{LONO_ENV}/#{name}.txt"
+      "#{Lono.root}/params/#{Lono.env}/#{name}.txt"
     else
       raise "hell: dont come here"
     end
@@ -147,7 +139,7 @@ class Lono::Cfn::Base
 
   # Returns String with value of "yml" or "json".
   def detect_format
-    formats = Dir.glob("#{@project_root}/templates/**/*").
+    formats = Dir.glob("#{Lono.root}/templates/**/*").
                 map { |path| path.sub(/\.erb$/, '') }.
                 map { |path| File.extname(path) }.
                 reject { |s| s.empty? }. # reject ""
@@ -210,7 +202,7 @@ class Lono::Cfn::Base
     end
 
     # otherwise use the settings preference
-    settings = Lono::Settings.new(@project_root)
+    settings = Lono::Settings.new
     settings.data['randomize_stack_name']
   end
 

data/lib/lono/cfn/delete.rb

@@ -5,7 +5,6 @@ class Lono::Cfn::Delete
   def initialize(stack_name, options={})
     @stack_name = stack_name
     @options = options
-    @project_root = options[:project_root] || '.'
   end
 
   def run

data/lib/lono/clean.rb

@@ -4,12 +4,11 @@ class Lono::Clean
   attr_reader :options
   def initialize(options)
     @options = options
-    @project_root = options[:project_root] || '.'
   end
 
   def run
     puts "Cleaning up"
     puts "Removing output/ folder"
-    FileUtils.rm_rf("#{@project_root}/output")
+    FileUtils.rm_rf("#{Lono.root}/output")
   end
 end

data/lib/lono/cli.rb

@@ -17,7 +17,6 @@ module Lono
     desc "import [SOURCE]", "Imports raw CloudFormation template and lono-fies it"
     long_desc Help.import
     option :format, type: :string, default: "yaml", desc: "format for the final template"
-    option :project_root, default: ".", aliases: "-r", desc: "project root"
     option :casing, default: "underscore", desc: "camelcase or underscore the template name"
     option :name, default: nil, desc: "final name of downloaded template without extension"
     def import(source)
@@ -27,7 +26,6 @@ module Lono
     desc "generate", "Generate both CloudFormation templates and parameters files"
     Help.generate
     option :clean, type: :boolean, aliases: "-c", desc: "remove all output files before generating"
-    option :project_root, default: ".", aliases: "-r", desc: "project root"
     option :quiet, type: :boolean, aliases: "-q", desc: "silence the output"
     option :pretty, type: :boolean, default: true, desc: "json pretty the output.  only applies with json format"
     def generate

data/lib/lono/core.rb

@@ -0,0 +1,24 @@
+require 'pathname'
+
+module Lono
+  module Core
+    def env
+      LONO_ENV
+    end
+
+    def root
+      path = ENV['LONO_ROOT'] || '.'
+      Pathname.new(path)
+    end
+
+    def setup!
+      settings = Lono::Settings.new.data
+      map = settings['aws_profile_lono_env_map']
+
+      lono_env = map[ENV['AWS_PROFILE']] || map['default'] || 'prod' # defaults to prod
+      lono_env = ENV['LONO_ENV'] if ENV['LONO_ENV'] # highest precedence
+
+      Kernel.const_set(:LONO_ENV, lono_env)
+    end
+  end
+end

data/lib/lono/importer.rb

@@ -8,7 +8,6 @@ class Lono::Importer
     @source = source
     @options = options
     @format = normalize_format(@options[:format])
-    @project_root = options[:project_root] || '.'
   end
 
   def run
@@ -39,7 +38,7 @@ class Lono::Importer
 
   # Add template definition to config/templates/base/stacks.rb.
   def add_template_definition
-    path = "#{@project_root}/config/templates/base/stacks.rb"
+    path = "#{Lono.root}/config/templates/base/stacks.rb"
     lines = File.exist?(path) ? IO.readlines(path) : []
     new_template_definition = %Q|template "#{template_name}"|
     unless lines.detect { |l| l.include?(new_template_definition) }
@@ -74,12 +73,12 @@ class Lono::Importer
   end
 
   def params_path
-    "#{@project_root}/params/base/#{template_name}.txt"
+    "#{Lono.root}/params/base/#{template_name}.txt"
   end
 
 
   def template_path
-    "#{@project_root}/templates/#{template_name}.#{@format}"
+    "#{Lono.root}/templates/#{template_name}.#{@format}"
   end
 
   def template_name
@@ -104,7 +103,7 @@ private
 
   def template_data
     return @template_data if @template_data
-    template_path = "#{@project_root}/templates/#{template_name}.#{@format}"
+    template_path = "#{Lono.root}/templates/#{template_name}.#{@format}"
     @template_data = YAML.load(IO.read(template_path))
   end
 

data/lib/lono/inspector.rb

@@ -8,7 +8,6 @@ class Lono::Inspector < Lono::Command
 
   class_option :verbose, type: :boolean
   class_option :noop, type: :boolean
-  class_option :project_root, desc: "Project folder.  Defaults to current directory", default: "."
 
   desc "depends STACK", "Prints dependencies tree of CloudFormation template resources"
   long_desc Help.depends

data/lib/lono/inspector/base.rb

@@ -2,7 +2,6 @@ class Lono::Inspector::Base
   def initialize(stack_name, options)
     @stack_name = stack_name
     @options = options
-    @project_root = options[:project_root] || '.'
   end
 
   def generate_templates
@@ -16,7 +15,7 @@ class Lono::Inspector::Base
 
   def data
     return @data if @data
-    template_path = "#{@project_root}/output/#{@stack_name}.yml"
+    template_path = "#{Lono.root}/output/#{@stack_name}.yml"
     check_template_exists(template_path)
     @data = YAML.load(IO.read(template_path))
   end

data/lib/lono/param.rb

@@ -7,7 +7,6 @@ class Lono::Param < Lono::Command
   class_option :verbose, type: :boolean
   class_option :noop, type: :boolean
   class_option :mute, type: :boolean
-  class_option :project_root, desc: "project root to use", default: '.'
 
   desc "generate", "generate all parameter files to json format"
   long_desc Help.generate

data/lib/lono/param/generator.rb

@@ -3,9 +3,8 @@ class Lono::Param::Generator
 
   def self.generate_all(options)
     puts "Generating params files"
-    project_root = options[:project_root] || '.'
 
-    params = param_names(project_root, "base") + param_names(project_root, LONO_ENV)
+    params = param_names("base") + param_names(Lono.env)
     params.uniq.each do |name|
       param = Lono::Param::Generator.new(name, options)
       param.generate
@@ -18,19 +17,18 @@ class Lono::Param::Generator
   #   params/base/a.txt params/base/b.txt params/base/c.txt
   # Returns:
   #   param_names("base") => ["a", "b", "c"]
-  def self.param_names(project_root, folder)
-    base_folder = "#{project_root}/params/#{folder}" # Example: "./params/base"
+  def self.param_names(folder)
+    base_folder = "#{Lono.root}/params/#{folder}" # Example: "./params/base"
     Dir.glob("#{base_folder}/**/*.txt").map do |path|
       path.sub("#{base_folder}/", '').sub('.txt','')
     end
   end
 
   def initialize(name, options)
-    @_name = "#{LONO_ENV}/#{name}"
+    @_name = "#{Lono.env}/#{name}"
     @_options = options
-    @_project_root = options[:project_root] || '.'
-    @_env_path = options[:path] || "#{@_project_root}/params/#{@_name}.txt"
-    @_base_path = @_env_path.sub("/#{LONO_ENV}/", "/base/")
+    @_env_path = options[:path] || "#{Lono.root}/params/#{@_name}.txt"
+    @_base_path = @_env_path.sub("/#{Lono.env}/", "/base/")
   end
 
   def generate
@@ -44,7 +42,7 @@ class Lono::Param::Generator
       write_output(json)
       # Example: @_name = stag/ecs/private
       #          pretty_name = ecs/private
-      pretty_name = @_name.sub("#{LONO_ENV}/", '')
+      pretty_name = @_name.sub("#{Lono.env}/", '')
       puts "Params file generated for #{pretty_name} at #{output_path}" unless @_options[:mute]
     else
       puts "#{@_base_path} or #{@_env_path} could not be found?  Are you sure it exist?"
@@ -179,7 +177,7 @@ class Lono::Param::Generator
   end
 
   def output_path
-    "#{@_project_root}/output/params/#{@_name}.json".sub(/\.\//,'')
+    "#{Lono.root}/output/params/#{@_name}.json".sub(/\.\//,'')
   end
 
   def write_output(json)
@@ -191,7 +189,7 @@ class Lono::Param::Generator
 
   def load_variables
     load_variables_folder("base")
-    load_variables_folder(LONO_ENV)
+    load_variables_folder(Lono.env)
   end
 
   # Load the variables defined in config/variables/* to make available the params/*.txt files
@@ -205,7 +203,7 @@ class Lono::Param::Generator
   #     AmiId=<%= @ami %>
   #
   def load_variables_folder(folder)
-    paths = Dir.glob("#{@_project_root}/config/variables/#{folder}/**/*")
+    paths = Dir.glob("#{Lono.root}/config/variables/#{folder}/**/*")
     paths.select{ |e| File.file? e }.each do |path|
       instance_eval(IO.read(path))
     end

data/lib/lono/project_checker.rb

@@ -1,12 +1,8 @@
 class Lono::ProjectChecker
     # Checks to see command is running in a lono project.
   # If not, provide a friendly message and exit.
-  def self.check(project_root)
-    new(project_root).check
-  end
-
-  def initialize(project_root)
-    @project_root = project_root
+  def self.check
+    new.check
   end
 
   def check
@@ -16,26 +12,34 @@ class Lono::ProjectChecker
   end
 
   def config_folder_exist
-    unless File.exist?("#{@project_root}/config")
+    unless File.exist?("#{Lono.root}/config")
       puts "The config folder does not exist in this project.  Are you sure this is a lono project?"
-      exit 1
+      quit
     end
   end
 
   def templates_folder_exist
-    unless File.exist?("#{@project_root}/templates")
+    unless File.exist?("#{Lono.root}/templates")
       puts "The templates folder does not exist in this project.  Are you sure this is a lono project?"
-      exit 1
+      quit
     end
   end
 
   def empty_folders
-    if Dir["#{@project_root}/config/**/*.rb"].empty?
+    if Dir["#{Lono.root}/config/**/*.rb"].empty?
       puts "The config folder does not contain any lono template definitions."
-      exit 1
+      quit
     end
-    if Dir["#{@project_root}/templates/**/*"].empty?
+    if Dir["#{Lono.root}/templates/**/*"].empty?
       puts "The templates folder does not contain any lono template definitions."
+      quit
+    end
+  end
+
+  def quit
+    if ENV['TEST'] == '1'
+      raise("Not in lono project")
+    else
       exit 1
     end
   end

data/lib/lono/settings.rb

@@ -1,8 +1,4 @@
 class Lono::Settings
-  def initialize(project_root=nil)
-    @project_root = project_root || '.'
-  end
-
   # The options from the files get merged with the following precedence:
   #
   # current folder - The current folder’s config/settings.yml values take the highest precedence.
@@ -13,7 +9,7 @@ class Lono::Settings
   def data
     return @settings_yaml if @settings_yaml
 
-    project_file = "#{@project_root}/config/settings.yml"
+    project_file = "#{Lono.root}/config/settings.yml"
     project = File.exist?(project_file) ? YAML.load_file(project_file) : {}
 
     user_file = "#{ENV['HOME']}/.lono/settings.yml"
@@ -27,7 +23,7 @@ class Lono::Settings
 
   # Examples:
   #
-  # Using the LONO_ENV
+  # Using the Lono.env
   # s3:
   #   path:
   #     production: s3://infrastructure-prod/cloudformation
@@ -44,6 +40,6 @@ class Lono::Settings
     s3_path = s3['path']
     # s3_path['default'] - key will always exist because of default lono/settings.yml
     #   default value is nil though
-    s3_path[ENV['AWS_PROFILE']] || s3_path[LONO_ENV] || s3_path['default']
+    s3_path[ENV['AWS_PROFILE']] || s3_path[Lono.env] || s3_path['default']
   end
 end

data/lib/lono/template.rb

@@ -16,14 +16,12 @@ class Lono::Template < Lono::Command
   desc "generate", "Generate the CloudFormation templates"
   Help.generate
   option :clean, type: :boolean, aliases: "-c", desc: "remove all output files before generating"
-  option :project_root, default: ".", aliases: "-r", desc: "project root"
   option :pretty, type: :boolean, default: true, desc: "json pretty the output.  only applies with json format"
   def generate
     DSL.new(options.clone).run
   end
 
   desc "upload", "Uploads templates to configured s3 folder"
-  option :project_root, default: ".", aliases: "-r", desc: "project root"
   def upload
     Upload.new(options.clone).run
   end

data/lib/lono/template/dsl.rb

@@ -1,9 +1,8 @@
 class Lono::Template::DSL
   def initialize(options={})
     @options = options
-    @project_root = @options[:project_root] || '.'
-    @config_path = "#{@project_root}/config"
-    Lono::ProjectChecker.check(@project_root)
+    @config_path = "#{Lono.root}/config"
+    Lono::ProjectChecker.check
     @templates = []
     @results = {}
     @detected_format = nil
@@ -16,12 +15,12 @@ class Lono::Template::DSL
   end
 
   # Instance eval's all the files within each folder under
-  #   config/lono/base and config/lono/[LONO_ENV]
-  # Base gets base first and then the LONO_ENV configs get evaluate second.
+  #   config/lono/base and config/lono/[Lono.env]
+  # Base gets base first and then the Lono.env configs get evaluate second.
   # This means the env specific configs override the base configs.
   def evaluate_templates
     evaluate_folder("base")
-    evaluate_folder(LONO_ENV)
+    evaluate_folder(Lono.env)
     @detected_format = detect_format
   end
 
@@ -70,7 +69,7 @@ class Lono::Template::DSL
   # templates files.
   # All the templates must be of the same format, either all json or all yaml.
   def detect_format
-    extensions = Dir.glob("#{@project_root}/templates/**/*").map do |path|
+    extensions = Dir.glob("#{Lono.root}/templates/**/*").map do |path|
       File.extname(path).sub(/^\./,'')
     end.reject(&:empty?).uniq
     extensions.include?('yml') ? 'yml' : 'json' # defaults to yml - falls back to json
@@ -88,7 +87,7 @@ class Lono::Template::DSL
   end
 
   def write_output
-    output_path = "#{@project_root}/output"
+    output_path = "#{Lono.root}/output"
     FileUtils.rm_rf(output_path) if @options[:clean]
     FileUtils.mkdir(output_path) unless File.exist?(output_path)
     puts "Generating CloudFormation templates:" unless @options[:quiet]
@@ -149,12 +148,7 @@ class Lono::Template::DSL
       # This file was generated with lono. Do not edit directly, the changes will be lost.
       # More info: http://lono.cloud
     EOS
-    "#{comment}#{remove_blank_lines(text)}"
-  end
-
-  # ERB templates leaves blank lines around, remove those lines
-  def remove_blank_lines(text)
-    text.split("\n").reject { |l| l.strip == '' }.join("\n") + "\n"
+    "#{comment}#{text}"
   end
 
   def ensure_parent_dir(path)

data/lib/lono/template/helpers.rb

@@ -4,7 +4,7 @@ module Lono::Template::Helpers
     template_path = "#{template_name}.#{format}"
 
     # must have settings.s3_path for this to owrk
-    settings = Lono::Settings.new(@project_root)
+    settings = Lono::Settings.new
     if settings.s3_path
       # high jacking Upload for useful s3_https_url method
       upload = Lono::Template::Upload.new(@_options)
@@ -17,9 +17,8 @@ module Lono::Template::Helpers
   end
 
   def template_params(param_name)
-    param_path = "params/#{LONO_ENV}/#{param_name}.txt"
+    param_path = "params/#{Lono.env}/#{param_name}.txt"
     generator_options = {
-      project_root: @_project_root,
       path: param_path,
       allow_no_file: true
     }.merge(@_options)
@@ -28,8 +27,9 @@ module Lono::Template::Helpers
     generator.params    # Returns Array in underscore keys format
   end
 
+  # Really only useful if using json format
   def user_data(path, vars={})
-    path = "#{@_project_root}/templates/user_data/#{path}"
+    path = "#{Lono.root}/templates/user_data/#{path}"
     template = IO.read(path)
     variables(vars)
     result = erb_result(path, template)
@@ -92,15 +92,7 @@ module Lono::Template::Helpers
     variables(vars)
     result = erb_result(path, template)
     result = indent(result, options[:indent]) if options[:indent]
-    if options[:indent]
-      # Add empty line at beginning because empty lines gets stripped during
-      # processing anyway. This allows the user to call partial without having
-      # to put the partial call at very beginning of the line.
-      # This only should happen if user is using indent option.
-      ["\n", result].join("\n")
-    else
-      result
-    end
+    result
   end
 
   # add indentation
@@ -112,7 +104,7 @@ module Lono::Template::Helpers
 
 private
   def partial_path_for(path)
-    "#{@_project_root}/templates/partial/#{path}"
+    "#{Lono.root}/templates/partial/#{path}"
   end
 
   def auto_add_format(path)

data/lib/lono/template/template.rb

@@ -15,13 +15,12 @@ class Lono::Template::Template
     @_options = options
     @_detected_format = options[:detected_format]
     @_block = block
-    @_project_root = options[:project_root] || '.'
-    @_config_path = "#{@_project_root}/config"
+    @_config_path = "#{Lono.root}/config"
     @_source = default_source(name)
   end
 
   def default_source(name)
-    "#{@_project_root}/templates/#{name}.#{@_detected_format}" # defaults to name, source method overrides
+    "#{Lono.root}/templates/#{name}.#{@_detected_format}" # defaults to name, source method overrides
   end
 
   def build
@@ -34,7 +33,7 @@ class Lono::Template::Template
 
   def load_variables
     load_variables_folder("base")
-    load_variables_folder(LONO_ENV)
+    load_variables_folder(Lono.env)
   end
 
   # Load the variables defined in config/variables/* to make available in the
@@ -62,7 +61,7 @@ class Lono::Template::Template
 
   # Load custom helper methods from the user's infra repo
   def load_custom_helpers
-    Dir.glob("#{@_project_root}/helpers/**/*_helper.rb").each do |path|
+    Dir.glob("#{Lono.root}/helpers/**/*_helper.rb").each do |path|
       filename = path.sub(%r{.*/},'').sub('.rb','')
       module_name = filename.classify
 
@@ -72,7 +71,7 @@ class Lono::Template::Template
   end
 
   def source(path)
-    @_source = path[0..0] == '/' ? path : "#{@_project_root}/templates/#{path}"
+    @_source = path[0..0] == '/' ? path : "#{Lono.root}/templates/#{path}"
     @_source += ".#{@_detected_format}"
   end
 

data/lib/lono/template/upload.rb

@@ -8,7 +8,6 @@ class Lono::Template::Upload
 
   def initialize(options={})
     @options = options
-    @project_root = options[:project_root] || '.'
     @checksums = {}
   end
 
@@ -16,7 +15,7 @@ class Lono::Template::Upload
     ensure_s3_setup!
     load_checksums!
 
-    paths = Dir.glob("#{@project_root}/output/**/*")
+    paths = Dir.glob("#{Lono.root}/output/**/*")
     paths.reject { |p| p =~ %r{output/params} }.
           select { |p| File.file?(p) }.each do |path|
       upload(path)
@@ -36,7 +35,7 @@ class Lono::Template::Upload
   def load_checksums!
     return if @options[:noop]
 
-    prefix = "#{s3_path}/#{LONO_ENV}" # s3://s3-bucket-and-path-from-settings/prod
+    prefix = "#{s3_path}/#{Lono.env}" # s3://s3-bucket-and-path-from-settings/prod
     resp = s3.list_objects(bucket: s3_bucket, prefix: prefix)
     resp.contents.each do |object|
       # key does not include the bucket name
@@ -56,7 +55,7 @@ class Lono::Template::Upload
 
   def upload(path)
     pretty_path = path.sub(/^\.\//, '')
-    key = "#{s3_path}/#{LONO_ENV}/#{pretty_path.sub(/^output\//,'')}"
+    key = "#{s3_path}/#{Lono.env}/#{pretty_path.sub(/^output\//,'')}"
     s3_full_path = "s3://#{s3_bucket}/#{key}"
 
     local_checksum = Digest::MD5.hexdigest(IO.read(path))
@@ -89,25 +88,27 @@ class Lono::Template::Upload
     # first convert the local path to the path format that is stored in @checksums keys
     # ./output/docker.yml => cloudformation-templates/stag/docker.yml
     pretty_path = path.sub(/^\.\//, '')
-    key = "#{s3_path}/#{LONO_ENV}/#{pretty_path.sub(/^output\//,'')}"
+    key = "#{s3_path}/#{Lono.env}/#{pretty_path.sub(/^output\//,'')}"
     @checksums[key]
   end
 
   # https://s3.amazonaws.com/mybucket/cloudformation-templates/prod/parent.yml
   def s3_https_url(template_path)
     ensure_s3_setup!
-    "https://s3.amazonaws.com/#{s3_bucket}/#{s3_path}/#{LONO_ENV}/#{template_path}"
+    "https://s3.amazonaws.com/#{s3_bucket}/#{s3_path}/#{Lono.env}/#{template_path}"
   end
 
   # Example:
   #    s3_bucket('s3://mybucket/templates/storage/path') => mybucket
   def s3_bucket
+    return '' if @options[:noop] # to get spec passing
     @s3_full_path.sub('s3://','').split('/').first
   end
 
   # Example:
   #    s3_bucket('s3://mybucket/templates/storage/path') => templates/storage/path
   def s3_path
+    return '' if @options[:noop] # to get spec passing
     @s3_full_path.sub('s3://','').split('/')[1..-1].join('/')
   end
 
@@ -115,7 +116,7 @@ class Lono::Template::Upload
   def ensure_s3_setup!
     return if @options[:noop]
 
-    settings = Lono::Settings.new(@project_root)
+    settings = Lono::Settings.new
     if settings.s3_path
       @s3_full_path = settings.s3_path
     else

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "3.4.1"
+  VERSION = "3.5.0"
 end

data/spec/fixtures/my_project/config/templates/base/stacks.rb

@@ -1,3 +1,3 @@
 # this file is just in here to get the lono-cfn spec to pass
 
-template "aws-waf-security-automations"
+template "my-stack"

data/spec/lib/lono/cfn_spec.rb

@@ -1,38 +1,39 @@
-require_relative "../../spec_helper"
+require "spec_helper"
 
 describe Lono::Cfn do
   before(:all) do
-    @args = "--noop --project-root spec/fixtures/my_project"
+    @env = "LONO_ROOT=#{ENV['LONO_ROOT']}"
+    @args = "--noop"
   end
 
   describe "lono cfn" do
     it "create stack" do
-      out = execute("bin/lono cfn create my-stack #{@args}")
+      out = execute("#{@env} bin/lono cfn create my-stack #{@args}")
       expect(out).to include("Creating")
     end
 
     it "update stack" do
-      out = execute("bin/lono cfn update my-stack #{@args}")
+      out = execute("#{@env} bin/lono cfn update my-stack #{@args}")
       expect(out).to include("Updating")
     end
 
     it "delete stack" do
-      out = execute("bin/lono cfn delete my-stack #{@args}")
+      out = execute("#{@env} bin/lono cfn delete my-stack #{@args}")
       expect(out).to include("Deleted")
     end
 
     it "preview stack" do
-      out = execute("bin/lono cfn preview my-stack #{@args}")
+      out = execute("#{@env} bin/lono cfn preview my-stack #{@args}")
       expect(out).to include("CloudFormation preview")
     end
 
     it "diff stack" do
-      out = execute("bin/lono cfn diff my-stack #{@args}")
+      out = execute("#{@env} bin/lono cfn diff my-stack #{@args}")
       expect(out).to include("diff")
     end
 
     it "download stack" do
-      out = execute("bin/lono cfn download my-stack #{@args}")
+      out = execute("#{@env} bin/lono cfn download my-stack #{@args}")
       expect(out).to include("Download")
     end
   end

data/spec/lib/lono/inspect_spec.rb

@@ -2,7 +2,7 @@ require_relative "../../spec_helper"
 
 describe Lono::Inspector do
   before(:all) do
-    @args = "--noop --project-root spec/fixtures/my_project"
+    @args = "--noop"
   end
 
   describe "lono inspect" do

data/spec/lib/lono/new_spec.rb

@@ -1,11 +1,13 @@
-require_relative "../../spec_helper"
+require "spec_helper"
 
 describe Lono::New do
   before(:each) do
-    @project_root = File.expand_path("../../../../tmp/lono_project", __FILE__)
+    @saved_root = ENV['LONO_ROOT']
+    ENV['LONO_ROOT'] = ENV['TMP_LONO_ROOT']
   end
   after(:each) do
-    FileUtils.rm_rf(@project_root) unless ENV['KEEP_TMP_PROJECT']
+    ENV['LONO_ROOT'] = @saved_root
+    FileUtils.rm_rf(ENV['TMP_LONO_ROOT']) unless ENV['KEEP_TMP_PROJECT']
   end
 
   context "json starter project" do
@@ -14,18 +16,17 @@ describe Lono::New do
         force: true,
         quiet: true,
         format: 'json',
-        project_root: @project_root
+        project_root: ENV['TMP_LONO_ROOT'],
       )
       new_project.run
     end
 
     it "should be able to lono generate" do
       dsl = Lono::Template::DSL.new(
-        project_root: @project_root,
         quiet: true
       )
       dsl.run
-      generated = File.exist?("#{@project_root}/output/blog-web.json")
+      generated = File.exist?("#{Lono.root}/output/blog-web.json")
       expect(generated).to be true
     end
   end
@@ -36,18 +37,17 @@ describe Lono::New do
         force: true,
         quiet: true,
         format: 'yaml',
-        project_root: @project_root
+        project_root: ENV['TMP_LONO_ROOT'],
       )
       new_project.run
     end
 
     it "should be able to lono generate" do
       dsl = Lono::Template::DSL.new(
-        project_root: @project_root,
         quiet: true
       )
       dsl.run
-      generated = File.exist?("#{@project_root}/output/blog-web.yml")
+      generated = File.exist?("#{Lono.root}/output/blog-web.yml")
       expect(generated).to be true
     end
   end

data/spec/lib/lono/param/generator_spec.rb

@@ -2,11 +2,14 @@ require_relative "../../../spec_helper"
 
 describe Lono::Param::Generator do
   def generate(project_root)
+    @saved_root = ENV['LONO_ROOT']
+    ENV['LONO_ROOT'] = project_root
     param = Lono::Param::Generator.new("network",
-      project_root: project_root,
       mute: true
     )
     json = param.generate
+    ENV['LONO_ROOT'] = @saved_root
+
     data = JSON.load(json)
     param_value = data.first["ParameterValue"]
   end

data/spec/lib/lono/param_spec.rb

@@ -2,7 +2,7 @@ require_relative "../../spec_helper"
 
 describe Lono::Param do
   before(:all) do
-    @args = "--project-root spec/fixtures/my_project"
+    @args = ""
   end
 
   describe "lono param" do

data/spec/lib/lono/template/dsl_spec.rb

@@ -1,11 +1,13 @@
-require_relative "../../../spec_helper"
+require "spec_helper"
 
 describe Lono::Template::DSL do
   before(:each) do
-    @project_root = File.expand_path("../../../../tmp/lono_project", __FILE__)
+    @saved_root = ENV['LONO_ROOT']
+    ENV['LONO_ROOT'] = ENV['TMP_LONO_ROOT']
   end
   after(:each) do
-    FileUtils.rm_rf(@project_root) unless ENV['KEEP_TMP_PROJECT']
+    ENV['LONO_ROOT'] = @saved_root
+    FileUtils.rm_rf(ENV['TMP_LONO_ROOT']) unless ENV['KEEP_TMP_PROJECT']
   end
 
   context "json starter project" do
@@ -14,14 +16,13 @@ describe Lono::Template::DSL do
         force: true,
         quiet: true,
         format: 'json',
-        project_root: @project_root
+        project_root: ENV['TMP_LONO_ROOT'],
       )
       new_project.run
     end
 
     it "json" do
       dsl = Lono::Template::DSL.new(
-        project_root: @project_root,
         quiet: true
       )
       dsl.evaluate_templates # run the dependent instance_eval and load_subfoler so @templates is assigned
@@ -36,14 +37,13 @@ describe Lono::Template::DSL do
         force: true,
         quiet: true,
         format: 'yaml',
-        project_root: @project_root
+        project_root: ENV['TMP_LONO_ROOT'],
       )
       new_project.run
     end
 
     it "yaml" do
       dsl = Lono::Template::DSL.new(
-        project_root: @project_root,
         quiet: true
       )
       dsl.evaluate_templates # run the dependent instance_eval and load_subfoler so @templates is assigned
@@ -69,32 +69,31 @@ describe Lono::Template::DSL do
         force: true,
         quiet: true,
         format: 'json',
-        project_root: @project_root
+        project_root: ENV['TMP_LONO_ROOT'],
       )
       new_project.run
 
       dsl = Lono::Template::DSL.new(
-        project_root: @project_root,
         quiet: true
       )
       dsl.run
     end
 
     it "should generate cloudformation template" do
-      raw = IO.read("#{@project_root}/output/api-web.json")
+      raw = IO.read("#{Lono.root}/output/api-web.json")
       json = JSON.load(raw)
       expect(json['Description']).to eq "Api Stack"
       expect(json['Mappings']['AWSRegionArch2AMI']['us-east-1']['64']).to eq 'ami-123'
     end
 
     it "should make trailing options pass to the partial helper available as instance variables" do
-      raw = IO.read("#{@project_root}/output/api-web.json")
+      raw = IO.read("#{Lono.root}/output/api-web.json")
       json = JSON.load(raw)
       expect(json['Resources']['HostRecord']['Properties']['Comment']).to eq 'DNS name for mydomain.com'
     end
 
     it "should generate user data with variables" do
-      raw = IO.read("#{@project_root}/output/api-redis.json")
+      raw = IO.read("#{Lono.root}/output/api-redis.json")
       json = JSON.load(raw)
       expect(json['Description']).to eq "Api redis"
       user_data = json['Resources']['server']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
@@ -102,7 +101,7 @@ describe Lono::Template::DSL do
     end
 
     it "should include multiple user_data scripts" do
-      raw = IO.read("#{@project_root}/output/api-redis.json")
+      raw = IO.read("#{Lono.root}/output/api-redis.json")
       json = JSON.load(raw)
       expect(json['Description']).to eq "Api redis"
       user_data = json['Resources']['server']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
@@ -110,7 +109,7 @@ describe Lono::Template::DSL do
     end
 
     it "should generate db template" do
-      raw = IO.read("#{@project_root}/output/api-redis.json")
+      raw = IO.read("#{Lono.root}/output/api-redis.json")
       json = JSON.load(raw)
       expect(json['Description']).to eq "Api redis"
       user_data = json['Resources']['server']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
@@ -161,7 +160,7 @@ describe Lono::Template::DSL do
     end
 
     it "should not transform user_data ruby scripts" do
-      raw = IO.read("#{@project_root}/output/api-worker.json")
+      raw = IO.read("#{Lono.root}/output/api-worker.json")
       json = JSON.load(raw)
       user_data = json['Resources']['LaunchConfig']['Properties']['UserData']['Fn::Base64']['Fn::Join'][1]
       expect(user_data).to include(%Q|ec2.tags.create(ec2.instances[my_instance_id], "Name", {value: Facter.hostname})\n|)
@@ -169,12 +168,12 @@ describe Lono::Template::DSL do
     end
 
     it "should create parent folders for parent/db-stack.json" do
-      directory_created = File.exist?("#{@project_root}/output/parent")
+      directory_created = File.exist?("#{Lono.root}/output/parent")
       expect(directory_created).to be true
     end
 
     it "task should generate CloudFormation templates" do
-      raw = IO.read("#{@project_root}/output/api-web.json")
+      raw = IO.read("#{Lono.root}/output/api-web.json")
       json = JSON.load(raw)
       expect(json['Description']).to eq "Api Stack"
       expect(json['Mappings']['AWSRegionArch2AMI']['us-east-1']['64']).to eq 'ami-123'

data/spec/lib/lono/template_spec.rb

@@ -1,17 +1,14 @@
-require_relative "../../spec_helper"
+require "spec_helper"
 
 describe Lono do
   before(:each) do
+    @env = "LONO_ROOT=tmp/foo"
     lono_bin = File.expand_path("../../../../bin/lono", __FILE__)
-    @project_root = File.expand_path("../../../../tmp/lono_project", __FILE__)
-    dir = File.dirname(@project_root)
-    name = File.basename(@project_root)
-    FileUtils.mkdir(dir) unless File.exist?(dir)
-    execute("cd #{dir} && #{lono_bin} new #{name} -f -q --format json")
+    execute("cd tmp && #{lono_bin} new foo -f -q --format json")
   end
 
   after(:each) do
-    FileUtils.rm_rf(@project_root) unless ENV['KEEP_TMP_PROJECT']
+    # FileUtils.rm_rf("foo") unless ENV['KEEP_TMP_PROJECT']
   end
 
   describe "bashify" do
@@ -24,12 +21,12 @@ describe Lono do
 
   describe "cli specs" do
     it "should generate templates" do
-      out = execute("./bin/lono template generate -c --project-root #{@project_root}")
+      out = execute("#{@env} ./bin/lono template generate -c")
       expect(out).to match /Generating CloudFormation templates/
     end
 
-    it "should generate templates" do
-      out = execute("./bin/lono template upload --project-root #{@project_root} --noop")
+    it "should upload templates" do
+      out = execute("#{@env} ./bin/lono template upload --noop")
       expect(out).to match /Templates uploaded to s3/
     end
   end

data/spec/lib/lono_spec.rb

@@ -3,20 +3,24 @@ require_relative "../spec_helper"
 describe Lono do
   describe "lono" do
     before(:each) do
-      @args = "--project-root spec/fixtures/my_project"
+      @env = "LONO_ROOT=#{ENV['LONO_ROOT']}"
     end
     after(:each) do
       FileUtils.rm_rf("spec/fixtures/my_project/params/base")
     end
 
     it "generate should build templates" do
-      out = execute("./bin/lono generate #{@args}")
+      out = execute("#{@env} bin/lono generate")
       expect(out).to match /Generating both CloudFormation template and parameter/
     end
 
     it "import should download template" do
-      out = execute("./bin/lono import spec/fixtures/raw_templates/aws-waf-security-automations.template #{@args}")
+      path = "spec/fixtures/my_project/config/templates/base/stacks.rb"
+      backup = "spec/fixtures/my_project/config/templates/base/stacks.rb.bak"
+      FileUtils.cp(path, backup)
+      out = execute("#{@env} bin/lono import spec/fixtures/raw_templates/aws-waf-security-automations.template #{@args}")
       expect(out).to match /Imported raw CloudFormation template/
+      FileUtils.mv(backup, path)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 ENV['TEST'] = '1'
 # Ensures aws api never called. Fixture home folder does not contain ~/.aws/credentails
 ENV['HOME'] = "spec/fixtures/home"
+ENV['LONO_ROOT'] = "spec/fixtures/my_project" # this gets kept
+ENV['TMP_LONO_ROOT'] = "./tmp/lono_project" # need the period for the load_custom_helpers require , unsure if I should adjust the LOAD_PATH
 
 require "pp"
 require "byebug"
@@ -12,8 +14,8 @@ $root = File.expand_path('../../', __FILE__)
 
 require "#{$root}/lib/lono"
 
-require 'coveralls'
-Coveralls.wear!
+# require 'coveralls'
+# Coveralls.wear!
 
 module Helpers
   def execute(cmd)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -285,9 +285,9 @@ files:
 - lib/lono/clean.rb
 - lib/lono/cli.rb
 - lib/lono/command.rb
+- lib/lono/core.rb
 - lib/lono/current_region.rb
 - lib/lono/default/settings.yml
-- lib/lono/env.rb
 - lib/lono/help.rb
 - lib/lono/importer.rb
 - lib/lono/inspector.rb
@@ -350,7 +350,7 @@ files:
 - spec/fixtures/my_project/config/templates/base/stacks.rb
 - spec/fixtures/my_project/params/my-stack.txt
 - spec/fixtures/my_project/templates/.gitkeep
-- spec/fixtures/my_project/templates/my-stack.yml.erb
+- spec/fixtures/my_project/templates/my-stack.yml
 - spec/fixtures/params/baseonly/params/base/network.txt
 - spec/fixtures/params/envonly/params/prod/network.txt
 - spec/fixtures/params/overlay/params/base/network.txt
@@ -409,7 +409,7 @@ test_files:
 - spec/fixtures/my_project/config/templates/base/stacks.rb
 - spec/fixtures/my_project/params/my-stack.txt
 - spec/fixtures/my_project/templates/.gitkeep
-- spec/fixtures/my_project/templates/my-stack.yml.erb
+- spec/fixtures/my_project/templates/my-stack.yml
 - spec/fixtures/params/baseonly/params/base/network.txt
 - spec/fixtures/params/envonly/params/prod/network.txt
 - spec/fixtures/params/overlay/params/base/network.txt

data/lib/lono/env.rb

@@ -1,11 +0,0 @@
-class Lono::Env
-  def self.setup!(project_root='.')
-    settings = Lono::Settings.new(project_root).data
-    map = settings['aws_profile_lono_env_map']
-
-    lono_env = map[ENV['AWS_PROFILE']] || map['default'] || 'prod' # defaults to prod
-    lono_env = ENV['LONO_ENV'] if ENV['LONO_ENV'] # highest precedence
-
-    Kernel.const_set(:LONO_ENV, lono_env)
-  end
-end