ec2-list 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9972d4bc4b4d7eef77ab975b36502cb033b7c5bd
-  data.tar.gz: 58ae1fbf6bc46b50d3745565d0a7f844048925bc
+  metadata.gz: c5fd967d53d4b91259043495c085b0d364943163
+  data.tar.gz: 586e5a1d8bb9dfdaf5f789d92289eb2d5ba2dcaa
 SHA512:
-  metadata.gz: d255fcc8398b01d4dcc415be42a9462d5d5e7627e8c3e966662d71818c511d4a09240e20fde891fafd50dafa9a9e76857af774cdad8d711a3a87d4692d0c669f
-  data.tar.gz: 88637671372a8c04ebfd4d77b917854760272e3596940c6beefc26030e32753d646eb9615f3db9e9fc1e07394526d871dcb6410772ba6a3b571b3d9544d169a7
+  metadata.gz: 67de679649c0b8eb170353bd014a9b35a52e63246ffd9928dfac9b6bc3bd95bcb473a3c026aca4c705ce24c15f616ed64386a09fa73f4c1b2931bf37bbbc0d7f
+  data.tar.gz: 37fa58cdf9c7423799f2f44e02c5892be6b2daecf8d8919cbc5cde8093f10e1ab45ca3fee133dcec58c59c3ef0ce4297576218e630fc33e70aad167b60f0b0a1

data/lib/ec2list/cli.rb

@@ -29,7 +29,7 @@ module Ec2list
     private
 
     def display_columns
-      [:id, :type, :tag, :status, :fqdn, :ip_addr, :since]
+      ec2_list.display_columns
     end
 
     def ec2_list

data/lib/ec2list/version.rb

@@ -1,3 +1,3 @@
 module Ec2list
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/ec2list.rb

@@ -18,27 +18,19 @@ module Ec2list
     end
 
     def result
-      if @tag
-        instance_list.select { |instance| instance[:tag].include?(@tag) }
-      else
-        instance_list
-      end
+      instances.map { |instance|
+        display_columns.zip(display_columns.map { |col| instance.send(col) }).to_h
+      }
+    end
+
+    def display_columns
+      %i(id type tag status fqdn ip_addr since)
     end
 
     def instance_list
-      instances.map { |instance|
-        {
-          id: instance.instance_id,
-          type: instance.instance_type,
-          status: instance.state.name,
-          since: since_about(Time.now - instance.launch_time),
-          tag: instance.tags.find { |tag| tag.key == 'Name' }.value.gsub(' ', '_'),
-          fqdn: instance.public_dns_name,
-          ip_addr: instance.public_ip_address
-        }
-      }.sort_by { |x| x[:tag] }
+      instances.sort_by(&:tag)
     end
-    
+
     def values(keys)
       result.map { |x| keys.map { |k| x[k] }.join (' ') }.compact.sort
     end
@@ -46,9 +38,17 @@ module Ec2list
     def reservations
       ec2.describe_instances(filters: [filter]).reservations
     end
-    
+
     def instances
-      ec2.describe_instances(filters: [filter]).reservations.map { |x| x.instances }.flatten
+      if @tag
+        all_instances.select { |instance| instance.cont?(@tag) }
+      else
+       all_instances
+      end
+    end
+
+    def all_instances
+      reservations.map { |x| x.instances }.flatten.map { |ec2| Instance.new ec2 }
     end
 
     def filter
@@ -61,16 +61,47 @@ module Ec2list
         {}
       end
     end
+  end
+
+  class Instance
+    attr_accessor :id, :type, :status, :since, :tags, :fqdn, :ip_addr
+
+    def initialize(ec2)
+      @id = ec2.instance_id
+      @type = ec2.instance_type
+      @status = ec2.state.name
+      @since = since_about(Time.now - ec2.launch_time)
+      @tags = ec2.tags || []
+      @fqdn = ec2.public_dns_name
+      @ip_addr = ec2.public_ip_address
+    end
+
+    def name
+      name_tag = tags.find { |tag| tag.key == 'Name' }
+      if name_tag
+        name_tag.value.gsub(' ', '_')
+      else
+        nil
+      end
+    end
+
+    def tag
+      name
+    end
+
+    def cont?(tag)
+      name && name.include?(tag)
+    end
 
     private
 
-    def since_about(second)
-      if second > 86400
-        "#{second.quo(86400).to_i}d"
-      elsif second > 3600
-        "#{second.quo(3600).to_i}h"
+    def since_about(since)
+      if since > 86400
+        "#{since.quo(86400).to_i}d"
+      elsif since > 3600
+        "#{since.quo(3600).to_i}h"
       else
-        "#{second.quo(60).to_i}m"
+        "#{since.quo(60).to_i}m"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2-list
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Jun Yokoyama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: display list of ec2 instances.