smartos-manager 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 137ad132fca39b6b0324020fa234dfe5f6ce27e0
-  data.tar.gz: 14abd66feaf04836cae4d34446776b82b8e0a399
+  metadata.gz: 08f6ffdaa4b9f3b88435b5a74308f1cba0a2e4ee
+  data.tar.gz: 61baf7480b232b6bfbbb01d7c8171a76dc991733
 SHA512:
-  metadata.gz: c8276fb6b3155b61d3f5776a4a97a4500c261e5954668ad57db7ad0539130949d31501e3200dfd731255a03d0a369b7a12e5f285a7d5d43fb2f60da48e99d7ea
-  data.tar.gz: 21dc78194fe6fa6334016ce4dbb5ff798e4d543aeec808fe91a2697939af0c72afe0a2137fcb6a5f9d1802ba39fabdb4f28a39aba9362fdda84450538b7441df
+  metadata.gz: e0bfa73b194c133bf34bb9ad9daa21119361f4a2a03e139de1674cc6e0662bf1b75c5d1376f3db7cdbb0bbd5f1ce9eb2faa9d5d5ca671d67af678ecf4553587d
+  data.tar.gz: c60ae132875b71575055084541742fee98bf5519f1b33b3d4a6db16936f6b966f0445eb42562c26cabed1dd9e27a7bf44aff50d726201968399c4a5be00ae41e

data/lib/smartos-manager/cli.rb

@@ -8,7 +8,7 @@ class ColorPicker
   
   def initialize
     @colors = {}
-    @available_colors = %w(green yellow cyan magenta blue red)
+    @available_colors = %w(green yellow cyan magenta blue red gray white)
   end
   
   def get(str)
@@ -18,6 +18,24 @@ class ColorPicker
 end
 
 class AppCLI < Thor
+  
+  desc "list_images", "List images available"
+  def list_images
+    registry = HostRegistry.new('smartos_hosts.toml')
+    ret = registry.list_images()
+    
+    rev_colors = ColorPicker.new
+    p_img_list("UUID", "Name", "Version", "OS")
+    
+    ret.each do |host, images|
+      puts "\n#{host.name} - #{host.address}"
+      images.each do |img|
+        # color = rev_colors.get(img.uuid)
+        p_img_list( img.uuid, img.name, img.version, img.os)
+      end
+    end
+  end
+  
   desc "list", "List all vms"
   def list
     registry = HostRegistry.new('smartos_hosts.toml')
@@ -84,6 +102,11 @@ class AppCLI < Thor
       str
     end
     
+    # (uuid name version os)
+    def p_img_list(uuid, name, version, os)
+      puts "  [ #{uuid.ljust(37)}]  #{name.ljust(30)} #{version.ljust(6)} #{os}"
+    end
+    
     def p_vm_list(size, name, type, uuid, state, admin_ip, disk_label, *user_columns)
       tmp = user_columns.map{|val| "[ #{format_generic(val).to_s.ljust(15).cyan} ]" }.join('')
       

data/lib/smartos-manager/core.rb

@@ -4,6 +4,7 @@ require 'net/ssh/multi'
 require 'net/ssh/gateway'
 require 'toml'
 require 'size_units'
+require 'json'
 
 
 class SSHHost
@@ -63,6 +64,18 @@ class VirtualMachine
   end
 end
 
+
+class Image
+  attr_reader :uuid, :name, :version, :os
+  
+  def initialize(data = {})
+    @uuid = data.delete('uuid')
+    @name = data.delete('name')
+    @version = data.delete('version')
+    @os = data.delete('os')
+  end
+end
+
 class HostRegistry
   attr_reader :user_columns
   
@@ -144,6 +157,26 @@ class HostRegistry
     
   end
   
+  
+  def list_images
+    ret = {}
+    
+    columns = %w(uuid name version os)
+    
+    images = run_on_all("imgadm list -j")
+    images.each do |host, data|
+      
+      json = JSON.parse(data)
+      
+      ret[host] = json.map do |img_data|
+        Image.new( img_data['manifest'] )
+      end
+    end
+    
+    ret
+  end
+  
+  
   def diag
     ret = {}
     

data/lib/smartos-manager/version.rb

@@ -1,3 +1,3 @@
 module SmartosManager
-  VERSION = "1.2.5"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartos-manager
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.0
 platform: ruby
 authors:
 - Julien Ammous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb