awsquery 0.1.0 → 0.2.0

data/README.md

@@ -1,20 +1,19 @@
-awsquery(1) -- query aws metadata for hosts 
+awsquery -- query aws metadata for hosts 
 ==========================================
 
-## SYNOPSIS
-
-Allows the lookup and querying of EC2 hosts via the associated metadata.
+A collection of tools for enumerating and manipulating AWS instances based on the tags and metadata.
 
 ## EXAMPLES
 
 1. Look up hosts based on tags
 
-`$ awsquery Name=app1`
+```bash
+$ awsquery Name=app1
+```
 
 2. Open iTerm with tabs for all appservers
 
-`$ awsquery Role=app | awsssh iterm`
-
-## CONTACT
+```bash
+$ awsquery Role=app | mssh iterm -u ubuntu
+```
 
-Author is Lachlan Donald <lachlan@ljd.cc>

data/bin/awsquery

@@ -1,13 +1,15 @@
-#!/usr/bin/env ruby                                                             
+#!/usr/bin/env ruby
 
 require 'rubygems'
 require 'fog'
 require 'optparse'
+require 'json/pure'
 
 options = {
   :default_key => 'Name',
   :state => 'running',
   :verbose => false,
+  :json => false,
 }
 
 OptionParser.new do |opts|
@@ -18,15 +20,18 @@ OptionParser.new do |opts|
   opts.on("-s", "--state STATE", "Filter by state") do |s|
     options[:state] = s
   end
+  opts.on("-j", "Output in JSON") do |j|
+    options[:json] = j
+  end
 end.parse!
 
 compute = Fog::Compute.new(
-  :provider => 'AWS', 
-  :aws_access_key_id => ENV['ACCESS_KEY_ID'], 
+  :provider => 'AWS',
+  :aws_access_key_id => ENV['ACCESS_KEY_ID'],
   :aws_secret_access_key => ENV['SECRET_ACCESS_KEY']
 )
 
-# apply basic filters 
+# apply basic filters
 servers = compute.servers
 servers.reject! { |s| s.state != options[:state] }
 
@@ -38,10 +43,14 @@ ARGV.each do |arg|
   servers.reject! { |s| !s.tags.key? key or s.tags[key] != value }
 end
 
-# output
-servers.each do |server|  
-  print server.dns_name
-  print " => %s" % server.tags.inspect if options[:verbose]
-  puts
+# output either json or lines
+if options[:json]
+  jj servers
+else
+  servers.each do |server|
+    print server.dns_name
+    print " => %s" % server.tags.inspect if options[:verbose]
+    puts
+  end
 end
 

data/bin/{awsssh → mssh}

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby                                                             
 
+# ssh helper, reads hosts from stdin
+# see https://github.com/opscode/chef/blob/master/chef/lib/chef/knife/ssh.rb
+
 require 'rubygems'
 require 'optparse'
+require 'json'
 
 options = {
   :verbose => false,
@@ -18,14 +22,17 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-# parse stdin hosts
-servers = []
+input = STDIN.read
 
-STDIN.read.split("\n").each do |a|
-  servers << { :host => a, :user => options[:user] }    
+# detect if stdin is json
+if input.match /^[{\[]/
+  servers = JSON.parse(input)    
+else                  
+  servers = input.split("\n").collect do |a|
+    { 'dns_name' => a, 'tags' => [] }    
+  end
 end
 
-
 def iterm(servers, options)
   command = '
     tell application "iTerm"
@@ -35,21 +42,17 @@ def iterm(servers, options)
   servers.each_with_index do |server, t|
     command << %Q|
     tell myterm
-        launch session "Default"
-        tell last session
-            write text "/usr/bin/ssh #{server[:user] ? server[:user]+'@'+server[:host] : server[:host]}" 
-            set name to "#{server[:host]}"
+        set mysession to (make new session at the end of sessions)
+        tell mysession
+            exec command "/usr/bin/ssh #{options[:user] ? options[:user]+'@'+server['dns_name'] : server['dns_name']}" 
+            set name to "#{server['tags'].key?('Name') ? server['tags']['Name'] : server['dns_name']}"
         end tell
     end tell\n|    
   end
   command << '
     end tell
   '
-  puts command
   exec "osascript -e '#{command}' > /dev/null"    
 end
 
-case ARGV[0]
-when "iterm"  
-  iterm servers, options
-end
+iterm servers, options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsquery
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70183867827920 !ruby/object:Gem::Requirement
+  requirement: &70294865862220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,19 +21,30 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70183867827920
+  version_requirements: *70294865862220
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70294865860580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70294865860580
 description: A collection of tools for querying AWS hosts based on metadata and manipulating
   them
 email:
 - lachlan@ljd.cc
 executables:
 - awsquery
-- awsssh
+- mssh
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/awsquery
-- bin/awsssh
+- bin/mssh
 - README.md
 homepage: http://github.com/lox/awsquery
 licenses: []