awsm 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2a776b8b7a7da2f58130c059143503dd7ef9c91
-  data.tar.gz: fce86df5336b0ee0db8fa886de9d568856b3b224
+  metadata.gz: 8a54968644f5d7afd9ae2b0a7162accca5643c6d
+  data.tar.gz: a2289e945afeddc75ddd214fa6c031035fa46ab4
 SHA512:
-  metadata.gz: 9059fd4236a6833e02183dd59de47ea9ef892136beb5c2b81c5cd9261e2456c1979b8c03e95428fa94514fb2174107a5f05620d6cfe3859d51a0083887db5b1f
-  data.tar.gz: 64113ba02491f7f85ecacecffc3313d8e9d77907eae9215c1e8c74e8f0faa1203f17397ed8e7d1a665b00dae406e142243583e1251490da58d8aeb92d2b95186
+  metadata.gz: 357ad2bf4b9844a660896a65c90e500a4d567209118aee454ee86675453f65f65941dda55d96c39e5ec6ee0af02d837a9c366958c2963e33e87df1f6e9d45ff4
+  data.tar.gz: f357d77031f24201e4040a2ff50a6fe4d070cb1f9c663be91ffef94c5667251df5d0e91869336452b1282149baa46420b89db001d34c13cf15e7acff7c3a1b4c

data/lib/awsm/cli/tag.rb

@@ -2,13 +2,27 @@ module Awsm
   module CLI
     class Tag < Clibase
 
-      desc 'find tag=value [tag2=value2] [...]',
-        "Find resources by tags. Resources must have all tag key value pairs specified."
+      desc 'find tag=value [tag=] [=value] [...]',
+        "Find instances by tags."
       def find( *args )
         Table::Instance.new( filter_instances( argsToFilters( args ) ) ).print
       end
 
+      desc 'list [resource_id]',
+        "List tags for resource."
+      def list( resource_id )
+        print_tags( case resource_id
+          when /^i-[0-9a-f]+/
+            filter_instances( [ { name: 'instance-id', values: [ resource_id ] } ] ).first.tags
+          when /^ami-[0-9a-f]+/
+            filter_images( [ { name: 'image-id', values: [ resource_id ] } ] ).first.tags
+          else
+            raise StandardError, "Unknown resource id format: #{resource_id}"
+        end )
+      end
+
       no_commands do
+
         def argsToFilters( args )
           tags = {}
           filters = args.map do |arg|
@@ -37,6 +51,13 @@ module Awsm
 
           filters
         end
+
+        def print_tags( tags )
+          tags.each do |t|
+            say "#{t.key} => #{t.value}"
+          end
+        end
+
       end
 
     end

data/lib/awsm/clibase.rb

@@ -26,6 +26,14 @@ module Awsm
         instances
       end
 
+      def filter_images( filters )
+        images = []
+        ec2.describe_images( filters: filters ).images.each do |i|
+          images << i
+        end
+        images
+      end
+
     end
   end
 end

data/lib/awsm/configure.rb

@@ -13,6 +13,38 @@ module Awsm
     @@c.dns
   end
 
+  def self.instance_table_config
+    @@c.instance_table
+  end
+
+  class InstanceTablutron
+
+    def initialize
+      @use_fields = []
+      @fields = {}
+    end
+
+    def use_fields( fields=nil )
+      if fields.nil?
+        return @use_fields
+      end
+
+      @use_fields = fields
+    end
+
+    def add_field( name, heading, &block )
+      @fields[ name ] = {
+        heading: heading,
+        block: block
+      }
+    end
+
+    def fields
+      return @fields
+    end
+
+  end
+
   class Configulator
 
     def initialize
@@ -20,6 +52,15 @@ module Awsm
       @dns_block = nil
     end
 
+    def instance_table
+      if block_given?
+        @instance_tablutron = InstanceTablutron.new
+        yield @instance_tablutron
+      else
+        @instance_tablutron
+      end
+    end
+
     def dns( &block )
       if block_given?
         @dns_block = block

data/lib/awsm/table/instance.rb

@@ -2,11 +2,41 @@ module Awsm
   module Table
     class Instance
 
-      def initialize( instances, fields = [ :instance_id, :name, :state, :image_id, :launch_time, :private_ip ] )
-        @fields = fields
+      def initialize( instances, fields=nil )
+        @use_fields = if fields.nil?
+          Awsm::instance_table_config.use_fields
+        else
+          fields
+        end
+
+        @headings = {
+          instance_id: 'Instance ID',
+          name: 'Name',
+          state: 'State',
+          image_id: 'Image ID',
+          launch_time: 'Launch Time',
+          private_ip: 'Private IP',
+          awsm_owner: 'Owner'
+        }
+
+        @fields = {
+          instance_id: -> (i) { i.instance_id },
+          name: -> (i) { tag( 'Name', i.tags ).first },
+          state: -> (i) { i.state.name },
+          image_id: -> (i) { i.image_id },
+          launch_time: -> (i) { i.launch_time },
+          private_ip: -> (i) { i.private_ip_address },
+          awsm_owner: -> (i) { tag( 'awsm:owner', i.tags ).first }
+        }
+
+        Awsm::instance_table_config.fields.each do |name, field|
+          @headings[ name ] = field[:heading]
+          @fields[ name ] = field[:block]
+        end
+
         @rows = instances.map do |i|
           row = []
-          @fields.each do |f|
+          @use_fields.each do |f|
             row << extract_field( i, f )
           end
           row
@@ -15,7 +45,7 @@ module Awsm
 
       def print
         puts Terminal::Table.new(
-          headings: @fields.map { |f| heading( f ) },
+          headings: @use_fields.map { |f| @headings[ f ] },
           rows: @rows
         )
       end
@@ -23,41 +53,7 @@ module Awsm
       private
 
       def extract_field( instance, field )
-        case field
-          when :instance_id
-            instance.instance_id
-          when :name
-            tag( 'Name', instance.tags ).first
-          when :state
-            instance.state.name
-          when :image_id
-            instance.image_id
-          when :launch_time
-            instance.launch_time
-          when :private_ip
-            if instance.state.name == "running"
-              instance.private_ip_address
-            else
-              'N/A'
-            end
-          when :awsm_owner
-            tag( 'awsm:owner', instance.tags ).first
-          else
-            raise StandardError "Unknown field"
-        end
-      end
-
-      def heading( field )
-        headings = {
-          instance_id: 'Instance ID',
-          name: 'Name',
-          state: 'State',
-          image_id: 'Image ID',
-          launch_time: 'Launch Time',
-          private_ip: 'Private IP',
-          awsm_owner: 'Owner'
-        }
-        headings[ field ]
+        @fields[ field ].call( instance )
       end
 
       def tag( key, tags )

data/lib/awsm/version.rb

@@ -1,3 +1,3 @@
 module Awsm
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Daniel Kendell