prism-marauder 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7869e99e97739e5880b4bf696ee9c7ff564cd2a6
-  data.tar.gz: e904f328a3e474b89fee76be642792cc72dd615f
+  metadata.gz: b95788c5c1a2d58445a2380506338ee61d6e4020
+  data.tar.gz: 379964fcc377ca27aa91b624e792190a2de38e70
 SHA512:
-  metadata.gz: 3ef0e8d6f90b82e25f5fe0aa166e59006bd71aa2d31d76b5cfca9f9a0e5977b5a6bf3e17489c79fbce495c457d517230e0a7ec254220d14f68e0316c45fe6ba8
-  data.tar.gz: 5cd43337f31e4ee96e42e3e18f76143cb1fb1211730a9011d2bbc917abce587022ee85b7861838eadd62a9579a95107cc4ebb40202d2892dda60e65246b38848
+  metadata.gz: 6e6f87f8b3302a46163a9b015b7b8cb7b2c8c61f5601de5219965ca4334a048ae876d7c0b3f19683a6eb9e292290ba7667c60378479cca7971ebab2cd3b26521
+  data.tar.gz: 4ac5e4b0b9386a2af899bbdb920f0bef577ad4c4e0ce5dba9091bd6e7551c0b05f42ce90d6bf2aa3a18019760f2437029524556e0a6274f56bc4b520e43d19f7

data/lib/marauder/commands.rb

@@ -109,9 +109,15 @@ def find_instances(filter)
 end
 
 def find_hardware(filter)
-  data = prism_query('/hardware', filter)
-  hardware = data["data"]["hardware"]
-  token_filter(hardware, filter){ |h| [h["dnsName"], h["stage"], h["stack"]] + h["app"] }
+  begin
+    data = prism_query('/hardware', filter)
+    hardware = data["data"]["hardware"]
+    token_filter(hardware, filter){ |h| [h["dnsName"], h["stage"], h["stack"]] + h["app"] }
+  rescue StandardError => error
+    STDERR.puts 'WARNING: The prism server you are using no longer has the hardware endpoint - ignoring request'
+    # return an empty list
+    []
+  end
 end
 
 def user_for_host(hostname)
@@ -127,6 +133,13 @@ def get_field_rec(object, fieldList)
 end
 
 def get_field(object, field)
+  if field.nil?
+    if object['addresses']['public'].nil?
+      field = 'ip'
+    else
+      field = 'dnsName'
+    end
+  end
   get_field_rec(object, field.split('.'))
 end
 
@@ -135,7 +148,7 @@ def display_results(matching, options, noun)
       STDERR.puts "No #{noun} found"
   else
     STDERR.puts "#{matching.length} results"
-    field_name = options.field || 'dnsName'
+    field_name = options.field || nil
     if options.short
       matching.map { |host| get_field(host, field_name) }.compact.each{ |value| puts value }
     else
@@ -151,7 +164,7 @@ end
 ###### COMMANDS ######
 
 command :hosts do |c|
-  c.description = 'List all hosts (hardware or instances) that match the search filter' 
+  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'
@@ -168,17 +181,17 @@ command :instances do |c|
   c.action do |args, options|
     display_results(find_instances(args), options, 'instances')
   end
-end  
+end
 
 command :hardware do |c|
-  c.description = 'List hardware that matches the search filter' 
+  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, 'hardware')
   end
-end   
+end
 
 command :ssh do |c|
   c.syntax = 'marauder ssh <filter>'
@@ -221,4 +234,4 @@ command :ssh do |c|
   end
 end
 
-default_command :hosts
+default_command :instances

data/lib/marauder/marauder.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prism-marauder
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - Sébastien Cevey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander