lono 7.1.0 → 7.2.0

data/lib/lono/template/strategy/dsl/builder/helpers.rb

@@ -7,5 +7,7 @@ class Lono::Template::Strategy::Dsl::Builder
     include LookupHelper
     include S3Helper
     include TagsHelper
+
+    include Lono::Template::Strategy::Common::Helpers
   end
 end

data/lib/lono/template/strategy/dsl/builder/helpers/file_helper.rb

@@ -13,8 +13,8 @@ module Lono::Template::Strategy::Dsl::Builder::Helpers
     def user_data_script
       unless @user_data_script
         return <<~EOL
-          # @user_data_script variable not set. IE: @user_data_script = "configs/#{@blueprint}/user-data/boostrap.sh"
-          # Also, make sure that "configs/#{@blueprint}/user-data/boostrap.sh" path you're using exists.
+          # @user_data_script variable not set. IE: @user_data_script = "configs/#{@blueprint}/user_data/boostrap.sh"
+          # Also, make sure that "configs/#{@blueprint}/user_data/boostrap.sh" path you're using exists.
         EOL
       end
 

data/lib/lono/template/strategy/dsl/builder/syntax.rb

@@ -4,7 +4,8 @@ class Lono::Template::Strategy::Dsl::Builder
     include Fn
     include Lono::Template::Evaluate
     include Section::Methods
-    include Section::Extensions
+    include ParameterGroup
+    include ExtendWith
     include Helpers # built-in helpers
   end
 end

data/lib/lono/template/strategy/dsl/builder/syntax/extend_with.rb

@@ -0,0 +1,9 @@
+module Lono::Template::Strategy::Dsl::Builder::Syntax
+  module ExtendWith
+    def extend_with(extension)
+      # Do nothing during the main DSL evaluation. The extend_with logical actual runs during during the
+      # pre_evalation stage before project helpers are loaded. This allows project helper to override extend helpers.
+      # Define the method here it does not error though.
+    end
+  end
+end

data/lib/lono/template/strategy/dsl/builder/{section/extensions.rb → syntax/parameter_group.rb}

@@ -1,5 +1,5 @@
-module Lono::Template::Strategy::Dsl::Builder::Section
-  module Extensions
+module Lono::Template::Strategy::Dsl::Builder::Syntax
+  module ParameterGroup
     def parameter_group(label)
       @group_label = label
       yield

data/lib/lono/version.rb

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

data/lib/templates/extension/%extension_name%.gemspec.tt

@@ -0,0 +1,45 @@
+# coding: utf-8
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "<%= extension_name %>/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "<%= extension_name %>"
+  spec.version       = <%= extension_class_name %>::VERSION
+  spec.authors       = ["<%= user_info[:author] %>"]
+  spec.email         = ["<%= ENV['LONO_EMAIL'] || user_info[:email] %>"]
+  spec.summary       = "Lono extension: <%= extension_name %>"
+  spec.homepage      = "<%= ENV['LONO_ORG'] || "https://github.com/USER" %>/<%= extension_name %>"
+  spec.license       = "<%= ENV['LONO_LICENSE'] || 'MIT' %>"
+
+  # 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"] = "extension"
+    spec.metadata["allowed_push_host"] = "<%= ENV['LONO_ALLOWED_PUSH_HOST'] || "TODO: Set to 'http://mygemserver.com'"%>"
+
+    spec.metadata["homepage_uri"] = spec.homepage
+<% if ENV['LONO_ORG'] -%>
+    spec.metadata["source_code_uri"] = "<%= ENV['LONO_ORG'] %>/<%= extension_name %>"
+    spec.metadata["changelog_uri"] = "<%= ENV['LONO_ORG'] %>/<%= extension_name %>/blob/master/CHANGELOG.md"
+<% else -%>
+    spec.metadata["source_code_uri"] = "https://github.com/user/repo" # TODO: Change me
+    spec.metadata["changelog_uri"] = "https://github.com/user/repo/blob/master/CHANGELOG.md"  # TODO: Change me
+<% end -%>
+  else
+    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  end
+
+  spec.files         = `git ls-files`.split($/)
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "activesupport"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+end

data/lib/templates/extension/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+_yardoc
+coverage
+doc/
+InstalledFiles
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+Gemfile.lock

data/lib/templates/extension/.rspec

@@ -0,0 +1,3 @@
+--require spec_helper
+--color
+--format documentation

data/lib/templates/extension/CHANGELOG.md

@@ -0,0 +1,7 @@
+# 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.
+
+## [0.1.0]
+- Initial release.

data/lib/templates/extension/Gemfile.tt

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+# Specify your gem dependencies in <%= extension_name %>.gemspec
+gemspec

data/lib/templates/extension/Rakefile.tt

@@ -0,0 +1,9 @@
+<% if ENV['LONO_ORG'] -%>
+ENV['gem_push']='no'
+<% end -%>
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new
+
+task default: :spec

data/lib/templates/extension/lib/%extension_name%.rb.tt

@@ -0,0 +1,5 @@
+$:.unshift(File.expand_path("../", __FILE__))
+require "<%= extension_underscore_name %>/version"
+
+module <%= extension_class_name %>
+end

data/lib/templates/extension/lib/%extension_name%/helpers/mappings.rb.tt

@@ -0,0 +1,24 @@
+module <%= extension_class_name %>::Helpers
+  module Mappings
+    def ami_mappings
+      mapping("AmiMap",
+        "ap-northeast-1": { Ami: "ami-011facbea5ec0363b" },
+        "ap-northeast-2": { Ami: "ami-0bea7fd38fabe821a" },
+        "ap-south-1":     { Ami: "ami-0217a85e28e625474" },
+        "ap-southeast-1": { Ami: "ami-05c64f7b4062b0a21" },
+        "ap-southeast-2": { Ami: "ami-0b8b10b5bf11f3a22" },
+        "ca-central-1":   { Ami: "ami-0a269ca7cc3e3beff" },
+        "eu-central-1":   { Ami: "ami-07cda0db070313c52" },
+        "eu-north-1":     { Ami: "ami-0662eb9b9b8685935" },
+        "eu-west-1":      { Ami: "ami-0713f98de93617bb4" },
+        "eu-west-2":      { Ami: "ami-0089b31e09ac3fffc" },
+        "eu-west-3":      { Ami: "ami-007fae589fdf6e955" },
+        "sa-east-1":      { Ami: "ami-09de7b4017733e2af" },
+        "us-east-1":      { Ami: "ami-062f7200baf2fa504" },
+        "us-east-2":      { Ami: "ami-02ccb28830b645a41" },
+        "us-west-1":      { Ami: "ami-03caa3f860895f82e" },
+        "us-west-2":      { Ami: "ami-04590e7389a6e577c" }
+      )
+    end
+  end
+end

data/lib/templates/extension/lib/%extension_name%/helpers/outputs.rb.tt

@@ -0,0 +1,7 @@
+module <%= extension_class_name %>::Helpers
+  module Outputs
+    def resource1_output
+      output("Resource1")
+    end
+  end
+end

data/lib/templates/extension/lib/%extension_name%/helpers/parameters.rb.tt

@@ -0,0 +1,10 @@
+module <%= extension_class_name %>::Helpers
+  module Parameters
+    def example_parameters
+      parameter_group("AWS::Service::Resource") do
+        parameter("Parameter1")
+        parameter("Parameter2")
+      end
+    end
+  end
+end

data/lib/templates/extension/lib/%extension_name%/helpers/resources/resource.rb.tt

@@ -0,0 +1,4 @@
+module <%= extension_class_name %>::Helpers::Resources
+  module Resource
+  end
+end

data/lib/templates/extension/lib/%extension_name%/helpers/variables.rb.tt

