morpheus-cli 6.3.3 → 7.0.0

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

@@ -119,10 +119,10 @@ module Morpheus::Cli::BackupsHelper
       "Backup" => lambda {|it| it['backup']['name'] rescue '' },
       "Status" => lambda {|it| format_backup_result_status(it) },
       #"Duration" => lambda {|it| format_duration(it['startDate'], it['endDate']) },
-      "Duration" => lambda {|it| format_duration_milliseconds(it['durationMillis']) },
+      "Duration" => lambda {|it| format_duration_milliseconds(it['durationMillis']) if it['durationMillis'].to_i > 0 },
       "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
       "End Date" => lambda {|it| format_local_dt(it['endDate']) },
-      "Size" => lambda {|it| format_bytes(it['sizeInMb'], 'MB') },
+      "Size" => lambda {|it| it['sizeInMb'].to_i != 0 ? format_bytes(it['sizeInMb'], 'MB') : '' },
     }
   end
 
@@ -155,7 +155,7 @@ module Morpheus::Cli::BackupsHelper
       "Target" => lambda {|it| it['instance']['name'] rescue '' },
       "Status" => lambda {|it| format_backup_result_status(it) },
       #"Duration" => lambda {|it| format_duration(it['startDate'], it['endDate']) },
-      "Duration" => lambda {|it| format_duration_milliseconds(it['durationMillis']) },
+      "Duration" => lambda {|it| format_duration_milliseconds(it['durationMillis']) if it['durationMillis'].to_i > 0 },
       "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
       "End Date" => lambda {|it| format_local_dt(it['endDate']) },
     }
@@ -168,4 +168,5 @@ module Morpheus::Cli::BackupsHelper
   def format_backup_restore_status(backup_restore, return_color=cyan)
     format_backup_result_status(backup_restore, return_color)
   end
+  
 end

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

@@ -84,6 +84,7 @@ module Morpheus::Cli::JobsHelper
       end
       if process_data[:error] && process_data[:error].strip.length > 0
         print_h2 "Error"
+        print red
         print (process['message'] || process['error']).to_s.strip
         print reset,"\n"
       end
@@ -129,6 +130,8 @@ module Morpheus::Cli::JobsHelper
         out << "#{green}#{status_string.upcase}"
       elsif ['error', 'offline', 'failed', 'failure'].include?(status_string)
         out << "#{red}#{status_string.upcase}"
+      elsif ['running'].include?(status_string)
+        out << "#{cyan}#{status_string.upcase}"
       else
         out << "#{yellow}#{status_string.upcase}"
       end

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

@@ -514,7 +514,8 @@ module Morpheus::Cli::PrintHelper
     else
       percent = ((used_value.to_f / max_value.to_f) * 100)
     end
-    percent_label = ((used_value.nil? || max_value.to_f == 0.0) ? "n/a" : "#{percent.round(percent_sigdig)}%").rjust(6, ' ')
+    unlimited_label = opts[:unlimited_label] || "n/a" 
+    percent_label = ((used_value.nil? || max_value.to_f == 0.0) ? unlimited_label : "#{percent.round(percent_sigdig)}%").rjust(6, ' ')
     bar_display = ""
     if percent > 100
       max_bars.times { bars << "|" }
@@ -1000,6 +1001,83 @@ module Morpheus::Cli::PrintHelper
     print as_description_list(obj, columns, opts)
   end
 
+  def print_pretty_details(obj, opts={})
+    print as_pretty_details(obj, opts)
+  end
+
+  def as_pretty_details(obj, opts={})
+    print as_pretty_details(obj, opts.merge({pretty: true}))
+  end
+
+  def print_details(obj, opts={})
+    print as_details(obj, opts)
+  end
+
+  def as_details(obj, opts={})
+    #return "" if obj.nil?
+    columns = {}
+    keys = obj.keys
+    if opts[:sort]
+      keys.sort!
+    end
+    keys.each do |key|
+      display_proc = nil
+      if opts[:column_format] && opts[:column_format].key?(key.to_sym)
+        display_proc = opts[:column_format][key.to_sym]
+      else
+        display_proc = lambda {|it| format_detail_value(it[key]) }
+      end
+      label = opts[:pretty] ? key.to_s.titleize : key.to_s
+      columns[label] = display_proc
+    end
+    as_description_list(obj, columns, opts)
+  end
+
+  def format_detail_value(value)
+    rtn = value
+    if value.is_a?(Array)
+      # show the first three objects
+      rtn = value.first(3).collect { |row| format_abbreviated_value(row) }.join(", ")
+    elsif value.is_a?(Hash)
+      # show the first three properties
+      keys = values.keys.select { |key| value[key].is_a?(Numeric) || value[key].is_a?(String) }.first(3)
+      rtn = keys.collect { |key|
+        "#{key.to_s.titleize}: #{format_abbreviated_value(value[key])}"
+      }.join(", ")
+    elsif value.is_a?(TrueClass) || value.is_a?(FalseClass)
+      rtn = format_boolean(value)
+    else
+      rtn = value.to_s
+    end
+    return rtn
+  end
+
+  def format_abbreviated_value(value)
+    if value.is_a?(Hash)
+      if value.keys.size == 0
+        "{}"
+      else
+        # show the first three properties
+        keys = value.keys.select { |key| value[key].is_a?(Numeric) || value[key].is_a?(String) }.first(3)
+        keys.collect { |key|
+          "#{key.to_s.titleize}: #{value[key]}"
+        }.join(", ")
+      end
+    elsif value.is_a?(Array)
+      if value.size == 0
+        return "[]"
+      elsif obj.size == 1
+        "[(#{obj.size})]"
+      else
+        "[(#{obj.size})]"
+      end
+    elsif value.is_a?(TrueClass) || value.is_a?(FalseClass)
+      format_boolean(value)
+    else
+      value.to_s
+    end
+  end
+
   # build_column_definitions constructs an Array of column definitions (OpenStruct)
   # Each column is defined by a label (String), and a display_method (Proc)
   #
