ufo 6.3.2 → 6.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee25a6ee92c06422088b489aa3f9d27d8fb0dfd229b7bb6e0b0eb2241a4d3902
-  data.tar.gz: f4a8043b8ab3bbb33794d3002d58890d8aa4753ffe3ac4b029432599195e5289
+  metadata.gz: 0b97f721b8915f665745b998087e612bb4bae0cc7f2a4046a9efe8492e2eac0c
+  data.tar.gz: b093ecdafedad9522784798d331256112efdcfabce099c97b980d03a7ddc4e09
 SHA512:
-  metadata.gz: 76beccace3016451330c40b589fa7c3f95680eff187a667f520eed80c7d4cd90b91667dd06d58288cabf4c5d5acb699cf53ecc6c296dcb48e66504a0c02147ad
-  data.tar.gz: 22700e11a6de03b489deacf6fbde1e7b5652b4048b078b1d3750dfc0f1b083e5e3bbc417057f04d9fe73e48ac609139aea92bc526ae4c33cfdee16253f341db8
+  metadata.gz: 787c7cb0f1818a34bdba0e4a075ca428cefc53b5c51fde23deda1fdd180eb12a845af279d6793743dd867ca7be68122366d104d7a56b6c94ed1742f3c7938a2b
+  data.tar.gz: 1e1a58d83901bf2218faad41263e51095022b1db1fc138cad9502b9c49da08131490b8d649b22e07027cae2ba61782d5a3c1bddc14789675e537b2b2254e6e71

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.
 
+## [6.3.3] - 2022-03-27
+- [#167](https://github.com/tongueroo/ufo/pull/167) fix edge case include_dir for ruby 2.7
+- remove update_dockerignore
+
 ## [6.3.2] - 2022-03-26
 - [#164](https://github.com/tongueroo/ufo/pull/164) existing elb target group support
 - [#165](https://github.com/tongueroo/ufo/pull/165) improve secrets support

data/lib/ufo/cli/new/init.rb

@@ -39,15 +39,6 @@ class Ufo::CLI::New
       end
     end
 
-    def update_dockerignore
-      text = ".ufo\n"
-      if File.exist?(".dockerignore")
-        append_to_file ".dockerignore", text
-      else
-        create_file ".dockerignore", text
-      end
-    end
-
     def create_dockefile
       return if File.exist?("Dockerfile")
       set_template_source("docker")

data/lib/ufo/ext/core/module.rb

@@ -17,10 +17,21 @@ class Module
     parent_dir = File.dirname(calling_file)
 
     full_dir = "#{parent_dir}/#{dir}"
-    paths = Dir.glob("#{full_dir}/**/*.rb")
+    # Tricky: Only include top-level dir. Do not include subdirs.
+    # Fixes ruby 2.7 issue where just calling constantize on Vars::Builder
+    # triggers Ufo::Config::CallableOption::Concern to load and causes
+    # And causes some helper methods to be missing. Error looks like this:
+    #
+    #    undefined method `stack_output' for #<Ufo::Config:0x0000000006585268>
+    #
+    # This is because stack_output is loaded after afterwards.
+    #
+    paths = Dir.glob("#{full_dir}/*.rb")
     if paths.empty?
       raise "Empty include_modules full_dir: #{full_dir}"
     end
+
+    paths.sort_by! { |p| p.size }
     paths.each do |path|
       regexp = Regexp.new(".*/lib/")
       mod = path.sub(regexp, '').sub('.rb','').camelize

data/lib/ufo/task_definition/helpers/{vars/aws_helper.rb → aws_helper.rb}

@@ -1,4 +1,4 @@
-module Ufo::TaskDefinition::Helpers::Vars
+module Ufo::TaskDefinition::Helpers
   # Named AwsHelper to avoid possible conflict with Aws elsewhere
   module AwsHelper
     extend Memoist

data/lib/ufo/task_definition/helpers/vars/builder.rb

@@ -3,9 +3,9 @@ require "aws_data"
 module Ufo::TaskDefinition::Helpers::Vars
   class Builder
     extend Memoist
-    include AwsHelper
     include Ufo::Concerns::Names
     include Ufo::Config::CallableOption::Concern
+    include Ufo::TaskDefinition::Helpers::AwsHelper
     include Ufo::Utils::CallLine
     include Ufo::Utils::Logging
     include Ufo::Utils::Pretty

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "6.3.2"
+  VERSION = "6.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 6.3.2
+  version: 6.3.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-26 00:00:00.000000000 Z
+date: 2022-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-logs
@@ -648,6 +648,7 @@ files:
 - lib/ufo/task_definition/erb/yaml.rb
 - lib/ufo/task_definition/helpers.rb
 - lib/ufo/task_definition/helpers/acm.rb
+- lib/ufo/task_definition/helpers/aws_helper.rb
 - lib/ufo/task_definition/helpers/docker.rb
 - lib/ufo/task_definition/helpers/ecr.rb
 - lib/ufo/task_definition/helpers/expansion.rb
@@ -655,7 +656,6 @@ files:
 - lib/ufo/task_definition/helpers/ssm/fetcher.rb
 - lib/ufo/task_definition/helpers/stack_output.rb
 - lib/ufo/task_definition/helpers/vars.rb
-- lib/ufo/task_definition/helpers/vars/aws_helper.rb
 - lib/ufo/task_definition/helpers/vars/builder.rb
 - lib/ufo/task_definition/helpers/vpc.rb
 - lib/ufo/task_definition/helpers/waf.rb
@@ -716,7 +716,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.10
 signing_key: 
 specification_version: 4
 summary: AWS ECS Deploy Tool