lono 7.5.2 → 8.0.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bb488fbda283f04107b4e461bf641727b5235d748a3a417bc6dced426fe67f1
-  data.tar.gz: 90530c32b44d161ac7a0b5bdd546a15bb37b04946ed8a4de6ce39f9b968ad4a6
+  metadata.gz: 93888f3a1dc76f9c5e21f98c0edf5d03ee7ba4cdcf9e5a4115b0ee1ce0f3b518
+  data.tar.gz: 22b18e2ccc2e98a41c57903aef1e67677f40dd48a953359447ef5546942f7ccb
 SHA512:
-  metadata.gz: cf60e6101ecad062a69f04ec343e7cb7e73d5b07252cf9546fbe71f5bae3a39a13b2b09faaa5213b44f86309e9bf7907022c337ad4f14cb57af3afacc1be3658
-  data.tar.gz: a3ddbafb4524a7f885e680021cd5fb07e8dc228e28b7a1c13dac73ebc475233f57e1ec93c35eecbe4eb155182cf807947791d875ac055042fa43c12a856462cf
+  metadata.gz: 67562f7b0059f63f0cd33c93157f4bc0d7182125305b9602f67cb6d3a13094c1d6c1f84f0fe493800ba917cb2404b0f31c789744ff6ef2232b1629b7b51ef34f
+  data.tar.gz: 7f9c0b5998e36e2acf9cef7dacdfd115ce8bcb49fde35c6664008fe31820e0ed4ce14c36897fc733c93ac93a5033770d1cdf4bf29d170420cc8335b0432cb35d

data/.cody/README.md

@@ -2,28 +2,18 @@
 
 CodeBuild is used to run **acceptance-level tests**.
 
