smartos-manager 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df083190e5bf6b2d9bb001353e9827eea099c8a6
-  data.tar.gz: 95071577df7b0470385b7aab886a6fb3b63e81a4
+  metadata.gz: d930e1b3dd0b55614b9a5f621d267bca346e8b00
+  data.tar.gz: d3612236431e2f72815318c3e6b16c59fce1d7df
 SHA512:
-  metadata.gz: 636a3f9e9ec9e2c48004987a433c342849a063a7f4d45b09eb6b761e5c134f3d082524c59ab9e1d4ea412ce40fcaceb8d3864c8c3fd3a8dfcfcccad0b0cb2194
-  data.tar.gz: f3cf4cbac5f6e3e158629c85639cdb0cb5c1d58c09ba7240f968a45792f1adc71f37826bc1cb18dbc2aec05ea68d6bd076323e4149cc7884349ed68577a9e1b8
+  metadata.gz: 014dd53eccfc59d3575fdb70d2b45327fbf4d8eed37cfe16c88563db7dc1cc9cfc08d0a385bedc5c3efca232efe2379441f9f27aa0b2293a5fc5737efbb900f1
+  data.tar.gz: 0af51492dc2d9b67bf1c65bda3afcb016462a266f7d3c315a08661172cdf7ca3153710fa4409f5a8e35d0fd54c9a47012161526ec00c4ecf83c56f24ac37e1b6

data/lib/smartos-manager/cli.rb

@@ -62,16 +62,6 @@ class AppCLI < Thor
     
     sysinfos = registry.sysinfo()
     diags = registry.diag()
-    
-    failures = registry.failed_connections()
-    unless failures.empty?
-      puts "Error while connecting to:".red()
-      failures.each do |s|
-        puts "  - #{s.name} : #{s.address}".red()
-      end
-      
-      puts ""
-    end
 
     
     user_columns = registry.user_columns.keys.map{|s| humanize(s) }
@@ -123,6 +113,16 @@ class AppCLI < Thor
       # puts "  Available Memory: #{avail.human_size(1)}".magenta()
     end
     
+    failures = registry.failed_connections()
+    unless failures.empty?
+      puts "\n\nError while connecting to:".red()
+      failures.each do |s|
+        puts "  - #{s.name} : #{s.address}".red()
+      end
+      
+      puts ""
+    end
+    
   end
   
   

data/lib/smartos-manager/core.rb

@@ -204,7 +204,7 @@ class Registry
     end
     
     # main MAC address
-    run_on_all("ifconfig e1000g0 | grep ether | cut -d ' ' -f 2").each do |addr, data|
+    run_on_all("ifconfig `dladm show-phys -p -o link | head -n 1` | grep ether | cut -d ' ' -f 2").each do |addr, data|
       host = find_host(addr)
       ret[host][:mac0] = data.strip()
     end
@@ -330,9 +330,9 @@ class SSHRegistry < Registry
     ret = {}
     
     # set the keys in cas we get nothing back
-    # @hosts.each do |addr, _|
-    #   ret[addr] = ""
-    # end
+    @hosts.each do |addr, _|
+      ret[addr] = ""
+    end
     
     channel = @connection.exec(cmd) do |ch, stream, data|
       host = @hosts[ch[:host]]
@@ -341,6 +341,13 @@ class SSHRegistry < Registry
     
     channel.wait()
     
+    # remove empty results
+    @hosts.each do |addr, _|
+      if ret[addr] == ""
+        ret.delete(addr)
+      end
+    end
+    
     cache_result(cmd, ret)
     
     ret

data/lib/smartos-manager/version.rb

@@ -1,3 +1,3 @@
 module SmartosManager
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartos-manager
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Julien Ammous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb