morpheus-cli 3.6.12 → 3.6.13

data/lib/morpheus/cli/archives_command.rb

@@ -4,7 +4,6 @@ require 'yaml'
 require 'rest_client'
 require 'optparse'
 require 'filesize'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::ArchivesCommand
@@ -131,11 +130,7 @@ class Morpheus::Cli::ArchivesCommand
             :visibility,
             {:isPublic => {label: 'Public URL'.upcase}}
           ]
-          term_width = current_terminal_width()
-          # if term_width > 170
-          #   columns += [:cpu, :memory, :storage]
-          # end
-          # custom pretty table columns ...
+          
           if options[:include_fields]
             columns = options[:include_fields]
           end
@@ -1774,9 +1769,7 @@ class Morpheus::Cli::ArchivesCommand
       rows = archive_buckets.collect do |it|
         {id: it['id'], name: it['name']}
       end
-      print red
-      tp rows, [:id, :name]
-      print reset,"\n"
+      puts as_pretty_table(rows, [:id, :name], {color:red})
       return nil
     else
       return archive_buckets[0]

data/lib/morpheus/cli/blueprints_command.rb

@@ -1714,14 +1714,6 @@ class Morpheus::Cli::BlueprintsCommand
         if tiers.empty?
           print yellow,"No tiers found.",reset,"\n"
         else
-          # rows = tiers.collect do |tier|
-          #   {
-          #     id: tier['id'],
-          #     name: tier['name'],
-          #   }
-          # end
-          # print cyan
-          # tp rows, [:name]
           print cyan
           tiers.each do |tier_name|
             puts tier_name

data/lib/morpheus/cli/boot_scripts_command.rb

@@ -1,7 +1,6 @@
 require 'rest_client'
 require 'optparse'
 require 'filesize'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::BootScriptsCommand
@@ -369,13 +368,11 @@ class Morpheus::Cli::BootScriptsCommand
       return nil
     elsif boot_scripts.size > 1
       print_red_alert "#{boot_scripts.size} boot scripts found by name #{name}"
-      # print_boot_scripts_table(boot_scripts, {color: red})
-      rows = boot_scripts.collect do |boot_script|
+      rows = boot_scripts.collect do |it|
         {id: it['id'], name: it['fileName']}
       end
-      print red
-      tp rows, [:id, :name]
-      print reset,"\n"
+      print "\n"
+      puts as_pretty_table(rows, [:id, :name], {color:red})
       return nil
     else
       return boot_scripts[0]

data/lib/morpheus/cli/cli_command.rb

@@ -443,10 +443,10 @@ module Morpheus
               header_list = [val.to_s]
               header_list.each do |h|
                 header_parts = val.to_s.split(":")
-                header_key, header_value = header_parts[0], header_parts[1..-1].join(":")
+                header_key, header_value = header_parts[0], header_parts[1..-1].join(":").strip
                 if header_parts.size() < 2
                   header_parts = val.to_s.split("=")
-                  header_key, header_value = header_parts[0], header_parts[1..-1].join("=")
+                  header_key, header_value = header_parts[0], header_parts[1..-1].join("=").strip
                 end
                 if header_parts.size() < 2
                   raise_command_error "Invalid HEADER value '#{val}'. HEADER should contain a key and a value. eg. -H 'X-Morpheus-Lease: $MORPHEUS_LEASE_TOKEN'"
@@ -534,6 +534,10 @@ module Morpheus
             opts.on('-F', '--fields x,y,z', Array, "Filter Output to a limited set of fields. Default is all fields.") do |val|
               options[:include_fields] = val
             end
+            opts.on(nil, '--all-fields', "Show all fields. Useful for showing hidden columns on wide tables.") do
+              options[:all_fields] = true
+            end
+            opts.add_hidden_option('--all-fields') if opts.is_a?(Morpheus::Cli::OptionParser)
 
           when :thin
             opts.on( '--thin', '--thin', "Format headers and columns with thin borders." ) do |val|

data/lib/morpheus/cli/cloud_datastores_command.rb

@@ -1,7 +1,6 @@
 require 'rest_client'
 require 'optparse'
 require 'filesize'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/mixins/infrastructure_helper'
 
@@ -379,13 +378,11 @@ class Morpheus::Cli::CloudDatastoresCommand
       return nil
     elsif datastores.size > 1
       print_red_alert "#{datastores.size} datastores found by name #{name}"
-      # print_datastores_table(datastores, {color: red})
       rows = datastores.collect do |it|
         {id: it['id'], name: it['name']}
       end
-      print red
-      tp rows, [:id, :name]
-      print reset,"\n"
+      print "\n"
+      puts as_pretty_table(rows, [:id, :name], {color:red})
       return nil
     else
       datastore = datastores[0]

data/lib/morpheus/cli/clouds.rb

@@ -90,7 +90,7 @@ class Morpheus::Cli::Clouds
         if clouds.empty?
           print cyan,"No clouds found.",reset,"\n"
         else
-          print_clouds_table(clouds)
+          print_clouds_table(clouds, options)
           print_results_pagination(json_response)
         end
         print reset,"\n"
@@ -623,10 +623,9 @@ class Morpheus::Cli::Clouds
       end
       cloud_types = get_available_cloud_types() # @clouds_interface.dry.cloud_types({})['zoneTypes']
       if options[:json]
-        print JSON.pretty_generate({zoneTypes: cloud_types})
-        print "\n"
+        puts as_json({zoneTypes: cloud_types}, options)
       else
-        print_h1 "Morpheus Cloud Types"
+        print_h1 "Morpheus Cloud Types", options
         if cloud_types.empty?
           print yellow,"No instances found.",reset,"\n"
         else
@@ -635,9 +634,12 @@ class Morpheus::Cli::Clouds
           rows = cloud_types.collect do |cloud_type|
             {id: cloud_type['id'], name: cloud_type['name'], code: cloud_type['code']}
           end
-          tp rows, :id, :name, :code
+          #print "\n"
+          puts as_pretty_table(rows, [:id, :name, :code], options)
+          #print_results_pagination({size:rows.size,total:rows.size})
+          #print "\n"
         end
-        print reset,"\n"
+        #print reset,"\n"
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -664,10 +666,7 @@ class Morpheus::Cli::Clouds
     columns = [
       :id, :name, :type, :location, :groups, :servers, :status
     ]
-    print table_color
-    tp rows, columns
-    print reset
-
+    print as_pretty_table(rows, columns, opts)
   end
 
   def add_cloud_option_types(cloud_type)

data/lib/morpheus/cli/commands/standard/history_command.rb

@@ -11,13 +11,17 @@ class Morpheus::Cli::HistoryCommand
   # todo: support all the other :list options too, not just max
   # AND start logging every terminal command, not just shell...
   def handle(args)
-    options = {}
+    options = {show_pagination:false}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus #{command_name}"
-      opts.on( '-n', '--max-commands MAX', "Max Results. Default is 25" ) do |val|
+      # -n is a hidden alias for -m
+      opts.on( '-n', '--max-commands MAX', "Alias for -m, --max option." ) do |val|
         options[:max] = val
       end
       opts.add_hidden_option('-n')
+      opts.on( '-p', '--pagination', "Display pagination and count info eg. Viewing 1-M of N" ) do
+        options[:show_pagination] = true
+      end
       opts.on( nil, '--flush', "Flush history, purges entire shell history file." ) do |val|
         options[:do_flush] = true
       end
@@ -31,6 +35,7 @@ Examples:
     history -m 100
     history --flush
 
+The most recently executed commands are seen by default.  Use --reverse to see the oldest commands.
 EOT
     end
     raw_cmd = "#{command_name} #{args.join(' ')}"
@@ -47,7 +52,6 @@ EOT
       Morpheus::Cli::Shell.instance.flush_history
       return 0
     else
-      # supports all the :list options
       Morpheus::Cli::Shell.instance.print_history(options)
       return 0  
     end

data/lib/morpheus/cli/containers_command.rb

@@ -2,7 +2,6 @@ require 'io/console'
 require 'rest_client'
 require 'optparse'
 require 'filesize'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/mixins/provisioning_helper'
 require 'morpheus/cli/option_types'

data/lib/morpheus/cli/cypher_command.rb

@@ -1,6 +1,4 @@
 require 'json'
-require 'yaml'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::CypherCommand

data/lib/morpheus/cli/deployments.rb

@@ -1,7 +1,6 @@
 require 'io/console'
 require 'rest_client'
 require 'optparse'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::Deployments
@@ -50,10 +49,11 @@ class Morpheus::Cli::Deployments
           print yellow,"No deployments currently configured.",reset,"\n"
         else
           print cyan
-          deployments_table_data = deployments.collect do |deployment|
+          rows = deployments.collect do |deployment|
             {name: deployment['name'], id: deployment['id'], description: deployment['description'], updated: format_local_dt(deployment['lastUpdated'])}
           end
