awsm 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3e16b0b9220fcb8b20915939481a181206e10b7
-  data.tar.gz: e7573a6bdb27b27cd1b1cbdc7bce7ed8ceeadc8d
+  metadata.gz: 51fea1f6476f3e4d5e0262b69f74805079182d7a
+  data.tar.gz: 4622721f521947a65aeb2e4350e50e50d02b54a2
 SHA512:
-  metadata.gz: 01eea39e072b4b4557b72bd9da1d162e8b4b5de330715e4cacddde5bd47b3de968e40d6368be162ac39b43c43916ee471f5e15b73ac4863cb56f813b2e60f2ff
-  data.tar.gz: 453a76736169896414447ecd1b2939966c72d3ad22203f0c809f5cda0c5f625beb0fed91aca4fa7f7c7ade12e741f11c89809f2657cc18130752f0269ccd6b25
+  metadata.gz: 2c1ddeb57df262dc9079498518baec241263f2b6151c24a3fe827c6ff4dd4c744570a9638ad1dd3621d4f5a90737d9aa7ec9eff43352cab851c7e1de6bdb435c
+  data.tar.gz: 81bf040b7d01cc21958b9de84a00b68518bcb3825dfba81938af3ae8fa02ea0e24605087ade1c3f55d92f3ff3a5d42dcddaa6c39b7c8075b71b1a548c27bdd9b

data/awsm.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor', '~> 0.19'
   spec.add_runtime_dependency 'aws-sdk', '~> 2'
   spec.add_runtime_dependency 'terminal-table', '~> 1.4'
-  spec.add_runtime_dependency 'mime', '~> 0.4'
+  spec.add_runtime_dependency 'vcr', '~> 2.9'
+  spec.add_runtime_dependency 'fakeweb', '~> 1.3'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency "pry", '~> 0.10'

data/lib/awsm.rb

@@ -1,8 +1,7 @@
 require 'yaml'
 require 'thor'
 require 'terminal-table'
-require 'mime'
-require 'base64'
+require 'json'
 
 require 'awsm/version'
 
@@ -13,7 +12,9 @@ require 'awsm/autoscalinggroups'
 require 'awsm/dns'
 require 'awsm/instances'
 
+require 'awsm/tablebase'
 require 'awsm/table/instance'
+require 'awsm/table/image'
 
 require 'awsm/clibase'
 require 'awsm/cli/tag'

data/lib/awsm/cli/spin.rb

@@ -94,25 +94,17 @@ module Awsm
         end
 
         def spin_up( c )
-          userdata = MIME::Multipart::Mixed.new
-          c.userdata.each do |path, file|
-            userdata.attach( MIME::Text.new( file, 'mendeley-config', charset: 'us-ascii' ), filename: path )
-          end
-          blobbified = Base64.encode64( userdata.to_s )
-
           response = ec2.run_instances(
             image_id: c.image_id,
             key_name: c.key_name,
             instance_type: c.instance_type,
             security_group_ids: c.security_groups,
             subnet_id: c.subnet,
-            user_data: blobbified,
             min_count: 1,
             max_count: 1
           )
 
           say "Spinning up #{c.image_id}..."
-          say "Userdata blob: #{blobbified}"
 
           instance_id = response.instances.first.instance_id
           say "Instance #{instance_id} is spinning up...", :green

data/lib/awsm/cli/tag.rb

@@ -2,19 +2,30 @@ module Awsm
   module CLI
     class Tag < Clibase
 
-      desc 'find tag=value [tag=] [=value] [...]',
-        "Find instances by tags."
-      method_option :fields, :type => :string
+      desc 'find tag=value [--instances|--images] [tag=] [=value] [...]',
+        "Find resources by tags."
+      method_option :format, :type => :string, :default => :pretty,
+        :desc => "Specify output format. [pretty|tsv|csv|json]"
+      method_option :instances, :type => :boolean, :lazy_default => false,
+        :desc => "Find instances matching tags."
+      method_option :images, :type => :boolean, :lazy_default => false,
+        :desc => "Find Images matching tags."
       def find( *args )
         if args == []
-          say "Please specify at least one tag=/=value/tag=value"
+          help( :find )
           return
         end
-        fields = nil
-        if !options[:fields].nil?
-          fields = options[:fields].split(',').map { |f| f.to_sym }
+
+        format = options[:format].to_sym
+        filters = argsToFilters( args )
+
+        if options[:instances]
+          Table::Instance.new( filter_instances( filters ), format ).print
+        end
+
+        if options[:images]
+          Table::Image.new( filter_images( filters ), format ).print
         end
-        Table::Instance.new( filter_instances( argsToFilters( args ) ), fields ).print
       end
 
       desc 'list [resource_id]',

data/lib/awsm/configure.rb

@@ -13,36 +13,8 @@ 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
-
+  def self.table_config( table )
+    @@c.table( table )
   end
 
   class Configulator
@@ -50,14 +22,18 @@ module Awsm
     def initialize
       @spin_blocks = {}
       @dns_block = nil
+      @table = {}
     end
 
-    def instance_table
+    def table( table )
       if block_given?
-        @instance_tablutron = InstanceTablutron.new
-        yield @instance_tablutron
+        @table[ table ] = Tablulatrix.new
+        yield @table[ table ]
       else
-        @instance_tablutron
+        if @table[ table ].nil?
+          raise StandardError, "Invalid table configuration: #{table}"
+        end
+        @table[ table ]
       end
     end
 
