awsm 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a54968644f5d7afd9ae2b0a7162accca5643c6d
-  data.tar.gz: a2289e945afeddc75ddd214fa6c031035fa46ab4
+  metadata.gz: c3e16b0b9220fcb8b20915939481a181206e10b7
+  data.tar.gz: e7573a6bdb27b27cd1b1cbdc7bce7ed8ceeadc8d
 SHA512:
-  metadata.gz: 357ad2bf4b9844a660896a65c90e500a4d567209118aee454ee86675453f65f65941dda55d96c39e5ec6ee0af02d837a9c366958c2963e33e87df1f6e9d45ff4
-  data.tar.gz: f357d77031f24201e4040a2ff50a6fe4d070cb1f9c663be91ffef94c5667251df5d0e91869336452b1282149baa46420b89db001d34c13cf15e7acff7c3a1b4c
+  metadata.gz: 01eea39e072b4b4557b72bd9da1d162e8b4b5de330715e4cacddde5bd47b3de968e40d6368be162ac39b43c43916ee471f5e15b73ac4863cb56f813b2e60f2ff
+  data.tar.gz: 453a76736169896414447ecd1b2939966c72d3ad22203f0c809f5cda0c5f625beb0fed91aca4fa7f7c7ade12e741f11c89809f2657cc18130752f0269ccd6b25

data/README.md

@@ -42,6 +42,18 @@ Awsm will read configuration from `~/.awsm.rb`. An example `~/.awsm.rb` file is
 ```
 Awsm::configure do |c|
 
+  c.instance_table do |c|
+
+    # Define which fields to display in an instance table and in what order
+    c.use_fields [ :environment, :name, :instance_id, :image_id, :launch_time, :state, :private_ip ]
+
+    # Add a custom field. Name, Heading, Block (extracts field value from instance object)
+    c.add_field :environment, 'Environment' do |i|
+      i.tags.find { |t| t.key == 'myapp:environment' }.value
+    end
+
+  end
+
   c.dns do |c|
     c.hosted_zone '/hostedzone/somethingorother'
   end

data/awsm.gemspec

@@ -21,6 +21,7 @@ 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_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency "pry", '~> 0.10'

data/lib/awsm.rb

@@ -1,6 +1,8 @@
 require 'yaml'
 require 'thor'
 require 'terminal-table'
+require 'mime'
+require 'base64'
 
 require 'awsm/version'
 

data/lib/awsm/cli/spin.rb

@@ -94,17 +94,25 @@ 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

@@ -4,8 +4,17 @@ module Awsm
 
       desc 'find tag=value [tag=] [=value] [...]',
         "Find instances by tags."
+      method_option :fields, :type => :string
       def find( *args )
-        Table::Instance.new( filter_instances( argsToFilters( args ) ) ).print
+        if args == []
+          say "Please specify at least one tag=/=value/tag=value"
+          return
+        end
+        fields = nil
+        if !options[:fields].nil?
+          fields = options[:fields].split(',').map { |f| f.to_sym }
+        end
+        Table::Instance.new( filter_instances( argsToFilters( args ) ), fields ).print
       end
 
       desc 'list [resource_id]',

data/lib/awsm/configure.rb

@@ -123,6 +123,7 @@ module Awsm
         @config[:subnet] = default.subnet
         @config[:security_groups] = default.security_groups
         @config[:tags] = default.tags || {}
+        @config[:userdata] = default.userdata || {}
       end
     end
 
@@ -170,6 +171,14 @@ 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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsm
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Daniel Kendell
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: mime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement