ec2ctl 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e93e145a9a46ba440c2425be62e4cc3165bf141
-  data.tar.gz: fb692f2bf1eb7c6f7ac199bbcf0f441f4a260b03
+  metadata.gz: dce53ee681a100859a592b712e6d350d5b42dc37
+  data.tar.gz: 41ae0cdcbd3246c92d6c1c33f714fbf6b83dd9a2
 SHA512:
-  metadata.gz: 8c0a2e966e7f14ffeabc54b5cee63c31d77aaadc78f69e1b0c7b16287a45dda5cf6fc180dd0892c8f09486d590e46f1751d803c9a81be7ddb74a68693e88898b
-  data.tar.gz: 1a1cac4e840229b9bcaebb0a79985ba55359d7537a7f5f3a2b29f0fc15bfcc189e2c9ded055275832fbea56ec65ba887b79e8eb774255894df2cd7092d779010
+  metadata.gz: 9cde8643788d2e8342ec3e21b35abf81ce6ee4d159b289de11c48e9f6a9645062424fd973b17a2905994bb1c62b1879ffd573688890a4662d5fd9f745d694d16
+  data.tar.gz: a7f825da6dec8d0e74748accf504aa4a126aa48d47e6d5eb3a97bd12ed415a2a5d16fe50be8dc145db8988af92cc9679905e9d5c1e0efbe79f34a7ace228ac22

data/ec2ctl.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.1.0"
+  spec.required_ruby_version = ">= 2.0.0"
 
   spec.add_dependency "aws-sdk",        "~> 2.3"
   spec.add_dependency "commander",      "~> 4.4"

data/lib/ec2ctl/cli.rb

@@ -30,7 +30,7 @@ module EC2Ctl
         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)
+          options.default attributes: %w(instance_id tag:Name instance_type public_dns_name state.name ssm:ping_status)
 
           invoke options do
             @client.ec2_list

data/lib/ec2ctl/client.rb

@@ -92,7 +92,8 @@ module EC2Ctl
     def ec2_list
       if @logger
         if @logger.debug?
-          @logger.debug ec2_instances: ec2_instances
+          @logger.debug ec2_instances:       ec2_instances
+          @logger.debug ssm_instance_states: ssm_instance_states(ec2_instances.map(&:instance_id))
         else
           ec2_instances_summary = if @count
             @attributes.each_with_object Hash.new do |attribute, attributes_memo|
@@ -116,7 +117,10 @@ module EC2Ctl
         end
       end
 
-      {ec2_instances: ec2_instances}
+      {
+        ec2_instances:       ec2_instances,
+        ssm_instance_states: ssm_instance_states(ec2_instances.map(&:instance_id)),
+      }
     end
 
     def ec2_execute
@@ -570,10 +574,22 @@ module EC2Ctl
         tag = instance.tags.find {|t| t.key == attribute.split(":")[1..-1].join(":")}
 
         tag ? tag.value : nil
-      else
-        attribute.split(".").map(&:intern).inject instance.data do |_acc, method|
-          _acc.send method
+      when /\Assm:/i
+        ssm_instance_state = ssm_instance_states(ec2_instances.map(&:instance_id)).find do |i|
+          i.instance_id == instance.instance_id
+        end
+
+        if ssm_instance_state
+          query_struct(ssm_instance_state, attribute.split(":")[1..-1].join(":"))
         end
+      else
+        query_struct(instance.data, attribute)
+      end
+    end
+
+    def query_struct(struct, attribute)
+      attribute.split(".").map(&:intern).inject struct do |_acc, method|
+        _acc.send method
       end
     end
   end

data/lib/ec2ctl/logger.rb

@@ -50,13 +50,17 @@ module EC2Ctl
     def to_hash(object)
       case object
       when Struct
-        object.each_pair.to_a.map {|a|
-          [a.first, to_hash(a.last)]
-        }.to_h
+        Hash[
+          object.each_pair.to_a.map {|a|
+            [a.first, to_hash(a.last)]
+          }
+        ]
       when Hash
-        object.to_a.map {|a|
-          [a.first, to_hash(a.last)]
-        }.to_h
+        Hash[
+          object.to_a.map {|a|
+            [a.first, to_hash(a.last)]
+          }
+        ]
       when Array, Aws::Resources::Collection
         object.map {|o| to_hash(o)}
       when Aws::Resources::Resource

data/lib/ec2ctl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2ctl
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Yoriki Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="