-## Cody Files
-
-The files in folder are used by cody to build AWS CodeBuild projects.  For more info, check out the [cody docs](https://cody.run). Here's a quick start.
-
-## Install Tool
-
-    gem install cody
-
-This installs the `cody` command to manage the AWS CodeBuild project.
-
-## Update Project
+## Deploy Project
 
 To update the CodeBuild project that handles deployment:
 
-    cody deploy lono
+    cody deploy lono -t acceptance
 
-## Start a Deploy
+## Start Build
 
 To start a CodeBuild build:
 
-    cody start lono
+    cody start lono -t acceptance
 
 To specify a branch:
 
-    cody start lono -b feature
+    cody start lono -t acceptance -b feature

data/.cody/acceptance/bin/build.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+final_status=0
+function final_status {
+  if [ "$?" -ne "0" ] && [ $final_status -ne 1 ] ; then
+    final_status=1
+  fi
+}
+
+set -eu
+# will build from /tmp because terraspace/Gemfile may interfere
+cd /tmp
+export PATH=~/bin:$PATH # ~/bin/lono wrapper
+
+lono new project infra
+cd infra
+
+# Rewrite the Gemfile to use the local lono gem for testing
+cat << EOF > Gemfile
+source "https://rubygems.org"
+gem "lono", path: "$CODEBUILD_SRC_DIR", submodules: true
+gem "rspec-lono", git: "https://github.com/boltops-tools/rspec-lono", branch: "master"
+EOF
+cat Gemfile
+
+bundle # install lono gem in the infra project
+
+export LONO_ENV="test-$(date +%Y%m%d%H%M%S)"
+lono new blueprint demo --examples
+
+# Continue on error and capture final exit status so lono down always and cleans up stack
+set +e
+# Test new stack creation
+lono up demo -y
+final_status
+
+lono seed demo # just to test it. will overwrite file
+final_status
+
+# Test stack update
+cat << EOF > config/blueprints/demo/params/$LONO_ENV.txt
+AccessControl=PublicRead
+EOF
+lono up demo -y
+final_status
+
+# Clean up resources
+lono down demo -y
+final_status
+set -e
+
+exit $final_status

data/.cody/acceptance/buildspec.yml

@@ -0,0 +1,10 @@
+version: 0.2
+
+phases:
+  install:
+    runtime-versions:
+      ruby: latest
+  build:
+    commands:
+      - .cody/shared/script/install.sh
+      - .cody/acceptance/bin/build.sh

data/.cody/acceptance/project.rb

@@ -0,0 +1,6 @@
+github_url("https://github.com/boltops-tools/lono")
+linux_image("aws/codebuild/amazonlinux2-x86_64-standard:3.0")
+# triggers(
+#   webhook: true,
+#   filter_groups: [[{type: "EVENT", pattern: "PUSH"}]]
+# )

data/.cody/shared/script/install/lono.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -eux
+
+export PATH=~/bin:$PATH
+
+cat << 'EOF' > ~/.gemrc
+---
+:backtrace: false
+:bulk_threshold: 1000
+:sources:
+- https://rubygems.org
+:update_sources: true
+:verbose: true
+benchmark: false
+install: "--no-ri --no-rdoc --no-document"
+update: "--no-ri --no-rdoc --no-document"
+EOF
+
+gem install bundler # upgrade bundler
+
+# In original lono source and install lono
+cd $CODEBUILD_SRC_DIR # lono folder - in case code is added later above this that uses cd
+bundle install
+bundle exec rake install
+
+mkdir -p ~/bin
+cat << EOF > ~/bin/lono
+#!/bin/bash
+# If there's a Gemfile, assume we're in a lono project with a Gemfile for lono
+if [ -f Gemfile ]; then
+  exec bundle exec $CODEBUILD_SRC_DIR/exe/lono "\$@"
+else
+  exec $CODEBUILD_SRC_DIR/exe/lono "\$@"
+fi
+EOF
+
+cat ~/bin/lono
+
+chmod a+x ~/bin/lono

data/.cody/shared/script/install.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -eu
+
+.cody/shared/script/install/lono.sh

data/CHANGELOG.md

@@ -1,7 +1,24 @@
 # Change Log
 
 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.
+This project *tries* to adhere to [Semantic Versioning](http://semver.org/).
+
+## [8.0.0.rc1] - 2022-02-21
+
+* v8 cleaner and simplier interface
+* commands: lono up, down, bundle, list, new, output, plan
+* conventional stack name
+* lono new generators
+* improve lono plan previews
+* improve layering
+* boot hooks
+* change default env to dev
+* app config support: config.names.stack, etc
+* change --sure to --yes option
+* remove core settings in favor of config/app.rb
+* logger support
+* remove docs. move to separate repo
+* plugin system and test framework
 
 ## [7.5.2] - 2022-02-08
 - [#74](https://github.com/boltops-tools/lono/pull/74) activesupport require fix
@@ -137,7 +154,7 @@ This project *tries* to adhere to [Semantic Versioning](http://semver.org/), eve
 ## [6.1.9]
 - #30 fix md5 sum calcuation for single file
 - #31 Add app files ERB support docs
-- options `--sure` and `--iam` add `CAPABILITY_AUTO_EXPAND` for serverless transform
+- options `-y` and `--iam` add `CAPABILITY_AUTO_EXPAND` for serverless transform
 
 ## [6.1.8]
 - #28 add user_data_script helper
@@ -243,7 +260,7 @@ This project *tries* to adhere to [Semantic Versioning](http://semver.org/), eve
 
 ## [5.2.2]
 - seed only support params for main conventional template in blueprint
-- set --iam with --sure option also
+- set --iam with -y option also
 
 ## [5.2.1]
 - improve param lookup
@@ -265,7 +282,7 @@ This project *tries* to adhere to [Semantic Versioning](http://semver.org/), eve
 ## [5.0.1]
 - Introduce lono DSL and set as default mode
 - Introduce blueprints concept
-- Introduce lono cfn deploy command
+- Introduce lono up command
 - Auto-create lono managed s3 bucket
 - Zeitwerk autoloader
 - Restructure project structure

data/CONTRIBUTING.md

@@ -13,7 +13,7 @@ Here are some ways *you* can contribute:
 * by closing [issues][]
 * by reviewing patches
 
-[issues]: https://github.com/tongueroo/lono/issues
+[issues]: https://github.com/boltops-tools/lono/issues
 
 ## Submitting an Issue
 
@@ -48,7 +48,7 @@ already been submitted.
   asking for help. We love helping!
 * Please don't update the Gem version.
 
-[repo]: https://github.com/tongueroo/lono/tree/master
+[repo]: https://github.com/boltops-tools/lono/tree/master
 [fork]: https://help.github.com/articles/fork-a-repo/
 [branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/
 [pr]: https://help.github.com/articles/using-pull-requests/

data/Gemfile

@@ -3,4 +3,8 @@ source "https://rubygems.org"
 # Specify your gem dependencies in lono.gemspec
 gemspec
 
-gem "codeclimate-test-reporter", group: :test, require: nil
+if ENV['C9_USER']
+  gem "rspec-lono", path: "~/boltops-tools/rspec-lono"
+else
+  gem "rspec-lono", git: "https://github.com/boltops-tools/rspec-lono", branch: "master"
+end

data/LICENSE.txt

@@ -1 +1,201 @@
-https://www.boltops.com/boltops-community-license
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.md

@@ -18,7 +18,7 @@ Lono is a CloudFormation framework. It builds, manages, and deploys CloudFormati
 * Simple CLI interface to launch CloudFormation stacks.
 * Ability to use [Existing CloudFormation Templates](https://lono.cloud/docs/existing-templates/).
 * [The Lono DSL](https://lono.cloud/docs/dsl/) - Generate templates from beautiful code.
-* Write your CloudFormation parameters with [simple env-like values](https://lono.cloud/docs/configs/params/).
+* Write your CloudFormation parameters with [simple env-like values](https://lono.cloud/docs/config/params/).
 * Preview CloudFormation changes before pressing the big red button.
 * [Layering](https://lono.cloud/docs/core/layering/) - Allows you to build multiple environments like development and production with the same template.
 * [Variables](https://lono.cloud/docs/layering/variables/) - Allows you to construct templates where runtime Parameters do not suffice.
@@ -39,7 +39,7 @@ It only takes a couple of commands to start using lono.
     lono new infra
     cd infra
     lono blueprint new demo
-    lono cfn deploy demo
+    lono up demo
 
 ![Lono flowchart](https://lono.cloud/img/tutorial/lono-flowchart.png "Lono flowchart")
 
@@ -73,9 +73,9 @@ output("SecurityGroup", get_att("SecurityGroup.GroupId"))
 
 ### Lono Cfn Deploy
 
-Lono provides a `lono cfn` lifecycle command that allows you to launch stacks quickly.  The `lono cfn deploy` generates and launches the CloudFormation stack.  If you are in a lono project and have a `demo` lono blueprint.  To create a stack run:
+Lono provides a `lono cfn` lifecycle command that allows you to launch stacks quickly.  The `lono up` generates and launches the CloudFormation stack.  If you are in a lono project and have a `demo` lono blueprint.  To create a stack run:
 
-    $ lono cfn deploy demo
+    $ lono up demo
 
 ## Contributing
 

data/lib/lono/api/client.rb

@@ -3,6 +3,7 @@ module Lono::Api
     extend Memoist
     include Verify
     include Repos
+    include Lono::Utils::Logging
 
     def http
       Proxy.new
@@ -20,8 +21,8 @@ module Lono::Api
         end
       else
         if ENV['LONO_DEBUG_API']
-          puts "Error: Non-successful http response status code: #{res.code}"
-          puts "headers: #{res.each_header.to_h.inspect}"
+          logger.info "Error: Non-successful http response status code: #{res.code}"
+          logger.info "headers: #{res.each_header.to_h.inspect}"
         end
         nil
       end

data/lib/lono/app/inits.rb

@@ -0,0 +1,13 @@
+class Lono::App
+  class Inits
+    class << self
+      include DslEvaluator
+
+      def run_all
+        Dir.glob("#{Lono.root}/config/inits/*.rb").each do |path|
+          evaluate_file(path)
+        end
+      end
+    end
+  end
+end

data/lib/lono/app.rb

@@ -0,0 +1,71 @@
+module Lono
+  class App
+    extend Memoist
+    include DslEvaluator
+    include Singleton
+    include Lono::Utils::Logging
+
+    attr_reader :config
+    def initialize
+      @config = defaults
+    end
+
+    def defaults
+      config = ActiveSupport::OrderedOptions.new
+
+      config.log = ActiveSupport::OrderedOptions.new
+      config.log.root = Lono.log_root
+      config.logger = lono_logger
+      config.logger.formatter = Logger::Formatter.new
+      config.logger.level = ENV['LONO_LOG_LEVEL'] || :info
+
+      config.names = ActiveSupport::OrderedOptions.new
+      config.names.stack = ":APP-:BLUEPRINT-:ENV"
+      config.names.output = ActiveSupport::OrderedOptions.new
+      config.names.output.stack = ":BLUEPRINT-:ENV" # does not include APP by default. Think this is more common
+      config.names.output.expand = true
+
+      config.paths = ActiveSupport::OrderedOptions.new
+      config.paths.scripts = "scripts"
+      config.paths.content = "content"
+      config.paths.helpers = "helpers"
+      config.paths.user_data = "user_data"
+
+      config.up = ActiveSupport::OrderedOptions.new
+      config.up.capabilities = nil
+      config.up.notification_arns = nil
+      config.up.rollback = true
+      config.up.tags = nil
+
+      config.diff = ActiveSupport::OrderedOptions.new
+      config.diff.changeset = true
+      config.diff.params = "full"
+      config.diff.template = "summary" # summary is same as true
+
+      config.extract_scripts = {}
+
+      config.test = ActiveSupport::OrderedOptions.new
+      config.test.framework = "rspec"
+
+      config.layering = ActiveSupport::OrderedOptions.new
+      config.layering.names = {}
+
+      config
+    end
+
+    def lono_logger
+      Logger.new(ENV['LONO_LOG_PATH'] || $stderr)
+    end
+    memoize :lono_logger
+
+    def configure
+      yield(@config)
+    end
+
+    def load_project_config
+      evaluate_file("#{Lono.root}/config/app.rb")
+      path = "#{Lono.root}/config/envs/#{Lono.env}.rb"
+      evaluate_file(path)
+    end
+  end
+end

data/lib/lono/app_file/base.rb

@@ -1,6 +1,6 @@
 # Naming AppFile instead of File so we dont to use ::File for normal regular File class
 module Lono::AppFile
-  class Base < Lono::AbstractBase
+  class Base < Lono::CLI::Base
     # What's needed for a Thor::Group or "Sequence". Gives us Thor::Actions commands like create_file
     # Must be included before `def initialize` as we override the Thor initialize
     include Thor::Actions

data/lib/lono/app_file/build/lambda_layer/ruby_packager.rb

@@ -4,10 +4,10 @@ class Lono::AppFile::Build::LambdaLayer
     include Lono::Utils::Rsync
 
     def initialize(blueprint, registry_item)
-      @blueprint, @registry_item = blueprint, registry_item
+      @blueprint.name, @registry_item = blueprint, registry_item
 
       @registry_name = @registry_item.name.sub(/\/$/,'')
-      @app_root = "#{Lono.blueprint_root}/app/files/#{@registry_name}"
+      @app_root = "#{@blueprint.root}/app/files/#{@registry_name}"
     end
 
     def build
@@ -42,7 +42,7 @@ class Lono::AppFile::Build::LambdaLayer
 
       # create symlink in output path not the cache path
       symlink_dest = "#{output_area}/vendor/gems/ruby/#{ruby_folder}"
-      puts "symlink_dest #{symlink_dest}"
+      logger.info "symlink_dest #{symlink_dest}"
       FileUtils.rm_rf(symlink_dest) # blow away original 2.5.0 folder
 
       # Create symlink that will point to the gems in the Lambda Layer:
@@ -68,7 +68,7 @@ class Lono::AppFile::Build::LambdaLayer
     # project gets built again not all the gems from get installed from the
     # beginning.
     def bundle_install
-      puts "Bundling: running bundle install in cache area: #{cache_area}."
+      logger.info "Bundling: running bundle install in cache area: #{cache_area}."
 
       rsync(output_area, cache_area)
 
@@ -85,15 +85,15 @@ class Lono::AppFile::Build::LambdaLayer
       FileUtils.rm_rf("#{cache_area}/.bundle")
       require "bundler" # dynamically require bundler so user can use any bundler
       setup_bundle_config(cache_area)
-      Bundler.with_unbundled_env do
+      ::Bundler.with_unbundled_env do
         sh "cd #{cache_area} && env bundle install"
       end
 
       remove_bundled_with("#{cache_area}/Gemfile.lock")
       # Fixes really tricky bug where Gemfile and Gemfile.lock is out-of-sync. Details: https://gist.github.com/tongueroo/b5b0d0c924a4a1633eee514795e4b04b
-      FileUtils.cp("#{cache_area}/Gemfile.lock", "#{Lono.config.output_path}/#{@blueprint}/files/#{@registry_name}/Gemfile.lock")
+      FileUtils.cp("#{cache_area}/Gemfile.lock", "#{Lono.root}/output/#{@blueprint.name}/files/#{@registry_name}/Gemfile.lock")
 
-      puts 'Bundle install success.'
+      logger.info 'Bundle install success.'
     end
 
     # Remove the BUNDLED WITH line since we don't control the bundler gem version on AWS Lambda
@@ -130,11 +130,11 @@ EOL
     end
 
     def output_area
-      "#{Lono.config.output_path}/#{@blueprint}/files/#{@registry_name}"
+      "#{Lono.root}/output/#{@blueprint.name}/files/#{@registry_name}"
     end
 
     def build_area
-      "#{Lono.config.output_path}/#{@blueprint}/lambda_layers/#{@registry_name}"
+      "#{Lono.root}/output/#{@blueprint.name}/lambda_layers/#{@registry_name}"
     end
 
     def cache_area