-          tp deployments_table_data, :id, :name, :description, :updated
+          columns = [:id, :name, :description, :updated]
+          print as_pretty_table(rows, columns, options)
         end
         print reset,"\n"
       end
@@ -98,10 +98,11 @@ class Morpheus::Cli::Deployments
           print yellow,"No deployment versions currently exist.",reset,"\n"
         else
           print cyan
-          versions_table_data = versions.collect do |version|
+          rows = versions.collect do |version|
             {version: version['userVersion'], type: version['deployType'], updated: format_local_dt(version['lastUpdated'])}
           end
-          tp versions_table_data, :version, :type, :updated
+          coumns = [:version, :type, :updated]
+          print as_pretty_table(rows, columns, options)
         end
         print reset,"\n"
       end

data/lib/morpheus/cli/deploys.rb

@@ -1,9 +1,7 @@
 # require 'yaml'
 require 'io/console'
 require 'rest_client'
-require 'optparse'
 require 'filesize'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::Deploys

data/lib/morpheus/cli/groups.rb

@@ -3,7 +3,6 @@ require 'yaml'
 require 'io/console'
 require 'rest_client'
 require 'optparse'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/mixins/infrastructure_helper'
 require 'morpheus/logging'
@@ -59,13 +58,13 @@ class Morpheus::Cli::Groups
       if groups.empty?
         print yellow,"No groups currently configured.",reset,"\n"
       else
-        print_groups_table(groups)
+        print_groups_table(groups, options)
         print_results_pagination(json_response)
         if @active_group_id
           active_group = groups.find { |it| it['id'] == @active_group_id }
           active_group = active_group || find_group_by_name_or_id(@active_group_id)
           #unless @appliances.keys.size == 1
-            print cyan, "\n# => Currently using group #{active_group['name']}\n", reset
+            print cyan, "\n# => Currently using group #{green}#{active_group['name']}#{reset}\n", reset
           #end
         else
           unless options[:remote]
@@ -487,23 +486,21 @@ class Morpheus::Cli::Groups
       {
         active: (is_active ? "=>" : ""),
         id: group['id'],
-        name: group['name'],
+        name: is_active ? "#{green}#{group['name']}#{reset}#{table_color}" : group['name'],
         location: group['location'],
         cloud_count: group['zones'] ? group['zones'].size : 0,
         server_count: group['serverCount']
       }
     end
     columns = [
-      {:active => {:display_name => ""}},
+      #{:active => {:display_name => ""}},
       {:id => {:width => 10}},
       {:name => {:width => 16}},
       {:location => {:width => 32}},
-      {:cloud_count => {:display_name => "Clouds"}},
-      {:server_count => {:display_name => "Hosts"}}
+      {:cloud_count => {:display_name => "CLOUDS"}},
+      {:server_count => {:display_name => "HOSTS"}}
     ]
-    print table_color
-    tp rows, columns
-    print reset
+    print as_pretty_table(rows, columns, opts)
   end
 
   def add_group_option_types()

data/lib/morpheus/cli/hosts.rb

@@ -193,6 +193,12 @@ class Morpheus::Cli::Hosts
             cpu_usage_str = !stats ? "" : generate_usage_bar((stats['usedCpu'] || stats['cpuUsage']).to_f, 100, {max_bars: 10})
             memory_usage_str = !stats ? "" : generate_usage_bar(stats['usedMemory'], stats['maxMemory'], {max_bars: 10})
             storage_usage_str = !stats ? "" : generate_usage_bar(stats['usedStorage'], stats['maxStorage'], {max_bars: 10})
+            # if stats['maxMemory'] && stats['maxMemory'].to_i != 0
+            #   memory_usage_str = memory_usage_str + cyan + format_bytes_short(stats['usedMemory']).strip.rjust(7, ' ')  + " / " + format_bytes_short(stats['maxMemory']).strip
+            # end
+            # if stats['maxStorage'] && stats['maxStorage'].to_i != 0
+            #   storage_usage_str = storage_usage_str + cyan + format_bytes_short(stats['usedStorage']).strip.rjust(7, ' ') + " / " + format_bytes_short(stats['maxStorage']).strip
+            # end
             row = {
               id: server['id'],
               tenant: server['account'] ? server['account']['name'] : server['accountId'],
@@ -213,10 +219,7 @@ class Morpheus::Cli::Hosts
           if multi_tenant
             columns.insert(4, :tenant)
           end
-          term_width = current_terminal_width()
-          if term_width > 170
-            columns += [:cpu, :memory, :storage]
-          end
+          columns += [:cpu, :memory, :storage]
           # custom pretty table columns ...
           if options[:include_fields]
             columns = options[:include_fields]

data/lib/morpheus/cli/image_builder_command.rb

@@ -3,7 +3,6 @@ require 'yaml'
 require 'rest_client'
 require 'optparse'
 require 'filesize'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/mixins/provisioning_helper'
 require 'morpheus/cli/boot_scripts_command'
@@ -116,10 +115,6 @@ class Morpheus::Cli::ImageBuilderCommand
           }
           columns = [:id, :name, :type, {:lastRunDate => {label: 'Last Run Date'.upcase}}, 
                       :status, {:result => {max_width: 60}}]
-          term_width = current_terminal_width()
-          # if term_width > 170
-          #   columns += [:cpu, :memory, :storage]
-          # end
           # custom pretty table columns ...
           if options[:include_fields]
             columns = options[:include_fields]
@@ -736,8 +731,7 @@ class Morpheus::Cli::ImageBuilderCommand
       rows = image_builds.collect do |it|
         {id: it['id'], name: it['name']}
       end
-      print red
-      tp rows, [:id, :name]
+      print as_pretty_table(rows, [:id, :name], {color:red})
       print reset,"\n"
       return nil
     else

data/lib/morpheus/cli/instances.rb

@@ -2,7 +2,6 @@ require 'io/console'
 require 'rest_client'
 require 'optparse'
 require 'filesize'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/mixins/accounts_helper'
 require 'morpheus/cli/mixins/provisioning_helper'
@@ -158,6 +157,12 @@ class Morpheus::Cli::Instances
             cpu_usage_str = !stats ? "" : generate_usage_bar((stats['usedCpu'] || stats['cpuUsage']).to_f, 100, {max_bars: 10})
             memory_usage_str = !stats ? "" : generate_usage_bar(stats['usedMemory'], stats['maxMemory'], {max_bars: 10})
             storage_usage_str = !stats ? "" : generate_usage_bar(stats['usedStorage'], stats['maxStorage'], {max_bars: 10})
+            # if stats['maxMemory'] && stats['maxMemory'].to_i != 0
+            #   memory_usage_str = memory_usage_str + cyan + format_bytes_short(stats['usedMemory']).strip.rjust(7, ' ')  + " / " + format_bytes_short(stats['maxMemory']).strip
+            # end
+            # if stats['maxStorage'] && stats['maxStorage'].to_i != 0
+            #   storage_usage_str = storage_usage_str + cyan + format_bytes_short(stats['usedStorage']).strip.rjust(7, ' ') + " / " + format_bytes_short(stats['maxStorage']).strip
+            # end
             row = {
               id: instance['id'],
               name: instance['name'],
@@ -170,16 +175,13 @@ class Morpheus::Cli::Instances
               cloud: !instance['cloud'].nil? ? instance['cloud']['name'] : nil,
               version: instance['instanceVersion'] ? instance['instanceVersion'] : '',
               cpu: cpu_usage_str + cyan,
-              memory: memory_usage_str + cyan,
+              memory: memory_usage_str + cyan, 
               storage: storage_usage_str + cyan
             }
             row
           }
-          columns = [:id, {:name => {:max_width => 50}}, :group, :cloud, :type, :version, :environment, :nodes, {:connection => {:max_width => 30}}, :status]
-          term_width = current_terminal_width()
-          if term_width > 190
-            columns += [:cpu, :memory, :storage]
-          end
+          columns = [:id, {:name => {:max_width => 50}}, :group, :cloud, :type, :version, :environment, 
+              :nodes, {:connection => {:max_width => 30}}, :status, :cpu, :memory, :storage]
           # custom pretty table columns ...
           if options[:include_fields]
             columns = options[:include_fields]
@@ -937,6 +939,12 @@ class Morpheus::Cli::Instances
             cpu_usage_str = !stats ? "" : generate_usage_bar((stats['usedCpu'] || stats['cpuUsage']).to_f, 100, {max_bars: 10})
             memory_usage_str = !stats ? "" : generate_usage_bar(stats['usedMemory'], stats['maxMemory'], {max_bars: 10})
             storage_usage_str = !stats ? "" : generate_usage_bar(stats['usedStorage'], stats['maxStorage'], {max_bars: 10})
+            if stats['maxMemory'] && stats['maxMemory'].to_i != 0
+              memory_usage_str = memory_usage_str + cyan + format_bytes_short(stats['usedMemory']).strip.rjust(7, ' ')  + " / " + format_bytes_short(stats['maxMemory']).strip
+            end
+            if stats['maxStorage'] && stats['maxStorage'].to_i != 0
+              storage_usage_str = storage_usage_str + cyan + format_bytes_short(stats['usedStorage']).strip.rjust(7, ' ') + " / " + format_bytes_short(stats['maxStorage']).strip
+            end
             row = {
               id: container['id'],
               status: format_container_status(container),
@@ -945,16 +953,12 @@ class Morpheus::Cli::Instances
               cloud: container['cloud'] ? container['cloud']['name'] : '',
               location: format_container_connection_string(container),
               cpu: cpu_usage_str + cyan,
-              memory: memory_usage_str + cyan,
+              memory: memory_usage_str + cyan, 
               storage: storage_usage_str + cyan
             }
             row
           }
-          columns = [:id, :status, :name, :type, :cloud, :location]
-          term_width = current_terminal_width()
-          if term_width > 190
-            columns += [:cpu, :memory, :storage]
-          end
+          columns = [:id, :status, :name, :type, :cloud, :location, :cpu, :memory, :storage]
           # custom pretty table columns ...
           if options[:include_fields]
             columns = options[:include_fields]
@@ -1054,6 +1058,12 @@ class Morpheus::Cli::Instances
           cpu_usage_str = !stats ? "" : generate_usage_bar((stats['usedCpu'] || stats['cpuUsage']).to_f, 100, {max_bars: 10})
           memory_usage_str = !stats ? "" : generate_usage_bar(stats['usedMemory'], stats['maxMemory'], {max_bars: 10})
           storage_usage_str = !stats ? "" : generate_usage_bar(stats['usedStorage'], stats['maxStorage'], {max_bars: 10})
+          if stats['maxMemory'] && stats['maxMemory'].to_i != 0
+            memory_usage_str = memory_usage_str + cyan + format_bytes_short(stats['usedMemory']).strip.rjust(7, ' ')  + " / " + format_bytes_short(stats['maxMemory']).strip
+          end
+          if stats['maxStorage'] && stats['maxStorage'].to_i != 0
+            storage_usage_str = storage_usage_str + cyan + format_bytes_short(stats['usedStorage']).strip.rjust(7, ' ') + " / " + format_bytes_short(stats['maxStorage']).strip
+          end
           row = {
             id: container['id'],
             status: format_container_status(container),
@@ -1067,11 +1077,7 @@ class Morpheus::Cli::Instances
           }
           row
         }
-        columns = [:id, :status, :name, :type, :cloud, :location]
-        term_width = current_terminal_width()
-        if term_width > 190
-          columns += [:cpu, :memory, :storage]
-        end
+        columns = [:id, :status, :name, :type, :cloud, :location, :cpu, :memory, :storage]
         # custom pretty table columns ...
         if options[:include_fields]
           columns = options[:include_fields]
@@ -1279,10 +1285,9 @@ class Morpheus::Cli::Instances
       if json_response['readOnlyEnvs']
         envs += json_response['readOnlyEnvs'].map { |k,v| {:name => k, :value => k.downcase.include?("password") || v['masked'] ? "********" : v['value'], :export => true}}
       end
-      tp envs, :name, :value, :export
+      columns = [:name, :value, :export]
       print_h2 "Imported Envs", options
-      imported_envs = json_response['importedEnvs'].map { |k,v| {:name => k, :value => k.downcase.include?("password") || v['masked'] ? "********" : v['value']}}
-      tp imported_envs
+      print as_pretty_table(envs, columns, options)
       print reset, "\n"
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -3224,25 +3229,6 @@ private
     end
   end
 
-  # def print_instances_table(instances, opts={})
-  #   table_color = opts[:color] || cyan
-  #   rows = instances.collect {|instance| 
-  #     {
-  #       id: instance['id'],
-  #       name: instance['name'],
-  #       connection: format_instance_connection_string(instance),
-  #       environment: instance['instanceContext'],
-  #       nodes: instance['containers'].count,
-  #       status: format_instance_status(instance, table_color),
-  #       type: instance['instanceType']['name'],
-  #       group: !instance['group'].nil? ? instance['group']['name'] : nil,
-  #       cloud: !instance['cloud'].nil? ? instance['cloud']['name'] : nil
-  #     }
-  #   }
-  #   print table_color
-  #   tp rows, :id, :name, :group, :cloud, :type, :environment, :nodes, :connection, :status
-  #   print reset
-  # end
 
   def format_instance_status(instance, return_color=cyan)
     out = ""