@@ -101,6 +77,34 @@ module Awsm
 
   end
 
+  class Tablulatrix
+
+    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 Domainatrix
 
     def hosted_zone( zone=nil )
@@ -123,7 +127,6 @@ module Awsm
         @config[:subnet] = default.subnet
         @config[:security_groups] = default.security_groups
         @config[:tags] = default.tags || {}
-        @config[:userdata] = default.userdata || {}
       end
     end
 
@@ -171,14 +174,6 @@ module Awsm
       end
     end
 
-    def userdata( path=nil, file=nil )
-      if path.nil? && file.nil?
-        return @config[:userdata]
-      end
-
-      @config[:userdata][ path ] = file
-    end
-
   end
 
 end

data/lib/awsm/table/image.rb

@@ -0,0 +1,39 @@
+module Awsm
+  module Table 
+    class Image < TableBase
+
+      def defaultHeadings
+        {
+          image_id: 'Image ID',
+          name: 'Name',
+          location: 'Location',
+          creation_date: 'Creation Date',
+          public: 'Public',
+          architecture: 'Architecture',
+          image_type: 'Image Type',
+          description: 'Description',
+          hypervisor: 'Hypervisor'
+        }
+      end
+
+      def defaultFields
+        {
+          image_id: -> (i) { i.image_id },
+          name: -> (i) { i.name },
+          location: -> (i) { i.image_location },
+          creation_date: -> (i) { i.creation_date },
+          public: -> (i) { i.public },
+          architecture: -> (i) { i.architecture },
+          image_type: -> (i) { i.image_type },
+          description: -> (i) { i.description },
+          hypervisor: -> (i) { i.hypervisor }
+        }
+      end
+
+      def config
+        Awsm::table_config( :image )
+      end
+
+    end
+  end
+end

data/lib/awsm/table/instance.rb

@@ -1,15 +1,9 @@
 module Awsm
-  module Table
-    class Instance
+  module Table 
+    class Instance < TableBase
 
-      def initialize( instances, fields=nil )
-        @use_fields = if fields.nil?
-          Awsm::instance_table_config.use_fields
-        else
-          fields
-        end
-
-        @headings = {
+      def defaultHeadings
+        {
           instance_id: 'Instance ID',
           name: 'Name',
           state: 'State',
@@ -18,8 +12,10 @@ module Awsm
           private_ip: 'Private IP',
           awsm_owner: 'Owner'
         }
+      end
 
-        @fields = {
+      def defaultFields
+        {
           instance_id: -> (i) { i.instance_id },
           name: -> (i) { tag( 'Name', i.tags ).first },
           state: -> (i) { i.state.name },
@@ -28,37 +24,10 @@ module Awsm
           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 = []
-          @use_fields.each do |f|
-            row << extract_field( i, f )
-          end
-          row
-        end
-      end
-
-      def print
-        puts Terminal::Table.new(
-          headings: @use_fields.map { |f| @headings[ f ] },
-          rows: @rows
-        )
-      end
-
-      private
-
-      def extract_field( instance, field )
-        @fields[ field ].call( instance )
       end
 
-      def tag( key, tags )
-        tags.select { |t| t.key == key }
-          .map { |t| t.value }
+      def config
+        Awsm::table_config( :instance )
       end
 
     end

data/lib/awsm/tablebase.rb

@@ -0,0 +1,71 @@
+module Awsm
+  class TableBase
+
+    def initialize( objects, format=:pretty )
+      @objects = objects
+      @format = format
+
+      @use_fields = config.use_fields
+      @fields = defaultFields
+      @headings = defaultHeadings
+    end
+
+    def print
+      config.fields.each do |name, field|
+        @headings[ name ] = field[:heading]
+        @fields[ name ] = field[:block]
+      end
+
+      @rows = @objects.map do |i|
+        row = []
+        @use_fields.each do |f|
+          row << extract_field( i, f )
+        end
+        row
+      end
+
+      case @format
+        when :pretty
+          puts Terminal::Table.new(
+            headings: @use_fields.map { |f| @headings[ f ] },
+            rows: @rows
+          )
+        when :tsv
+          @rows.each do |row|
+            puts row.join("\t")
+          end
+        when :csv
+          @rows.each do |row|
+            puts row.join(',')
+          end
+        when :json
+          json = []
+          @rows.each do |row|
+            json << Hash[ @use_fields.zip( row ) ]
+          end
+          puts JSON.generate( json )
+        else
+          puts "Unknown output format: #{@format}"
+      end
+    end
+
+    private
+
+    def field( field )
+      if @fields[ field ].nil?
+        raise StandardError, "Unknown field: #{field}"
+      end
+      @fields[ field ]
+    end
+
+    def extract_field( instance, field )
+      @fields[ field ].call( instance )
+    end
+
+    def tag( key, tags )
+      tags.select { |t| t.key == key }
+        .map { |t| t.value }
+    end
+
+  end
+end

data/lib/awsm/version.rb

@@ -1,3 +1,3 @@
 module Awsm
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsm
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Daniel Kendell
@@ -53,19 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: mime
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +137,9 @@ files:
 - lib/awsm/dns.rb
 - lib/awsm/instances.rb
 - lib/awsm/loadbalancers.rb
+- lib/awsm/table/image.rb
 - lib/awsm/table/instance.rb
+- lib/awsm/tablebase.rb
 - lib/awsm/version.rb
 homepage: http://github.com/mduk/awsm
 licenses: