ec2-clusterssh 0.2.0 → 0.3.0

data/README.md

@@ -5,10 +5,14 @@ Use instance tags to launch a ClusterSSH session to multiple EC2 instances.
 ## Installation
 
     $ gem install ec2-clusterssh
+    
+Note:  Mac users with the latest version of XCode may run into a compilation error installing the json gem dependency.  If you see the following error during the gem installation, see this [page](https://langui.sh/2014/03/10/wunused-command-line-argument-hard-error-in-future-is-a-harsh-mistress/) for a workaround
+
+> clang: error: unknown argument: '-multiply_definedsuppress' [-Wunused-command-line-argument-hard-error-in-future]
 
 ## Prerequisites
 
-- [ClusterSSH](http://sourceforge.net/apps/mediawiki/clusterssh/index.php?title=Main_Page)
+- [ClusterSSH](http://sourceforge.net/apps/mediawiki/clusterssh/index.php?title=Main_Page) (To install csshx on mac use this [page](https://code.google.com/p/csshx/))
 - Set up your AWS credentials (note that these values can be also passed in
   as command line options)
 
@@ -19,21 +23,23 @@ Use instance tags to launch a ClusterSSH session to multiple EC2 instances.
 > export AWS_REGION='us-west-2'
 
 - Edit /etc/csshrc to add the path to your identity file (rsa key).
+NOTE: Some linux users have reported problems using /etc/csshrc, but have had success using ~/.csshrc.
 
-> ssh_args = "-i path/to/identity/file"
+> ssh_args = -i path/to/identity/file
 
 ## Usage
 
     $cluster -h
-    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) list of values to match against (i.e. web,database)
+    Usage: cluster [-t TAGS] [-l USER] [-k KEY -s SECRET] [-r region]
+        -l, --login [USER]               Log in with this user (default: ec2-user
+        -t, --tags [TAGS]                a 'space' sparated key value pair of tags and values (i.e. role=web,database environment=dev)
         -k, --access-key [KEY]           AWS access key
         -s, --secret-key [SECRET]        AWS secret key
         -r, --region [REGION]            AWS region
+        -p, --use-private-ip             Use private IP (default false)
 
-    $cluster -l ec2-user -t Name -v web,database
+    $cluster -l ec2-user -t Name=web,database #Connects to all web and database servers
+    $cluster -l ec2-user -t role=web,database environment=dev  #Connects to all web and database servers in the dev environment
 
 ## Contributing
 

data/bin/cluster

@@ -4,20 +4,16 @@ require 'optparse'
 require 'rubygems'
 require 'aws-sdk'
 
-options = {'tag' => 'role', 'user' => 'ec2-user', 'use_private_ip' => false}
+options = {'user' => 'ec2-user', 'use_private_ip' => false}
 OptionParser.new do |opts|
-  opts.banner = "Usage: cluster [-t TAG] [-l USER] [-k KEY -s SECRET] [-r region] -v VALUES"
+  opts.banner = "Usage: cluster [-t TAGS] [-l USER] [-k KEY -s SECRET] [-r region]"
 
   opts.on("-l", "--login [USER]", "Log in with this user (default: #{options['user']}") do |opt|
     options['user'] = opt
   end
 
-  opts.on("-t", "--tag [TAG]", "TAG to filter on (default: #{options['tag']}") do |opt|
-    options['tag'] = opt
-  end
-
-  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
+  opts.on("-t", "--tags [TAGS]", Array, "a 'space' sparated key value pair of tags and values (i.e. role=web,database environment=dev)") do |opt|
+    options['tags'] = opt
   end
 
   opts.on("-k", "--access-key [KEY]", "AWS access key") do |opt|
@@ -46,14 +42,22 @@ if !options['region'].nil?
 end
 
 ec2 = AWS.ec2
+
+# filter instances based on tags
+instances = ec2.instances
+options['tags'].each do |tag|
+  tag = tag.split('=')
+  instances = instances.tagged(tag[0]).tagged_values(tag[1])
+end
+
+# get dns entries for cssh
 dns = nil
 if options['use_private_ip']
-  dns = ec2.instances.tagged(options['tag']).tagged_values(options['values']).map{|instance| instance.private_ip_address}
+  dns = instances.map{|instance| instance.private_ip_address}
 else
-  dns = ec2.instances.tagged(options['tag']).tagged_values(options['values']).map{|instance| instance.dns_name}
+  dns = instances.map{|instance| instance.dns_name}
 end
 
-
 cssh = (/darwin/ =~ RUBY_PLATFORM) ? 'csshX' : 'cssh'
 
 exec "#{cssh} -l #{options['user']} #{dns.join ' '}"

data/lib/ec2/clusterssh/version.rb

@@ -1,5 +1,5 @@
 module Ec2
   module Clusterssh
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2-clusterssh
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler