ufo 3.4.4 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53201d5487d8074486f75afc6e14e3078240714b721e84f32405c41a8fe64b16
-  data.tar.gz: 546cfdd56445e30f6c2791970fa9ad04921075895ba1bee7601f7570d2b06873
+  metadata.gz: 8603e4de3fb2be69fe4067d948377452ea08cc91f8b6f543dbc8d32b48b38bd9
+  data.tar.gz: bb1e8bc5d349091d40f4af2f24336444dd1169a8019998020e85435ed924ba30
 SHA512:
-  metadata.gz: 030546c273054b55929bf1d0f22ff4602a122985dd90757ee45dabc1cf2dbaca605236231c9fd195172121b49364d38efd44a730be65e00379341b718ddda24d
-  data.tar.gz: 4a072047fa10c03bafae95f8f8eb9e3d73197c924615fbe77058906e9480b7e60cc1d492ed645c9eb132e78a2812491f0cfbc822d744c5b29ba32dec6acf512f
+  metadata.gz: b9a6a95df195a1d9349220b9dbbd0160613b836d2df63cead1e4987357f07a11eb0a2befe54482828686d13541377045d5d20d75fc584e6ff79aa6fa67bd8656
+  data.tar.gz: cf070e26340633ee2490f1fe9cb6dc6bca76988736461454e7ce77340f257814ea6390b546f9e65773ab256dd3aa59b96057befd774bb38cc5a41f0069179c9f

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.
 
+## [3.5.0]
+- allow usage of template_definition_method in env variables files
+
 ## [3.4.4]
 - Merge pull request #34 from tongueroo/show-aws-cli-commands
 - Show equivalent cli commands when possible

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ufo (3.4.3)
+    ufo (3.4.4)
       aws-sdk-cloudwatchlogs
       aws-sdk-ec2
       aws-sdk-ecr
@@ -22,15 +22,15 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    aws-partitions (1.80.0)
-    aws-sdk-cloudwatchlogs (1.2.0)
+    aws-partitions (1.81.0)
+    aws-sdk-cloudwatchlogs (1.3.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sdk-core (3.19.0)
+    aws-sdk-core (3.20.1)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.29.0)
+    aws-sdk-ec2 (1.30.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
     aws-sdk-ecr (1.3.0)

data/docs/_docs/single-task.md

@@ -2,7 +2,7 @@
 title: Run Single Task
 ---
 
-Sometimes you do not want to run a long running `service` but a one time task. Running Rails migrations are a good example of a one off task.  Here is an example of how you would run a one time task.
+Sometimes you do not want to run a long running `service` but a one time task. Running Rails migrations are an example of a one off task.  Here is an example of how you would run a one time task.
 
 ```
 ufo task hi-web --command bundle exec rake db:migrate
@@ -24,6 +24,8 @@ You can describe that task for more details:
 aws ecs describe-tasks --tasks arn:aws:ecs:us-west-2:994926937775:task/a0e4229d-3d39-4b26-9151-6ab6869b84d4
 ```
 
+You can check out the [ufo task](http://ufoships.com/reference/ufo-task/) reference for more details.
+
 <a id="prev" class="btn btn-basic" href="{% link _docs/run-in-pieces.md %}">Back</a>
 <a id="next" class="btn btn-primary" href="{% link _docs/migrations.md %}">Next Step</a>
 <p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>

data/lib/ufo/dsl/task_definition.rb

@@ -18,13 +18,12 @@ module Ufo
       end
 
       def template_scope
-        @template_scope ||= Ufo::TemplateScope.new(helper)
+        @template_scope ||= Ufo::TemplateScope.new(helper, @task_definition_name)
       end
 
       def build
         instance_eval(&@block)
-        vars = template_scope.assign_instance_variables
-        RenderMePretty.result(source_path, vars)
+        RenderMePretty.result(source_path, context: template_scope)
       end
 
       # at this point instance_eval has been called and source has possibly been called

data/lib/ufo/param.rb

@@ -17,8 +17,8 @@ module Ufo
     def data
       upgrade_message!
 
-      vars = Ufo::TemplateScope.new(helper).assign_instance_variables
-      result = RenderMePretty.result(@params_path, vars)
+      context = Ufo::TemplateScope.new(helper, nil)
+      result = RenderMePretty.result(@params_path, context: context)
       YAML.load(result)
     end
     memoize :data

data/lib/ufo/template_scope.rb

@@ -1,8 +1,11 @@
 module Ufo
   class TemplateScope
     attr_reader :helper
-    def initialize(helper=nil)
+    attr_reader :task_definition_name
+    def initialize(helper=nil, task_definition_name=nil)
       @helper = helper
+      @task_definition_name = task_definition_name # only available from task_definition
+        # not available from params
       load_variables_file("base")
       load_variables_file(Ufo.env)
     end
@@ -29,7 +32,7 @@ module Ufo
     #   Wasnt able to make local variables available.
     def load_variables_file(filename)
       path = "#{Ufo.root}/.ufo/variables/#{filename}.rb"
-      instance_eval(IO.read(path)) if File.exist?(path)
+      instance_eval(IO.read(path), path) if File.exist?(path)
     end
 
     def assign_instance_variables

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "3.4.4"
+  VERSION = "3.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.5.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-21 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatchlogs