ufo 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2e5d67cf500ab4cc6382619423f59a6b502e95517cdf5cf467d346f6d04e92e
-  data.tar.gz: baced5a9033bf83feadb35cd34b565849fefb707f3b4c2607ac3f15ca6a7f9f5
+  metadata.gz: df0785744573abcd889a7d125e002395ed402a11628844cbb02792579c651427
+  data.tar.gz: c707e64b786e5f4bf7aed4a8e64ae0b8ad1f37231b0ac2259523c707ef139932
 SHA512:
-  metadata.gz: 28361c8c2224d80f6709bdd97cedb029cb4d3ce94d13711e15a50ac0d051dd85831fbaef73799c5d606d44fd6a7fcbae9ce9caa8e195eba3e401196f882c71da
-  data.tar.gz: df430c0756da190b5e25872c0fb1d8a127e780c46d0b9db5e42b301e833d394352b44b6d8993470ec3d7aff17d493f036395e336b6281577245b5e4c5402cc1d
+  metadata.gz: 126232930ff21ac0a23daf5a9ff430c268792c6eeb986998794ff641f3ba6c1cd02e186d4924c2cad0ef268a1956b1d3aff013b348188364475103203aec1fbd
+  data.tar.gz: dfdabc75f052471f0539e31196ec9474610ab51f82841db05685a24135f40727f6377787a94536e4e38315c005f7f98398a008c25c713e1c8ac5296dbf7ada0e

data/.gitignore

@@ -1,5 +1,19 @@
-/ufo/output
-/ufo/docker_full_image_name.txt
-/spec/fixtures/hi
-/spec/fixtures/home
-/pkg
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+_yardoc
+coverage
+doc/
+InstalledFiles
+lib/bundler/man
+pkg
+pkg
+rdoc
+spec/fixtures/hi
+spec/fixtures/home
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.rspec

@@ -1,3 +1,2 @@
 --color
---require spec_helper
 --format documentation

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 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.
 
+## [2.2.3]
+- eval $(ufo completion_script) for tab auto-completion
+- default task_defintion template fixes: add ecs/ to awslogs_group, add helper.current_region
+- move bin/ufo to exe/ufo
+- rename: AwsServices to AwsService, Defaults to Default, Settings to Setting
+
 ## [2.2.2]
 - Remove role passed to create_service. Fixes ufo ship when target-group-arn is provided.
 

data/Gemfile

@@ -1,6 +1,6 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in ufo.gemspec
+# Specify your gem dependencies in ufo.gemspec
 gemspec
 
 gem "codeclimate-test-reporter", group: :test, require: nil

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    ufo (2.1.0)
+    ufo (2.2.2)
       aws-sdk-cloudwatchlogs
       aws-sdk-ec2
+      aws-sdk-ecr
       aws-sdk-ecs
       aws-sdk-elasticloadbalancingv2
       colorize
       deep_merge
-      hashie
       plissken
       thor
 
@@ -23,7 +23,10 @@ GEM
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.25.0)
+    aws-sdk-ec2 (1.26.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-ecr (1.2.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
     aws-sdk-ecs (1.8.0)
@@ -40,7 +43,6 @@ GEM
     deep_merge (1.2.1)
     diff-lcs (1.3)
     docile (1.1.5)
-    hashie (3.5.7)
     jmespath (1.3.1)
     json (2.1.0)
     plissken (1.2.0)
@@ -69,7 +71,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3)
+  bundler
   byebug
   codeclimate-test-reporter
   rake

data/Guardfile

@@ -1,12 +1,19 @@
-guard 'rspec' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})      { "spec/ufo_spec.rb" }
-  watch(%r{^lib/ufo/(.+)\.rb$})  { "spec/ufo_spec.rb" }
-  watch('spec/spec_helper.rb')   { "spec/ufo_spec.rb" }
-  watch(%r{^lib/ufo/(.+)\.rb$})   { |m| "spec/lib/#{m[1]}_spec.rb" }
+guard "bundler", cmd: "bundle" do
+  watch("Gemfile")
+  watch(/^.+\.gemspec/)
 end
 
-guard 'bundler' do
-  watch('Gemfile')
-  watch(/^.+\.gemspec/)
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
 end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2017 Tung Nguyen
+Copyright (c) 2018 Tung Nguyen
 
 MIT License
 

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 task :default => :spec
 
-RSpec::Core::RakeTask.new
+RSpec::Core::RakeTask.new

data/{bin → exe}/ufo

@@ -7,10 +7,8 @@ Signal.trap("INT") {
   exit
 }
 
-require 'rubygems'
-
-$:.unshift(File.expand_path('../../lib', __FILE__))
-require 'ufo'
-require 'ufo/cli'
+$:.unshift(File.expand_path("../../lib", __FILE__))
+require "ufo"
+require "ufo/cli"
 
 Ufo::CLI.start(ARGV)

data/lib/starter_project/ufo/task_definitions.rb

@@ -3,10 +3,11 @@
 # Some of helpers get data from the Dockerfile and some are from other places.
 # Here's a summary of the some helpers:
 #
-#   full_image_name 
-#   dockerfile_port
-#   env_vars(text)
-#   env_file(path)
+#   helper.full_image_name 
+#   helper.dockerfile_port
+#   helper.env_vars(text)
+#   helper.env_file(path)
+#   helper.current_region
 #
 # More info: http://ufoships.com/docs/helpers/
 #
@@ -16,10 +17,12 @@ task_definition "<%= @app %>-web" do
     family: task_definition_name,
     name: "web",
     container_port: helper.dockerfile_port,
-    # uncomment out to set the log group
-    # awslogs_group: "<%= @app %>-web",
-    # awslogs_stream_prefix: "<%= @app %>",
-    # awslogs_region: "us-east-1",
+    # Comment out awslogs_* if you do not want logs to be sent to CloudWatch.
+    # Strongly recommended to use CloudWatch/centralized logging.
+    # Ufo automatically creates the log group as part of deployment.
+    awslogs_group: "ecs/<%= @app %>-web",
+    awslogs_stream_prefix: "<%= @app %>",
+    awslogs_region: helper.current_region,
     # command: ["bin/web"] # IMPORTANT: change or create a bin/web file
   )
 end
@@ -29,10 +32,10 @@ task_definition "<%= @app %>-worker" do
   variables(
     family: task_definition_name,
     name: "worker",
-    # uncomment out to set the log group
-    # awslogs_group: "<%= @app %>-worker",
-    # awslogs_stream_prefix: "<%= @app %>",
-    # awslogs_region: "us-east-1",
+    # Comment out awslogs_* if you do not want logs to be sent to CloudWatch.
+    awslogs_group: "ecs/<%= @app %>-worker",
+    awslogs_stream_prefix: "<%= @app %>",
+    awslogs_region: helper.current_region,
     # command: ["bin/worker"] # IMPORTANT: change or create a bin/worker file
   )
 end
@@ -42,10 +45,10 @@ task_definition "<%= @app %>-clock" do
   variables(
     family: task_definition_name,
     name: "clock",
-    # uncomment out to set the log group
-    # awslogs_group: "<%= @app %>-clock",
-    # awslogs_stream_prefix: "<%= @app %>",
-    # awslogs_region: "us-east-1",
+    # Comment out awslogs_* if you do not want logs to be sent to CloudWatch.
+    awslogs_group: "ecs/<%= @app %>-clock",
+    awslogs_stream_prefix: "<%= @app %>",
+    awslogs_region: helper.current_region,
     # command: ["bin/clock"] # IMPORTANT: change or create a bin/clock file
   )
 end

data/lib/ufo.rb

@@ -6,10 +6,10 @@ require 'fileutils'
 
 module Ufo
   autoload :Env, 'ufo/env'
-  autoload :Defaults, 'ufo/defaults'
-  autoload :AwsServices, 'ufo/aws_services'
+  autoload :Default, 'ufo/default'
+  autoload :AwsService, 'ufo/aws_service'
   autoload :Command, 'ufo/command'
-  autoload :Settings, 'ufo/settings'
+  autoload :Setting, 'ufo/setting'
   autoload :Util, 'ufo/util'
   autoload :Init, 'ufo/init'
   autoload :CLI, 'ufo/cli'
@@ -24,6 +24,8 @@ module Ufo
   autoload :Docker, 'ufo/docker'
   autoload :Ecr, 'ufo/ecr'
   autoload :Tasks, 'ufo/tasks'
+  autoload :Completion, "ufo/completion"
+  autoload :Completer, "ufo/completer"
 end
 
 Ufo::Env.setup!

data/lib/ufo/{aws_services.rb → aws_service.rb}

@@ -5,7 +5,7 @@ require "aws-sdk-ecs"
 require "aws-sdk-elasticloadbalancingv2"
 
 module Ufo
-  module AwsServices
+  module AwsService
     def ecs
       @ecs ||= Aws::ECS::Client.new
     end

data/lib/ufo/cli.rb

@@ -35,7 +35,7 @@ module Ufo
       option :wait, type: :boolean, desc: "Wait for deployment to complete", default: false
       option :pretty, type: :boolean, default: true, desc: "Pretty format the json for the task definitions"
       option :stop_old_tasks, type: :boolean, default: false, desc: "Stop old tasks after waiting for deploying to complete"
-      option :ecr_keep, type: :numeric, desc: "ECR specific cleanup of old images.  Specifies how many images to keep.  Only runs if the images are ECR images. Defaults to keeping all the images."
+      option :ecr_keep, type: :numeric, desc: "ECR specific cleanup of old images.  Specifies how many images to keep.  Only runs if the images are ECR images. Defaults keeps all images."
     end
 
     desc "ship [SERVICE]", "builds and ships container image to the ECS service"
@@ -95,6 +95,18 @@ module Ufo
       Scale.new(service, count, options).update
     end
 
+    desc "completion *PARAMS", "prints words for auto-completion"
+    long_desc Help.text("completion")
+    def completion(*params)
+      Completer.new(CLI, *params).run
+    end
+
+    desc "completion_script", "generates script that can be eval to setup auto-completion", hide: true
+    long_desc Help.text("completion_script")
+    def completion_script
+      Completer::Script.generate
+    end
+
     desc "version", "Prints version number of installed ufo"
     def version
       puts VERSION

data/lib/ufo/command.rb

@@ -18,23 +18,24 @@ module Ufo
     class << self
       def dispatch(m, args, options, config)
         # Allow calling for help via:
-        #   ufo docker help
-        #   ufo docker -h
-        #   ufo docker --help
-        #   ufo docker -D
+        #   ufo command help
+        #   ufo command -h
+        #   ufo command --help
+        #   ufo command -D
         #
-        # as well thor's nomral setting as
+        # as well thor's normal way:
         #
-        #   ufo help docker
+        #   ufo help command
         help_flags = Thor::HELP_MAPPINGS + ["help"]
         if args.length > 1 && !(args & help_flags).empty?
           args -= help_flags
           args.insert(-2, "help")
         end
 
+        #   ufo version
         #   ufo --version
         #   ufo -v
-        version_flags = ["-v", "--version"]
+        version_flags = ["--version", "-v"]
         if args.length == 1 && !(args & version_flags).empty?
           args = ["version"]
         end

data/lib/ufo/completer.rb

@@ -0,0 +1,139 @@
+# Code Explanation.  This is mainly focused on the run method.
+#
+# There are 3 main branches of logic for completion:
+#
+#   1. top-level commands - when there are zero completed words
+#   2. params completion - when a command has some required params
+#   3. options completion - when we have finished auto-completing the top-level command and required params, the rest of the completion words will be options
+#
+# Terms:
+#
+#   params - these are params in the command itself. Example: for the method `scale(service, count)` the params would be `service, count`.
+#   options - these are cli options flags.  Examples: --noop, --verbose
+#
+# When we are done processing method params, the completion will be only options. When the detected params size is greater than the arity we are have finished auto-completing the parameters in the method declaration.  For example, say you had a method for a CLI command with the following form:
+#
+#   scale(service, count) = arity of 2
+#
+#   ufo scale service count [TAB] # there are 3 params including the "scale" command
+#
+# So the completion will be something like:
+#
+#   --noop --verbose etc
+#
+# A note about artity values:
+#
+# We are using the arity of the command method to determine if we have finish auto-completing the params completion. When the ruby method has a splat param, it's arity will be negative.  Here are some example methods and their arities.
+#
+#    ship(service) = 1
+#    scale(service, count) = 2
+#    ships(*services) = -1
+#    foo(example, *rest) = -2
+#
+# Fortunately, negative and positive arity values are processed the same way. So we take simply take the abs of the arity.
+#
+# To test:
+#
+#   ufo completion
+#   ufo completion hello
+#   ufo completion hello name
+#   ufo completion hello name --
+#   ufo completion hello name --noop
+#
+#   ufo completion
+#   ufo completion sub:goodbye
+#   ufo completion sub:goodbye name
+#
+# Note when testing, the first top-level word must be an exact match
+#
+#   ufo completion hello # works fine
+#   ufo completion he # incomplete, this will just break
+#
+# The completion assumes that the top-level word that is being passed in
+# from completor/scripts.sh will always match exactly.  This must be the
+# case.  For parameters, the word does not have to match exactly.
+#
+module Ufo
+  class Completer
+    autoload :Script, 'ufo/completer/script'
+
+    def initialize(command_class, *params)
+      @params = params
+      @current_command = @params[0]
+      @command_class = command_class # CLI initiall
+    end
+
+    def run
+      if subcommand?(@current_command)
+        subcommand_class = @command_class.subcommand_classes[@current_command]
+        @params.shift # destructive
+        Completer.new(subcommand_class, *@params).run # recursively use subcommand
+        return
+      end
+
+      # full command has been found!
+      unless found?(@current_command)
+        puts all_commands
+        return
+      end
+
+      # will only get to here if command aws found (above)
+      arity = @command_class.instance_method(@current_command).arity.abs
+      if @params.size <= arity
+        puts params_completion
+      else
+        puts options_completion
+      end
+    end
+
+    def subcommand?(command)
+      @command_class.subcommands.include?(command)
+    end
+
+    def found?(command)
+      public_methods = @command_class.public_instance_methods - Object.methods
+      command && public_methods.include?(command.to_sym)
+    end
+
+    # all top-level commands
+    def all_commands
+      commands = @command_class.all_commands.reject do |k,v|
+        v.is_a?(Thor::HiddenCommand)
+      end
+      commands.keys
+    end
+
+    def params_completion
+      method_params = @command_class.instance_method(@current_command).parameters
+      # Example:
+      # >> Sub.instance_method(:goodbye).parameters
+      # => [[:req, :name]]
+      # >>
+      method_params.map!(&:last)
+
+      offset = @params.size - 1
+      offset_params = method_params[offset..-1]
+      method_params[offset..-1].first
+    end
+
+    def options_completion
+      used = ARGV.select { |a| a.include?('--') } # so we can remove used options
+
+      method_options = @command_class.all_commands[@current_command].options.keys
+      class_options = @command_class.class_options.keys
+
+      all_options = method_options + class_options + ['help']
+
+      all_options.map! { |o| "--#{o.to_s.gsub('_','-')}" }
+      filtered_options = all_options - used
+      filtered_options.uniq
+    end
+
+    # Useful for debugging. Using puts messes up completion.
+    def log(msg)
+      File.open("/tmp/complete.log", "a") do |file|
+        file.puts(msg)
+      end
+    end
+  end
+end

data/lib/ufo/completer/script.rb

@@ -0,0 +1,6 @@
+class Ufo::Completer::Script
+  def self.generate
+    bash_script = File.expand_path("script.sh", File.dirname(__FILE__))
+    puts "source #{bash_script}"
+  end
+end

data/lib/ufo/completer/script.sh

@@ -0,0 +1,10 @@
+_ufo() {
+  COMPREPLY=()
+  local word="${COMP_WORDS[COMP_CWORD]}"
+  local words=("${COMP_WORDS[@]}")
+  unset words[0]
+  local completion=$(ufo completion ${words[@]})
+  COMPREPLY=( $(compgen -W "$completion" -- "$word") )
+}
+
+complete -F _ufo ufo

data/lib/ufo/completion.rb

@@ -0,0 +1,15 @@
+module Ufo
+  class Completion < Command
+    desc "script", "generates script that can be eval to setup auto-completion"
+    long_desc Help.text("completion:script")
+    def script
+      Completer::Script.generate
+    end
+
+    desc "completions *PARAMS", "prints words for auto-completion"
+    long_desc Help.text("completion:list")
+    def list(*params)
+      Completer.new(*params).run
+    end
+  end
+end

data/lib/ufo/{defaults.rb → default.rb}

@@ -7,15 +7,15 @@ module Ufo
   # end
   #
   # So @options must be set
-  module Defaults
+  module Default
     # The default cluster normally defaults to the UFO_ENV value.
     # But it can be overriden by ufo/settings.yml ufo_env_cluster_map
     #
-    # Covered: http://localhost:4000/docs/settings/
+    # More info: http://ufoships.com/docs/settings/
     def default_cluster
       #
 
-      map = settings.data["ufo_env_cluster_map"]
+      map = setting.data["ufo_env_cluster_map"]
       if map
         ecs_cluster = map[UFO_ENV] || map["default"]
       end
@@ -25,23 +25,23 @@ module Ufo
 
     # These default service values only are used when a service is created by `ufo`
     def default_maximum_percent
-      Integer(new_service_settings["maximum_percent"] || 200)
+      Integer(new_service_setting["maximum_percent"] || 200)
     end
 
     def default_minimum_healthy_percent
-      Integer(new_service_settings["minimum_healthy_percent"] || 100)
+      Integer(new_service_setting["minimum_healthy_percent"] || 100)
     end
 
     def default_desired_count
-      Integer(new_service_settings["desired_count"] || 1)
+      Integer(new_service_setting["desired_count"] || 1)
     end
 
-    def new_service_settings
-      settings.data["new_service"] || {}
+    def new_service_setting
+      setting.data["new_service"] || {}
     end
 
-    def settings
-      @settings ||= Settings.new(@options[:project_root])
+    def setting
+      @setting ||= Setting.new(@options[:project_root])
     end
   end
 end

data/lib/ufo/destroy.rb

@@ -1,7 +1,7 @@
 module Ufo
   class Destroy
-    include Defaults
-    include AwsServices
+    include Default
+    include AwsService
 
     def initialize(service, options={})
       @service = service

data/lib/ufo/docker/builder.rb

@@ -78,7 +78,7 @@ module Ufo
 
     # full_image - does not include the tag
     def image_name
-      settings.data["image"]
+      setting.data["image"]
     end
 
     # full_image - includes the tag
@@ -87,6 +87,8 @@ module Ufo
         return generate_name # name already has a newline
       end
 
+      return "tongueroo/hi:ufo-12345678" if ENV['TEST']
+
       unless File.exist?(docker_name_path)
         puts "Unable to find #{docker_name_path} which contains the last docker image name that was used as a part of `ufo docker build`.  Please run `ufo docker build` first."
         exit 1
@@ -125,8 +127,8 @@ module Ufo
       @git_sha.strip!
     end
 
-    def settings
-      @settings ||= Settings.new(@project_root)
+    def setting
+      @setting ||= Setting.new(@project_root)
     end
 
     def update_dockerfile

data/lib/ufo/docker/cleaner.rb

@@ -1,14 +1,14 @@
 module Ufo
   class Docker::Cleaner
     include Util
-    include Defaults
+    include Default
 
     def initialize(docker_image_name, options)
       # docker_image_name does not containg the tag
       # Example: 123456789.dkr.ecr.us-east-1.amazonaws.com/image
       @docker_image_name = docker_image_name
       @options = options
-      @keep = options[:keep] || settings.data["clean_keep"] || 3
+      @keep = options[:keep] || setting.data["clean_keep"] || 3
       @tag_prefix = options[:tag_prefix] || "ufo"
     end
 

data/lib/ufo/dsl/helper.rb

@@ -59,8 +59,13 @@ module Ufo
         env_vars(text)
       end
 
-      def settings
-        @settings ||= Settings.new(@project_root)
+      def current_region
+        return 'us-east-1' if ENV['TEST']
+        @current_region ||= `aws configure get region`.strip rescue 'us-east-1'
+      end
+
+      def setting
+        @setting ||= Setting.new(@project_root)
       end
 
       def parse_for_dockerfile_port(dockerfile_path)

data/lib/ufo/ecr/auth.rb

@@ -1,6 +1,6 @@
 module Ufo
   class Ecr::Auth
-    include AwsServices
+    include AwsService
 
     def initialize(repo_domain)
       @repo_domain = repo_domain

data/lib/ufo/ecr/cleaner.rb

@@ -5,15 +5,15 @@ require "json"
 #   ufo ship app-web --cluster prod --noop
 module Ufo
   class Ecr::Cleaner
-    include AwsServices
-    include Defaults
+    include AwsService
+    include Default
 
     def initialize(docker_image_name, options={})
       # docker_image_name does not containg the tag
       # Example: 123456789.dkr.ecr.us-east-1.amazonaws.com/image
       @docker_image_name = docker_image_name
       @options = options
-      @keep = options[:ecr_keep] || settings.data["ecr_keep"]
+      @keep = options[:ecr_keep] || setting.data["ecr_keep"]
       @tag_prefix = options[:tag_prefix] || "ufo"
     end
 

data/lib/ufo/env.rb

@@ -3,9 +3,9 @@ class Ufo::Env
     # Ensures that  UFO_ENV is always set to a default value.
     # For Ufo::Env.setup! we do not need to check if we're in a ufo project
     # Because we could not be at first. For example when: ufo init is first called.
-    # Other uses of Ufo::Settings assumes that we should be in a ufo project.
-    settings = Ufo::Settings.new(project_root, false).data
-    map = settings['aws_profile_ufo_env_map']
+    # Other uses of Ufo::Setting assumes that we should be in a ufo project.
+    setting = Ufo::Setting.new(project_root, false).data
+    map = setting['aws_profile_ufo_env_map']
 
     if map
       ufo_env = map[ENV['AWS_PROFILE']] || map['default']

data/lib/ufo/help/completion.md

@@ -0,0 +1,22 @@
+Example:
+
+  ufo completion
+
+Prints words for TAB auto-completion.
+
+Examples:
+
+  ufo completion
+  ufo completion hello
+  ufo completion hello name
+
+To enable, TAB auto-completion add the following to your profile:
+
+  eval $(ufo completion script)
+
+Auto-completion example usage:
+
+  ufo [TAB]
+  ufo hello [TAB]
+  ufo hello name [TAB]
+  ufo hello name --[TAB]

data/lib/ufo/help/completion_script.md

@@ -0,0 +1,3 @@
+To use, add the following to your ~/.bashrc or ~/.profile
+
+  eval $(ufo completion script)

data/lib/ufo/help/completions.md

@@ -0,0 +1,16 @@
+Provides completions words.
+
+Examples:
+
+  ufo completions ship service --mute
+
+Add this to your profile:
+
+  eval $(ufo completions-script)
+
+Auto-completion example usage:
+
+  ufo ship [TAB]
+  ufo ship service [TAB]
+  ufo ship service --mute[TAB]
+

data/lib/ufo/help/completions_script.md

@@ -0,0 +1 @@
+eval $(ufo completions_script)

data/lib/ufo/help/hello.md

@@ -0,0 +1,5 @@
+Examples:
+
+  ufo hello
+  ufo hello NAME
+  ufo hello NAME --from me

data/lib/ufo/help/sub/goodbye.md

@@ -0,0 +1,5 @@
+Examples:
+
+  ufo sub:goodbye
+  ufo sub:goodbye NAME
+  ufo sub:goodbye NAME --from me

data/lib/ufo/log_group.rb

@@ -1,7 +1,7 @@
 # Use to automatically create the CloudWatch group
 module Ufo
   class LogGroup
-    include AwsServices
+    include AwsService
 
     def initialize(task_definition, options)
       @task_definition, @options = task_definition, options

data/lib/ufo/scale.rb

@@ -1,7 +1,7 @@
 module Ufo
   class Scale
-    include Defaults
-    include AwsServices
+    include Default
+    include AwsService
 
     def initialize(service, count, options={})
       @service = service

data/lib/ufo/{settings.rb → setting.rb}

@@ -1,7 +1,7 @@
 require 'yaml'
 
 module Ufo
-  class Settings
+  class Setting
     def initialize(project_root='.', check_ufo_project=true)
       @project_root = project_root
       @check_ufo_project = check_ufo_project

data/lib/ufo/ship.rb

@@ -22,8 +22,8 @@ module Ufo
   class ShipmentOverridden < UfoError; end
 
   class Ship
-    include Defaults
-    include AwsServices
+    include Default
+    include AwsService
     include Util
 
     def initialize(service, task_definition, options={})

data/lib/ufo/sub.rb

@@ -0,0 +1,12 @@
+module Ufo
+  class Sub < Command
+
+    desc "goodbye NAME", "say goodbye to NAME"
+    long_desc Help.text("sub:goodbye")
+    option :from, desc: "from person"
+    def goodbye(name="you")
+      puts "from: #{options[:from]}" if options[:from]
+      puts "Goodbye #{name}"
+    end
+  end
+end

data/lib/ufo/task.rb

@@ -1,7 +1,7 @@
 module Ufo
   class Task
-    include Defaults
-    include AwsServices
+    include Default
+    include AwsService
 
     def initialize(task_definition, options)
       @task_definition = task_definition

data/lib/ufo/tasks/register.rb

@@ -3,7 +3,7 @@ require 'json'
 
 module Ufo
   class Tasks::Register
-    include AwsServices
+    include AwsService
 
     def self.register(task_name, options={})
       project_root = options[:project_root] || '.'

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "2.2.2"
+  VERSION = "2.3.0"
 end

data/spec/lib/cli_spec.rb

@@ -15,31 +15,31 @@ describe Ufo::CLI do
   describe "ufo" do
     context "docker" do
       it "build builds image" do
-        out = execute("bin/ufo docker build #{@args}")
+        out = execute("exe/ufo docker build #{@args}")
         expect(out).to include("docker build -t tongueroo/hi")
       end
 
       it "tag shows the tag" do
-        out = execute("bin/ufo docker name #{@args}")
+        out = execute("exe/ufo docker name #{@args}")
         expect(out).to match(%r{tongueroo/hi:ufo-.{7}})
       end
     end
 
     context "tasks" do
       it "build builds task definition" do
-        out = execute("bin/ufo tasks build #{@args}")
+        out = execute("exe/ufo tasks build #{@args}")
         expect(out).to include("Task Definitions built")
       end
 
       it "register it registers all the output task definitions" do
-        out = execute("bin/ufo tasks register #{@args}")
+        out = execute("exe/ufo tasks register #{@args}")
         expect(out).to include("register")
       end
     end
 
     context "ship" do
       it "deploys software" do
-        out = execute("bin/ufo ship hi-web-prod #{@args} --no-wait")
+        out = execute("exe/ufo ship hi-web-prod #{@args} --no-wait")
         # cannot look for Software shipped! because
         #   ship.deploy unless ENV['TEST'] # to allow me to quickly test CLI portion only
         # just testing the CLI portion.  The ship class itself is tested via ship_spec.rb
@@ -49,7 +49,7 @@ describe Ufo::CLI do
 
     context "ships" do
       it "deploys software to multiple services" do
-        out = execute("bin/ufo ships hi-web-prod hi-worker-prod #{@args} --no-wait")
+        out = execute("exe/ufo ships hi-web-prod hi-worker-prod #{@args} --no-wait")
         # cannot look for Software shipped! because
         #   ship.deploy unless ENV['TEST'] # to allow me to quickly test CLI portion only
         # just testing the CLI portion.  The ship class itself is tested via ship_spec.rb
@@ -59,8 +59,8 @@ describe Ufo::CLI do
 
     context "task" do
       it "runs one time task" do
-        out = execute("bin/ufo task hi-migrate-prod #{@args}")
-        expect(out).to include("Running task_definition")
+        out = execute("exe/ufo completion ship name")
+        expect(out).to include("--help")
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,30 +1,36 @@
-ENV['TEST'] = '1'
+ENV["TEST"] = "1"
 # Ensures aws api never called. Fixture home folder does not contain ~/.aws/credentails
 ENV['HOME'] = "spec/fixtures/home"
 
+# CodeClimate test coverage: https://docs.codeclimate.com/docs/configuring-test-coverage
+# require 'simplecov'
+# SimpleCov.start
+
 require "pp"
 require "byebug"
-
-root = File.expand_path('../../', __FILE__)
+root = File.expand_path("../", File.dirname(__FILE__))
 require "#{root}/lib/ufo"
 
 module Helpers
+  def create_starter_project_fixture
+    FileUtils.rm_rf("spec/fixtures/hi")
+    execute("exe/ufo init --app hi --image tongueroo/hi --project-root spec/fixtures/hi")
+  end
+
   def execute(cmd)
-    puts "Running: #{cmd.colorize(:magenta)}" if ENV['DEBUG']
+    puts "Running: #{cmd}" if show_command?
     out = `#{cmd}`
-    puts out if ENV['DEBUG']
+    puts out if show_command?
     out
   end
 
-  def create_starter_project_fixture
-    FileUtils.rm_rf("spec/fixtures/hi")
-    execute("bin/ufo init --app hi --image tongueroo/hi --project-root spec/fixtures/hi")
+  # Added SHOW_COMMAND because DEBUG is also used by other libraries like
+  # bundler and it shows its internal debugging logging also.
+  def show_command?
+    ENV['DEBUG'] || ENV['SHOW_COMMAND']
   end
 end
 
 RSpec.configure do |c|
   c.include Helpers
-
-  c.before(:each) do
-  end
 end

