cfhighlander 0.2.1.alpha.16 → 0.2.1.alpha.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7e3dc363c120e270b173d9d06b32f2b9c7f3b616aae6a7967b2c72861b86948
-  data.tar.gz: 4459ae657c47d2bd3a24d09c635c9a30e441c13be99c165f014f74875fdd905d
+  metadata.gz: 4a7d7d97f9d94570594d6c075bd489aa6ae3058d6ce7c096a532ea65288c9de0
+  data.tar.gz: 19df3d0459ef71885b3f9e85f7067e2bcf73d7fc9e612af579d72a0fe59f1ad3
 SHA512:
-  metadata.gz: 086be5bfdc71f40ae9802bb8d7256a9a21abbc106a8943e77a95d378e80e127dc2db811ff7766281c88a5feeee7ad4fde6a0ed56b7e1f36bf4f95b172af3f620
-  data.tar.gz: 7ce4d1afa76815d1b9e64ee19982d27b31757956effc7a05c12e57aaaa05e2ec8296a2651653f46b6067c9128ed372f0a71ea5d579fe3ed6213bfc64b3ab400b
+  metadata.gz: 32eefcd197e05029a8d176dffef997238aa794fdd51684d31e9099d919e0bba9fe42ec7182f87c74437d074b91c0e3d4ab261b8624c8057e33c0595f960e473b
+  data.tar.gz: c3521f255a7f6509524b2df2e8a72289d6912375fd13a98e7270c38858db4dbcb9b0d08a723cff1603102fdf621ffa11c741c2f3a65d0af22f765390f272a309

data/README.md

@@ -1,8 +1,8 @@
 [![Build Status](https://travis-ci.com/theonestack/cfhighlander.svg?branch=develop)](https://travis-ci.com/theonestack/cfhighlander)
 
-# Highlander
+# Cfhighlander
 
-Highlander is DSL processor that enables composition and orchestration of Amazon CloudFormation templates 
+Cfhighlander is DSL processor that enables composition and orchestration of Amazon CloudFormation templates 
 written using [CfnDsl](https://github.com/cfndsl/cfndsl) in an abstract way. It tries to tackle problem of merging multiple templates into master
 template in an elegant way, so higher degree of template reuse can be achieved. It does so by formalising commonly
 used patterns via DSL statements. For an example, passing output of one stack into other stack is achieved using 
@@ -48,7 +48,7 @@ this file defines map used within component itself
 - Define cfndsl template used for building CloudFormation resources
 
 
-**Outer component** is component that defines other component via higlander dsl `Component` statement. Defined component
+**Outer component** is component that defines other component via cfhighlander dsl `Component` statement. Defined component
 is called **inner component**. Components defined under same outer component are **sibling components**
 
 ## Usage
@@ -58,30 +58,30 @@ For both ways, highlander is distributed as ruby gem
 
 
 ```bash
-$ gem install highlander
-$ highlander help
-highlander commands:
-  highlander cfcompile component[@version] -f, --format=FORMAT   # Compile Highlander component to CloudFormation templates
-  highlander cfpublish component[@version] -f, --format=FORMAT   # Publish CloudFormation template for component, and it' referenced subcomponents
-  highlander configcompile component[@version]                   # Compile Highlander components configuration
-  highlander dslcompile component[@version] -f, --format=FORMAT  # Compile Highlander component configuration and create cfndsl templates
-  highlander help [COMMAND]                                      # Describe available commands or one specific command
-  highlander publish component[@version] [-v published_version]  # Publish CloudFormation template for component, and it' referenced subcomponents
+$ gem install cfhighlander
+$ cfhighlander help
+cfhighlander commands:
+  cfhighlander cfcompile component[@version] -f, --format=FORMAT   # Compile Highlander component to CloudFormation templates
+  cfhighlander cfpublish component[@version] -f, --format=FORMAT   # Publish CloudFormation template for component, and it' referenced subcomponents
+  cfhighlander configcompile component[@version]                   # Compile Highlander components configuration
+  cfhighlander dslcompile component[@version] -f, --format=FORMAT  # Compile Highlander component configuration and create cfndsl templates
+  cfhighlander help [COMMAND]                                      # Describe available commands or one specific command
+  cfhighlander publish component[@version] [-v published_version]  # Publish CloudFormation template for component, and it' referenced subcomponents
 
 ```
 ### Working directory
 
 All templates and configuration generated are placed in `$WORKDIR/out` directory. Optionally, you can alter working directory
-via `HIGHLANDER_WORKDIR` environment variable. 
+via `CFHIGHLANDER_WORKDIR` environment variable. 
 
 ### Commands
 
 To get full list of options for any of cli commands use `highlander help command_name` syntax
 
 ```bash
-$ highlander help publish
+$ cfhighlander help publish
 Usage:
-  highlander publish component[@version] [-v published_version]
+  cfhighlander publish component[@version] [-v published_version]
 
 Options:
       [--dstbucket=DSTBUCKET]  # Distribution S3 bucket
@@ -95,7 +95,7 @@ Publish CloudFormation template for component,
 
 #### Silent mode
 
-Highlander DSL processor has built-in support for packaging and deploying AWS Lambda functions. Some of these lambda
+Cfhighlander DSL processor has built-in support for packaging and deploying AWS Lambda functions. Some of these lambda
 functions may require shell command to be executed (e.g. pulling library dependencies) prior their packaging in ZIP archive format.
 Such commands are potential security risk, as they allow execution of arbitrary code, so for this reason user agreement is required
 e.g:
@@ -136,11 +136,11 @@ cfndsl templates. Check component configuration section for more details.
 
 #### dslcompile
 
-*dslcompile* will produce intermediary cfndsl templates. This is useful for debugging highlander components
+*dslcompile* will produce intermediary cfndsl templates. This is useful for debugging cfhighlander components
 
 #### publish
 
-*publish* command publishes highlander components source code to s3 location (compared to *cfpublish* which is publishing
+*publish* command publishes cfhighlander components source code to s3 location (compared to *cfpublish* which is publishing
 compiled cloudformation templates). Same CLI / DSL options apply as for *cfpublish* command. Version defaults to `latest`
 
 
@@ -408,4 +408,4 @@ so extension methods can be consumed within cfndsl template.
 
 Any extensions placed within `cfndsl_ext` folder will be 
 available in cfndsl templates of all components. Any extensions placed within `hl_ext` folder are 
-available in highlander templates of all components. 
+available in cfhighlander templates of all components. 

data/bin/cfhighlander

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 
-require_relative('./highlander')
+require_relative('./cfhighlander')

data/bin/{highlander.rb → cfhighlander.rb}

@@ -9,7 +9,7 @@
 
 require 'thor'
 require 'rubygems'
-require_relative '../lib//highlander.compiler'
+require_relative '../lib/highlander.compiler'
 require_relative '../lib/highlander.factory'
 require_relative '../lib/highlander.publisher'
 require_relative '../lib/highlander.validator'
@@ -138,9 +138,7 @@ end
 
 # build component from passed cli options
 def build_component(options, component_name)
-  if ENV['HIGHLANDER_WORKDIR'].nil?
-    ENV['HIGHLANDER_WORKDIR'] = Dir.pwd
-  end
+
   component_version = options[:version]
   distribution_bucket = options[:dstbucket]
   distribution_prefix = options[:dstprefix]
@@ -155,4 +153,11 @@ def build_component(options, component_name)
   component
 end
 
+if ENV['CFHIGHLANDER_WORKDIR'].nil?
+  ENV['CFHIGHLANDER_WORKDIR'] = Dir.pwd
+end
+if ENV['HIGHLANDER_WORKDIR'].nil?
+  ENV['HIGHLANDER_WORKDIR'] = Dir.pwd
+end
+
 HighlanderCli.start

data/lib/highlander.compiler.rb

@@ -33,7 +33,7 @@ module Highlander
 
       def initialize(component)
 
-        @workdir = ENV['HIGHLANDER_WORKDIR']
+        @workdir = ENV['CFHIGHLANDER_WORKDIR']
         @component = component
         @sub_components = []
         @component_name = component.highlander_dsl.name.downcase

data/lib/highlander.dsl.rb

@@ -397,7 +397,6 @@ def HighlanderComponent(&block)
   puts "Processing higlander component #{@name}\n\tLocation:#{@highlander_dsl_path}" +
       "\n\tConfig:#{@config}"
 
-  component_config = @config
 
   instance.config = @config
 
@@ -426,3 +425,7 @@ def HighlanderComponent(&block)
 
   return instance
 end
+
+def CfhighlanderComponent(&block)
+  HighlanderComponent(&block)
+end

data/lib/highlander.factory.rb

@@ -2,7 +2,7 @@ require_relative './highlander.dsl'
 require 'fileutils'
 require 'git'
 
-LOCAL_HIGHLANDER_CACHE_LOCATION = "#{ENV['HOME']}/.highlander/components"
+LOCAL_HIGHLANDER_CACHE_LOCATION = "#{ENV['HOME']}/.cfhighlander/components"
 
 module Highlander
 
@@ -40,6 +40,7 @@ module Highlander
       def load_config()
         @config = {} if @config.nil?
         Dir["#{@component_dir}/*.config.yaml"].each do |config_file|
+          puts "Loading config for #{@name}:\n\tread #{config_file} "
           partial_config = YAML.load(File.read(config_file))
           unless partial_config.nil?
             @config.extend(partial_config)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.2.1.alpha.16
+  version: 0.2.1.alpha.23
 platform: ruby
 authors:
 - Nikola Tosic
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -214,7 +214,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/cfhighlander
-- bin/highlander.rb
+- bin/cfhighlander.rb
 - cfndsl_ext/config/managed_policies.yaml
 - cfndsl_ext/iam_helper.rb
 - cfndsl_ext/lambda_helper.rb