@@ -1059,7 +1137,7 @@ module Morpheus::Cli::PrintHelper
           column_def.display_method = lambda {|data| get_object_value(data, v) }
         elsif v.is_a?(Proc)
           column_def.display_method = v
-        elsif v.is_a?(Hash) || v.is_a?(OStruct)
+        elsif v.is_a?(Hash) || v.is_a?(OpenStruct)
           if v[:display_name] || v[:label]
             column_def.label = v[:display_name] || v[:label]
           end

data/lib/morpheus/cli/option_types.rb

@@ -1113,8 +1113,15 @@ module Morpheus
         value_found = false
         value = nil
         while !value_found do
-          print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{!option_type['defaultValue'].to_s.empty? ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
-          input = $stdin.gets.chomp!
+          # print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{!option_type['defaultValue'].to_s.empty? ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
+          # input = $stdin.gets.chomp!
+          Readline.completion_append_character = ""
+          Readline.basic_word_break_characters = ''
+          Readline.completion_proc = nil
+          prompt_label = "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{!option_type['defaultValue'].to_s.empty? ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
+          input = Readline.readline(prompt_label, false).to_s
+          input = input.chomp #.strip
+
           value = input.empty? ? option_type['defaultValue'] : input
           if input == '?'
             help_prompt(option_type)

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "6.3.3"
+    VERSION = "7.0.0"
   end
 end

data/lib/morpheus/routes.rb

@@ -223,9 +223,10 @@ module Morpheus::Routes
         path = "/admin/settings/environments"
       when "software-licenses"
         path = "/admin/settings/software-licenses"
-      when "license"
+      when "license","licenses"
         path = "/admin/settings/#!license"
       end
+      # todo: this is weird, fix it so "view license matches license before software-licenses without needing the above alias..
       # dasherize path and attempt to match the plural first
       plural_path = path.pluralize
       paths = [path.dasherize]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 6.3.3
+  version: 7.0.0
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -204,6 +204,7 @@ files:
 - lib/morpheus/api/backup_service_types_interface.rb
 - lib/morpheus/api/backup_services_interface.rb
 - lib/morpheus/api/backup_settings_interface.rb
+- lib/morpheus/api/backup_types_interface.rb
 - lib/morpheus/api/backups_interface.rb
 - lib/morpheus/api/billing_interface.rb
 - lib/morpheus/api/blueprints_interface.rb
@@ -238,6 +239,7 @@ files:
 - lib/morpheus/api/guidance_interface.rb
 - lib/morpheus/api/guidance_settings_interface.rb
 - lib/morpheus/api/health_interface.rb
+- lib/morpheus/api/hub_interface.rb
 - lib/morpheus/api/image_builder_boot_scripts_interface.rb
 - lib/morpheus/api/image_builder_image_builds_interface.rb
 - lib/morpheus/api/image_builder_interface.rb
@@ -381,6 +383,7 @@ files:
 - lib/morpheus/cli/commands/backup_results_command.rb
 - lib/morpheus/cli/commands/backup_services_command.rb
 - lib/morpheus/cli/commands/backup_settings_command.rb
+- lib/morpheus/cli/commands/backup_types_command.rb
 - lib/morpheus/cli/commands/backups_command.rb
 - lib/morpheus/cli/commands/benchmark_command.rb
 - lib/morpheus/cli/commands/blueprints_command.rb
@@ -424,6 +427,7 @@ files:
 - lib/morpheus/cli/commands/health_command.rb
 - lib/morpheus/cli/commands/history_command.rb
 - lib/morpheus/cli/commands/hosts.rb
+- lib/morpheus/cli/commands/hub.rb
 - lib/morpheus/cli/commands/image_builder_command.rb
 - lib/morpheus/cli/commands/instance_types.rb
 - lib/morpheus/cli/commands/instances.rb