data/ufo.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ufo/version'
+require "ufo/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "ufo"
@@ -10,25 +10,26 @@ Gem::Specification.new do |spec|
   spec.email         = ["tongueroo@gmail.com"]
   spec.description   = %q{Build Docker Containers and Ship Them to AWS ECS}
   spec.summary       = %q{Build Docker Containers and Ship Them to AWS ECS}
-  spec.homepage      = "https://github.com/tongueroo/ufo"
+  spec.homepage      = "http://ufoships.com"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thor"
-  spec.add_dependency "hashie"
-  spec.add_dependency "colorize"
-  spec.add_dependency "deep_merge"
-  spec.add_dependency "aws-sdk-ecs"
+  spec.add_dependency "aws-sdk-cloudwatchlogs"
   spec.add_dependency "aws-sdk-ec2"
+  spec.add_dependency "aws-sdk-ecr"
+  spec.add_dependency "aws-sdk-ecs"
   spec.add_dependency "aws-sdk-elasticloadbalancingv2"
-  spec.add_dependency "aws-sdk-cloudwatchlogs"
+  spec.add_dependency "colorize"
+  spec.add_dependency "deep_merge"
   spec.add_dependency "plissken"
+  spec.add_dependency "thor"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2018-02-10 00:00:00.000000000 Z
+date: 2018-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: aws-sdk-cloudwatchlogs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: aws-sdk-ecr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: deep_merge
+  name: aws-sdk-ecs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-ecs
+  name: aws-sdk-elasticloadbalancingv2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-ec2
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-elasticloadbalancingv2
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-cloudwatchlogs
+  name: plissken
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: plissken
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -140,16 +140,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/ufo
 - docs/.gitignore
 - docs/CNAME
 - docs/Gemfile
@@ -311,6 +310,7 @@ files:
 - docs/js/nav.js
 - docs/quick-start.md
 - docs/style.css
+- exe/ufo
 - lib/starter_project/.env
 - lib/starter_project/Dockerfile
 - lib/starter_project/bin/deploy
@@ -321,11 +321,15 @@ files:
 - lib/starter_project/ufo/variables/development.rb
 - lib/starter_project/ufo/variables/production.rb
 - lib/ufo.rb
-- lib/ufo/aws_services.rb
+- lib/ufo/aws_service.rb
 - lib/ufo/cli.rb
 - lib/ufo/command.rb
+- lib/ufo/completer.rb
+- lib/ufo/completer/script.rb
+- lib/ufo/completer/script.sh
+- lib/ufo/completion.rb
+- lib/ufo/default.rb
 - lib/ufo/default/settings.yml
-- lib/ufo/defaults.rb
 - lib/ufo/destroy.rb
 - lib/ufo/docker.rb
 - lib/ufo/docker/builder.rb
@@ -340,16 +344,22 @@ files:
 - lib/ufo/ecr/cleaner.rb
 - lib/ufo/env.rb
 - lib/ufo/help.rb
+- lib/ufo/help/completion.md
+- lib/ufo/help/completion_script.md
+- lib/ufo/help/completions.md
+- lib/ufo/help/completions_script.md
 - lib/ufo/help/destroy.md
 - lib/ufo/help/docker.md
 - lib/ufo/help/docker/base.md
 - lib/ufo/help/docker/build.md
 - lib/ufo/help/docker/clean.md
 - lib/ufo/help/docker/name.md
+- lib/ufo/help/hello.md
 - lib/ufo/help/init.md
 - lib/ufo/help/scale.md
 - lib/ufo/help/ship.md
 - lib/ufo/help/ships.md
+- lib/ufo/help/sub/goodbye.md
 - lib/ufo/help/task.md
 - lib/ufo/help/tasks.md
 - lib/ufo/help/tasks/build.md
@@ -357,8 +367,9 @@ files:
 - lib/ufo/init.rb
 - lib/ufo/log_group.rb
 - lib/ufo/scale.rb
-- lib/ufo/settings.rb
+- lib/ufo/setting.rb
 - lib/ufo/ship.rb
+- lib/ufo/sub.rb
 - lib/ufo/task.rb
 - lib/ufo/tasks.rb
 - lib/ufo/tasks/builder.rb
@@ -375,7 +386,7 @@ files:
 - spec/lib/task_spec.rb
 - spec/spec_helper.rb
 - ufo.gemspec
-homepage: https://github.com/tongueroo/ufo
+homepage: http://ufoships.com
 licenses:
 - MIT
 metadata: {}