ufo 4.1.2 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 913fc3663c65dc235081311b3ecbb30d8deccda12d48b270a109fa937c32a0cd
-  data.tar.gz: bb4e8be1f00d616aa4a291b990e4d7173a5b50a60660ff408f51c0c02714b87e
+  metadata.gz: 93c6b17c7c0722a44185ef2449241c9ad716838317d2cc64d4d328a027221721
+  data.tar.gz: 730ca94c0a44a9648fb9e10de9197c9f4c7e8f58bcca58ce0391876d6f3d5bd7
 SHA512:
-  metadata.gz: f1cefafb8a8f89a8897311621cae298349a331904b5072e16227139ae361b1b7626d42d7a1b8f56384ac1063b551fe84a507736ff9fb868eca1ba3d69d5a0b7a
-  data.tar.gz: a6c27db5966e491c1a1e39689331939e16e01bbc789a3c8b2c512bb53b177bdc9e4ac3bdd020559476755bda60f171fd9c99f3e930d7ae87fb429c536bc8513a
+  metadata.gz: 688ae4a1750d046d6e53251ba3867d35bcdf4b2d292e4c7d2744d25ba690ed58be19a92f822bfc1ba002735d7bbb90e7f6d0aae1f08e610932df7f8e83c1f5e3
+  data.tar.gz: 0f26fec4175b0788c606f4933f7b8ed5c243b45a8cb4a1f4efe9c7bc821b34b343b8222f8e1b333e22c92130750c44fd14c5634e89db23c6366a824ba969ff95

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 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.
 
+## [4.1.4]
+- improve regexp for striping trailing comments in env files, fixes #47
+
+## [4.1.3]
+- build the task definition by default for ufo deploy
+
 ## [4.1.2]
 - add --build option for ufo deploy
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ufo (4.1.1)
+    ufo (4.1.3)
       aws-sdk-cloudformation
       aws-sdk-cloudwatchlogs
       aws-sdk-ec2
@@ -19,34 +19,34 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.0)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     aws-eventstream (1.0.1)
-    aws-partitions (1.95.0)
+    aws-partitions (1.100.0)
     aws-sdk-cloudformation (1.6.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sdk-cloudwatchlogs (1.4.0)
+    aws-sdk-cloudwatchlogs (1.5.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sdk-core (3.22.1)
+    aws-sdk-core (3.24.1)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.38.0)
+    aws-sdk-ec2 (1.42.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
     aws-sdk-ecr (1.4.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sdk-ecs (1.15.0)
+    aws-sdk-ecs (1.17.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sdk-elasticloadbalancingv2 (1.11.0)
+    aws-sdk-elasticloadbalancingv2 (1.12.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.3)
@@ -59,7 +59,7 @@ GEM
     deep_merge (1.2.1)
     diff-lcs (1.3)
     docile (1.1.5)
-    i18n (1.0.1)
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     json (2.1.0)
@@ -71,19 +71,19 @@ GEM
       activesupport
       colorize
       tilt
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -109,4 +109,4 @@ DEPENDENCIES
   ufo!
 
 BUNDLED WITH
-   1.16.1
+   1.16.3

data/README.md

@@ -2,13 +2,13 @@
   <img src="http://ufoships.com/img/logos/ufo-logo.png" />
 </div>
 
-# Ufo - ECS Deployment Tool
+# UFO - ECS Deployment Tool
 
 [![CircleCI](https://circleci.com/gh/tongueroo/ufo.svg?style=svg)](https://circleci.com/gh/tongueroo/ufo)
 [![Join the chat at https://gitter.im/tongueroo/ufo](https://badges.gitter.im/tongueroo/ufo.svg)](https://gitter.im/tongueroo/ufo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Support](https://img.shields.io/badge/get-support-blue.svg)](https://boltops.com?utm_source=badge&utm_medium=badge&utm_campaign=ufo)
 
-Ufo is a tool that eases the building and deployment of Docker images to [AWS ECS](https://aws.amazon.com/ecs/).  The main command is `ufo ship`.  Here's summary of what it does:
+Ufo is a tool that builds Docker images and deploys them to [AWS ECS](https://aws.amazon.com/ecs/).  The main command is `ufo ship`.  Here's summary of what it does:
 
 1. Builds a docker image. 
 2. Generates and registers the ECS template definition. 
@@ -35,7 +35,7 @@ To quickly demonstrate how simple it is to use ufo we will use an example app fr
     gem install ufo
     git clone https:///github.com/tongueroo/demo-ufo.git demo
     cd demo
-    ufo init --app=demo --image=tongueroo/demo-ufo
+    ufo init --image=tongueroo/demo-ufo
     ufo ship demo-web
 
 Congratulations, you have successfully used ufo to deploy to an ECS service.
@@ -46,9 +46,11 @@ Ufo can also create a load balancer as part of creating the ECS service if you w
 
 ## Articles
 
-* This blog post provides an introduction to the tool: [Ufo - Build Docker Containers and Ship Them to AWS ECS](https://medium.com/@tongueroo/ufo-easily-build-docker-containers-and-ship-them-to-aws-ecs-15556a2b39f#.qqu8o4wal).
-* This presentation covers ufo also: [Ufo Ship on AWS ECS](http://www.slideshare.net/tongueroo/ufo-ship-for-aws-ecs-70885296)
-
+* [UFO How to Create Unlimited Extra Environments](https://blog.boltops.com/2018/07/12/ufo-how-to-create-unlimited-extra-environments)
+* [UFO and ECS Fargate Introduction Tutorial](https://blog.boltops.com/2018/07/11/ufo-and-ecs-fargate-introduction-tutorial)
+* [UFO ECS Deployment Tool Introduction](https://blog.boltops.com/2018/07/06/ufo-ecs-deployment-tool-introduction)
+* [UFO Version 4 Release: Load Balancer Support](https://blog.boltops.com/2018/07/05/ufo-version-4-release)
+* [UFO Ship on AWS ECS Presentation](http://www.slideshare.net/tongueroo/ufo-ship-for-aws-ecs-70885296)
 
 ## Contributing
 

data/docs/_includes/footer.html

@@ -6,8 +6,9 @@
                     <div class="footer-col col-md-4">
                         <h3>More Tools</h3>
                         <ul class="list-unstyled tools">
-                            <li><a href="http://sonic-screwdriver.cloud">Sonic Screwdriver</a></li>
+                            <li><a href="http://rubyonjets.com">Jets</a></li>
                             <li><a href="http://lono.cloud">Lono</a></li>
+                            <li><a href="http://sonic-screwdriver.cloud">Sonic</a></li>
                             <li><a href="http://jack-eb.com">Jack</a></li>
                             <li><a href="https://boltops.com/toolbelt">Toolbelt</a></li>
                         </ul>

data/docs/_includes/header.html

@@ -1,9 +1,9 @@
     <!-- Header -->
-    <header>
+    <header style="background-color: #12153e">
         <div class="container">
             <div class="row">
                 <div class="col-lg-12">
-                    <img class="img-responsive" src="/img/logos/ufo-logo.png" alt="">
+                    <img class="img-responsive" src="/img/logos/ufo-logo-2.png" alt="">
                     <div class="intro-text">
                         <span class="name">UFO</span>
                         <hr class="star-light">

data/docs/_reference/ufo-deploy.md

@@ -20,13 +20,13 @@ The above command does the following:
 1. register the `.ufo/output/demo-web.json` task definition to ECS untouched.
 2. deploys it to ECS by updating the service
 
-### ufo tasks build
+## ufo tasks build
 
 To regenerate a `.ufo/output/demo-web.json` definition:
 
     ufo tasks build
 
-### ufo ship
+## ufo ship
 
 The `ufo deploy` command does less than the `ufo ship` command.  Normally, it is recommended to use `ufo ship` over the `ufo deploy` command to do everything in one step:
 
@@ -38,6 +38,18 @@ The `ufo ships`, `ufo ship`, `ufo deploy` command support the same options. The
 
 {% include ufo-ship-options.md %}
 
+## Creating mutiple environments in parallel
+
+If you would like to create multiple enviroments quickly in parallel, the `--no-wait` and `--build` option can help speed up the process.  Example:
+
+    ufo ship # at least once
+    for i in {1..3}; do
+      UFO_ENV_EXTRA=$i ufo deploy --no-wait --build
+    done
+
+A more detailed post is available here: [How to Create Unlimited Extra Environments
+](https://blog.boltops.com/2018/07/12/ufo-how-to-create-unlimited-extra-environments).
+
 
 ## Options
 
@@ -55,6 +67,7 @@ The `ufo ships`, `ufo ship`, `ufo deploy` command support the same options. The
 [--register], [--no-register]              # Register task definition
                                            # Default: true
 [--build], [--no-build]                    # Build task definition
+                                           # Default: true
 [--verbose], [--no-verbose]                
 [--mute], [--no-mute]                      
 [--noop], [--no-noop]                      

data/docs/_reference/ufo-ship.md

@@ -73,6 +73,9 @@ By default when ufo updates the ECS service with the new task definition it does
 
     ufo ship demo-web --no-wait
 
+The `--no-wait` option is useful for creating multiple environments:: [How to Create Unlimited Extra Environments
+](https://blog.boltops.com/2018/07/12/ufo-how-to-create-unlimited-extra-environments).
+
 ### Route 53 DNS Support
 
 Ufo can automatically create a "pretty" route53 record an set it to the created ELB dns name. This is done in by configuring the `.ufo/settings/network/[profile].yml` file. Example:

data/docs/articles.md

@@ -2,8 +2,13 @@
 title: Articles
 ---
 
-* This blog post provides an introduction to the tool: [Ufo - Build Docker Containers and Ship Them to AWS ECS](https://medium.com/@tongueroo/ufo-easily-build-docker-containers-and-ship-them-to-aws-ecs-15556a2b39f#.qqu8o4wal)
-* This presentation covers ufo also: [Ufo Ship on AWS ECS](http://www.slideshare.net/tongueroo/ufo-ship-for-aws-ecs-70885296)
+* [How to Create Unlimited Extra Environments
+](https://blog.boltops.com/2018/07/12/ufo-how-to-create-unlimited-extra-environments)
+* [UFO and ECS Fargate Introduction Tutorial](https://blog.boltops.com/2018/07/11/ufo-and-ecs-fargate-introduction-tutorial)
+* [UFO ECS Deployment Tool Introduction](https://blog.boltops.com/2018/07/06/ufo-ecs-deployment-tool-introduction)
+* [UFO Version 4 Release: Load Balancer Support](https://blog.boltops.com/2018/07/05/ufo-version-4-release)
+* [Heroku vs ECS Fargate vs EC2 On-Demand vs EC2 Spot Pricing Comparison](https://blog.boltops.com/2018/04/22/heroku-vs-ecs-fargate-vs-ec2-on-demand-vs-ec2-spot-pricing-comparison)
+* [Ufo Ship on AWS ECS Presentation](http://www.slideshare.net/tongueroo/ufo-ship-for-aws-ecs-70885296)
 
 <a id="prev" class="btn btn-basic" href="{% link _docs/auto-completion.md %}">Back</a>
 <a id="next" class="btn btn-primary" href="{% link _docs/next-steps.md %}">Next Step</a>

data/docs/quick-start.md

@@ -6,9 +6,9 @@ In a hurry? No sweat! Here's a quick start to using ufo that takes only a few mi
 
 ```sh
 gem install ufo
-git clone https://github.com/tongueroo/demo-ufo.git
-cd demo-ufo
-ufo init --app=demo --image=tongueroo/demo-ufo
+git clone https://github.com/tongueroo/demo-ufo.git demo
+cd demo
+ufo init --image=tongueroo/demo-ufo
 ufo current --service demo-web
 ufo ship
 ufo ps

data/lib/ufo/cli.rb

@@ -47,7 +47,7 @@ module Ufo
     long_desc Help.text(:deploy)
     ship_options.call
     option :register, type: :boolean, desc: "Register task definition", default: true
-    option :build, type: :boolean, desc: "Build task definition", default: false
+    option :build, type: :boolean, desc: "Build task definition", default: true
     def deploy(service=:current)
       service = service == :current ? Current.service! : service
       task_definition = options[:task] || service # convention

data/lib/ufo/dsl/helper.rb

@@ -41,7 +41,7 @@ module Ufo
       def filtered_lines(text)
         lines = text.split("\n")
         # remove comment at the end of the line
-        lines.map! { |l| l.sub(/#.*/,'').strip }
+        lines.map! { |l| l.sub(/\s+#.*/,'').strip }
         # filter out commented lines
         lines = lines.reject { |l| l =~ /(^|\s)#/i }
         # filter out empty lines

data/lib/ufo/help/deploy.md

@@ -33,3 +33,6 @@ If you would like to create multiple enviroments quickly in parallel, the `--no-
     for i in {1..3}; do
       UFO_ENV_EXTRA=$i ufo deploy --no-wait --build
     done
+
+A more detailed post is available here: [How to Create Unlimited Extra Environments
+](https://blog.boltops.com/2018/07/12/ufo-how-to-create-unlimited-extra-environments).

data/lib/ufo/help/ship.md

@@ -60,6 +60,9 @@ By default when ufo updates the ECS service with the new task definition it does
 
     ufo ship demo-web --no-wait
 
+The `--no-wait` option is useful for creating multiple environments:: [How to Create Unlimited Extra Environments
+](https://blog.boltops.com/2018/07/12/ufo-how-to-create-unlimited-extra-environments).
+
 ### Route 53 DNS Support
 
 Ufo can automatically create a "pretty" route53 record an set it to the created ELB dns name. This is done in by configuring the `.ufo/settings/network/[profile].yml` file. Example:

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "4.1.2"
+  VERSION = "4.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
@@ -408,6 +408,7 @@ files:
 - docs/img/docs/cloudformation-resources.png
 - docs/img/logos/boltops-logo-full.png
 - docs/img/logos/boltops-logo.png
+- docs/img/logos/ufo-logo-2.png
 - docs/img/logos/ufo-logo.png
 - docs/img/logos/ufo-site-header.png
 - docs/img/logos/ufo.jpg