ufo 4.4.3 → 4.5.0

data/lib/ufo/task.rb

@@ -8,7 +8,8 @@ module Ufo
     def initialize(task_definition, options)
       @task_definition = task_definition
       @options = options
-      @cluster = @options[:cluster] || default_cluster
+      # Assume task_definition is the same name as the ecs service name
+      @cluster = @options[:cluster] || default_cluster(task_definition)
     end
 
     def run

data/lib/ufo/tasks.rb

@@ -1,8 +1,5 @@
 module Ufo
   class Tasks < Command
-    autoload :Builder, 'ufo/tasks/builder'
-    autoload :Register, 'ufo/tasks/register'
-
     desc "build", "Build task definitions."
     long_desc Help.text("tasks:build")
     option :pretty, type: :boolean, default: true, desc: "Pretty format the json for the task definitions"

data/lib/ufo/upgrade.rb

@@ -1,10 +1,5 @@
 module Ufo
   class Upgrade < Command
-    autoload :Upgrade3, "ufo/upgrade/upgrade3"
-    autoload :Upgrade33to34, "ufo/upgrade/upgrade33to34"
-    autoload :Upgrade4, "ufo/upgrade/upgrade4"
-    autoload :Upgrade43to44, "ufo/upgrade/upgrade43to44"
-
     desc "v2to3", "Upgrade from version 2 to 3."
     def v2to3
       Upgrade3.new(options).run
@@ -30,9 +25,9 @@ module Ufo
       Upgrade4.start
     end
 
-    desc "v43to44", "Upgrade from version 4.3 to 4.4"
-    def v43to44
-      Upgrade43to44.new(options).run
+    desc "v43to45", "Upgrade from version 4.3 and 4.4 to 4.5"
+    def v43to45
+      Upgrade43to45.new(options).run
     end
   end
 end

data/lib/ufo/upgrade/{upgrade43to44.rb → upgrade43to45.rb}

@@ -2,7 +2,7 @@ require 'fileutils'
 require 'yaml'
 
 class Ufo::Upgrade
-  class Upgrade43to44
+  class Upgrade43to45
     def initialize(options)
       @options = options
     end
@@ -10,13 +10,13 @@ class Ufo::Upgrade
     def run
       settings_path = ".ufo/settings.yml"
       settings = YAML.load_file(settings_path)
-      if settings["base"]["stack_naming"]
-        puts "Detected stack_naming in the #{settings_path}. Already upgraded to v4.4"
+      if settings.dig("base", "stack_naming") == "append_ufo_env"
+        puts "Detected stack_naming in the #{settings_path}. Already upgraded to v4.5"
         return
       end
 
-      puts "Upgrading to ufo v4.4..."
-      settings["base"]["stack_naming"] = "append_env"
+      puts "Upgrading to ufo v4.5..."
+      settings["base"]["stack_naming"] = "append_ufo_env"
       text = YAML.dump(settings)
       IO.write(settings_path, text)
       puts "Updated .ufo/settings.yml"

data/lib/ufo/util.rb

@@ -6,8 +6,11 @@ module Ufo
     # But it can be overriden by ufo/settings.yml cluster
     #
     # More info: http://ufoships.com/docs/settings/
-    def default_cluster
-      settings[:cluster] || Ufo.env
+    def default_cluster(service)
+      # to_s.to_sym in case service is nil
+      settings.dig(:service_cluster, service.to_s.to_sym) ||
+      settings[:cluster] ||
+      Ufo.env
     end
 
     # Keys are strings for simplicity.

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "4.4.3"
+  VERSION = "4.5.0"
 end

data/spec/fixtures/settings.yml

@@ -6,7 +6,7 @@ base:
   # defaults when an new ECS service is created by ufo ship
   cfn_profile: default
   network_profile: default
-  stack_naming: append_env # so spec doesnt pause for 20s
+  stack_naming: append_ufo_env # so spec doesnt pause for 20s
 
 development:
   cluster: dev

data/ufo.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "render_me_pretty"
   spec.add_dependency "text-table"
   spec.add_dependency "thor"
