aws_pocketknife 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a905dab1c729293da8624fca40f5549a095378a8
-  data.tar.gz: e011a7b84b9aa2ed22ea4aea4dfb7d6f5fc951a3
+  metadata.gz: 19ad8446907eb841bc3d38706aa027880443bf25
+  data.tar.gz: 1eaad90a4f81172db80eb3cf1c4adb1705b66a37
 SHA512:
-  metadata.gz: 0a7c5493e68f1717c80fc5eb693a9e9f5762130813c5cb9bdcb2132dff7ff3c0e060d1c4f371d60b13fba9c921899121b8d9af6b4de1da73e2bac30964ccd72b
-  data.tar.gz: d9d3d7d27a839f03c607a0aef9ca726547ceff16c4d35e3601cbd16ffa2b4a358215fa7955714104676faf67991eacb82969343e882a426961bca65a4ccabe01
+  metadata.gz: f15e20b95dcea964567ba815066df899dcd145632011c4a734a65391904c2c78f0cf48c5005ef51fb19a82645aa0bd3f7aac48527444f98045d029c4a5995fb8
+  data.tar.gz: 592e8002cc830cabfa8bf98e4e22a602ab73e9c9f788f59df4e7c54810fe0c1d0643d537ee905dc8aef50d9e666c41f6b6a3e2f73bb58e5e5113e02002aff15a

data/lib/aws_pocketknife/cli/ecs.rb

@@ -115,8 +115,8 @@ module AwsPocketknife
                   "pending_tasks_count","running_tasks_count", "status",
                   "cpu (units)", "mem (MiB)"
                 ]
-        headers_2 = ["total",
-          "total pending", "total running",
+        headers_2 = ["active", "draining", 
+          "tasks pending", "tasks running",
           "cpu_reserved / cpu_total", "mem_reserved / mem_total"
         ]
         data = []
@@ -124,7 +124,8 @@ module AwsPocketknife
         if instances.nil?
           puts "No instances found"
         else
-          count = 0
+          count_active = 0
+          count_draining = 0
           mem_cluster_total = 0.0
           mem_cluster_res_total = 0.0
           mem_percentage = 0.0
@@ -146,15 +147,16 @@ module AwsPocketknife
             ]
             pending_tasks_count_total = pending_tasks_count_total + info.pending_tasks_count
             running_tasks_count_total = running_tasks_count_total + info.running_tasks_count
-            mem_cluster_total = mem_cluster_total + mem_total
+            mem_cluster_total = mem_cluster_total + mem_total if info.status == "ACTIVE"
             mem_cluster_res_total = mem_cluster_res_total + mem_available if info.status == "ACTIVE"
             mem_percentage = (((mem_cluster_total - mem_cluster_res_total)/mem_cluster_total) * 100).round(2)
-            cpu_cluster_total = cpu_cluster_total + cpu_total
+            cpu_cluster_total = cpu_cluster_total + cpu_total if info.status == "ACTIVE"
             cpu_cluster_res_total = cpu_cluster_res_total + cpu_available if info.status == "ACTIVE"
             cpu_percentage = (((cpu_cluster_total - cpu_cluster_res_total)/cpu_cluster_total) * 100).round(2)
-            count = count + 1
+            count_active = count_active + 1 if info.status == "ACTIVE"
+            count_draining = count_draining + 1 if info.status == "DRAINING"
           end
-            data_2 << [count,
+            data_2 << [count_active, count_draining, 
               pending_tasks_count_total, running_tasks_count_total,
               "#{(cpu_cluster_total - cpu_cluster_res_total).round(0)} / #{cpu_cluster_total.round(0)} (#{cpu_percentage} %)", "#{(mem_cluster_total - mem_cluster_res_total).round(0)} / #{mem_cluster_total.round(0)} (#{mem_percentage} %)"
             ]

data/lib/aws_pocketknife/cli/main.rb

@@ -4,6 +4,7 @@ require "aws_pocketknife"
 module AwsPocketknife
   module Cli
     class Main < Thor
+      map %w[--version -v] => :__print_version
 
       desc "ec2 SUBCOMMAND ...ARGS", "ec2 command lines"
       subcommand "ec2", AwsPocketknife::Cli::Ec2
@@ -32,6 +33,11 @@ module AwsPocketknife
       desc "ecs SUBCOMMAND ...ARGS", "ecs command lines"
       subcommand "ecs", AwsPocketknife::Cli::Ecs
 
+      desc "--version, -v", "print the version"
+      def __print_version
+        puts AwsPocketknife::VERSION
+      end
+    
     end
   end
 end

data/lib/aws_pocketknife/version.rb

@@ -1,3 +1,3 @@
 module AwsPocketknife
-  VERSION = "0.1.23"
+  VERSION = "0.1.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_pocketknife
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Gustavo Soares Souza
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Command line tools to make aws administration a little bit easier and faster