smartos-manager 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62b523db761a6c566da3f141b0a6ae32e35fa214
-  data.tar.gz: 7bed70aa00d9635c9467cd73773069c4860a56d6
+  metadata.gz: 623bb38ba01a9e00f9bd141beca2340cc705700c
+  data.tar.gz: c4f2d566102caeb8de069eef4e57a1d4265c631c
 SHA512:
-  metadata.gz: ab4d3d05461ab02addf9676958d693862c1528d7486fb20b3b618c8ae58aa3fdd09092c8eb720b2427b3422dfe81a6bab788abaee117965b8a9b5d7b8674d30e
-  data.tar.gz: 1fe5548be72889bb674efbfd2b12a7992081c1bbc60b10e15d451ecd789ec43c91adfba6629f717c66e7d91da74fe1d93ed0d28c68c80c7ae8276fb7d8223147
+  metadata.gz: c1e8dbba3850f91ef503260bf7c5f691e322880a200deb16940bdf79ac6df332d68fccd27a91f09d87e7fa1913ea8b1ad194299518d91915e4429a0014d47d86
+  data.tar.gz: b6d64d6fa46c2baad1366b3635920719e06d77c089aff5df6b183f086a9632bcf2718458c50743b17a6fc841b14c6a4cfdace1b65e4c9993a4bb39d6c99d88fd

data/Gemfile

@@ -4,14 +4,14 @@ gemspec
 
 gem 'rake'
 
-group(:test) do
-  gem 'eetee',          '~> 0.0.4'
-  gem 'mocha',          '~> 0.12.0'
-  # gem 'factory_girl'
-  gem 'rb-blink1'
-  
-  gem 'simplecov'
-  gem 'guard'
-  gem 'rb-fsevent'
-  gem 'growl'
-end
+# group(:test) do
+#   gem 'eetee',          '~> 0.0.4'
+#   gem 'mocha',          '~> 0.12.0'
+#   # gem 'factory_girl'
+#   gem 'rb-blink1'
+#   
+#   gem 'simplecov'
+#   gem 'guard'
+#   gem 'rb-fsevent'
+#   gem 'growl'
+# end

data/lib/smartos-manager/cli.rb

@@ -63,6 +63,17 @@ 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) }
     
     p_vm_list("Memory", "Name (gray = online)", "Type", "UUID", "State", "Admin IP", "DD(GB)", *user_columns)

data/lib/smartos-manager/core.rb

@@ -174,13 +174,16 @@ class Registry
     
     run_on_all("prtdiag").each do |addr, data|
       host = find_host(addr)
+      system_id = "(none)"
       free_memory_banks = 0
       
-      system_id = data.match(/^System Configuration: (.+)$/)[1]
-      data.scan(/(empty).*DIMM\s+([0-9])/).each do |reg|
-        free_memory_banks+= 1
+      if matches = data.match(/^System Configuration: (.+)$/)
+        system_id = mastches[1]
+        data.scan(/(empty).*DIMM\s+([0-9])/).each do |reg|
+          free_memory_banks+= 1
+        end
       end
-            
+      
       ret[host] = {
         system_id: system_id,
         free_memory_banks: free_memory_banks
@@ -301,28 +304,31 @@ class SSHRegistry < Registry
     puts "(( Using live data ))"
     super
     
+    @failed_connections = []
+    
     @gateways = {}
-    @connection = Net::SSH::Multi.start()
+    @connection = Net::SSH::Multi.start(:on_error => ->(server){
+        @failed_connections << server.host
+      })
     
     @hosts.each do |_, host|
       @connection.use(host.address,
           via: gateway_for(host.gateway, host.gateway_user),
-          # via: @gateways[host.gateway],
           user: host.user,
           timeout: 20,
+          auth_methods: %w(publickey),
           compression: false
         )
     end
-    
   end
   
   def run_on_all(cmd)
     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]]
@@ -335,6 +341,10 @@ class SSHRegistry < Registry
     
     ret
   end
+  
+  def failed_connections
+    @failed_connections.map{|address| @hosts[address] }
+  end
 
 private
   def gateway_for(host, user)

data/lib/smartos-manager/version.rb

@@ -1,3 +1,3 @@
 module SmartosManager
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

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