awsm 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ad7bcebefe552317579e717e09fce0b4f7ff68d
-  data.tar.gz: ad146920d05f8b9b2cf39c59d6dad2c62a50f69e
+  metadata.gz: b2a776b8b7a7da2f58130c059143503dd7ef9c91
+  data.tar.gz: fce86df5336b0ee0db8fa886de9d568856b3b224
 SHA512:
-  metadata.gz: b9623ec29662f0738616d4126b3b909fab771e8e4cfb2e371014b6ab52a1cd598573003e10366131ce534f90eb0d08e30acdee4fe689eb4f265a17a0f655a7ca
-  data.tar.gz: e81cb3864051bf78f65661371fe377941ebce0722ead5f393c33576252b285785776deacc94ca10f058d645b37c1063a95eb31a24fc6cf9ae34b7e9fb19fa0b4
+  metadata.gz: 9059fd4236a6833e02183dd59de47ea9ef892136beb5c2b81c5cd9261e2456c1979b8c03e95428fa94514fb2174107a5f05620d6cfe3859d51a0083887db5b1f
+  data.tar.gz: 64113ba02491f7f85ecacecffc3313d8e9d77907eae9215c1e8c74e8f0faa1203f17397ed8e7d1a665b00dae406e142243583e1251490da58d8aeb92d2b95186

data/lib/awsm.rb

@@ -11,7 +11,10 @@ require 'awsm/autoscalinggroups'
 require 'awsm/dns'
 require 'awsm/instances'
 
+require 'awsm/table/instance'
+
 require 'awsm/clibase'
+require 'awsm/cli/tag'
 require 'awsm/cli/unused'
 require 'awsm/cli/spin'
 require 'awsm/cli/main'

data/lib/awsm/cli/main.rb

@@ -16,6 +16,9 @@ module Awsm
       desc 'unused', 'Find unused resources'
       subcommand 'unused', Awsm::CLI::Unused
 
+      desc 'tag', 'Search by tags'
+      subcommand 'tag', Awsm::CLI::Tag
+
       desc "specific <comma-separated-elb-names>",
         "Only find specific ELBs named in a comma-separated list."
       def specific( elb_names )

data/lib/awsm/cli/spin.rb

@@ -38,21 +38,14 @@ module Awsm
         "Spin down the specified instance"
       def down( instance_id )
         response = ec2.describe_instances(
-          instance_ids: [ instance_id ]
+          filters: [
+            { name: 'instance-id', values: [ instance_id ] },
+            { name: 'tag:awsm:owner', values: [ whoami ] }
+          ]
         )
 
-        if response.reservations.first.instances.length == 0
-          say "Instance #{instance_id} not found."
-          return
-        end
-
-        instance = response.reservations.first.instances.first
-        owner_tag = instance.tags.select do |t|
-          t.key == 'awsm:owner' && t.value == whoami
-        end
-
-        if owner_tag.length == 0
-          say "Instance #{instance_id} doesn't belong to you, leave it alone."
+        if response.reservations.length == 0
+          say "Instance #{instance_id} not spinning."
           return
         end
 
@@ -67,47 +60,15 @@ module Awsm
       option :simple, :type => :boolean, :default => false, :aliases => '-s',
         :desc => "Display list without prettiness - good for sedding"
       def list
-        response = ec2.describe_instances(
-          filters: [
-            { name: 'tag-key', values: [ "awsm:owner" ] }
-          ]
-        )
-        spinning = []
-        response.reservations.each do |r|
-          r.instances.each do |i|
-            owner = i.tags.select { |t| t.key == 'awsm:owner' }.first.value
-
-            if owner == whoami
-              fields = [ i.instance_id, i.state.name, i.image_id, owner, i.launch_time ]
-
-              if i.state.name == 'running'
-                fields << i.private_ip_address
-              else
-                fields << 'N/A'
-              end
-
-              spinning << fields
-            end
-          end
-        end
-
-        if options[:simple]
-          spinning.each do |row|
-            say row.join(' ')
-          end
-        else
-          puts_table(
-            headings: [ 'Instance ID', 'State', 'AMI ID', 'Owner', 'Launched Time', 'Private IP' ],
-            rows: spinning
-          )
-        end
+        instances = filter_instances( [
+          { name: 'tag:awsm:owner', values: [ whoami ] }
+        ] )
+        Table::Instance.new( instances, [
+          :instance_id, :state, :image_id, :awsm_owner, :launch_time, :private_ip
+        ] ).print
       end
 
       no_commands do
-        def ec2
-          Aws::EC2::Client.new
-        end
-
         def whoami
           me_host = `hostname -f`.strip
           me_user = `whoami`.strip

data/lib/awsm/cli/tag.rb

@@ -0,0 +1,44 @@
+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."
+      def find( *args )
+        Table::Instance.new( filter_instances( argsToFilters( args ) ) ).print
+      end
+
+      no_commands do
+        def argsToFilters( args )
+          tags = {}
+          filters = args.map do |arg|
+            key, value = arg.split( '=' )
+
+            if tags[ key ].nil?
+              tags[ key ] = []
+            end
+
+            tags[ key ] << value
+          end
+
+          filters = []
+          tags.each do |k, v|
+            v = v.select { |e| !e.nil? }.uniq
+            if k == ""
+              filters << { name: 'tag-value', values: v }
+            else
+              if v == []
+                filters << { name: 'tag-key', values: [ k ] }
+              else
+                filters << { name: "tag:#{k}", values: v }
+              end
+            end
+          end
+
+          filters
+        end
+      end
+
+    end
+  end
+end

data/lib/awsm/clibase.rb

@@ -1,6 +1,7 @@
 module Awsm
   class Clibase < Thor
     no_commands do
+
       def puts_table( table )
         if options[:tables] == true
           puts Terminal::Table.new( table )
@@ -10,6 +11,21 @@ module Awsm
           end
         end
       end
+
+      def ec2
+        Aws::EC2::Client.new
+      end
+
+      def filter_instances( filters )
+        instances = []
+        ec2.describe_instances( filters: filters ).reservations.each do |r|
+          r.instances.each do |i|
+            instances << i
+          end
+        end
+        instances
+      end
+
     end
   end
 end

data/lib/awsm/table/instance.rb

@@ -0,0 +1,70 @@
+module Awsm
+  module Table
+    class Instance
+
+      def initialize( instances, fields = [ :instance_id, :name, :state, :image_id, :launch_time, :private_ip ] )
+        @fields = fields
+        @rows = instances.map do |i|
+          row = []
+          @fields.each do |f|
+            row << extract_field( i, f )
+          end
+          row
+        end
+      end
+
+      def print
+        puts Terminal::Table.new(
+          headings: @fields.map { |f| heading( f ) },
+          rows: @rows
+        )
+      end
+
+      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 ]
+      end
+
+      def tag( key, tags )
+        tags.select { |t| t.key == key }
+          .map { |t| t.value }
+      end
+
+    end
+  end
+end

data/lib/awsm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awsm
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Kendell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -102,12 +102,14 @@ files:
 - lib/awsm/autoscalinggroups.rb
 - lib/awsm/cli/main.rb
 - lib/awsm/cli/spin.rb
+- lib/awsm/cli/tag.rb
 - lib/awsm/cli/unused.rb
 - lib/awsm/clibase.rb
 - lib/awsm/configure.rb
 - lib/awsm/dns.rb
 - lib/awsm/instances.rb
 - lib/awsm/loadbalancers.rb
+- lib/awsm/table/instance.rb
 - lib/awsm/version.rb
 homepage: http://github.com/mduk/awsm
 licenses: