ufo 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3d8f1f8c2b21980b90a1b68dfb5d79387c24aa1
-  data.tar.gz: 0e9a2a98ed9672e1afcbab2b227cb1ddf451b879
+  metadata.gz: 90a28bfa86e91d3ea36a942ebd7685507a9463b1
+  data.tar.gz: fe27b4aedda9f25ba87f919a78cd9d2f793c6c1a
 SHA512:
-  metadata.gz: 293470c3e6910644e4ab203af44f7b46a6b424f34adefe3fda97e430382c88043ef99f6d521dafa61d3ed9cab530f15e3430e23bee32484154272d666998ea14
-  data.tar.gz: d0a9fa4d3043a1cf834658299fef0f1cb142194d819ace3cc89967bee9888882776e254e5e7c4a84af258b54f6bf5517c861d4731734eb62b12f967c7266b291
+  metadata.gz: 0de91d904e57382fd4efbf827b4902803c5c79ec21824666c4a84b3c22b4d46cc89e942f21bf24142c61ae557b9fda8f8048c3d3cc5669cc4198319f90e70be0
+  data.tar.gz: c442de506a8cf9700049a74314498ea8a715138ec397185c95292d8a2ebf99853c0830bec440ab83932f3467ccae6ef4b54201055174c489e18f97869234dc64

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.
 
+## [1.1.0]
+
+* print out useful error for ERB template errors
+
 ## [1.0.1]
 
 * simplify `ufo task` command option

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ufo (0.1.6)
+    ufo (1.1.0)
       aws-sdk
       colorize
       deep_merge
@@ -20,94 +20,53 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    aws-sdk (2.9.12)
-      aws-sdk-resources (= 2.9.12)
-    aws-sdk-core (2.9.12)
+    aws-sdk (2.9.25)
+      aws-sdk-resources (= 2.9.25)
+    aws-sdk-core (2.9.25)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.9.12)
-      aws-sdk-core (= 2.9.12)
+    aws-sdk-resources (2.9.25)
+      aws-sdk-core (= 2.9.25)
     aws-sigv4 (1.0.0)
     builder (3.2.3)
     byebug (9.0.6)
-    codeclimate-test-reporter (0.6.0)
-      simplecov (>= 0.7.1, < 1.0.0)
-    coderay (1.1.1)
+    codeclimate-test-reporter (1.0.8)
+      simplecov (<= 0.13)
     colorize (0.8.1)
     deep_merge (1.1.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
-    ffi (1.9.14)
-    formatador (0.2.5)
-    guard (2.14.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-bundler (2.1.0)
-      bundler (~> 1.0)
-      guard (~> 2.2)
-      guard-compat (~> 1.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
     hashie (3.5.5)
-    i18n (0.8.1)
+    i18n (0.8.3)
     jmespath (1.3.1)
-    json (2.0.2)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.10)
-    method_source (0.8.2)
-    minitest (5.10.1)
-    nenv (0.3.0)
-    notiffany (0.1.1)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
+    json (2.1.0)
+    minitest (5.10.2)
     plissken (0.3.0)
       symbolize (~> 4.2)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rake (11.3.0)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.3)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rake (12.0.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    ruby_dep (1.4.0)
-    shellany (0.0.1)
-    simplecov (0.12.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
+    simplecov-html (0.10.1)
     symbolize (4.5.2)
       activemodel (>= 3.2, < 5)
       activesupport (>= 3.2, < 5)
       i18n
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.6)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
@@ -119,11 +78,9 @@ DEPENDENCIES
   bundler (~> 1.3)
   byebug
   codeclimate-test-reporter
-  guard
-  guard-bundler
-  guard-rspec
   rake
+  rspec
   ufo!
 
 BUNDLED WITH
-   1.14.6
+   1.15.0

data/README.md

@@ -1,4 +1,4 @@
-# Ufo - A Easy Way to Build and Ship Docker Images AWS ECS
+# Ufo - A Easy Way to Build and Ship Docker Images to AWS ECS
 
 [![CircleCI](https://circleci.com/gh/tongueroo/ufo.svg?style=svg)](https://circleci.com/gh/tongueroo/ufo)
 
@@ -22,7 +22,10 @@ Ufo deploys a task definition that is created via a template generator which is
 
     $ gem install ufo
 
-Dependencies: You will need a working version of docker installed as ufo shells out and calls the `docker` command.
+### Dependencies
+
+* Docker: You will need a working version of [Docker](https://docs.docker.com/engine/installation/) installed as ufo shells out and calls the `docker` command.
+* AWS: Set up your AWS credentials at `~/.aws/credentials` and `~/.aws/config`.  This is the [AWS standard way of setting up credentials](https://aws.amazon.com/blogs/security/a-new-and-standardized-way-to-manage-credentials-in-the-aws-sdks/).
 
 ## Quick Usage
 
@@ -31,7 +34,7 @@ Dependencies: You will need a working version of docker installed as ufo shells
 To execute the ship process run:
 
 ```bash
-ufo ship hi-web-prod--cluster mycluster
+ufo ship hi-web-prod --cluster mycluster
 ```
 
 Note, if you have configured `ufo/settings.yml` to map hi-web-prod to the `mycluster` cluster using the service_cluster option the command becomes simply:
@@ -181,12 +184,12 @@ This is easily accomplished with the `bin/deploy` wrapper script that the `ufo i
 ```bash
 #!/bin/bash -xe
 
-ufo ship hi-worker --cluster stag --no-wait
-ufo ship hi-clock --cluster stag --no-wait --no-docker
-ufo ship hi-web-prod--cluster stag --no-docker
+ufo ship hi-worker-prod --cluster stag --no-wait
+ufo ship hi-clock-prod --cluster stag --no-wait --no-docker
+ufo ship hi-web-prod --cluster stag --no-docker
 ```
 
-The first `ufo ship hi-worker` command build and ships docker image to ECS, but the following two `ufo ship` commands use the `--no-docker` flag to skip the `docker build` step.  `ufo ship` will use the last built docker image as the image to be shipped.  For those curious, this is stored in `ufo/docker_image_name_ufo.txt`.
+The first `ufo ship hi-worker-prod` command build and ships docker image to ECS, but the following two `ufo ship` commands use the `--no-docker` flag to skip the `docker build` step.  `ufo ship` will use the last built docker image as the image to be shipped.  For those curious, this is stored in `ufo/docker_image_name_ufo.txt`.
 
 ### Service and Task Names Convention
 

data/lib/ufo/dsl/outputter.rb

@@ -13,8 +13,8 @@ module Ufo
         FileUtils.rm_rf(output_path) if @options[:clean]
         FileUtils.mkdir(output_path) unless File.exist?(output_path)
 
-        path = "#{output_path}/#{@name}.json"
-        puts "Generated task definition at: #{path}" unless @options[:quiet]
+        path = "#{output_path}/#{@name}.json".sub(/^\.\//,'')
+        puts "  #{path}" unless @options[:quiet]
         validate(@erb_result, path)
         json = @pretty ?
           JSON.pretty_generate(JSON.parse(@erb_result)) :

data/lib/ufo/dsl/task_definition.rb

@@ -20,10 +20,40 @@ module Ufo
 
       def build
         instance_eval(&@block)
-        erb_template = IO.read(source_path)
-        ERB.new(erb_template).result(binding)
+        erb_result(source_path)
       end
 
+      def erb_result(path)
+        template = IO.read(path)
+        begin
+          ERB.new(template, nil, "-").result(binding)
+        rescue Exception => e
+          puts e
+
+          # how to know where ERB stopped? - https://www.ruby-forum.com/topic/182051
+          # syntax errors have the (erb):xxx info in e.message
+          # undefined variables have (erb):xxx info in e.backtrac
+          error_info = e.message.split("\n").grep(/\(erb\)/)[0]
+          error_info ||= e.backtrace.grep(/\(erb\)/)[0]
+          raise unless error_info # unable to find the (erb):xxx: error line
+          line = error_info.split(':')[1].to_i
+          puts "Error evaluating ERB template on line #{line.to_s.colorize(:red)} of: #{path.sub(/^\.\//, '')}"
+
+          template_lines = template.split("\n")
+          context = 5 # lines of context
+          top, bottom = [line-context-1, 0].max, line+context-1
+          spacing = template_lines.size.to_s.size
+          template_lines[top..bottom].each_with_index do |line_content, index|
+            line_number = top+index+1
+            if line_number == line
+              printf("%#{spacing}d %s\n".colorize(:red), line_number, line_content)
+            else
+              printf("%#{spacing}d %s\n", line_number, line_content)
+            end
+          end
+          exit 1 unless ENV['TEST']
+        end
+      end
       # at this point instance_eval has been called and source has possibly been called
       def source(name)
         @source = name

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/spec_helper.rb

@@ -3,6 +3,9 @@ ENV['TEST'] = '1'
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 
+# Ensures aws api never called. Fixture home folder does not contain ~/.aws/credentails
+ENV['HOME'] = "spec/fixtures/home"
+
 require "pp"
 require "byebug"
 
@@ -27,7 +30,5 @@ RSpec.configure do |c|
   c.include Helpers
 
   c.before(:each) do
-    # ensures we never called real aws api since the fixture home folder does not have ~/.aws/credentails setup
-    ENV['HOME'] = "spec/fixtures/home"
   end
 end

data/ufo.gemspec

@@ -28,7 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-bundler"
-  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -137,35 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -256,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Build Docker Containers and Ship Them to AWS ECS