awful 0.0.64 → 0.0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 197984134d5cd711e7621da746ab62517ecfdb45
-  data.tar.gz: 588c9979e01069e6817fa3335b2fe76d4b3c32fe
+  metadata.gz: 833a0d6caac75f922bd8fd7085cb047142564e31
+  data.tar.gz: d5bb1cbca3c714b12043f69c36056f0d41a34f19
 SHA512:
-  metadata.gz: ebda32f8f5061fe2aabadf78075cd304da15ff59b34b2f60f56550ac9e5e165a366b0eb5a23aaf20db8fc0d2618b185017775ef1ed215a36f7addc4629d3d6bb
-  data.tar.gz: b56a1ed0e90e116882d65fc59abc271cce22186ac3b3bf7c276463d8a99c5c47baacc655dfc940fcaaa9175dedbe3c9d20c0116add40958b71d0e52d1c5182d5
+  metadata.gz: efb0d8ad07fcf29ffc1d6e6f2047607c62eb0be32563215cef03568b2f3d64e13a696a620531ecd63ee6c384cc1aa294f0557a0420b62e760d2d83386ab73390
+  data.tar.gz: de93c913120a50d137cdd1ea5f612e53e3ee17b4fda03a7145ede5298d72c7014c6017167bd2740db42d15ab7acad61fe1576f3d0bf5dacf27669881e47bbd72

data/bin/ecs

@@ -4,4 +4,4 @@
 require 'awful'
 require 'awful/ecs'
 
-Awful::Ecs.start(ARGV)
+Awful::Ecs.start(ARGV)

data/lib/awful/dynamodb.rb

@@ -140,22 +140,26 @@ module Awful
       end
 
       ## lame progress indicator, pass true for put, false for skip
-      dots = options[:dots] ? ->(x){print x ? '.' : 'x'} : ->{}
+      dots = options[:dots] ? ->(x){print x ? '.' : 'x'} : ->(_){}
 
       ## recursive closure to scan some items from src and put to dest;
       ## would be more studly as an anonymous y-combinator, but we should write readable code instead
       scan_and_put = ->(myself, key) {
         r = src_client.scan(table_name: src_table, exclusive_start_key: key, return_consumed_capacity: 'INDEXES')
-        print "[#{Time.now}] Scanned #{r.count} items; last evaluated key: #{r.last_evaluated_key}"
+        print "[#{Time.now}] [#{src_table}] [scanned:#{r.count}] last key: #{r.last_evaluated_key || 'nil'}"
+        put = skipped = 0
         r.items.each do |item|
           begin
             dst_client.put_item(params.merge(item: item))
+            put += 1
             dots.call(true)
           rescue Aws::DynamoDB::Errors::ConditionalCheckFailedException #item key exists
+            skipped += 1
             dots.call(false)
           end
         end
         print "\n"
+        puts "[#{Time.now}] [#{dst_table}] [put:#{put} skipped:#{skipped}]"
 
         ## recurse if there are more keys to scan
         if r.last_evaluated_key

data/lib/awful/ecs.rb

@@ -5,6 +5,10 @@ module Awful
     COLORS = {
       ACTIVE:   :green,
       INACTIVE: :red,
+      true:     :green,
+      false:    :red,
+      RUNNING:  :green,
+      STOPPED:  :red,
     }
 
     no_commands do
@@ -49,19 +53,48 @@ module Awful
       arns = ecs.list_container_instances(cluster: cluster).container_instance_arns
       if options[:long]
         container_instances = ecs.describe_container_instances(cluster: cluster, container_instances: arns).container_instances
-        ec2_instances = ec2.describe_instances(instance_ids: container_instances.map(&:ec2_instance_id)).map(&:reservations).flatten.map(&:instances).flatten
+
+        ## get hash of tags for each instance id
+        tags = ec2.describe_instances(instance_ids: container_instances.map(&:ec2_instance_id)).
+               map(&:reservations).flatten.
+               map(&:instances).flatten.
+               each_with_object({}) do |i,h|
+          h[i.instance_id] = tag_name(i, '--')
+        end
+
         print_table container_instances.each_with_index.map { |ins, i|
           [
-            tag_name(ec2_instances[i]),
+            tags[ins.ec2_instance_id],
             ins.container_instance_arn.split('/').last,
             ins.ec2_instance_id,
-            "agent:#{ins.agent_connected}",
+            "agent:#{color(ins.agent_connected.to_s)}",
             color(ins.status),
           ]
+        }.sort
+      else
+        puts arns
+      end
+    end
+
+    desc 'tasks CLUSTER', 'list tasks for CLUSTER'
+    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    def tasks(cluster)
+      arns = ecs.list_tasks(cluster: cluster).task_arns
+      if options[:long]
+        tasks = ecs.describe_tasks(cluster: cluster, tasks: arns).tasks
+        print_table tasks.map { |task|
+          [
+            task.task_arn.split('/').last,
+            task.task_definition_arn.split('/').last,
+            task.container_instance_arn.split('/').last,
+            "#{color(task.last_status)} (#{task.desired_status})",
+            task.started_by,
+          ]
         }
       else
         puts arns
       end
     end
+
   end
 end

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = "0.0.64"
+  VERSION = "0.0.65"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.64
+  version: 0.0.65
 platform: ruby
 authors:
 - Ric Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler