ec2-clusterssh 0.0.5 → 0.1.0

data/README.md

@@ -9,6 +9,15 @@ Use instance tags to launch a ClusterSSH session to multiple EC2 instances.
 ## Prerequisites
 
 - [ClusterSSH](http://sourceforge.net/apps/mediawiki/clusterssh/index.php?title=Main_Page)
+- Set up your AWS credentials (note that these values can be also passed in
+  as command line options)
+
+> export AWS_ACCESS_KEY_ID='...'
+
+> export AWS_SECRET_ACCESS_KEY='...'
+
+> export AWS_REGION='us-west-2'
+
 - Edit /etc/csshrc to add the path to your identity file (rsa key).
 
 > ssh_args = "-i path/to/identity/file"
@@ -16,10 +25,13 @@ Use instance tags to launch a ClusterSSH session to multiple EC2 instances.
 ## Usage
 
     $cluster -h
-    Usage: cluster [-t TAG] -v VALUES
+    Usage: cluster [-t TAG] [-l USER] [-k KEY -s SECRET] [-r region] -v VALUES
+        -l, --login [USER]               Log in with this user (default: ec2-user)
         -t, --tag [TAG]                  TAG to filter on (default: role)
-        -v, --values [VALUES]            a comma separated (no spaces) of values to match against (i.e. web,database)
-
+        -v, --values [VALUES]            a comma separated (no spaces) list of values to match against (i.e. web,database)
+        -k, --access-key [KEY]           AWS access key
+        -s, --secret-key [SECRET]        AWS secret key
+        -r, --region [REGION]            AWS region
 
     $cluster -l ec2-user -t Name -v web,database
 

data/bin/cluster

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
+require 'rubygems'
+require 'aws-sdk'
 
 options = {'tag' => 'role', 'user' => 'ec2-user'}
 OptionParser.new do |opts|
-  opts.banner = "Usage: cluster [-t TAG -l USER] -v VALUES"
+  opts.banner = "Usage: cluster [-t TAG] [-l USER] [-k KEY -s SECRET] [-r region] -v VALUES"
 
   opts.on("-l", "--login [USER]", "Log in with this user (default: #{options['user']}") do |opt|
     options['user'] = opt
@@ -17,35 +19,31 @@ OptionParser.new do |opts|
   opts.on("-v", "--values [VALUES]", Array, "a comma separated (no spaces) list of values to match against (i.e. web,database)") do |opt|
     options['values'] = opt
   end
-end.parse!
 
-instances = {}
-tags = {}
-
-output = %x{ec2-describe-instances}
-output.split(/\n/).each do |line|
-  words = line.split(/\s/)
-  if words[0] == 'INSTANCE'
-    instance_id = words[1]
-    public_dns = words[3]
-    instances[instance_id] = public_dns
-  elsif words[0] == 'TAG'
-    instance_id = words[2]
-    tag = words[3]
-    value = words[4]
-    tags[tag] = {} if tags[tag].nil?
-    tags[tag][value] = [] if tags[tag][value].nil?
-    tags[tag][value] << instance_id
+  opts.on("-k", "--access-key [KEY]", "AWS access key") do |opt|
+    options['aws_access_key'] = opt
   end
-end
 
-dns = []
-options['values'].each do |value|
-  tags[options['tag']][value].each do |instance_id|
-    dns << instances[instance_id]
+  opts.on("-s", "--secret-key [SECRET]", "AWS secret key") do |opt|
+    options['aws_secret_key'] = opt
   end
+
+  opts.on("-r", "--region [REGION]", "AWS region") do |opt|
+    options['region'] = opt
+  end
+end.parse!
+
+if !options['aws_secret_key'].nil? && !options['aws_access_key'].nil?
+  AWS.config(access_key_id: options['aws_access_key'], secret_access_key: options['aws_secret_key'])
+end
+
+if !options['region'].nil?
+  AWS.config(region: options['region'])
 end
 
+ec2 = AWS.ec2
+dns = ec2.instances.tagged(options['tag']).tagged_values(options['values']).map{|instance| instance.dns_name}
+
 cssh = (/darwin/ =~ RUBY_PLATFORM) ? 'csshX' : 'cssh'
 
 exec "#{cssh} -l #{options['user']} #{dns.join ' '}"

data/ec2-clusterssh.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_dependency 'aws-sdk'
 end

data/lib/ec2/clusterssh/version.rb

@@ -1,5 +1,5 @@
 module Ec2
   module Clusterssh
-    VERSION = "0.0.5"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2-clusterssh
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,6 +43,22 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use instance tags to launch a ClusterSSH session to multiple EC2 instances.
 email:
 - gposton1040@gmail.com
@@ -75,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 876455048668943885
+      hash: -1450336275784820976
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -84,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 876455048668943885
+      hash: -1450336275784820976
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25