ufo 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e32cfe7ae9d1c54917cfca857b135fd1ad7dccc7f865ccc9f2b7187238c0b62
-  data.tar.gz: 39a546c17315befed8fcc630f382a613556b756e3ccd74e11fe20dc3a768d4c1
+  metadata.gz: 33f1048c6f9c171330e61473ffa002d602bc0e133fa377c6e41fae8d4c2cbd88
+  data.tar.gz: 7ffd9cd2540acdd259378cd0913c61398fb956d10df64dcf4cae6a7ef675a2af
 SHA512:
-  metadata.gz: ca820a40d91b2983413dfbf33d0a0ee31971f04e989711a827c413fa8708dc51c507e97bf5f889e094ab7b3d65a7dbc53001148fc59b716b6224e6a5ace17d73
-  data.tar.gz: 89856c014555a1685b101c62da4ee7b585197da7dcfe2ee113a79a857ef98ad6933eb66802a903b7f48ed0429ecaf9a3276afeeaf087dedcc001d7c3926e030c
+  metadata.gz: 10401ec23bec1fc97a7d8191893b812cf51cdb39688d8ead07ae2cad2698bfcf35790b387aea8c3bfd0358eb908ede51df401e3cefa6635fe85c9526d86bbe3a
+  data.tar.gz: 70b8d718a779ff77a63037210b7113432e118e916786fe148a806e01153d30492abfbc1be9d2607a9c3a9df43db37b9647357b4df298773af4f99fb0fbd31b53

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.
 
+## [4.1.1]
+- add --no-register ability to ufo deploy command
+- fixes: hide_time_took, ps_spec
+- ufo destroy: improve error handling for in progress state
+- ufo ps --extra: show shorter container instance arn id
+
 ## [4.1.0]
 - Merge pull request #46 from tongueroo/ufo-status
 - add ufo status command

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ufo (4.0.0)
+    ufo (4.1.0)
       aws-sdk-cloudformation
       aws-sdk-cloudwatchlogs
       aws-sdk-ec2
@@ -37,7 +37,7 @@ GEM
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.37.0)
+    aws-sdk-ec2 (1.38.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
     aws-sdk-ecr (1.4.0)

data/docs/_reference/ufo-deploy.md

@@ -52,6 +52,8 @@ The `ufo ships`, `ufo ship`, `ufo deploy` command support the same options. The
 [--task=TASK]                              # ECS task name, to override the task name convention.
 [--wait], [--no-wait]                      # Wait for deployment to complete
                                            # Default: true
+[--register], [--no-register]              # Register task definition
+                                           # Default: true
 [--verbose], [--no-verbose]                
 [--mute], [--no-mute]                      
 [--noop], [--no-noop]                      

data/docs/_reference/ufo-ps.md

@@ -45,6 +45,7 @@ Skip the summary info:
 ```
 [--summary], [--no-summary]  # Display summary header info.
                              # Default: true
+[--extra], [--no-extra]      # Display extra debugging columns.
 [--verbose], [--no-verbose]  
 [--mute], [--no-mute]        
 [--noop], [--no-noop]        

data/docs/_reference/ufo-status.md

@@ -0,0 +1,23 @@
+---
+title: ufo status
+reference: true
+---
+
+## Usage
+
+    ufo status SERVICE
+
+## Description
+
+Status of ECS service.  Essentially, status of CloudFormation stack
+
+
+## Options
+
+```
+[--verbose], [--no-verbose]  
+[--mute], [--no-mute]        
+[--noop], [--no-noop]        
+[--cluster=CLUSTER]          # Cluster.  Overrides .ufo/settings.yml.
+```
+

data/docs/reference.md

@@ -20,6 +20,7 @@ title: CLI Reference
 * [ufo scale]({% link _reference/ufo-scale.md %})
 * [ufo ship]({% link _reference/ufo-ship.md %})
 * [ufo ships]({% link _reference/ufo-ships.md %})
+* [ufo status]({% link _reference/ufo-status.md %})
 * [ufo stop]({% link _reference/ufo-stop.md %})
 * [ufo task]({% link _reference/ufo-task.md %})
 * [ufo tasks]({% link _reference/ufo-tasks.md %})

data/lib/ufo/cli.rb

@@ -46,10 +46,11 @@ module Ufo
     desc "deploy SERVICE", "Deploy task definition to ECS service without re-building the definition."
     long_desc Help.text(:deploy)
     ship_options.call
+    option :register, type: :boolean, desc: "Register task definition", default: true
     def deploy(service=:current)
       service = service == :current ? Current.service! : service
       task_definition = options[:task] || service # convention
-      Tasks::Register.register(task_definition, options)
+      Tasks::Register.register(task_definition, options) if options[:register]
       ship = Ship.new(service, options.merge(task_definition: task_definition))
       ship.deploy
     end

data/lib/ufo/destroy.rb

@@ -8,10 +8,18 @@ module Ufo
 
       stack = find_stack(@stack_name)
       unless stack
-        puts "Stack #{@stack_name} does not exist."
+        puts "Stack #{@stack_name.colorize(:green)} does not exist."
         exit
       end
 
+      if stack.stack_status =~ /_IN_PROGRESS$/
+        puts "Cannot destroy service #{@pretty_service_name.colorize(:green)}"
+        puts "Cannot delete stack #{@stack_name.colorize(:green)} in this state: #{stack.stack_status.colorize(:green)}"
+        puts "If the stack is taking a long time, you can cancel the current operation with:"
+        puts "  ufo cancel #{@service}"
+        return
+      end
+
       cloudformation.delete_stack(stack_name: @stack_name)
       puts "Deleting CloudFormation stack with ECS resources: #{@stack_name}."
 

data/lib/ufo/ps/task.rb

@@ -27,7 +27,7 @@ class Ufo::Ps
     end
 
     def container_instance_arn
-      @task['container_instance_arn']
+      @task['container_instance_arn'].split('/').last
     end
 
     def release

data/lib/ufo/stack/status.rb

@@ -65,7 +65,7 @@ class Ufo::Stack
         puts "Stack success status: #{last_event_status}".colorize(:green)
       end
 
-      return unless @hide_time_took
+      return if @hide_time_took
       took = Time.now - start_time
       puts "Time took for stack deployment: #{pretty_time(took).green}."
     end

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

data/spec/lib/ps_spec.rb

@@ -7,8 +7,8 @@ describe Ufo::Ps do
     let(:describe_tasks_response) do
       JSON.load(IO.read("spec/fixtures/ps/describe_tasks.json"))
     end
-    it "displays info" do
-      ps.display_info(describe_tasks_response)
+    it "display_tasks" do
+      ps.display_tasks(describe_tasks_response)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
@@ -382,6 +382,7 @@ files:
 - docs/_reference/ufo-scale.md
 - docs/_reference/ufo-ship.md
 - docs/_reference/ufo-ships.md
+- docs/_reference/ufo-status.md
 - docs/_reference/ufo-stop.md
 - docs/_reference/ufo-task.md
 - docs/_reference/ufo-tasks-build.md