ec2ctl 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2db3d33906e470bb3a0e6b4a96e840feae7e0dfd
-  data.tar.gz: aac465cbdf09c95ce707088fd6dd705584088290
+  metadata.gz: 2e93e145a9a46ba440c2425be62e4cc3165bf141
+  data.tar.gz: fb692f2bf1eb7c6f7ac199bbcf0f441f4a260b03
 SHA512:
-  metadata.gz: 14cadc9ca8e185e0b97547b05a155b0fb44ee2be7952430ae27199a292f3dc2594027e24c5fbdc71e3afcf46be780ccba3c2533da63febb972c2de37abcc8aa7
-  data.tar.gz: 19ab369c479627d591d68b44e943bcd6d3ce66ae66ec5fde155c634ec49f7afb0a411f1efe162a9b1d95487beaed8c4f26dccb50c900bace55b9bf8b940f8774
+  metadata.gz: 8c0a2e966e7f14ffeabc54b5cee63c31d77aaadc78f69e1b0c7b16287a45dda5cf6fc180dd0892c8f09486d590e46f1751d803c9a81be7ddb74a68693e88898b
+  data.tar.gz: 1a1cac4e840229b9bcaebb0a79985ba55359d7537a7f5f3a2b29f0fc15bfcc189e2c9ded055275832fbea56ec65ba887b79e8eb774255894df2cd7092d779010

data/README.md

@@ -20,6 +20,12 @@ Or install it yourself as:
 
 ## Usage
 
+Please run
+
+```
+$ ec2ctl --help
+```
+
 ### `ec2 list`
 
 List EC2 instances.

data/lib/ec2ctl/cli.rb

@@ -26,6 +26,9 @@ module EC2Ctl
 
         ec2_options c
 
+        c.option "-a", "--attributes KEY1,KEY2...", Array, "(Optional) The instance attribute keys to display."
+        c.option "-C", "--count",                          "(Optional) Display instance attribute stats."
+
         c.action do |args, options|
           options.default attributes: %w(instance_id tag:Name instance_type public_dns_name state.name)
 
@@ -229,7 +232,6 @@ module EC2Ctl
     end
 
     def ec2_options(_command)
-      _command.option "-a", "--attributes KEY1,KEY2...",            Array, "(Optional) The instance attribute keys to display."
       _command.option "-f", "--filters KEY1=VALUE1,KEY2=VALUE2...", Array, "(Optional) The key-value pairs to filter instances."
       _command.option "-s", "--search KEY1=VALUE1,KEY2=VALUE2...",  Array, "(Optional) The key-value pairs to search instances by Regexp."
       _command.option "-i", "--instance-ids STRING1,STRING2",       Array, "(Optional) The IDs of the instances."

data/lib/ec2ctl/client.rb

@@ -42,7 +42,8 @@ module EC2Ctl
       instance_ids:           [],
       filters:                [],
       attributes:             [],
-      search:                 []
+      search:                 [],
+      count:                  false
     )
       @logger = logger
 
@@ -73,6 +74,7 @@ module EC2Ctl
       @filters                = filters
       @attributes             = attributes
       @search                 = search
+      @count                  = count
 
       if @load_balancer_name
         @elb_instance_ids = elb_instance_states.map(&:instance_id).select do |instance_id|
@@ -92,12 +94,22 @@ module EC2Ctl
         if @logger.debug?
           @logger.debug ec2_instances: ec2_instances
         else
-          ec2_instances_summary = ec2_instances.each_with_object Array.new do |instance, instances_memo|
-            instance_summary = @attributes.each_with_object Hash.new do |attribute, attributes_memo|
-              attributes_memo[attribute] = query_instance_attribute(instance, attribute)
+          ec2_instances_summary = if @count
+            @attributes.each_with_object Hash.new do |attribute, attributes_memo|
+              attribute_hash = ec2_instances.each_with_object Hash.new(0) do |instance, instances_memo|
+                instances_memo[query_instance_attribute(instance, attribute)] += 1
+              end
+
+              attributes_memo[attribute] = attribute_hash
             end
+          else
+            ec2_instances.each_with_object Array.new do |instance, instances_memo|
+              instance_summary = @attributes.each_with_object Hash.new do |attribute, attributes_memo|
+                attributes_memo[attribute] = query_instance_attribute(instance, attribute)
+              end
 
-            instances_memo.push instance_summary
+              instances_memo.push instance_summary
+            end
           end
 
           @logger.info ec2_instances_summary: ec2_instances_summary

data/lib/ec2ctl/version.rb

@@ -1,3 +1,3 @@
 module EC2Ctl
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2ctl
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Yoriki Yamaguchi