prism-marauder 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e46a680ca8d16f3f1bdf889ba47d71ec61d5ac4
-  data.tar.gz: 2dcf7840b6e84148661daf0933b43b76599ef989
+  metadata.gz: 7869e99e97739e5880b4bf696ee9c7ff564cd2a6
+  data.tar.gz: e904f328a3e474b89fee76be642792cc72dd615f
 SHA512:
-  metadata.gz: 4572a2af3815683434558fd4461fa43007e5e68ad7de94246db56d7f0074e74dbbbd28cb30e02c948243a2111ac5eace3be65ab1c7a3ca5f2f5728d666bdc261
-  data.tar.gz: 8fc35c8ae3c68871bd019bc9016098bd31c1b8707441fc2b56dcde3e79764f29a7b70168b48d8970bb6bc53237baddaedc01e5607154e4969207faefdb38cab7
+  metadata.gz: 3ef0e8d6f90b82e25f5fe0aa166e59006bd71aa2d31d76b5cfca9f9a0e5977b5a6bf3e17489c79fbce495c457d517230e0a7ec254220d14f68e0316c45fe6ba8
+  data.tar.gz: 5cd43337f31e4ee96e42e3e18f76143cb1fb1211730a9011d2bbc917abce587022ee85b7861838eadd62a9579a95107cc4ebb40202d2892dda60e65246b38848

data/lib/marauder/commands.rb

@@ -118,20 +118,34 @@ def user_for_host(hostname)
   Net::SSH.configuration_for(hostname)[:user]
 end
 
-def display_results(matching, short, noun)
+def get_field_rec(object, fieldList)
+  if !object || fieldList.empty?
+    object
+  else
+    get_field_rec(object[fieldList[0]], fieldList.drop(1))
+  end
+end
+
+def get_field(object, field)
+  get_field_rec(object, field.split('.'))
+end
+
+def display_results(matching, options, noun)
   if matching.empty?
       STDERR.puts "No #{noun} found"
+  else
+    STDERR.puts "#{matching.length} results"
+    field_name = options.field || 'dnsName'
+    if options.short
+      matching.map { |host| get_field(host, field_name) }.compact.each{ |value| puts value }
     else
-      if short 
-        matching.each { |host| puts host['dnsName'] }
-      else
-        puts table(matching.map { |host|
-          app = host['app'].join(',')
-          app = host['mainclasses'].join(',') if app.length == 0
-          [host['stage'], host['stack'], app, host['dnsName'], host['createdAt']] 
-        })
-      end
+      puts table(matching.map { |host|
+        app = host['app'].join(',')
+        app = host['mainclasses'].join(',') if app.length == 0
+        [host['stage'], host['stack'], app, get_field(host, field_name), host['createdAt']]
+      })
     end
+  end
 end
 
 ###### COMMANDS ######
@@ -140,8 +154,9 @@ command :hosts do |c|
   c.description = 'List all hosts (hardware or instances) that match the search filter' 
   c.syntax = 'marauder hosts <filter>'
   c.option '-s', '--short', 'Only return hostnames'
+  c.option '-f', '--field STRING', String, 'Use specified field from prism'
   c.action do |args, options|
-    display_results(find_hosts(args), options.short, 'hosts')
+    display_results(find_hosts(args), options, 'hosts')
   end
 end
 
@@ -149,8 +164,9 @@ command :instances do |c|
   c.description = 'List instances that match the search filter' 
   c.syntax = 'marauder instances <filter>'
   c.option '-s', '--short', 'Only return hostnames'
+  c.option '-f', '--field STRING', String, 'Use specified field from prism'
   c.action do |args, options|
-    display_results(find_instances(args), options.short, 'instances')
+    display_results(find_instances(args), options, 'instances')
   end
 end  
 
@@ -158,8 +174,9 @@ command :hardware do |c|
   c.description = 'List hardware that matches the search filter' 
   c.syntax = 'marauder hardware <filter>'
   c.option '-s', '--short', 'Only return hostnames'
+  c.option '-f', '--field STRING', String, 'Use specified field from prism'
   c.action do |args, options|
-    display_results(find_hardware(args), options.short, 'hardware')
+    display_results(find_hardware(args), options, 'hardware')
   end
 end   
 

data/lib/marauder/marauder.rb

@@ -1,3 +1,3 @@
 class Marauder
-	VERSION="0.6.5"
+	VERSION="0.6.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prism-marauder
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Sébastien Cevey