lono 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 277fec8b235735156d549bc309cebad6c7277eaf102ef4ac7d242d0af610c54a
-  data.tar.gz: 80239ae154cbd2de9ad4730fbcdccbc2b746654db65935f84ed1293a776c76be
+  metadata.gz: ffc3d416a358f6676a11c46731c18dff4c2eb1220ec68dce304e4e570e19dca0
+  data.tar.gz: 03a5e764bb8f66582d909fef1f5c32274e1a1105d4c3627a0834bb1316f0b2f4
 SHA512:
-  metadata.gz: 937af6ff08ea6e36ad6cb785f50665f3e50d9c45b90fcaa2dd4e09771824791cd7ea7cb9b1816dfaff6bd7a188824a9d4d30fbac93ccdafc508f79b17d9c2b8e
-  data.tar.gz: 16b40f4b8ddae0d6de37992ab7f8f673622d6a3097bec434db90cec0951386be2f96ddb6bd41d22758a5b3fef44d3bc8ee84672fe4623f97db53bef9e82302e0
+  metadata.gz: 2cf2ee72d6d80f0be84171139b45855d167012e28c54a262c5f7954941d577958d7cb600aecffc9fc446c8b5b4f1f873750ff8511eafc84197b875e9758952af
+  data.tar.gz: fdb40125279f0e67eea4e5abda5e445febfd3ce26ae427070f850955b794206c83f58e311778a6febb60ebba20ff6472afd3fae77609f7339402a15d4fb96bd9

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 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.
 
+## [6.0.1]
+- #14 restructure dsl methods are available in variables definition
+- #15 fix Type camelize bug
+- #16 add --variable option, allow user to specify
+
 ## [6.0.0]
 - #13 DSL improvements: auto camelize off by default
 - `auto_camelize: off` as new default for blueprints.

data/README.md

@@ -43,15 +43,15 @@ description "Demo stack"
 parameter("InstanceType", "t3.micro")
 
 mapping("AmiMap",
-  "us-east-1": { ami: "ami-0de53d8956e8dcf80" },
-  "us-west-2": { ami: "ami-061392db613a6357b" }
+  "us-east-1": { Ami: "ami-0de53d8956e8dcf80" },
+  "us-west-2": { Ami: "ami-061392db613a6357b" }
 )
 
 resource("Instance", "AWS::EC2::Instance",
-  instance_type: ref("InstanceType"),
-  image_id: find_in_map("AmiMap", ref("AWS::Region"), :ami),
-  security_group_ids: [get_att("SecurityGroup.GroupId")],
-  user_data: base64(user_data("bootstrap.sh"))
+  InstanceType: ref("InstanceType"),
+  ImageId: find_in_map("AmiMap", ref("AWS::Region"), "Ami"),
+  SecurityGroupIds: [get_att("SecurityGroup.GroupId")],
+  UserData: base64(user_data("bootstrap.sh"))
 )
 resource("SecurityGroup", "AWS::EC2::SecurityGroup",
   group_description: "demo security group",

data/lib/lono/cfn.rb

@@ -4,15 +4,16 @@ module Lono
     class_option :noop, type: :boolean
 
     base_options = Proc.new do
-      # common to create and update
+      # common to create, update and deploy
       option :blueprint, desc: "override convention and specify the template file to use"
-      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 :lono, type: :boolean, desc: "invoke lono to generate CloudFormation templates", default: true
       option :capabilities, type: :array, desc: "iam capabilities. Ex: CAPABILITY_IAM, CAPABILITY_NAMED_IAM"
       option :iam, type: :boolean, desc: "Shortcut for common IAM capabilities: CAPABILITY_IAM, CAPABILITY_NAMED_IAM"
+      option :lono, type: :boolean, desc: "invoke lono to generate CloudFormation templates", default: true
+      option :param, desc: "override convention and specify the param file to use"
       option :rollback, type: :boolean, desc: "rollback", default: true
       option :tags, type: :hash, desc: "Tags for the stack. IE: name:api-web owner:bob"
+      option :template, desc: "override convention and specify the template file to use"
+      option :variable, desc: "override convention and specify the variable file to use"
     end
     wait_option = Proc.new do
       option :wait, type: :boolean, desc: "Wait for stack operation to complete.", default: true

data/lib/lono/param/generator.rb

@@ -37,7 +37,7 @@ class Lono::Param
       medium_form = "#{root}/configs/#{@blueprint}/params/#{env}/#{@param}"
       short_form = "#{root}/configs/#{@blueprint}/params/#{env}"
 
-      if ENV['LONO_PARAM_DEBUG']
+      if ENV['LONO_DEBUG_PARAM']
         puts "Lono.blueprint_root #{Lono.blueprint_root}"
         puts "direct_absolute_form #{direct_absolute_form}"
         puts "direct_relative_form #{direct_relative_form}"
@@ -87,7 +87,7 @@ class Lono::Param
       @base_path = lookup_param_file(env: "base")
       @env_path = lookup_param_file(env: Lono.env)
 
-      if ENV['LONO_PARAM_DEBUG']
+      if ENV['LONO_DEBUG_PARAM']
         puts "  @base_path #{@base_path.inspect}"
         puts "  @env_path #{@env_path.inspect}"
       end

data/lib/lono/template/context.rb

@@ -4,7 +4,8 @@ class Lono::Template
     extend Memoist
     include Lono::Template::Helper
     include Loader
-    include Helpers
+    include Helpers # ERB
+    include Dsl::Builder::Syntax # DSL
 
     def initialize(blueprint, options={})
       @blueprint, @options = blueprint, options

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

@@ -8,14 +8,32 @@ class Lono::Template::Context
     #   config/variables/development.rb - will override any variables in base.rb
     #
     def load_variables
-      load_variables_file(blueprint_path("base"))
-      load_variables_file(blueprint_path(Lono.env))
       load_variables_file(project_path("base"))
-      load_variables_file(project_path(Lono.env))
+
+      direct_absolute_form = @options[:variable] # user provided the absolute full path
+      direct_relative_form = "#{Lono.root}/configs/#{@blueprint}/variables/#{@options[:variable]}" # user provided the full path within the lono project
+      conventional_form = project_path(Lono.env)
+
+      if ENV['LONO_DEBUG_VARIABLE']
+        puts "direct_absolute_form: #{direct_absolute_form.inspect}"
+        puts "direct_relative_form: #{direct_relative_form.inspect}"
+        puts "conventional_form: #{conventional_form.inspect}"
+      end
+
+      load_variables_file(variable_file(direct_absolute_form)) if variable_file?(direct_absolute_form)
+      load_variables_file(variable_file(direct_relative_form)) if variable_file?(direct_relative_form)
+      load_variables_file(conventional_form) if variable_file?(conventional_form)
+    end
+
+    def variable_file?(path)
+      return if path.nil?
+      return path if File.file?(path) # direct lookup with .rb extension
+      return "#{path}.rb" if File.file?("#{path}.rb") # direct lookup without .rb extension
     end
 
-    def blueprint_path(name)
-      "#{Lono.blueprint_root}/config/variables/#{name}.rb"
+    def variable_file(path)
+      return path if File.file?(path)
+      return "#{path}.rb" if File.file?("#{path}.rb")
     end
 
     def project_path(name)

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

@@ -3,9 +3,6 @@ class Lono::Template::Dsl
     include Lono::Template::Util
     include Lono::Template::Context::Loader
 
-    include Fn
-    include Helpers # built-in helpers
-    include Lono::Template::Evaluate
     include Syntax
     extend Memoist
 

data/lib/lono/template/dsl/builder/resource.rb

@@ -21,7 +21,7 @@ class Lono::Template::Dsl::Builder
       elsif definition.size == 2 && second.is_a?(String) # short form with no properties
         logical_id, type = first, second
         { logical_id => {
-            type: type
+            Type: type
         }}
       elsif definition.size == 3 && (second.is_a?(String) || second.is_a?(NilClass)) # short form
         logical_id, type, properties = first, second, third

data/lib/lono/template/dsl/builder/section_methods.rb

@@ -0,0 +1,57 @@
+# Organize core section method syntax here
+class Lono::Template::Dsl::Builder
+  module SectionMethods
+    def aws_template_format_version(version_date)
+      @cfn["AWSTemplateFormatVersion"] = version_date
+    end
+
+    def description(text)
+      @cfn["Description"] = text
+    end
+
+    def metadata(data)
+      @cfn["Metadata"] = data
+    end
+
+    def transform(*definition)
+      definition = definition.flatten
+      @cfn["Transform"] = definition.size == 1 ? definition.first : definition
+    end
+
+    def parameter(*definition)
+      @cfn["Parameters"] ||= {}
+      param = Parameter.new(@blueprint, definition)
+      @cfn["Parameters"].merge!(param.template)
+    end
+
+    def mapping(*definition)
+      @cfn["Mappings"] ||= {}
+      mapping = Mapping.new(@blueprint, definition)
+      @cfn["Mappings"].merge!(mapping.template)
+    end
+
+    def resource(*definition)
+      @cfn["Resources"] ||= {}
+      resource = Resource.new(@blueprint, definition)
+      @cfn["Resources"].merge!(resource.template)
+    end
+
+    def condition(*definition)
+      @cfn["Conditions"] ||= {}
+      condition = Condition.new(@blueprint, definition)
+      @cfn["Conditions"].merge!(condition.template)
+    end
+
+    def output(*definition)
+      @cfn["Outputs"] ||= {}
+      output = Output.new(@blueprint, definition)
+      @cfn["Outputs"].merge!(output.template)
+    end
+
+    # Generic section method in case CloudFormation adds a new future section.
+    # The generic section method adds a new top-level key
+    def section(key, definition)
+      @cfn[key] = Section.new(@blueprint, definition).template
+    end
+  end
+end

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

@@ -1,57 +1,9 @@
-# Organize core syntax here
+# Encapsulates syntax methods so they can be included in both the Builder and Context scope
 class Lono::Template::Dsl::Builder
   module Syntax
-    def aws_template_format_version(version_date)
-      @cfn["AWSTemplateFormatVersion"] = version_date
-    end
-
-    def description(text)
-      @cfn["Description"] = text
-    end
-
-    def metadata(data)
-      @cfn["Metadata"] = data
-    end
-
-    def transform(*definition)
-      definition = definition.flatten
-      @cfn["Transform"] = definition.size == 1 ? definition.first : definition
-    end
-
-    def parameter(*definition)
-      @cfn["Parameters"] ||= {}
-      param = Parameter.new(@blueprint, definition)
-      @cfn["Parameters"].merge!(param.template)
-    end
-
-    def mapping(*definition)
-      @cfn["Mappings"] ||= {}
-      mapping = Mapping.new(@blueprint, definition)
-      @cfn["Mappings"].merge!(mapping.template)
-    end
-
-    def resource(*definition)
-      @cfn["Resources"] ||= {}
-      resource = Resource.new(@blueprint, definition)
-      @cfn["Resources"].merge!(resource.template)
-    end
-
-    def condition(*definition)
-      @cfn["Conditions"] ||= {}
-      condition = Condition.new(@blueprint, definition)
-      @cfn["Conditions"].merge!(condition.template)
-    end
-
-    def output(*definition)
-      @cfn["Outputs"] ||= {}
-      output = Output.new(@blueprint, definition)
-      @cfn["Outputs"].merge!(output.template)
-    end
-
-    # Generic section method in case CloudFormation adds a new future section.
-    # The generic section method adds a new top-level key
-    def section(key, definition)
-      @cfn[key] = Section.new(@blueprint, definition).template
-    end
+    include Fn
+    include Helpers # built-in helpers
+    include Lono::Template::Evaluate
+    include SectionMethods
   end
 end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "6.0.0"
+  VERSION = "6.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-30 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -562,6 +562,7 @@ files:
 - lib/lono/template/dsl/builder/resource.rb
 - lib/lono/template/dsl/builder/resource/property_mover.rb
 - lib/lono/template/dsl/builder/section.rb
+- lib/lono/template/dsl/builder/section_methods.rb
 - lib/lono/template/dsl/builder/syntax.rb
 - lib/lono/template/erb.rb
 - lib/lono/template/evaluate.rb