ec2-clusterssh 0.3.0 → 0.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 83d88a4cea26fe56c682d7e9dcec4c9a10051547
+  data.tar.gz: db0f883685623e31a2ed911f7d4916f538c2c379
+SHA512:
+  metadata.gz: 24679afc44231152ccb2bde8cf7b22e3ecfef0fc229eef753f9981ef61bc2eff56e5219ad1b543753a301b8df214157b1bdacb39aa90eb27aff90a627ca8279a
+  data.tar.gz: 3e994e22717df3fa5d66999c15b80a57e582a656dedf863f002e44b0afa3e01a03ec1a2b53ccc52da41ad498352ce391c630189ae5d42227745ef1ee9c3677d3

data/README.md

@@ -33,12 +33,10 @@ NOTE: Some linux users have reported problems using /etc/csshrc, but have had su
     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=web,database #Connects to all web and database servers
+    $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,7 +4,12 @@ require 'optparse'
 require 'rubygems'
 require 'aws-sdk'
 
-options = {'user' => 'ec2-user', 'use_private_ip' => false}
+options = {
+  'user'           => 'ec2-user',
+  'use_private_ip' => false,
+  'region'         => 'us-east-1'
+}
+
 OptionParser.new do |opts|
   opts.banner = "Usage: cluster [-t TAGS] [-l USER] [-k KEY -s SECRET] [-r region]"
 
@@ -12,16 +17,8 @@ OptionParser.new do |opts|
     options['user'] = opt
   end
 
-  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|
-    options['aws_access_key'] = opt
-  end
-
-  opts.on("-s", "--secret-key [SECRET]", "AWS secret key") do |opt|
-    options['aws_secret_key'] = opt
+  opts.on("-t", "--tags [TAGS]", "a 'space' sparated key value pair of tags and values (i.e. role=web,database environment=dev)") do |opt|
+    options['tags'] = opt.split(' ')
   end
 
   opts.on("-r", "--region [REGION]", "AWS region") do |opt|
@@ -33,21 +30,17 @@ OptionParser.new do |opts|
   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
+AWS.config(:region => options['region'])
 
-ec2 = AWS.ec2
+ec2 = AWS::EC2.new
 
 # 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])
+  key = tag[0]
+  values = tag[1].split(',')
+  instances = instances.tagged(key).tagged_values(values)
 end
 
 # get dns entries for cssh
@@ -58,6 +51,14 @@ else
   dns = instances.map{|instance| instance.dns_name}
 end
 
+if dns.length == 0
+  puts "No instances matched #{options['tags']}"
+  exit
+end
+
 cssh = (/darwin/ =~ RUBY_PLATFORM) ? 'csshX' : 'cssh'
 
-exec "#{cssh} -l #{options['user']} #{dns.join ' '}"
+cmd = "#{cssh} -l #{options['user']} #{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.3.0"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ec2-clusterssh
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors:
 - Glenn Poston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '>='
+    - - ">="
       - !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.
@@ -67,7 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -79,26 +72,25 @@ files:
 homepage: https://github.com/gposton/ec2-clusterssh
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use instance tags to launch a ClusterSSH session to multiple EC2 instances.
 test_files: []