+  spec.add_dependency "zeitwerk"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 4.4.3
+  version: 4.5.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -278,7 +292,6 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
@@ -293,6 +306,7 @@ files:
 - docs/_docs/aws-ecs-task-execution-role.md
 - docs/_docs/conventions.md
 - docs/_docs/extras/codebuild-iam-role.md
+- docs/_docs/extras/dockerfile-erb.md
 - docs/_docs/extras/ecs-network-mode.md
 - docs/_docs/extras/load-balancer.md
 - docs/_docs/extras/minimal-deploy-iam.md
@@ -313,11 +327,12 @@ files:
 - docs/_docs/more/stuck-cloudformation.md
 - docs/_docs/more/why-cloudformation.md
 - docs/_docs/next-steps.md
-- docs/_docs/params.md
 - docs/_docs/quick-start-ec2.md
-- docs/_docs/settings-cfn.md
-- docs/_docs/settings-network.md
 - docs/_docs/settings.md
+- docs/_docs/settings/aws_profile.md
+- docs/_docs/settings/cfn.md
+- docs/_docs/settings/cluster.md
+- docs/_docs/settings/network.md
 - docs/_docs/structure.md
 - docs/_docs/tutorial-ufo-docker-build.md
 - docs/_docs/tutorial-ufo-init.md
@@ -328,9 +343,10 @@ files:
 - docs/_docs/ufo-current.md
 - docs/_docs/ufo-env-extra.md
 - docs/_docs/ufo-env.md
+- docs/_docs/ufo-task-params.md
 - docs/_docs/ufo-tasks-register.md
 - docs/_docs/upgrading.md
-- docs/_docs/upgrading/upgrade4.4.md
+- docs/_docs/upgrading/upgrade4.5.md
 - docs/_docs/upgrading/upgrade4.md
 - docs/_docs/variables.md
 - docs/_includes/about.html
@@ -403,7 +419,7 @@ files:
 - docs/_reference/ufo-upgrade-v2to3.md
 - docs/_reference/ufo-upgrade-v33to34.md
 - docs/_reference/ufo-upgrade-v3to4.md
-- docs/_reference/ufo-upgrade-v43to44.md
+- docs/_reference/ufo-upgrade-v43to45.md
 - docs/_reference/ufo-upgrade.md
 - docs/_reference/ufo-version.md
 - docs/articles.md
@@ -460,7 +476,9 @@ files:
 - lib/ufo.rb
 - lib/ufo/apps.rb
 - lib/ufo/apps/cfn_map.rb
+- lib/ufo/apps/cluster.rb
 - lib/ufo/apps/service.rb
+- lib/ufo/autoloader.rb
 - lib/ufo/aws_service.rb
 - lib/ufo/base.rb
 - lib/ufo/cancel.rb
@@ -477,16 +495,16 @@ files:
 - lib/ufo/docker.rb
 - lib/ufo/docker/builder.rb
 - lib/ufo/docker/cleaner.rb
+- lib/ufo/docker/compiler.rb
 - lib/ufo/docker/dockerfile.rb
 - lib/ufo/docker/pusher.rb
+- lib/ufo/docker/variables.rb
 - lib/ufo/dsl.rb
 - lib/ufo/dsl/helper.rb
 - lib/ufo/dsl/outputter.rb
 - lib/ufo/dsl/task_definition.rb
-- lib/ufo/ecr.rb
 - lib/ufo/ecr/auth.rb
 - lib/ufo/ecr/cleaner.rb
-- lib/ufo/ecs.rb
 - lib/ufo/ecs/service.rb
 - lib/ufo/help.rb
 - lib/ufo/help/apps.md
@@ -553,7 +571,7 @@ files:
 - lib/ufo/upgrade/upgrade3.rb
 - lib/ufo/upgrade/upgrade33to34.rb
 - lib/ufo/upgrade/upgrade4.rb
-- lib/ufo/upgrade/upgrade43to44.rb
+- lib/ufo/upgrade/upgrade43to45.rb
 - lib/ufo/util.rb
 - lib/ufo/version.rb
 - spec/fixtures/apps/describe_services.json
@@ -601,8 +619,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: AWS ECS Deploy Tool

data/Gemfile.lock

@@ -1,113 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ufo (4.4.2)
-      aws-sdk-cloudformation
-      aws-sdk-cloudwatchlogs
-      aws-sdk-ec2
-      aws-sdk-ecr
-      aws-sdk-ecs
-      aws-sdk-elasticloadbalancingv2
-      deep_merge
-      memoist
-      plissken
-      rainbow
-      render_me_pretty
-      text-table
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.2.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    aws-eventstream (1.0.3)
-    aws-partitions (1.171.0)
-    aws-sdk-cloudformation (1.22.0)
-      aws-sdk-core (~> 3, >= 3.53.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatchlogs (1.20.0)
-      aws-sdk-core (~> 3, >= 3.53.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.54.2)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-ec2 (1.89.0)
-      aws-sdk-core (~> 3, >= 3.53.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-ecr (1.17.0)
-      aws-sdk-core (~> 3, >= 3.53.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.40.0)
-      aws-sdk-core (~> 3, >= 3.53.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancingv2 (1.29.0)
-      aws-sdk-core (~> 3, >= 3.53.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-    byebug (11.0.1)
-    cli_markdown (0.1.0)
-    codeclimate-test-reporter (1.0.9)
-      simplecov (<= 0.13)
-    concurrent-ruby (1.1.5)
-    deep_merge (1.2.1)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
-    json (2.2.0)
-    memoist (0.16.0)
-    minitest (5.11.3)
-    plissken (1.3.0)
-    rainbow (3.0.0)
-    rake (12.3.2)
-    render_me_pretty (0.8.2)
-      activesupport
-      rainbow
-      tilt
-    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.3)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    text-table (1.2.4)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tilt (2.0.9)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  byebug
-  cli_markdown
-  codeclimate-test-reporter
-  rake
-  rspec
-  ufo!
-
-BUNDLED WITH
-   2.0.1

data/docs/_docs/upgrading/upgrade4.4.md

@@ -1,39 +0,0 @@
----
-title: Upgrading to Version 4.4
-short_title: Version 4.4
-order: 1
-categories: upgrading
-nav_order: 31
----
-
-In ufo version 4.4, the environment name gets appends to the end of the CloudFormation stack name.  Previous versions prepended the environment name to the stack name. This means a new stack gets created if you're going from version 4.3 to 4.4. For example:
-
-Version | Stack Name
---- | ---
-4.3 and below | development-demo-web
-4.4 and above | demo-web-development
-
-You must upgrade to using the new stack and delete the old stack manually.  You can delete the old stack with the CloudFormation console by selecting the old stack, clicking Actions, and *Delete Stack*.
-
-## Upgrading Instructions
-
-To upgrade from version 4.3 to 4.4 you can run:
-
-    ufo upgrade v43to44
-
-This updates your `.ufo/settings.yml` file to include `stack_naming: append_env` which removes a warning message and 20 second delay when you deploy. Example:
-
-.ufo/settings.yml:
-
-```yaml
-base:
-  stack_naming: append_env
-```
-
-If you would still like to keep the old behavior, you can use `stack_naming: prepend_env` for now. However, support for prepend_env will be removed in future versions.
-
-## Reasoning
-
-CloudFormation names the resources it creates with the beginning portion of the stack name. When the stack name prepends the environment then resources like ELBs a little bit harder to identify since they might be named something like this `product-Elb-K0LFFQ9LK50W`. It makes it harder to distinguish ELBs from different apps created by ufo.
-
-{% include prev_next.md %}

data/docs/_reference/ufo-upgrade-v43to44.md

@@ -1,15 +0,0 @@
----
-title: ufo upgrade v43to44
-reference: true
----
-
-## Usage
-
-    ufo upgrade v43to44
-
-## Description
-
-Upgrade from version 4.3 to 4.4
-
-
-

data/lib/ufo/ecr.rb

@@ -1,6 +0,0 @@
-module Ufo
-  module Ecr
-    autoload :Auth, 'ufo/ecr/auth'
-    autoload :Cleaner, 'ufo/ecr/cleaner'
-  end
-end

data/lib/ufo/ecs.rb

@@ -1,5 +0,0 @@
-module Ufo
-  module ECS
-    autoload :Service, 'ufo/ecs/service'
-  end
-end