@@ -0,0 +1,6 @@
+module <%= extension_class_name %>::Helpers
+  module Variables
+    # AWS::Service::Resource example
+    attr_reader :property1, :property2
+  end
+end

data/lib/templates/extension/lib/%extension_name%/version.rb.tt

@@ -0,0 +1,3 @@
+module <%= extension_class_name %>
+  VERSION = "0.1.0"
+end

data/lib/templates/extension/spec/spec_helper.rb.tt

@@ -0,0 +1,29 @@
+ENV["<%= extension_underscore_name.upcase %>_TEST"] = "1"
+
+# CodeClimate test coverage: https://docs.codeclimate.com/docs/configuring-test-coverage
+# require 'simplecov'
+# SimpleCov.start
+
+require "pp"
+require "byebug"
+root = File.expand_path("../", File.dirname(__FILE__))
+require "#{root}/lib/<%= extension_name %>"
+
+module Helper
+  def execute(cmd)
+    puts "Running: #{cmd}" if show_command?
+    out = `#{cmd}`
+    puts out if show_command?
+    out
+  end
+
+  # Added SHOW_COMMAND because DEBUG is also used by other libraries like
+  # bundler and it shows its internal debugging logging also.
+  def show_command?
+    ENV['DEBUG'] || ENV['SHOW_COMMAND']
+  end
+end
+
+RSpec.configure do |c|
+  c.include Helper
+end

data/lono.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "aws-sdk-ssm"
   gem.add_dependency "bundler", "~> 2"
   gem.add_dependency "cfn_camelizer"
+  gem.add_dependency "cli-format"
   gem.add_dependency "filesize"
   gem.add_dependency "graph" # lono xgraph command dependency
   gem.add_dependency "hashie"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cli-format
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -479,10 +493,6 @@ files:
 - lib/lono/configset/evaluate_file.rb
 - lib/lono/configset/generator.rb
 - lib/lono/configset/list.rb
-- lib/lono/configset/materializer/final.rb
-- lib/lono/configset/materializer/gems_builder.rb
-- lib/lono/configset/materializer/jade.rb
-- lib/lono/configset/materializer/source.rb
 - lib/lono/configset/meta.rb
 - lib/lono/configset/meta/dsl.rb
 - lib/lono/configset/new.rb
@@ -491,7 +501,6 @@ files:
 - lib/lono/configset/register/blueprint.rb
 - lib/lono/configset/register/dsl.rb
 - 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
@@ -504,11 +513,21 @@ files:
 - lib/lono/core/config.rb
 - lib/lono/default/settings.yml
 - lib/lono/ext/bundler.rb
+- lib/lono/extension.rb
+- lib/lono/extension/helper.rb
+- lib/lono/extension/list.rb
+- lib/lono/extension/new.rb
+- lib/lono/extensions.rb
+- lib/lono/extensions/dsl.rb
+- lib/lono/extensions/loader.rb
+- lib/lono/extensions/preparer.rb
+- lib/lono/extensions/register.rb
 - lib/lono/file_uploader.rb
 - lib/lono/finder/base.rb
 - lib/lono/finder/blueprint.rb
 - lib/lono/finder/blueprint/configset.rb
 - lib/lono/finder/configset.rb
+- lib/lono/finder/extension.rb
 - lib/lono/generate.rb
 - lib/lono/help.rb
 - lib/lono/help/blueprint/new.md
@@ -562,6 +581,11 @@ files:
 - lib/lono/inspector/summary.rb
 - lib/lono/jade.rb
 - lib/lono/jade/circular.rb
+- lib/lono/jade/materializer.rb
+- lib/lono/jade/materializer/final.rb
+- lib/lono/jade/materializer/gems_builder.rb
+- lib/lono/jade/materializer/source.rb
+- lib/lono/jade/registry.rb
 - lib/lono/jadespec.rb
 - lib/lono/layering.rb
 - lib/lono/md5.rb
@@ -624,12 +648,14 @@ files:
 - lib/lono/template/context.rb
 - lib/lono/template/context/helpers.rb
 - lib/lono/template/context/loader.rb
+- lib/lono/template/context/loader/load_files.rb
 - lib/lono/template/context/ssm_fetcher.rb
 - lib/lono/template/evaluate.rb
 - lib/lono/template/generator.rb
 - lib/lono/template/helper.rb
 - lib/lono/template/post_processor.rb
 - lib/lono/template/strategy/base.rb
+- lib/lono/template/strategy/common/helpers.rb
 - lib/lono/template/strategy/dsl.rb
 - lib/lono/template/strategy/dsl/builder.rb
 - lib/lono/template/strategy/dsl/builder/fn.rb
@@ -641,7 +667,6 @@ files:
 - lib/lono/template/strategy/dsl/builder/helpers/tags_helper.rb
 - lib/lono/template/strategy/dsl/builder/section/base.rb
 - lib/lono/template/strategy/dsl/builder/section/condition.rb
-- lib/lono/template/strategy/dsl/builder/section/extensions.rb
 - lib/lono/template/strategy/dsl/builder/section/mapping.rb
 - lib/lono/template/strategy/dsl/builder/section/methods.rb
 - lib/lono/template/strategy/dsl/builder/section/output.rb
@@ -652,6 +677,8 @@ files:
 - lib/lono/template/strategy/dsl/builder/squeezer.rb
 - lib/lono/template/strategy/dsl/builder/stringify.rb
 - lib/lono/template/strategy/dsl/builder/syntax.rb
+- lib/lono/template/strategy/dsl/builder/syntax/extend_with.rb
+- lib/lono/template/strategy/dsl/builder/syntax/parameter_group.rb
 - lib/lono/template/strategy/dsl/finalizer.rb
 - lib/lono/template/strategy/dsl/finalizer/parameter_groups.rb
 - lib/lono/template/strategy/erb.rb
@@ -688,6 +715,20 @@ files:
 - lib/templates/configset/README.md.tt
 - lib/templates/configset/Rakefile.tt
 - lib/templates/configset/lib/configset.rb
+- lib/templates/extension/%extension_name%.gemspec.tt
+- lib/templates/extension/.gitignore
+- lib/templates/extension/.rspec
+- lib/templates/extension/CHANGELOG.md
+- lib/templates/extension/Gemfile.tt
+- lib/templates/extension/Rakefile.tt
+- lib/templates/extension/lib/%extension_name%.rb.tt
+- lib/templates/extension/lib/%extension_name%/helpers/mappings.rb.tt
+- lib/templates/extension/lib/%extension_name%/helpers/outputs.rb.tt
+- lib/templates/extension/lib/%extension_name%/helpers/parameters.rb.tt
+- lib/templates/extension/lib/%extension_name%/helpers/resources/resource.rb.tt
+- lib/templates/extension/lib/%extension_name%/helpers/variables.rb.tt
+- lib/templates/extension/lib/%extension_name%/version.rb.tt
+- lib/templates/extension/spec/spec_helper.rb.tt
 - lib/templates/skeleton/.gitignore
 - lib/templates/skeleton/Gemfile
 - lib/templates/skeleton/README.md

data/lib/lono/configset/registry.rb

@@ -1,34 +0,0 @@
-class Lono::Configset
-  class Registry
-    attr_reader :args, :options
-    attr_accessor :caller_line, :parent, :depends_on
-    def initialize(args, options)
-      @args, @options = args, options
-    end
-
-    def name
-      @args.first
-    end
-
-    def resource
-      @options[:resource]
-    end
-
-    def resource=(v)
-      @options[:resource] = v
-    end
-
-    def gem_options
-      options = @options.dup
-      # Delete special options that is not supported by bundler Gemfile
-      options.delete(:repo)
-      options.delete(:resource)
-      options.delete(:vars)
-      options
-    end
-
-    def vars
-      options[:vars] || {}
-    end
-  end
-end