ufo 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 480370e11a41c52b4621077e0fa0aaaa80351468c4d14f8d84239399ffd0f321
-  data.tar.gz: 1f5622d7faf49ae0fa2dd038b6ba221306805fb4d7a12406f9ead4426e78df23
+  metadata.gz: 9526c75651199d68e6ab75d2c9ead77f0fe98494dea3bd9bca13a3c2693e2151
+  data.tar.gz: bb7af2fbd70a4a59e63a8b39907c4923310aeb5d4dc4aeac4e906509af4b1e5b
 SHA512:
-  metadata.gz: f0ae8e2dfcc53a6f39fcda7caa3f01fcd64795ae8ec1b58c9e89109b116036355c3df063233599411fc97c0c3e2a3ef0fbe1741e4d3b1e2a0c65618d7954018c
-  data.tar.gz: 10070e225d4de1d08fe514e250fb1a8165a33653423438cddf4e3b0f8e8fc40d2b04a4a5e1981ae13f03ddd566c8a8cf19a8a4b0ab59c011ef0224a318376a0b
+  metadata.gz: 2a0c2bd7632a8f0643072130d074fd8730f683803eba102d830ec6c875ecc23173139e72883ff40c99fdb884ef07b97e3c2df54f3348d4772e784c26fa7bacb7
+  data.tar.gz: e09b54aa2f9bc98a729f74592036def9b4caa5ee531c1addab982e4a6576d52c52645027c5da9a243b911f6cb02b2ce14e057a6832a4c836c3986f77e3585d1d

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.
 
+## [3.3.2]
+- Merge pull request #28 from netguru/master
+- Fix one off task: ufo task
+
 ## [3.3.1]
 - fix starter template name
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ufo (3.2.2)
+    ufo (3.3.2)
       aws-sdk-cloudwatchlogs
       aws-sdk-ec2
       aws-sdk-ecr
@@ -21,11 +21,11 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    aws-partitions (1.70.0)
+    aws-partitions (1.73.0)
     aws-sdk-cloudwatchlogs (1.2.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sdk-core (3.17.0)
+    aws-sdk-core (3.17.1)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
@@ -35,14 +35,14 @@ GEM
     aws-sdk-ecr (1.3.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sdk-ecs (1.10.0)
+    aws-sdk-ecs (1.12.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
     aws-sdk-elasticloadbalancingv2 (1.8.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.2)
-    byebug (10.0.0)
+    byebug (10.0.1)
     cli_markdown (0.1.0)
     codeclimate-test-reporter (1.0.8)
       simplecov (<= 0.13)
@@ -57,8 +57,8 @@ GEM
     json (2.1.0)
     minitest (5.11.3)
     plissken (1.2.0)
-    rake (12.3.0)
-    render_me_pretty (0.8.0)
+    rake (12.3.1)
+    render_me_pretty (0.8.1)
       activesupport
       colorize
       tilt

data/docs/_docs/tutorial-ufo-init.md

@@ -57,8 +57,8 @@ The explanation of the folders and files were covered in detailed earlier at [St
 Take a look at the `settings.yml` file and notice that it contains some default configuration settings so you do not have to type out these options repeatedly for some of the ufo commands.
 
 ```yaml
-# More info: http://ufoships.com/docs/ufo-settings/
-base: &base
+# More info: http://ufoships.com/docs/settings/
+base:
   image: tongueroo/hi
   # clean_keep: 30 # cleans up docker images on your docker server.
   # ecr_keep: 30 # cleans up images on ECR and keeps this remaining amount. Defaults to keep all.
@@ -69,7 +69,6 @@ base: &base
     desired_count: 1
 
 development:
-  <<: *base
   # cluster: dev # uncomment if you want the cluster name be other than the default
                  # the default is to match UFO_ENV.  So UFO_ENV=development means the ECS
                  # cluster will be name development
@@ -81,7 +80,6 @@ development:
   #   - dev_profile2
 
 production:
-  <<: *base
   # cluster: prod
   # aws_profiles:
   #   - prod_profile

data/docs/_reference/ufo-init.md

@@ -65,7 +65,7 @@ If you would like the `ufo init` command to use your own custom templates, you c
 
     ufo init --app=hi --image=tongueroo/hi --template=tongueroo/ufo-custom-template
 
-This will clone the repo on GitHub into the `~/.ufo/templates/tongueroo/ufo-custom-template` and use that as an additional template source.  The default `--template-mode=additive` which means that if there's a file in `tongueroo/ufo-custom-template` that exists it will use that in place of the default template files.
+This will clone the repo on GitHub into the `~/.ufo/templates/tongueroo/ufo-custom-template` and use that as an additional template source.  The default `--template-mode=additive` mode means that if there's a file in `tongueroo/ufo-custom-template` that exists it will use that in place of the default template files.
 
 If you do not want to use any of the original default template files within the ufo gem at all, you can use the `--template-mode=replace` mode. Replace mode will only use templates from the provided `--template` option.  Example:
 

data/lib/ufo/docker/builder.rb

@@ -8,7 +8,7 @@ class Ufo::Docker
     def self.build(options)
       builder = Builder.new(options) # outside if because it need builder.full_image_name
       builder.build
-      pusher = Docker::Pusher.new(nil, options)
+      pusher = Pusher.new(nil, options)
       pusher.push
       builder
     end

data/lib/ufo/dsl/helper.rb

@@ -30,7 +30,8 @@ module Ufo
       def env_vars(text)
         lines = filtered_lines(text)
         lines.map do |line|
-          key,value = line.strip.split("=").map {|x| x.strip}
+          key,*value = line.strip.split("=").map {|x| x.strip}
+          value = value.join('=')
           {
             name: key,
             value: value,

data/lib/ufo/help/init.md

@@ -52,7 +52,7 @@ If you would like the `ufo init` command to use your own custom templates, you c
 
     ufo init --app=hi --image=tongueroo/hi --template=tongueroo/ufo-custom-template
 
-This will clone the repo on GitHub into the `~/.ufo/templates/tongueroo/ufo-custom-template` and use that as an additional template source.  The default `--template-mode=additive` which means that if there's a file in `tongueroo/ufo-custom-template` that exists it will use that in place of the default template files.
+This will clone the repo on GitHub into the `~/.ufo/templates/tongueroo/ufo-custom-template` and use that as an additional template source.  The default `--template-mode=additive` mode means that if there's a file in `tongueroo/ufo-custom-template` that exists it will use that in place of the default template files.
 
 If you do not want to use any of the original default template files within the ufo gem at all, you can use the `--template-mode=replace` mode. Replace mode will only use templates from the provided `--template` option.  Example:
 

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "3.3.1"
+  VERSION = "3.3.2"
 end

data/spec/fixtures/settings.yml

@@ -1,5 +1,5 @@
 # More info: http://ufoships.com/docs/ufo-settings/
-base: &base
+base:
   image: <%= @image %>
   # clean_keep: 30 # cleans up docker images on your docker server.
   # ecr_keep: 30 # cleans up images on ECR and keeps this remaining amount. Defaults to keep all.
@@ -10,14 +10,12 @@ base: &base
     desired_count: 1
 
 development:
-  <<: *base
   cluster: dev
   aws_profiles:
     - dev_profile1
     - dev_profile2
 
 production:
-  <<: *base
   cluster: prod
   aws_profiles:
     - prod_profile

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatchlogs