ec2-clusterssh 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83d88a4cea26fe56c682d7e9dcec4c9a10051547
-  data.tar.gz: db0f883685623e31a2ed911f7d4916f538c2c379
+  metadata.gz: 46ff2974ac83b84c572b07c6ba2b1d6d5bc2430b
+  data.tar.gz: b6fbf9f6d5c51fa52d7d75f32c49261dcb095757
 SHA512:
-  metadata.gz: 24679afc44231152ccb2bde8cf7b22e3ecfef0fc229eef753f9981ef61bc2eff56e5219ad1b543753a301b8df214157b1bdacb39aa90eb27aff90a627ca8279a
-  data.tar.gz: 3e994e22717df3fa5d66999c15b80a57e582a656dedf863f002e44b0afa3e01a03ec1a2b53ccc52da41ad498352ce391c630189ae5d42227745ef1ee9c3677d3
+  metadata.gz: cedcc5fcd0ce1da794f43740edf16d86fe98b605822618e0ffdeacece8cf46377ef01cd9482ef22b340bc65fe9ce44c735de9a3f351e9c30cc36e55f67ed4612
+  data.tar.gz: 56cabbe7570ce1db77c4704050202e4b26fb36d3373589389e3d055b35cff56e164df2421820f094a53432dfffd7d2d4da3bb6c5656662b1d19c64fc62a4e14e

data/README.md

@@ -30,7 +30,7 @@ NOTE: Some linux users have reported problems using /etc/csshrc, but have had su
 ## Usage
 
     $cluster -h
-    Usage: cluster [-t TAGS] [-l USER] [-k KEY -s SECRET] [-r region]
+    Usage: cluster [-t TAGS] [-l USER] [-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)
         -r, --region [REGION]            AWS region

data/bin/cluster

@@ -6,8 +6,8 @@ require 'aws-sdk'
 
 options = {
   'user'           => 'ec2-user',
-  'use_private_ip' => false,
-  'region'         => 'us-east-1'
+  'use_private_ip' => true,
+  'region'         => 'us-west-2'
 }
 
 OptionParser.new do |opts|
@@ -30,17 +30,36 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-AWS.config(:region => options['region'])
+Aws.config.update({:region => options['region']})
 
-ec2 = AWS::EC2.new
+ec2 = Aws::EC2::Client.new
 
 # filter instances based on tags
-instances = ec2.instances
+instances = []
 options['tags'].each do |tag|
   tag = tag.split('=')
   key = tag[0]
   values = tag[1].split(',')
-  instances = instances.tagged(key).tagged_values(values)
+  response = ec2.describe_instances(filters: [{:name => "tag-key", :values => [key]}])
+  if response.reservations[0].nil?
+    puts "No instances in #{options['region']} had a tag named '#{key}'"
+    next
+  else
+    response.reservations.each do |reservation|
+      reservation.instances.each do |instance|
+        puts instance.tags
+        tag_value = instance.tags.keep_if{|instance_tag| instance_tag[:key] == key}[0][:value]
+        if values.include? tag_value
+          instances << instance
+        end
+      end
+    end
+  end
+end
+
+if instances.length == 0
+  puts "No instnaces matched filter: #{options['tags']}"
+  exit 1
 end
 
 # get dns entries for cssh
@@ -48,13 +67,9 @@ dns = nil
 if options['use_private_ip']
   dns = instances.map{|instance| instance.private_ip_address}
 else
-  dns = instances.map{|instance| instance.dns_name}
+  dns = instances.map{|instance| instance.public_ip_address}
 end
 
-if dns.length == 0
-  puts "No instances matched #{options['tags']}"
-  exit
-end
 
 cssh = (/darwin/ =~ RUBY_PLATFORM) ? 'csshX' : 'cssh'
 

data/lib/ec2/clusterssh/version.rb

@@ -1,5 +1,5 @@
 module Ec2
   module Clusterssh
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ec2-clusterssh
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Glenn Poston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Use instance tags to launch a ClusterSSH session to multiple EC2 instances.
@@ -60,7 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -79,17 +79,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Use instance tags to launch a ClusterSSH session to multiple EC2 instances.