smartos-manager 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37214f80056c5a2ba2bd25ecf36ead002011ec77
-  data.tar.gz: 9b7b0d614a7f81c5a9ed370c31fe411c1ed4be51
+  metadata.gz: 29841f2633b48a0b3157ce61b2e192a14c48475e
+  data.tar.gz: 2854a9fa98812383556aa13ac5a9495d68416346
 SHA512:
-  metadata.gz: a5797b5b333c33bb34db357f29aaaa9a369cf20f051b0754d11ba21d76a832884baec693dd933fc58e9034fe3fbbf6fc17c0defb7f452bf6a360082559713dcb
-  data.tar.gz: 3465b613e2e8f7a159e0cad40c99ff1f3b1068c15990a883f753f209cf405ac9dc672f8c8baf2491c69670f3eeb68dfdabc5742b43d82b7e6fdbce3f15a7f58e
+  metadata.gz: 5faba60549136b532abd89709807a3dd4f2961ad601f7789f9c72e2f8339858b609819aec004174b427f457d97e569de04f51ab03a2d69760612a58113c8145b
+  data.tar.gz: 6ca13ee99a7bd442d4d5e62a143ea4cad53e06e78002914d3b629bd5fe40e13653117f47f0dcc4e95bf1ffa34345c8e8a423f14dc8d49cdd502f905eed3c99d5

data/lib/smartos-manager/cli.rb

@@ -22,7 +22,8 @@ class AppCLI < Thor
       vms.each{|vm| vm_memory += vm.memory }
       avail = (mem - vm_memory) - (20 * mem/100.0)
       
-      puts "\n#{host.name} (#{host.address})  (#{vms.size} vms)  (Total RAM: #{mem.human_size(1).green}, Avail: #{avail.human_size(1).magenta})"
+      rev = sysinfos[host][:smartos_version]
+      puts "\n#{host.name} [SmartOS: #{rev.green}] (#{host.address})  (#{vms.size} vms)  (Total RAM: #{mem.human_size(1).green}, Avail: #{avail.human_size(1).magenta})"
       vms.each do |vm|
         user_columns = registry.user_columns.values.map{|key| vm[key] }
         p_vm_list(vm.memory.human_size(1), vm.name, vm.type, vm.uuid, printable_state(vm.state), vm.admin_ip, *user_columns)

data/lib/smartos-manager/core.rb

@@ -148,12 +148,17 @@ class HostRegistry
     ret = {}
     
     # Memory size: 8157 Megabytes
-    hosts = run_on_all("prtconf | head -3 | grep Mem")
-    hosts.each do |host, data|
+    run_on_all("prtconf | head -3 | grep Mem").each do |host, data|
       _, _, mem, _ = data.split(" ")
       ret[host] = {memory: mem.to_i.megabytes}
     end
     
+    # joyent_20140207T053435Z
+    run_on_all("uname -a | cut -d ' ' -f 4").each do |host, data|
+      _, rev = data.strip().split('_')
+      ret[host][:smartos_version] = rev
+    end
+    
     ret
   end
   

data/lib/smartos-manager/version.rb

@@ -1,3 +1,3 @@
 module SmartosManager
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartos-manager
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Julien Ammous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb