ufo 3.5.2 → 3.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33a4f0ca42ab5507b137b8ffe1c080fd6a811e0c9951add460236f666a1347de
-  data.tar.gz: 74c888e1b3ce081f3c24345e8cb18defbe579a32d418f28b9e74eff41e34ef34
+  metadata.gz: 7338b5ba4ca3bb5d26dfa18ee50dba6f8ecd3d45834bcd89d8d3053811c28c78
+  data.tar.gz: a5d9590cc34d8a7929f1bb68ffebfb6e8625e2a6c55fa079d94a0393b864a882
 SHA512:
-  metadata.gz: 636ddfb310bcc127fd52eeb208345e04e71c5b4c3d703cdf18d8680219162de4042bade37fb70202bfa1011ffbced621855684f6a16cfeeb5e3faacda39c4318
-  data.tar.gz: c969a92a18abc9a2d1f6840b2b0777026f8d00eddf4d48003a0cc66f359784218d290834ef5ef59f8ea1430505a3b30134181a4c407be141e2903c232adde2e3
+  metadata.gz: 7c4e12cd02e469e89cb2a514a3e377d3c60f16f99cd29ab32dc8ce5c5e03a9d8a215b9fdcaa98e10e4151234d6a9169e97a4a0ec62e63b51a1f181b5711c4904
+  data.tar.gz: 9e6858395d6689e321687f6dd948a43739ff70b08114b190919eef171bce0d1994959c7ed12eb372b131938f759c2b459cef9172fd8f45890aed7cfec32a22d5

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 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.2]
+- Merge pull request #36 from tongueroo/fix-shared-variables-in-task-definitions
+- allow usage of shared variables in task_definition blocks again
+- dont warn of instance variable collision for template scope variables
+- improve builder error message
+- improve user error message when task definition block fails to evaluate
+
 ## [3.5.2]
 - add docs link to params.yml template
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ufo (3.4.4)
+    ufo (3.5.2)
       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.81.0)
+    aws-partitions (1.84.0)
     aws-sdk-cloudwatchlogs (1.3.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sdk-core (3.20.1)
+    aws-sdk-core (3.20.2)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.30.0)
+    aws-sdk-ec2 (1.31.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
     aws-sdk-ecr (1.3.0)

data/lib/ufo/docker/builder.rb

@@ -32,7 +32,11 @@ class Ufo::Docker
       command = "cd #{Ufo.root} && #{command}"
       success = execute(command, use_system: true)
       unless success
-        puts "ERROR: The docker image fail to build.  Are you sure the docker daemon is available?  Try running: docker version".colorize(:red)
+        docker_version_success = system("docker version > /dev/null 2>&1")
+        unless docker_version_success
+          docker_version_message = "  Are you sure the docker daemon is available?  Try running: docker version."
+        end
+        puts "ERROR: The docker image fail to build.#{docker_version_message}".colorize(:red)
         exit 1
       end
 

data/lib/ufo/dsl/task_definition.rb

@@ -22,24 +22,65 @@ module Ufo
       end
 
       def build
-        instance_eval(&@block)
+        copy_instance_variables
+        begin
+          instance_eval(&@block)
+        rescue Exception => e
+          build_error_info(e)
+          raise
+        end
         RenderMePretty.result(source_path, context: template_scope)
       end
 
-      # at this point instance_eval has been called and source has possibly been called
+      # Provide a slightly better error message to user when the task definition
+      # code block is not evaluated successfully.
+      def build_error_info(e)
+        puts "ERROR: evaluating block for task_definition #{@task_definition_name}".colorize(:red)
+        # The first line of the backtrace has the info of the file name. Example:
+        # ./.ufo/task_definitions.rb:24:in `block in evaluate_template_definitions'
+        info = e.backtrace[0]
+        filename = info.split(':')[0..1].join(':')
+        puts "Filename: #{filename}".colorize(:red)
+      end
+
+
+      # Copy the instance variables from TemplateScope to TaskDefinition
+      # so that config/variables are available in the task_definition blocks also.
+      # Example:
+      #
+      #   task_definition "my-app" do
+      #     # make config/variables available here also
+      #   end
+      #
+      # This allows possible collision but think it is worth it to have
+      # variables available.
+      def copy_instance_variables
+        template_scope.instance_variables.each do |var|
+          val = template_scope.instance_variable_get(var)
+          instance_variable_set(var, val)
+        end
+      end
+
+      # At this point instance_eval has been called and source has been possibly called
       def source(name)
         @source = name
       end
 
       def variables(vars={})
         vars.each do |var,value|
-          if instance_variable_defined?("@#{var}")
+          # Warn when variable collides with internal variable, but dont warn
+          # template_scope variables collision.
+          if instance_variable_defined?("@#{var}") && !template_scope_instance_variable?(var)
             puts "WARNING: The instance variable @#{var} is already used internally with ufo.  Please name you variable another name!"
           end
           template_scope.instance_variable_set("@#{var}", value)
         end
       end
 
+      def template_scope_instance_variable?(var)
+        template_scope.instance_variables.include?("@#{var}".to_sym)
+      end
+
       def source_path
         if @source # this means that source has been called
           path = "#{Ufo.root}/.ufo/templates/#{@source}.json.erb"

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "3.5.2"
+  VERSION = "3.5.3"
 end

metadata

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