lono 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4004cb33d3863a0160d5e75e3e24fd261448e206
-  data.tar.gz: b83737a5e2de0c98835fcebbc44da709b4e0e2b1
+  metadata.gz: 01b405f56d85200ea0063749316264a0587ea359
+  data.tar.gz: 8963150180a2ff89f2cf125bea08099e27b73917
 SHA512:
-  metadata.gz: 781e08333e3487dfc7025406f2b83b994bbadc22783bbb723e31f479ae4e9686accef93dfc870c6c014d6c8bb5245d24ff0ea55dfe6b4c33fd52cf01f65a693e
-  data.tar.gz: 9fbbd4cd14c0b7ae2b7a644950acb954fe54774c07f5c3d89a8a2cb302d2a02b43077e41e5ced05c5dc6c5cc08e7cd86cc2542763532251aebc82d8a05c2fabb
+  metadata.gz: c9c78aa0037081874d77499a5ae30e127558fcf36c99098a318bb87dd3b493c6c59b5092c316ce7c77be55d71634ec70143e1520463f0657d1312732376c24b8
+  data.tar.gz: 9cf8a0df5380cf41469efcb82ec35466d5e9a7737d60275c727f4897f47ed0f55c3ee4b88aec7cb02c308a63bbb8a701fd4fe1a64275cc2bf906419cbb1a5625

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.
 
+## [2.1.0]
+- improve instance_eval error when lono.rb errors, print out line of code and context
+
 ## [2.0.5]
 - add example template to starter app
 - add docs website

data/README.md

@@ -16,7 +16,9 @@ Lono is a tool for managing CloudFormation templates.
 * Lono takes simple env-like files to and generates the CloudFormation parameter files.
 * Lono wraps the CloudFormation api calls in a simple interface using the generated files to launch the CloudFormation stacks.
 
-These blog posts cover lono:
+Lono documentation is at [lono.cloud](http://lono.cloud).
+
+These blog posts also cover lono:
 
 * [Why Generate CloudFormation Templates with Lono](https://medium.com/boltops/why-generate-cloudformation-templates-with-lono-65b8ea5eb87d)
 * [Generating CloudFormation Templates with Lono](https://medium.com/boltops/generating-cloudformation-templates-with-lono-4709afa1299b)

data/lib/lono/clean.rb

@@ -9,7 +9,7 @@ class Lono::Clean
 
   def run
     puts "Cleaning up"
-    puts "Removing output/*"
-    FileUtils.rm_rf("#{@project_root}/output/*")
+    puts "Removing output/ folder"
+    FileUtils.rm_rf("#{@project_root}/output")
   end
 end

data/lib/lono/template/dsl.rb

@@ -16,11 +16,45 @@ class Lono::Template::DSL
   end
 
   def evaluate_templates
-    instance_eval(File.read(@path), @path)
+    evaluate_template(@path)
     load_subfolder
     @detected_format = detect_format
   end
 
+  def evaluate_template(path)
+    begin
+      instance_eval(File.read(path), path)
+    rescue Exception => e
+      template_evaluation_error(e)
+      puts "\nFull error:"
+      raise
+    end
+  end
+
+  # Prints out a user friendly task_definition error message
+  def template_evaluation_error(e)
+    error_info = e.backtrace.first
+    path, line_no, _ = error_info.split(':')
+    line_no = line_no.to_i
+    puts "Error evaluating #{path}:".colorize(:red)
+    puts e.message
+    puts "Here's the line in #{path} with the error:\n\n"
+
+    contents = IO.read(path)
+    content_lines = contents.split("\n")
+    context = 5 # lines of context
+    top, bottom = [line_no-context-1, 0].max, line_no+context-1
+    spacing = content_lines.size.to_s.size
+    content_lines[top..bottom].each_with_index do |line_content, index|
+      line_number = top+index+1
+      if line_number == line_no
+        printf("%#{spacing}d %s\n".colorize(:red), line_number, line_content)
+      else
+        printf("%#{spacing}d %s\n", line_number, line_content)
+      end
+    end
+  end
+
   # Detects the format of the templates.  Simply checks the extension of all the
   # templates files.
   # All the templates must be of the same format, either all json or all yaml.
@@ -48,7 +82,7 @@ class Lono::Template::DSL
   # load any templates defined in project/config/lono/*
   def load_subfolder
     Dir.glob("#{File.dirname(@path)}/lono/**/*").select{ |e| File.file? e }.each do |path|
-      instance_eval(File.read(path), path)
+      evaluate_template(path)
     end
   end
 

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "2.0.5"
+  VERSION = "2.1.0"
 end

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
+ENV['TEST'] = '1'
+# Ensures aws api never called. Fixture home folder does not contain ~/.aws/credentails
+ENV['HOME'] = "spec/fixtures/home"
+
 require "pp"
 require "byebug"
 require "bundler"
 
-ENV['TEST'] = '1'
-
 Bundler.require(:development)
 
 $root = File.expand_path('../../', __FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json