opennebula-cli 5.8.5 → 5.9.80.pre

data/bin/onehost

@@ -20,10 +20,16 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
-    REMOTES_LOCATION = '/var/lib/one/remotes/'
+    GEMS_LOCATION     = '/usr/share/one/gems'
+    REMOTES_LOCATION  = '/var/lib/one/remotes/'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
-    REMOTES_LOCATION = ONE_LOCATION + '/var/remotes/'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+    REMOTES_LOCATION  = ONE_LOCATION + '/var/remotes/'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -230,7 +236,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :hostid,
-            :options => OpenNebulaHelper::XML do
+            :options => [OpenNebulaHelper::XML, OpenNebulaHelper::DECRYPT] do
         helper.show_resource(args[0], options)
     end
 

data/bin/oneimage

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -432,4 +438,14 @@ CommandParser::CmdParser.new(ARGV) do
             i.unlock
         end
     end
+
+    show_desc = <<-EOT.unindent
+        Shows orphans images (i.e images not referenced in any template).
+    EOT
+
+    command :orphans, show_desc do
+        puts helper.check_orphans
+
+        return 0
+    end
 end

data/bin/onemarket

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onemarketapp

@@ -20,12 +20,18 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
     VAR_LOCATION      = '/var/lib/one'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
     VAR_LOCATION      = ONE_LOCATION + '/var'
 end
 
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
+end
+
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
 

data/bin/onesecgroup

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/oneshowback

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onetemplate

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/oneuser

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -72,11 +78,10 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'Read password from file'
     }
 
-    SHA1 = {
-        :name => 'sha1',
-        :large => '--sha1',
-        :description => "The password will be hashed using the sha1\n" \
-                        ' ' * 31 << 'algorithm'
+    SHA256 = {
+        :name => 'sha256',
+        :large => '--sha256',
+        :description => 'The password will be hashed using the sha256 algorithm'
     }
 
     SSH = {
@@ -203,7 +208,7 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'enable stdin password'
     }
 
-    auth_options = [READ_FILE, SHA1, SSH, X509, KEY, CERT, DRIVER]
+    auth_options = [READ_FILE, SHA256, SSH, X509, KEY, CERT, DRIVER]
 
     create_options = auth_options.clone.unshift(GROUP_CREATE)
 

data/bin/onevcenter

@@ -20,10 +20,16 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
-    REMOTES_LOCATION = '/var/lib/one/remotes/'
+    GEMS_LOCATION     = '/usr/share/one/gems'
+    REMOTES_LOCATION  = '/var/lib/one/remotes/'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
-    REMOTES_LOCATION = ONE_LOCATION + '/var/remotes/'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+    REMOTES_LOCATION  = ONE_LOCATION + '/var/remotes/'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -97,6 +103,14 @@ CommandParser::CmdParser.new(ARGV) do
         :format => String
     }
 
+    PORT = {
+        :name => 'port',
+        :short => '-p port',
+        :large => '--port port',
+        :format => String,
+        :description => 'vCenter API port, defaults to 443 (SSL) or 80'
+    }
+
     USE_DEFAULTS = {
         :name => 'defaults',
         :large => '--use-defaults',
@@ -234,7 +248,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
     command :hosts,
             host_desc,
-            :options => [VCENTER, USER, PASS, USE_DEFAULTS] do
+            :options => [VCENTER, USER, PASS, USE_DEFAULTS, PORT] do
         con_ops = helper.connection_options('Hosts', options)
 
         VCenterDriver::VcImporter.import_clusters(con_ops, options)

data/bin/onevdc

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevm

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -220,6 +226,10 @@ CommandParser::CmdParser.new(ARGV) do
         helper.retrieve_snapshot_id(@current_vm, arg)
     end
 
+    format :disk_snapshot_id, 'Disk_snapshot identifier' do |arg|
+        helper.retrieve_disk_snapshot_id(@current_vm, arg)
+    end
+
     ########################################################################
     # Commands
     ########################################################################
@@ -869,7 +879,7 @@ CommandParser::CmdParser.new(ARGV) do
     resched_desc = <<-EOT.unindent
         Sets the rescheduling flag for the VM.
 
-        States: RUNNING
+        States: RUNNING, POWEROFF
     EOT
 
     command :resched, resched_desc, [:range, :vmid_list] do
@@ -881,7 +891,7 @@ CommandParser::CmdParser.new(ARGV) do
     unresched_desc = <<-EOT.unindent
         Clears the rescheduling flag for the VM.
 
-        States: RUNNING
+        States: RUNNING, POWEROFF
     EOT
 
     command :unresched, unresched_desc, [:range, :vmid_list] do
@@ -1045,8 +1055,9 @@ CommandParser::CmdParser.new(ARGV) do
             table = helper.format_pool(options)
             pool = OpenNebula::VirtualMachinePool.new(OneVMHelper.get_client)
 
-            rc = pool.info_search(:query    => options[:search],
-                                  :extended => options[:extended])
+            rc = pool.info_search(
+                :extended => options[:extended], :query => options[:search]
+            )
 
             if !rc.nil?
                 puts rc.message
@@ -1068,7 +1079,9 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :vmid,
-            :options => [OpenNebulaHelper::XML, OneVMHelper::ALL_TEMPLATE] do
+            :options => [OpenNebulaHelper::XML,
+                         OpenNebulaHelper::DECRYPT,
+                         OneVMHelper::ALL_TEMPLATE] do
         helper.show_resource(args[0], options)
     end
 

data/bin/onevmgroup

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevnet

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -305,7 +311,9 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :vnetid,
-            :options => [OpenNebulaHelper::XML, OneVNetHelper::SHOW_AR] do
+            :options => [OpenNebulaHelper::XML,
+                         OpenNebulaHelper::DECRYPT,
+                         OneVNetHelper::SHOW_AR] do
         helper.show_resource(args[0], options)
     end
 
@@ -421,4 +429,14 @@ CommandParser::CmdParser.new(ARGV) do
             vnet.unlock
         end
     end
+
+    show_desc = <<-EOT.unindent
+        Shows orphans vnets (i.e vnets not referenced in any template).
+    EOT
+
+    command :orphans, show_desc do
+        puts helper.check_orphans
+
+        return 0
+    end
 end

data/bin/onevntemplate

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevrouter

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onezone

@@ -20,8 +20,14 @@ ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
+    GEMS_LOCATION     = '/usr/share/one/gems'
 else
     RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
+    GEMS_LOCATION     = ONE_LOCATION + '/share/gems'
+end
+
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/lib/cli_helper.rb

@@ -16,355 +16,753 @@
 
 require 'csv'
 
+# CLI Helper
 module CLIHelper
+
+    # CLI general options
     LIST = {
-        :name  => "list",
-        :short => "-l x,y,z",
-        :large => "--list x,y,z",
+        :name => 'list',
+        :short => '-l x,y,z',
+        :large => '--list x,y,z',
         :format => Array,
-        :description => "Selects columns to display with list command"
+        :description => 'Selects columns to display with list command'
     }
 
     LISTCONF = {
-        :name   => "listconf",
-        :short  => "-c conf",
-        :large  => "--listconf conf",
+        :name => 'listconf',
+        :short => '-c conf',
+        :large => '--listconf conf',
         :format => String,
-        :description => "Selects a predefined column list"
+        :description => 'Selects a predefined column list'
     }
 
     CSV_OPT = {
-        :name  => "csv",
-        :large => "--csv",
-        :description => "Write table in csv format"
+        :name => 'csv',
+        :large => '--csv',
+        :description => 'Write table in csv format'
+    }
+
+    CSV_DEL = {
+        :name => 'csv_del',
+        :large => '--csv-del del',
+        :format => String,
+        :description => 'Set delimiter for csv output'
     }
 
-    #ORDER = {
-    #    :name  => "order",
-    #    :short => "-o x,y,z",
-    #    :large => "--order x,y,z",
-    #    :format => Array,
-    #    :description => "Order by these columns, column starting with - means decreasing order"
-    #}
-    #
     FILTER = {
-        :name  => "filter",
-        :short => "-f x,y,z",
-        :large => "--filter x,y,z",
+        :name => 'filter',
+        :short => '-f x,y,z',
+        :large => '--filter x,y,z',
         :format => Array,
-        :description => "Filter data. An array is specified with\n"<<
-                        " "*31<<"column=value pairs."
+        :description => "Filter data. An array is specified with\n" <<
+                        ' ' * 31 << 'column=value pairs.'
     }
+
     OPERATOR = {
-        :name  => "operator",
-        :large => "--operator operator",
+        :name => 'operator',
+        :large => '--operator operator',
         :format => String,
-        :description => "Logical operator used on filters: AND, OR."<<
-                        " Default: AND."
+        :description => 'Logical operator used on filters: AND, OR. ' \
+                        'Default: AND.'
+    }
+
+    NO_HEADER = {
+        :name => 'no_header',
+        :large => '--no-header',
+        :description => 'Hides the header of the table'
     }
- 
-    #
-    #HEADER = {
-    #    :name  => "header",
-    #    :short => "-H",
-    #    :large => "--header",
-    #    :description => "Shows the header of the table"
-    #}
 
     DELAY = {
-        :name  => "delay",
-        :short => "-d x",
-        :large => "--delay x",
+        :name => 'delay',
+        :short => '-d x',
+        :large => '--delay x',
         :format => Integer,
-        :description => "Sets the delay in seconds for top command"
+        :description => 'Sets the delay in seconds for top command'
     }
 
     NO_PAGER = {
-        :name  => "no_pager",
-        :large => "--no-pager",
-        :format => String,
-        :description => "Disable pagination",
-        :proc => lambda { |o, options|
-            ENV['ONE_PAGER'] = 'cat' if File.exists?('/bin/cat')
+        :name => 'no_pager',
+        :large => '--no-pager',
+        :description => 'Disable pagination',
+        :proc => lambda {|_o, _options|
+            ENV['ONE_PAGER'] = 'cat' if File.exist?('/bin/cat')
         }
     }
 
-    #OPTIONS = [LIST, ORDER, FILTER, HEADER, DELAY]
-    OPTIONS = [LIST, LISTCONF, DELAY, FILTER, OPERATOR, CSV_OPT, NO_PAGER]
+    ADJUST = {
+        :name => 'adjust',
+        :large => '--adjust x,y,z',
+        :format => Array,
+        :description => 'Adjust size to not truncate selected columns'
+    }
+
+    SIZE = {
+        :name => 'size',
+        :short => '-s x=size,y=size',
+        :large => '--size x=size,y=size',
+        :format => Array,
+        :description => 'Change the size of selected columns. ' \
+                        'For example: ' \
+                        '$ onevm list --size "name=20" ' \
+                        'will make column name size 20.'
+    }
+
+    EXPAND = {
+        :name => 'expand',
+        :large => '--expand [x=prop,y=prop]',
+        :format => Array,
+        :description => 'Expands the columns size to fill the terminal. ' \
+                        'For example: ' \
+                        '$onevm list --expand name=0.4,group=0.6 ' \
+                        'will expand name 40% and group 60%. ' \
+                        '$onevm list --expand name,group ' \
+                        'will expand name and group based on its size.' \
+                        '$onevm list --expand will expand all columns.'
+    }
+
+    NO_EXPAND = {
+        :name => 'no_expand',
+        :large => '--no-expand',
+        :description => 'Disable expand'
+    }
+
+    OPTIONS = [LIST,
+               LISTCONF,
+               DELAY,
+               FILTER,
+               OPERATOR,
+               CSV_OPT,
+               CSV_DEL,
+               NO_PAGER,
+               NO_HEADER,
+               ADJUST,
+               SIZE,
+               EXPAND,
+               NO_EXPAND]
 
     # Sets bold font
-    def CLIHelper.scr_bold
+    def self.scr_bold
         print "\33[1m"
     end
 
     # Sets underline
-    def CLIHelper.scr_underline
+    def self.scr_underline
         print "\33[4m"
     end
 
     # Restore normal font
-    def CLIHelper.scr_restore
+    def self.scr_restore
         print "\33[0m"
     end
 
     # Clears screen
-    def CLIHelper.scr_cls
+    def self.scr_cls
         print "\33[2J\33[H"
     end
 
     # Moves the cursor
-    def CLIHelper.scr_move(x,y)
-        print "\33[#{x};#{y}H"
-    end
-
-    def CLIHelper.scr_red
-        print "\33[31m"
-    end
-
-    def CLIHelper.scr_green
-        print "\33[32m"
+    #
+    # @param cord_x [Integer] Coordinate x
+    # @param cord_y [Integer] Coordinate y
+    def self.scr_move(cord_x, cord_y)
+        print "\33[#{cord_x};#{cord_y}H"
     end
 
-    ANSI_RED="\33[31m"
-    ANSI_GREEN="\33[32m"
-    ANSI_RESET="\33[0m"
-    ANSI_YELLOW="\33[33m"
+    # CLI state colors
+    ANSI_RED    = "\33[31m"
+    ANSI_GREEN  = "\33[32m"
+    ANSI_RESET  = "\33[0m"
+    ANSI_YELLOW = "\33[33m"
 
-    OK_STATES=%w{runn rdy on configured}
-    BAD_STATES=%w{fail err err error}
-    REGULAR_STATES=%w{pending}
+    # CLI states
+    OK_STATES      = %w[runn rdy on configured SUCCESS]
+    BAD_STATES     = %w[fail err error ERROR]
+    REGULAR_STATES = %w[pending]
 
-    def CLIHelper.color_state(stat)
+    # Set state color
+    #
+    # @param stat [String] Current state
+    def self.color_state(state)
         if $stdout.tty?
-            case stat.strip
+            case state.strip
             when *OK_STATES
-                ANSI_GREEN+stat+ANSI_RESET
+                ANSI_GREEN + state + ANSI_RESET
             when *BAD_STATES
-                ANSI_RED+stat+ANSI_RESET
+                ANSI_RED + state + ANSI_RESET
             when *REGULAR_STATES
-                ANSI_YELLOW+stat+ANSI_RESET
+                ANSI_YELLOW + state + ANSI_RESET
             else
-                stat
+                state
             end
         else
-            stat
+            state
         end
     end
 
     # Print header
-    def CLIHelper.print_header(str, underline=true)
+    #
+    # @param str       [String]  String with header content
+    # @param underline [Boolean] True to underline the header
+    def self.print_header(str, underline = true)
         if $stdout.tty?
             print_tty_header(str, underline)
         else
             print str
         end
+
         puts
     end
 
-    # Pretty print header
-    def CLIHelper.print_tty_header(str, underline=true)
+    # Print pretty header
+    #
+    # @param str       [String]  String with header content
+    # @param underline [Boolean] True to underline the header
+    def self.print_tty_header(str, underline = true)
         scr_bold
         scr_underline if underline
         print str
         scr_restore
     end
 
+    # Show error message and exit with error
+    #
+    # @param message [String] Error message to show
+    def self.fail(message)
+        STDERR.puts message
+
+        exit(-1)
+    end
+
+    # Check if value is in base64
+    #
+    # @param value [String] Value to check
+    #
+    # @return [Boolean] True if it's base64
+    def self.base64?(value)
+        re = %r(^([A-Za-z0-9+\/]{4})*([A-Za-z0-9+\/]{3}=|[A-Za-z0-9+\/]{2}==)?$)
+
+        !value.match(re).nil?
+    end
+
+    # Hash with search
     module HashWithSearch
+
+        # Search inside path
+        #
+        # @param path [String] Path to search on
         def dsearch(path)
-            stems=path.split('/')
-            hash=self
+            stems = path.split('/')
+            hash  = self
 
             stems.delete_if {|s| s.nil? || s.empty? }
 
             stems.each do |stem|
-                if Hash===hash
+                if hash.is_a? Hash
                     if hash[stem]
-                        hash=hash[stem]
+                        hash = hash[stem]
                     else
-                        hash=nil
+                        hash = nil
                         break
                     end
                 else
-                    hash=nil
+                    hash = nil
                     break
                 end
             end
 
             hash
         end
+
     end
 
+    # Show table
     class ShowTable
+
         require 'yaml'
 
         attr_reader :default_columns
 
-        def initialize(conf=nil, ext=nil, &block)
-            @columns = Hash.new
-            @default_columns = Array.new
+        # Class constructor
+        #
+        # @param conf [String] Configuration file
+        # @param ext  [Helper] Cli helper information
+        def initialize(conf = nil, ext = nil, &block)
+            @columns         = {}
+            @default_columns = []
 
-            @ext = ext
+            @ext  = ext
             @conf = conf
 
             instance_eval(&block)
         end
 
+        # Get the helper
         def helper
             @ext
         end
 
+        # Fill column attributes
+        #
+        # @param name [String] Column name
+        # @param desc [String] Column description
+        # @param conf [Array]  Configutation attributes
         def column(name, desc, *conf, &block)
-            column = Hash.new
+            column = {}
+
             column[:desc] = desc
             column[:size] = 5
-            conf.each{|c|
-                if c.instance_of?(Symbol)
-                    column[c]=true
-                elsif c.instance_of?(Hash)
-                    c.each{|key,value|
-                        column[key]=value
-                    }
+
+            conf.each do |c|
+                if c.is_a? Symbol
+                    column[c] = true
+                elsif c.is_a? Hash
+                    c.each do |key, value|
+                        column[key] = value
+                    end
                 end
-            }
+            end
+
             column[:proc] = block
+
             @columns[name.to_sym] = column
-            @default_columns<<name
+
+            @default_columns << name
         end
 
+        # Get default columns
+        #
+        # @param args [Array] Array with default columns
         def default(*args)
-            args.map!{|a| a.to_sym }
-            @default_columns=args
+            args.map! {|a| a.to_sym }
+
+            @default_columns = args
         end
 
-        def show(data, options={})
-            update_columns(options)
+        # Show resource
+        #
+        # @param data    [Hash/Object] Data to show
+        # @param options [Hash] Object with CLI user options
+        # @param top     [Boolean]     True to not update columns again
+        def show(data, options = {}, top = false)
+            update_columns(options) unless top
+
+            if data.is_a? Hash
+                @data = data
 
-            if Hash===data
-                @data=data
                 @data.extend(HashWithSearch)
 
-                pool=@data.keys.first
-                return print_table(nil, options) if !pool
+                pool = @data.keys.first
 
-                element=pool.split('_')[0..-2].join('_')
+                return print_table(data, options) unless pool
 
-                pool_data=@data.dsearch("#{pool}/#{element}")
-                pool_data=[pool_data].flatten if pool_data
+                element = pool.split('_')[0..-2].join('_')
+
+                pool_data = @data.dsearch("#{pool}/#{element}")
+
+                if pool_data
+                    pool_data = [pool_data].flatten
+                else
+                    pool_data = []
+                end
 
                 print_table(pool_data, options)
             else
+                data ||= []
+
                 print_table(data, options)
             end
         end
 
-        def top(options={}, &block)
-            delay=options[:delay] ? options[:delay] : 1
+        # Show resource continuosly
+        #
+        # @param options [Hash] Object with CLI user options
+        def top(options = {})
+            delay = options[:delay] || 1
+            top   = false
 
             begin
-                while true
-                    data = block.call
+                loop do
+                    data = yield
 
                     CLIHelper.scr_cls
-                    CLIHelper.scr_move(0,0)
+                    CLIHelper.scr_move(0, 0)
+
+                    show(data, options, top)
 
-                    show(data, options)
                     sleep delay
+
+                    top = true
                 end
-            rescue Exception => e
-                puts e.message
+            rescue SystemExit, Interrupt, StandardError => e
+                CLIHelper.fail(e.message)
             end
         end
 
+        # Show column description
         def describe_columns
-            str="%-20s: %-20s"
+            str = '%-20s: %-20s'
 
             @columns.each do |column, d|
-                puts str % [column, d[:desc]]
+                puts format(str, column, d[:desc])
+            end
+        end
+
+        # Get maximum string lenght in column
+        #
+        # @param index [Integer] Column index to search
+        #
+        # @return      [Integer] Maximum length
+        def max_size(index)
+            sizes = []
+
+            @res_data.each do |d|
+                sizes << d[index].size
+            end
+
+            sizes.max
+        end
+
+        # Get total size of all columns
+        #
+        # @param columns [Array]   Array with columns name
+        #
+        # @return        [Integer] Total size
+        def total_columns_size(columns)
+            size = 0
+
+            columns.each do |c|
+                size += @columns[c[:name]][:size]
             end
+
+            size
         end
 
+        # Get columns information
+        #
+        # @param columns [Array] Array with columns information
+        #
+        # @return        [Array] Array with columns objects
+        def columns_info(columns)
+            ret = []
+
+            columns.each do |column|
+                data = column.to_s.split('=')
+
+                ret << { :name => data[0].upcase.to_sym, :prop => data[1] }
+            end
+
+            ret
+        end
+
+        # Print tty header
         def print_tty_header
             CLIHelper.print_tty_header(header_str)
+
             puts
         end
 
         private
 
+        # Get header in string format
+        def header_str
+            @default_columns.collect do |c|
+                if @columns[c]
+                    format_str(c, c.to_s)
+                else
+                    CLIHelper.fail("Column #{c} not defined.")
+                end
+            end.compact.join(' ')
+        end
+
+        # Print data in table format
+        #
+        # @param data    [Array] Array with data to show
+        # @param options [Hash]  Object with CLI user options
         def print_table(data, options)
-            if !options[:csv] && !options[:noheader]
+            @res_data = data_array(data, options)
+
+            update_columns_size(options)
+
+            if !options[:csv] && (!options.key? :no_header)
                 CLIHelper.print_header(header_str)
             end
 
-            data ? print_data(data, options) : puts
+            if options[:csv] && (!options.key? :no_header)
+                print_csv_data([@default_columns], options[:csv_del])
+            end
+
+            @res_data ? print_data(@res_data, options) : puts
         end
 
+        # Print data
+        #
+        # @param data [Array] Array with data to show
+        # @param options [Hash] Object with CLI user options
         def print_data(data, options)
-            ncolumns=@default_columns.length
-            res_data=data_array(data, options)
+            if options[:csv]
+                print_csv_data(data, options[:csv_del])
+            else
+                print_normal_data(data, options[:stat_column])
+            end
+        rescue Errno::EPIPE => e
+            CLIHelper.fail(e.message)
+        end
 
-            if options[:stat_column]
-                stat_column=@default_columns.index(
-                    options[:stat_column].upcase.to_sym)
+        # Print data in CSV format
+        #
+        # @param data [Array] Array with data to show
+        # @param del  [Char]  CSV delimiter
+        def print_csv_data(data, del)
+            del ? del = del : del = ','
+
+            data.each do |l|
+                puts CSV.generate_line(l, :col_sep => del)
+            end
+        end
+
+        # Print data in normal format
+        #
+        # @param data        [Array]  Array with data to show
+        # @param stat_column [String] Name of the state column
+        def print_normal_data(data, stat_column)
+            ncolumns = @default_columns.length
+
+            if stat_column
+                stat        = stat_column.upcase.to_sym
+                stat_column = @default_columns.index(stat)
             else
-                stat_column=@default_columns.index(:STAT)
+                stat_column = @default_columns.index(:STAT)
             end
 
-            begin
-                if options[:csv]
-                    puts CSV.generate_line(@default_columns) if !options[:noheader]
-                    res_data.each {|l| puts CSV.generate_line(l) }
-                else
-                    res_data.each{|l|
-                        puts (0..ncolumns-1).collect{ |i|
-                            dat=l[i]
-                            col=@default_columns[i]
+            data.each do |l|
+                result = []
+
+                ncolumns.times do |i|
+                    dat = l[i]
+                    col = @default_columns[i]
+
+                    str = format_str(col, dat)
 
-                            str=format_str(col, dat)
-                            str=CLIHelper.color_state(str) if i==stat_column
+                    str = CLIHelper.color_state(str) if i == stat_column
 
-                            str
-                        }.join(' ').rstrip
-                    }
+                    result << str
                 end
-            rescue Errno::EPIPE
+                puts result.join(' ').rstrip
             end
         end
 
+        # Get data in array format
+        #
+        # @param data    [Array] Array with data to show
+        # @param options [Hash]  Object with CLI user options
+        #
+        # @return        [Array] Array with selected columns information
         def data_array(data, options)
-            res_data=data.collect {|d|
-                @default_columns.collect {|c|
+            res_data = data.collect do |d|
+                @default_columns.collect do |c|
                     @columns[c][:proc].call(d).to_s if @columns[c]
-                }
-            }
+                end
+            end
 
             if options
                 filter_data!(res_data, options) if options[:filter]
-                sort_data!(res_data, options[:order]) if options[:order]
             end
 
             res_data
         end
 
+        # Format data as string
+        #
+        # @param field [Symbol] Name of the column to format
+        # @param data  [String] Data to format
         def format_str(field, data)
             if @columns[field]
-                minus=( @columns[field][:left] ? "-" : "" )
-                size=@columns[field][:size]
-                if @columns[field][:donottruncate]
-                    return "%#{minus}#{size}s" % [ data.to_s ]
+                @columns[field][:left] ? minus = '-' : minus = ''
+                size = @columns[field][:size]
+
+                if @columns[field][:adjust]
+                    format("%#{minus}#{size}s", data.to_s)
+                else
+                    format("%#{minus}#{size}.#{size}s", data.to_s)
                 end
-                return "%#{minus}#{size}.#{size}s" % [ data.to_s ]
             else
-                exit -1, "Column #{field} not defined."
+                CLIHelper.fail("Column #{field} not defined.")
             end
         end
 
+        # Get expand information from configuration files
+        #
+        # @return [Array] Array with columns data
+        def config_expand_data
+            ret = []
+
+            @default_columns.each do |column|
+                expand_c = @columns[column][:expand]
+
+                next unless expand_c
+
+                column = column.to_s.downcase
+
+                ret << "#{column}=#{expand_c}" if expand_c.is_a? Numeric
+
+                ret << column.to_s.downcase unless expand_c.is_a? Numeric
+            end
+
+            ret
+        end
+
+        # Get adjust information from configuration files
+        #
+        # @return [Array] Array with columns data
+        def config_adjust_data
+            ret = []
+
+            @default_columns.each do |column|
+                next unless @columns[column][:adjust]
+
+                ret << column.to_s.downcase
+            end
+
+            ret
+        end
+
+        # Change the size of expand columns
+        #
+        # @param expand_columns [Array]   Array with expand columns names
+        # @param all            [Boolean] True to expand all columns
+        def expand_columns(expand_columns, all = false)
+            return if expand_columns.empty?
+
+            if $stdout.tty?
+                terminal_size = IO.console.winsize[1]
+            else
+                terminal_size = nil
+            end
+
+            return if terminal_size.nil?
+
+            default_columns = columns_info(@default_columns)
+            expand_columns  = columns_info(expand_columns)
+
+            total_size     = total_columns_size(default_columns)
+            columns_size   = total_columns_size(expand_columns)
+
+            terminal_size -= (@default_columns.size - 1)
+            left_size      = terminal_size - total_size
+            remaining_size = left_size
+
+            return if left_size <= 0
+
+            expand_columns.each do |c|
+                column = c[:name]
+                prop   = c[:prop]
+
+                if @columns[column].nil?
+                    CLIHelper.fail("Unknown column #{column}")
+                end
+
+                if all
+                    prop = @columns[column][:size] / total_size.to_f
+                elsif !prop
+                    prop = @columns[column][:size] / columns_size.to_f
+                end
+
+                size = (left_size * prop.to_f).round
+
+                @columns[column][:adjust] = false
+                @columns[column][:size]  += size
+
+                remaining_size -= size
+            end
+
+            if remaining_size > 0
+                # If there is some left space, add it to the last column
+                @columns[expand_columns[-1][:name]][:size] += remaining_size
+            end
+
+            return if terminal_size == total_columns_size(default_columns)
+
+            # If there is extra space, sub it from the last column
+            diff = total_columns_size(default_columns) - terminal_size
+
+            @columns[expand_columns[-1][:name]][:size] -= diff
+        end
+
+        # Change columns size
+        #
+        # @param options [Array] Array with size information for each column
+        def size_columns(options)
+            options[:size].each do |column|
+                data   = column.split('=')
+                column = data[0].upcase.to_sym
+                size   = data[1].to_i
+
+                @columns[column][:adjust] = false
+                @columns[column][:size]   = size
+            end
+        end
+
+        # Update columns size information
+        #
+        # @param options [Hash] Object with CLI user options
+        def update_columns_size(options)
+            adjust = options[:adjust]
+
+            if adjust
+                adjust += config_adjust_data
+            else
+                adjust = config_adjust_data
+            end
+
+            expand_all  = (options.key? :expand) && options[:expand].nil?
+            expand      = !options[:expand].nil?
+            expand_data = []
+
+            if expand_all
+                expand_data = @default_columns
+            elsif expand
+                expand_data += options[:expand]
+            end
+
+            expand_data += config_expand_data
+
+            c_size = options[:size]
+
+            # Update adjust attribute to not truncate the column
+            # If expand all columns adjust is ignored
+            unless expand_all
+                adjust.each do |column|
+                    column = column.upcase.to_sym
+                    size   = max_size(@default_columns.index(column))
+
+                    if size && size > @columns[column][:size]
+                        @columns[column][:adjust] = true
+                        @columns[column][:size]   = size
+                    end
+                end
+            end
+
+            # Update size attribute if size
+            size_columns(options) if c_size
+
+            # Update size attribute if expand
+            expand_columns(expand_data) unless options.key? :no_expand
+        end
+
+        # Update columns information
+        #
+        # @param options [Hash] Object with CLI user options
         def update_columns(options)
             begin
-                config = YAML.load_file(@conf)
+                if @conf
+                    config = YAML.load_file(@conf)
+                else
+                    config = {}
+                end
 
-                default = config.delete(:default)
+                default      = config.delete(:default) || {}
                 default_conf = config.delete(:default_conf) || {}
-                listconf = options[:listconf]
+                listconf     = options[:listconf]
 
                 listconf = default_conf[listconf.to_sym] if listconf
 
@@ -381,75 +779,69 @@ module CLIHelper
                 # Filter show options with available columns
                 @default_columns &= @columns.keys
 
-                @columns.merge!(config) { |key, oldval, newval|
+                @columns.merge!(config) do |_key, oldval, newval|
                     oldval.merge(newval)
-                }
-            rescue Exception => e
+                end
+            rescue StandardError => e
+                CLIHelper.fail(e.message)
             end
 
-            @default_columns = options[:list].collect{|o| o.to_sym} if options[:list]
-        end
+            return unless options[:list]
 
-        def header_str
-            @default_columns.collect {|c|
-                if @columns[c]
-                    format_str(c, c.to_s)
-                else
-                    puts "Column #{c} not defined."
-                    exit -1
-                end
-            }.compact.join(' ')
+            @default_columns = options[:list].collect {|o| o.upcase.to_sym }
         end
 
+        # Filter data
+        #
+        # @param data    [Array] Array with data to filter
+        # @param options [Hash]  Object with CLI user options
         def filter_data!(data, options)
-            # TBD: add more operators
-            # operators=/(==|=|!=|<|<=|>|>=)/
-            operators=/(=|!=)/
-            filter = options[:filter]
+            operators = /(=|!=|<|<=|>|>=)/
+            filter    = options[:filter]
+
             if options.key?(:operator)
-              log_operator = options[:operator].upcase
+                log_operator = options[:operator].upcase
             else
-                log_operator = "AND"
+                log_operator = 'AND'
             end
 
-            stems=filter.map do |s|
-                m=s.match(/^(.*?)#{operators}(.*?)$/)
+            stems = filter.map do |s|
+                m = s.match(/^(.*?)#{operators}(.*?)$/)
+
                 if m
-                    left, operator, right=m[1..3]
-                    index=@default_columns.index(left.to_sym)
+                    index = @default_columns.index(m[1].to_sym)
 
                     if index
                         {
-                            :left       => left,
-                            :operator   => operator,
-                            :right      => right,
+                            :left       => m[1],
+                            :operator   => m[2],
+                            :right      => m[3],
                             :index      => index
                         }
                     else
-                        STDERR.puts "Column '#{left}' not found"
-                        exit(-1)
+                        CLIHelper.fail("Column '#{left}' not found")
                     end
                 else
-                    STDERR.puts "Expression '#{s}' incorrect"
-                    exit(-1)
+                    CLIHelper.fail("Expression '#{s}' incorrect")
                 end
             end
 
             data.select! do |d|
-                pass=true
+                pass = true
 
                 stems.each do |s|
+                    s[:operator] == '=' ? op = '==' : op = s[:operator]
 
-                    if d[s[:index]].public_send(s[:operator] == "=" ? "==" : s[:operator], s[:right])
-                        if log_operator == "OR"
+                    if d[s[:index]].public_send(op, s[:right])
+                        if log_operator == 'OR'
                             pass = true
+
                             break
                         end
                     else
                         pass = false
-                        if log_operator == "AND"
-                            break
-                        end
+
+                        break if log_operator == 'AND'
                     end
                 end
 
@@ -457,6 +849,8 @@ module CLIHelper
             end
         end
 
-        # TBD def sort_data!
+        # TODO: def sort_data!(data, options)
+
     end
+
 end