cfhighlander 0.5.0.alpha.1537756555 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6c0a1c38615bb1f785ef21558c6837c83fdff6f3794088c4fa71ae4cb799ca1
-  data.tar.gz: 7bb734af3575bcde2743f6146910fbe31432bab774bdf1f979246791e337ed5e
+  metadata.gz: 7b7c838fff4e882df269d587a0d5b2048110c578b427736aa585e1263356518c
+  data.tar.gz: 3c3550787154b47551e400e5dd62bb5f4a6da44f43581d89ebd805bd27752246
 SHA512:
-  metadata.gz: 110021afdd5b96b11637064b5f6f106cfc09cb06075acc7df83ff593965441e176e26d6c4ac5b77cf8447647f54d6ea7ff08ba17103cc5f1e2f06835888dbb9f
-  data.tar.gz: 0d6ac9d296a14a87b827f593ec7fb2cc19cb329f5afde8cc004035cc681e6fe0c4de03bc96048163c2322f516b4410057a92acbe8fe8a58e5f1fd9918f1fb842
+  metadata.gz: 9d7e9c626748c6abd2fe83868883f13b130920cc00fb18b4228d49f7c9494cbb9a08cc9e224faa12b283c9c4663699e8e34045e7ae98c9384e16de5fb42cf952
+  data.tar.gz: 0e332bd182449545b18abef13c834544f229a85c1c3a54b6a233ca621f96190969705fccdd2d187ad335d6d339f5eae32f4b81be82fe0136683e0d0ec86b86d4

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/theonestack/cfhighlander.svg?branch=develop)](https://travis-ci.org/theonestack/cfhighlander) [![Join the chat at https://gitter.im/theonestack/cfhighlander](https://badges.gitter.im/theonestack/cfhighlander.svg)](https://gitter.im/theonestack/cfhighlander?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://travis-ci.org/theonestack/cfhighlander.svg?branch=develop)](https://travis-ci.org/theonestack/cfhighlander)
 
 # Intro
 
@@ -39,7 +39,7 @@ has to be done manually - either if you build JSON/YAML templates by hand,
 or if using `Cfndsl`. With cfhighlander, this code is automatically generated for you
 
 ```ruby
-## place contents below in file name application.cfhighlander.rb
+
 CfhighlanderTemplate do
 
   # explicit configuration for vpc component
@@ -80,13 +80,13 @@ end
 ... compile the template with ... 
 
 ```shell
-cfcompile application
+cfcompile application.cfhighlander.rb
 ```
 
 ... and check how the subnets are being passed around ..
 
 ```shell
-$ cat out/yaml/application.compiled.yaml | grep  -A3 SubnetCompute0
+$ cat out/yaml/app.compiled.yaml | grep  -A3 SubnetCompute0
           SubnetCompute0:
             Fn::GetAtt:
             - vpc

data/lib/cfhighlander.compiler.rb

@@ -246,41 +246,41 @@ module Cfhighlander
           FileUtils.remove full_destination_path if File.exist? full_destination_path
 
           # download file if code remote archive
-          puts "INFO | Lambda #{name} | Start package process"
-          puts "INFO | Lambda #{name} | Destination is #{full_destination_path}"
+          puts "Packaging AWS Lambda function #{name}...\n"
+          puts "Destination archive is #{full_destination_path}"
 
           md5 = Digest::MD5.new
           md5.update lambda_config['code']
           hash = md5.hexdigest
-          cached_location = "#{ENV['HOME']}/.cfhighlander/cache/lambdas/#{hash}"
+          cached_location = "#{@workdir}/.cache/lambdas/#{hash}"
           if cached_downloads.key? lambda_config['code']
-            puts "INFO | Lambda #{name} | Using already downloaded archive #{lambda_config['code']}"
+            puts "Using already downloaded archive #{lambda_config['code']}"
             FileUtils.copy(cached_downloads[lambda_config['code']], full_destination_path)
           elsif File.file? cached_location
-            puts "INFO | Lambda #{name} | Using cache from #{cached_location}"
+            puts "Using cached download - '#{cached_location}'"
             FileUtils.copy(cached_location, full_destination_path)
           else
             if lambda_config['code'].include? 'http'
-              puts "INFO | Lambda #{name} |  Downloading source from #{lambda_config['code']}"
+              puts "INFO Downloading lambda #{name} source from #{lambda_config['code']}"
               download = open(lambda_config['code'])
               IO.copy_stream(download, "#{out_folder}/src.zip")
-              FileUtils.mkdir_p("#{ENV['HOME']}/.cfhighlander/cache/lambdas")
+              FileUtils.mkdir_p('.cache/lambdas')
               FileUtils.copy("#{out_folder}/src.zip", cached_location)
               FileUtils.copy("#{out_folder}/src.zip", full_destination_path)
-              puts "INFO | Lambda #{name} | source cached to #{cached_location}"
+              puts "INFO lambda #{name} source cached to #{cached_location}"
               cached_downloads[lambda_config['code']] = cached_location
             elsif lambda_config['code'].include? 's3://'
               parts = lambda_config['code'].split('/')
               if parts.size < 4
-                STDERR.puts "ERROR | Lambda #{name} |  Lambda function source code from s3 should be in s3://bucket/path format"
+                STDERR.puts "ERROR: Lambda function source code from s3 should be in s3://bucket/path format"
                 exit -8
               end
               bucket = parts[2]
               key = parts.drop(3).join('/')
               s3 = Aws::S3::Client.new({ region: s3_bucket_region(bucket) })
-              puts "INFO | Lambda #{name} | Downloading source from #{lambda_config['code']}"
+              puts "INFO Downloading lambda #{name} source from #{lambda_config['code']}"
               s3.get_object({ bucket: bucket, key: key, response_target: cached_location })
-              puts "INFO | Lambda #{name} | source cached to #{cached_location}"
+              puts "INFO lambda #{name} source cached to #{cached_location}"
               FileUtils.copy(cached_location, full_destination_path)
               cached_downloads[lambda_config['code']] = cached_location
             else
@@ -297,7 +297,7 @@ module Cfhighlander
                 component_dir = nil unless parent_exists
               end
               if component_dir.nil?
-                STDERR.puts "ERROR | Lambda #{name} | Could not find source code directory in component #{@component.name}"
+                STDERR.puts "ERROR: Could not find source code directory for lambda function #{name} in component #{@component.name}"
                 exit -9
               end
 
@@ -316,7 +316,7 @@ module Cfhighlander
 
               # Lambda function source code allows pre-processing (e.g. install code dependencies)
               unless lambda_config['package_cmd'].nil?
-                puts "INFO | Lambda #{name} | Following code will be executed to generate lambda function #{name}:\n\n#{lambda_config['package_cmd']}\n\n"
+                puts "Following code will be executed to generate lambda function #{name}:\n\n#{lambda_config['package_cmd']}\n\n"
 
                 if @confirm_code_execution
                   exit -7 unless HighLine.agree('Proceed (y/n)?')
@@ -326,7 +326,7 @@ module Cfhighlander
                 puts 'Processing package command...'
                 package_result = system(package_cmd)
                 unless package_result
-                  puts "ERROR | Lambda #{name} | create package - following command failed\n\n#{package_cmd}\n\n"
+                  puts "Error packaging lambda function, following command failed\n\n#{package_cmd}\n\n"
                   exit -4
                 end
               end
@@ -342,7 +342,7 @@ module Cfhighlander
           end
           sha256 = Digest::SHA256.file full_destination_path
           sha256 = sha256.base64digest
-          puts "INFO | Lambda #{name} | Created zip package #{full_destination_path} with digest #{sha256}"
+          puts "Created zip package #{full_destination_path} for lambda #{name} with digest #{sha256}"
           @metadata['sha256'][name] = sha256
           @metadata['version'][name] = timestamp
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.5.0.alpha.1537756555
+  version: 0.5.0
 platform: ruby
 authors:
 - Nikola Tosic
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -278,9 +278,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7