ec2-clusterssh 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c74dd88d642351a19eb487a390e82274b747e387
-  data.tar.gz: b89e5951f98b0248596d6d84ec20dde465a3ee74
+  metadata.gz: e6372df3f909d807cbe50f7b27b9047b55cbf0bf
+  data.tar.gz: 4a0275ecadbc4f08dfbc9a1220b57590c7dcd2d8
 SHA512:
-  metadata.gz: 944f261efa54b09d5b04bc56e4cd2d5c3536f162216cab9609305673a92a3d1bd6ca76e7767d6842320658b374224eeff0c0536fcb6b869aa15939190fb0af04
-  data.tar.gz: 8e9898937e00ee414330d49ebef4a590b63962c16107aa9c9b9dc2c3055e384a1ee22717076e69226c85f33e241ee9eb66aa12388f47daf0bdb13c67091ce4d2
+  metadata.gz: 237dbca77daceee9390cac5c4922b94398a20070be58c742d0c1ecd74fa444abee900b4f177c5ca51b981b6c88dc4765e48a81e40cb8f1c80661c3bfa17e9534
+  data.tar.gz: 32fe08161bc6371c46ee5169794a9b4248c3ada71d82039706a4056b0e1dacaf69bea4594cce7dba3bf0a050e3a30085dff3cafaa44ece577fa349f0f355525d

data/README.md

@@ -5,7 +5,7 @@ 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]
@@ -27,11 +27,17 @@ Note:  Mac users with the latest version of XCode may run into a compilation err
         -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)
         -r, --region [REGION]            AWS region
-        -p, --use-private-ip             Use private IP (default false)
+        -p, --use-public-ip              Use public IP (default false)
 
     $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
 
+## Notes
+
+If you use a bastion jumphost, you'll want to configure your ssh config
+file to route the relavant IP ranges through your bastion.  (i.e.
+192.168.*)
+
 ## Contributing
 
 1. Fork it

data/bin/cluster

@@ -5,7 +5,6 @@ require 'rubygems'
 require 'aws-sdk'
 
 options = {
-  'user'           => 'ec2-user',
   'use_public_ip'  => false,
   'region'         => 'us-west-2'
 }
@@ -13,7 +12,7 @@ options = {
 OptionParser.new do |opts|
   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|
+  opts.on("-l", "--login [USER]", "Log in with this user") do |opt|
     options['user'] = opt
   end
 
@@ -25,9 +24,14 @@ OptionParser.new do |opts|
     options['region'] = opt
   end
 
+  opts.on("-s", "--screen [SCREEN]", "What screen to use for clustering windows (form multiple displays)") do |opt|
+    options['screen'] = opt
+  end
+
   opts.on("-p", "--use-public-ip", "Use public IP (default #{options['use_public_ip']})") do
     options['use_public_ip'] = true
   end
+
 end.parse!
 
 Aws.config.update({:region => options['region']})
@@ -72,7 +76,11 @@ end
 
 cssh = (/darwin/ =~ RUBY_PLATFORM) ? 'csshX' : 'cssh'
 
-cmd = "#{cssh} -l #{options['user']} #{dns.join ' '}"
+cmd = "#{cssh}"
+cmd = cmd + " -l #{options['user']}" unless options['user'].nil?
+cmd = cmd + " -screen #{options['screen']}" unless options['screen'].nil?
+cmd = cmd + " #{dns.join ' '}"
+
 puts "Connecting to #{dns.length} instances"
 puts cmd
 exec cmd

data/lib/ec2/clusterssh/version.rb

@@ -1,5 +1,5 @@
 module Ec2
   module Clusterssh
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2-clusterssh
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Glenn Poston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler