ec2-clusterssh 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2eccafeb666e8571d974f859152314f076b0db1
-  data.tar.gz: 80d246b1dbc3ea948a92bfcb3213d1743597ad05
+  metadata.gz: 87e0940e6e9a972f932a251ea1ad5ef8f80f8b7b
+  data.tar.gz: 724c9fe8595dc50a057511f96e034cb1892305e6
 SHA512:
-  metadata.gz: 5cde55c7a1907c72d4aca4ded9ae1c56320dabc50ab27598b02b693e91b053e71042b1f521b19d5aca498ff53d703692c692d738da90c7b723f37bffd85600e0
-  data.tar.gz: 3b08abc374e9c818edbb8d96ff59fc8058e72bcec30e9e11796b23ff240222c61ca9664cf148c7b50567fa4bb727963c5c46e975f58bdc0b52878055446b5e1c
+  metadata.gz: 6dc03822490f16a98756ed823d007e5a5457791c72ccf527f73593048af95d7c6969c7004bc91817751bc3fd19e3438e4ef152996139f19d11b01b67386f190d
+  data.tar.gz: f981e74639119f9d0649f4e8f3b0dcbeec54c86eff47101fb31a2b55cc430ade66664a0a10b9f4df9dc0b98cbbc09898c00e7313c465fa34c0be47882588f817

data/bin/cluster

@@ -16,8 +16,8 @@ OptionParser.new do |opts|
     options['user'] = opt
   end
 
-  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(' ')
+  opts.on("-t", "--tags [TAGS]", Array, "a 'comma' sparated key value pair of tags and values (i.e. role=web|database,environment=dev)") do |opt|
+    options['tags'] = opt
   end
 
   opts.on("-r", "--region [REGION]", "AWS region") do |opt|
@@ -34,10 +34,20 @@ OptionParser.new do |opts|
 
 end.parse!
 
+puts options
+
 
 Aws.config.update({:region => options['region']})
 $ec2 = Aws::EC2::Client.new
 
+def get_ip(instance, options)
+  if options['use_public_ip']
+    return instance.public_ip_address
+  else
+    return instance.private_ip_address
+  end
+end
+
 def get_instances_by_tag (tag_key,tag_values,options)
   instances = []
   response = $ec2.describe_instances(filters: [{:name => "tag:#{tag_key}", :values => tag_values},{:name => "instance-state-name", :values => ['running']}])
@@ -46,7 +56,7 @@ def get_instances_by_tag (tag_key,tag_values,options)
   else
     response.reservations.each do |reservation|
       reservation.instances.each do |instance|
-        instances << instance
+        instances << get_ip(instance, options)
       end
     end
     return instances
@@ -58,33 +68,26 @@ matched_instances = []
 options['tags'].each do |tag|
   tag = tag.split('=')
   key = tag[0]
-  values = tag[1].split(',')
-  matched_instances << get_instances_by_tag(key,values,options)
+  values = tag[1].split('|')
+  if matched_instances.empty?
+    matched_instances = get_instances_by_tag(key,values,options)
+  end
+  matched_instances = matched_instances & get_instances_by_tag(key,values,options)
+  puts "#{tag}: #{matched_instances}"
 end
-instances = matched_instances[0]
-matched_instances.map {|group| instances = group & instances }
 
-if instances.length == 0
+if matched_instances.length == 0
   puts "No instnaces matched filter: #{options['tags']}"
   exit 1
 end
 
-# get dns entries for cssh
-dns = nil
-if options['use_public_ip']
-  dns = instances.map{|instance| instance.public_ip_address}
-else
-  dns = instances.map{|instance| instance.private_ip_address}
-end
-
-
 cssh = (/darwin/ =~ RUBY_PLATFORM) ? 'csshX' : 'cssh'
 
 cmd = "#{cssh}"
 cmd = cmd + " -l #{options['user']}" unless options['user'].nil?
 cmd = cmd + " -screen #{options['screen']}" unless options['screen'].nil?
-cmd = cmd + " #{dns.join ' '}"
+cmd = cmd + " #{matched_instances.join ' '}"
 
-puts "Connecting to #{dns.length} instances"
+puts "Connecting to #{matched_instances.length} instances"
 puts cmd
-exec cmd
+#exec cmd

data/lib/ec2/clusterssh/version.rb

@@ -1,5 +1,5 @@
 module Ec2
   module Clusterssh
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2-clusterssh
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Glenn Poston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler