morpheus-cli 3.6.12 → 3.6.13

data/lib/morpheus/cli/key_pairs.rb

@@ -385,14 +385,14 @@ class Morpheus::Cli::KeyPairs
         dateCreated: format_local_dt(key_pair['dateCreated'])
       }
     end
-    print table_color
-    tp rows, [
+    columns = [
       :id,
       :name,
       {:fingerprint => {:width => 47} },
       # {:md5 => {:width => 32} },
       {:dateCreated => {:display_name => "Date Created"} }
     ]
+    print as_pretty_table(rows, columns, opts)
     print reset
   end
 

data/lib/morpheus/cli/library_option_lists_command.rb

@@ -55,7 +55,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
       option_type_lists = json_response['optionTypeLists']
       subtitles = []
       subtitles += parse_list_subtitles(options)
-      print_h1 "Morpheus Option Lists", subtitles
+      print_h1 "Morpheus Option Lists", subtitles, options
       if option_type_lists.empty?
         print cyan,"No option lists found.",reset,"\n"
       else
@@ -68,17 +68,16 @@ class Morpheus::Cli::LibraryOptionListsCommand
             size: option_type_list['listItems'] ? option_type_list['listItems'].size : ''
           }
         end
-        print cyan
-        tp rows, [
-          :id,
-          :name,
-          :description,
-          :type,
-          :size
-        ]
-        print reset
-        print_results_pagination(json_response)
       end
+      columns = [
+        :id,
+        :name,
+        :description,
+        :type,
+        :size
+      ]
+      print cyan
+      print as_pretty_table(rows, columns, options)
       print reset,"\n"
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -118,7 +117,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
         return
       end
 
-      print_h1 "Option List Details"
+      print_h1 "Option List Details", options
       print cyan
       if option_type_list['type'] == 'manual'
         print_description_list({
@@ -151,7 +150,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
         if source_headers && !source_headers.empty?
           print cyan
           print_h2 "Source Headers"
-          print as_pretty_table(source_headers, [:name, :value, :masked])
+          print as_pretty_table(source_headers, [:name, :value, :masked], options)
         end
         if !option_type_list['initialDataset'].empty?
           print_h2 "Initial Dataset"
@@ -164,12 +163,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
       end
       print_h2 "List Items"
       if option_type_list['listItems']
-        # puts "\tNAME\tVALUE"
-        # option_type_list['listItems'].each do |list_item|
-        #   puts "\t#{list_item['name']}\t#{list_item['value']}"
-        # end
-        print cyan
-        tp option_type_list['listItems'], ['name', 'value']
+        print as_pretty_table(option_type_list['listItems'], ['name', 'value'], options)
       else
         puts "No data"
       end

data/lib/morpheus/cli/library_option_types_command.rb

@@ -71,7 +71,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
           }
         end
         print cyan
-        tp rows, [
+        print as_pretty_table(rows, [
           :id,
           :name,
           :type,
@@ -79,7 +79,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
           {:fieldName => {:display_name => "Field Name"} },
           :default,
           :required
-        ]
+        ], options)
         print reset
         print_results_pagination(json_response)
       end

data/lib/morpheus/cli/license.rb

@@ -1,7 +1,6 @@
 require 'io/console'
 require 'rest_client'
 require 'optparse'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::License

data/lib/morpheus/cli/load_balancers.rb

@@ -2,7 +2,6 @@
 require 'io/console'
 require 'rest_client'
 require 'optparse'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::LoadBalancers
@@ -250,7 +249,7 @@ class Morpheus::Cli::LoadBalancers
           lb_table_data = lb_types.collect do |lb_type|
             {name: lb_type['name'], id: lb_type['id'], code: lb_type['code']}
           end
-          tp lb_table_data, :id, :name, :code
+          print as_pretty_table(lb_table_data, [:id, :name, :code], options)
         end
 
         print reset,"\n"

data/lib/morpheus/cli/mixins/accounts_helper.rb

@@ -1,4 +1,3 @@
-require 'table_print'
 require 'morpheus/cli/mixins/print_helper'
 
 # Mixin for Morpheus::Cli command classes
@@ -198,16 +197,16 @@ module Morpheus::Cli::AccountsHelper
         dateCreated: format_local_dt(account['dateCreated'])
       }
     end
-    print table_color
-    tp rows, [
+    print table_color if table_color
+    print as_pretty_table(rows, [
       :id,
       :name,
       :description,
       :role,
       {:dateCreated => {:display_name => "Date Created"} },
       :status
-    ]
-    print reset
+    ], options.merge({color:table_color}))
+    print reset if table_color
   end
 
   def format_role_type(role)
@@ -231,13 +230,6 @@ module Morpheus::Cli::AccountsHelper
 
   def print_roles_table(roles, options={})
     table_color = options.key?(:color) ? options[:color] : cyan
-    # tp roles, [
-    #   'id',
-    #   'name',
-    #   'description',
-    #   'scope',
-    #   {'dateCreated' => {:display_name => "Date Created", :display_method => lambda{|it| format_local_dt(it['dateCreated']) } } }
-    # ]
     rows = roles.collect do |role|
       {
         id: role['id'],

data/lib/morpheus/cli/mixins/print_helper.rb

@@ -349,7 +349,7 @@ module Morpheus::Cli::PrintHelper
       label = n_label || label
     end
     out_str = ""
-    string_key_values = {start_index: offset + 1, end_index: offset + size, total: total, size: size, offset: offset, label: label}
+    string_key_values = {start_index: format_number(offset + 1), end_index: format_number(offset + size), total: format_number(total), size: format_number(size), offset: format_number(offset), label: label}
     if size > 0
       if message
         out_str << message % string_key_values
@@ -623,6 +623,57 @@ module Morpheus::Cli::PrintHelper
       end
     end
 
+    # responsive tables
+    # pops columns off end until they all fit on the terminal
+    # could use some options[:preferred_columns] logic here to throw away in some specified order
+    # --all fields disables this
+    trimmed_columns = []
+    if options[:responsive_table] != false && options[:include_fields].nil? && options[:all_fields] != true
+
+      begin
+        term_width = current_terminal_width()
+        table_width = columns.inject(0) {|acc, column_def| acc + (column_def.width || 0) }
+        table_width += ((columns.size-0) * (3)) # col border width
+        if term_width && table_width
+          # leave 1 column always...
+          while table_width > term_width && columns.size > 1
+            column_index = columns.size - 1
+            removed_column = columns.pop
+            trimmed_columns << removed_column
+            if removed_column.width
+              table_width -= removed_column.width
+              table_width -= 3 # col border width
+            end
+            
+            # clear from data_matrix
+            # wel, nvm it just gets regenerated
+
+          end
+        end
+      rescue => ex
+        Morpheus::Logging::DarkPrinter.puts "Encountered error while applying responsive table sizing: (#{ex.class}) #{ex}"
+      end
+
+      if trimmed_columns.size > 0
+        # data_matrix = generate_table_data(data, columns, options)
+        header_row = []
+        columns.each do |column_def|
+          header_row << column_def.label
+        end
+        rows = []
+        data.each do |row_data|
+          row = []
+          columns.each do |column_def|
+            # r << column_def.display_method.respond_to?(:call) ? column_def.display_method.call(row_data) : get_object_value(row_data, column_def.display_method)
+            value = column_def.display_method.call(row_data)        
+            row << value
+          end
+          rows << row
+        end
+        data_matrix = [header_row] + rows
+      end
+    end
+
     # format header row
     header_cells = []
     columns.each_with_index do |column_def, column_index|
@@ -809,7 +860,7 @@ module Morpheus::Cli::PrintHelper
           if v[:min_width]
             column_def.min_width = v[:min_width]
           end
-          # tp uses width to behave like max_width
+          # tp uses width to behave like max_width, but tp() is gone, remove this?
           if v[:width]
             column_def.width = v[:width]
             column_def.max_width = v[:width]

data/lib/morpheus/cli/mixins/processes_helper.rb

@@ -1,4 +1,3 @@
-require 'table_print'
 require 'morpheus/cli/mixins/print_helper'
 
 # Mixin for Morpheus::Cli command classes

data/lib/morpheus/cli/mixins/whoami_helper.rb

@@ -1,4 +1,3 @@
-require 'table_print'
 require 'morpheus/cli/mixins/print_helper'
 
 # Mixin for Morpheus::Cli command classes

data/lib/morpheus/cli/monitoring_contacts_command.rb

@@ -4,7 +4,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'
 

data/lib/morpheus/cli/network_domains_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'
 
@@ -553,9 +552,7 @@ class Morpheus::Cli::NetworkDomainsCommand
       rows = network_domains.collect do |network_domain|
         {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 network_domains[0]

data/lib/morpheus/cli/network_groups_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'
 
@@ -580,12 +579,10 @@ class Morpheus::Cli::NetworkGroupsCommand
     elsif network_groups.size > 1
       print_red_alert "#{network_groups.size} network groups found by name #{name}"
       # print_networks_table(networks, {color: red})
-      rows = network_groups.collect do |network_group|
+      rows = network_groups.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 network_groups[0]

data/lib/morpheus/cli/network_pool_servers_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'
 
@@ -408,12 +407,10 @@ class Morpheus::Cli::NetworkPoolServersCommand
     elsif network_pool_servers.size > 1
       print_red_alert "#{network_pool_servers.size} network pool servers found by name #{name}"
       # print_networks_table(networks, {color: red})
-      rows = network_pool_servers.collect do |network_pool_server|
+      rows = network_pool_servers.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 network_pool_servers[0]

data/lib/morpheus/cli/network_pools_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'
 
@@ -473,12 +472,10 @@ class Morpheus::Cli::NetworkPoolsCommand
     elsif network_pools.size > 1
       print_red_alert "#{network_pools.size} network pools found by name #{name}"
       # print_networks_table(networks, {color: red})
-      rows = network_pools.collect do |network_pool|
+      rows = network_pools.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 network_pools[0]

data/lib/morpheus/cli/network_proxies_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'
 
@@ -570,12 +569,10 @@ class Morpheus::Cli::NetworkProxiesCommand
     elsif network_proxies.size > 1
       print_red_alert "#{network_proxies.size} network proxies found by name #{name}"
       # print_networks_table(networks, {color: red})
-      rows = network_proxies.collect do |network_proxy|
+      rows = network_proxies.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 network_proxies[0]

data/lib/morpheus/cli/network_services_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'
 
@@ -127,12 +126,10 @@ class Morpheus::Cli::NetworkServicesCommand
     elsif network_services.size > 1
       print_red_alert "#{network_services.size} network services found by name #{name}"
       # print_networks_table(networks, {color: red})
-      rows = network_services.collect do |network_service|
+      rows = network_services.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 network_services[0]

data/lib/morpheus/cli/networks_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'
 
@@ -834,12 +833,10 @@ class Morpheus::Cli::NetworksCommand
     elsif networks.size > 1
       print_red_alert "#{networks.size} networks found by name #{name}"
       # print_networks_table(networks, {color: red})
-      rows = networks.collect do |network|
+      rows = networks.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
       network = networks[0]

data/lib/morpheus/cli/old_cypher_command.rb

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

data/lib/morpheus/cli/policies_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/infrastructure_helper'
 require 'morpheus/cli/mixins/accounts_helper'
@@ -908,9 +907,7 @@ class Morpheus::Cli::PoliciesCommand
       rows = policies.collect do |policy|
         {id: policy['id'], name: policy['name']}
       end
-      print red
-      tp rows, [:id, :name]
-      print reset,"\n"
+      puts as_pretty_table(rows, [:id, :name], {color:red})
       return nil
     else
       policy = policies[0]