morpheus-cli 5.0.0 → 5.2.2

data/lib/morpheus/cli/whoami.rb

@@ -160,15 +160,15 @@ EOT
         print cyan
         print_description_list({
           "ID" => 'id',
-          "Tenant" => lambda {|it| (it['account'] ? it['account']['name'] : '') + (@is_master_account ? " (Master Tenant)" : '') },
-          "First Name" => 'firstName',
-          "Last Name" => 'lastName',
-          # "Name" => 'displayName',
-          #"Name" => lambda {|it| it['firstName'] ? it['displayName'] : '' },
           "Username" => 'username',
+          # "First Name" => 'firstName',
+          # "Last Name" => 'lastName',
+          # "Name" => 'displayName',
+          "Name" => lambda {|it| "#{it['firstName']} #{it['lastName']}".strip },
           "Email" => 'email',
+          "Tenant" => lambda {|it| (it['account'] ? it['account']['name'] : '') + (@is_master_account ? " (Master Tenant)" : '') },
           "Role" => lambda {|it| format_user_role_names(it) },
-          #"Remote" => lambda {|it| display_appliance(@appliance_name, @appliance_url) },
+          "Remote" => lambda {|it| display_appliance(@appliance_name, @appliance_url) },
         }, @current_user)
         print cyan
 

data/lib/morpheus/cli/workflows.rb

@@ -32,7 +32,7 @@ class Morpheus::Cli::Workflows
     params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
+      opts.banner = subcommand_usage("[search]")
       opts.on("-t", "--type TYPE", "Type of workflow. i.e. provision or operation. Default is provision.") do |val|
         workflow_type = val.to_s.downcase
         if workflow_type.include?('provision')
@@ -42,50 +42,43 @@ class Morpheus::Cli::Workflows
         end
         params['type'] = workflow_type
       end
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_list_options(opts, options)
+      opts.footer = "List workflows."
     end
     optparse.parse!(args)
     connect(options)
-    begin
-      params.merge!(parse_list_options(options))
-      @task_sets_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @task_sets_interface.dry.get(params)
-        return
-      end
-      json_response = @task_sets_interface.get(params)
-      task_sets = json_response['taskSets']
-      # print result and return output
-      if options[:json]
-        puts as_json(json_response, options, "taskSets")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(json_response['taskSets'], options)
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "taskSets")
-        return 0
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
+    params.merge!(parse_list_options(options))
+    @task_sets_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @task_sets_interface.dry.get(params)
+      return
+    end
+    json_response = @task_sets_interface.get(params)
+    task_sets = json_response['taskSets']
+    render_response(json_response, options, 'taskSets') do
+      title = "Morpheus Workflows"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      if params['type']
+        subtitles << "Type: #{params['type']}"
+      end
+      print_h1 title, subtitles
+      if task_sets.empty?
+        print cyan,"No workflows found.",reset,"\n"
       else
-        task_sets = json_response['taskSets']
-        title = "Morpheus Workflows"
-        subtitles = []
-        subtitles += parse_list_subtitles(options)
-        if params['type']
-          subtitles << "Type: #{params['type']}"
-        end
-        print_h1 title, subtitles
-        if task_sets.empty?
-          print cyan,"No workflows found.",reset,"\n"
-        else
-          print cyan
-          print_workflows_table(task_sets)
-          print_results_pagination(json_response)
-        end
-        print reset,"\n"
+        print cyan
+        print_workflows_table(task_sets)
+        print_results_pagination(json_response)
       end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+      print reset,"\n"
+    end
+    if task_sets.empty?
+      return 1, "no workflows found"
+    else
+      return 0, nil
     end
   end
 

data/lib/morpheus/formatters.rb

@@ -15,11 +15,7 @@ def parse_time(dt, format=nil)
   elsif dt.is_a?(String)
     result = nil
     err = nil
-    begin
-      result = Time.parse(dt)
-    rescue => e
-      err = e
-    end
+    
     if !result
       format ||= DEFAULT_TIME_FORMAT
       if format
@@ -29,12 +25,26 @@ def parse_time(dt, format=nil)
           err = e
         end
       end
-      if !result
-        begin
-          result = Time.strptime(dt, ALTERNATE_TIME_FORMAT)
-        rescue => e
-          err = e
-        end
+    end
+    if !result
+      begin
+        result = Time.strptime(dt, ALTERNATE_TIME_FORMAT)
+      rescue => e
+        # err = e
+      end
+    end
+    if !result
+      begin
+        result = Time.strptime(dt, DEFAULT_DATE_FORMAT)
+      rescue => e
+        # err = e
+      end
+    end
+    if !result
+      begin
+        result = Time.parse(dt)
+      rescue => e
+        err = e
       end
     end
     if result
@@ -352,7 +362,7 @@ def format_number(n, opts={})
   delim = opts[:delimiter] || ','
   out = ""
   parts = n.to_s.split(".")
-  whole_number = parts[0]
+  whole_number = parts[0].to_s
   decimal = parts[1] ? parts[1..-1].join('.') : nil
   i = 0
   whole_number.reverse.each_char do |c|
@@ -366,10 +376,16 @@ def format_number(n, opts={})
 end
 
 def format_sig_dig(n, sigdig=3, min_sigdig=nil, pad_zeros=false)
-  v = sprintf("%.#{sigdig}f", n)
-  if pad_zeros != true
-    v = v.to_f.to_s
+  v = ""
+  if sigdig && sigdig > 0
+    # v = n.to_i.round(sigdig).to_s
+    v = sprintf("%.#{sigdig}f", n)
+  else
+    v = n.to_i.round().to_s
   end
+  # if pad_zeros != true
+  #   v = v.to_f.to_s
+  # end
   if min_sigdig
     v_parts =  v.split(".")
     decimal_str = v_parts[1]
@@ -383,12 +399,18 @@ def format_sig_dig(n, sigdig=3, min_sigdig=nil, pad_zeros=false)
 end
 
 def currency_sym(currency)
-  Money::Currency.new((currency || 'usd').to_sym).symbol
+  Money::Currency.new((currency || 'USD').to_sym).symbol
 end
 
 # returns currency amount formatted like "$4,5123.00". 0.00 is formatted as "$0"
 # this is not ideal
-def format_currency(amount, currency='usd', opts={})
+def format_currency(amount, currency='USD', opts={})
+  # currency '' should probably error, like money gem does
+  if currency.to_s.empty?
+    currency = 'USD'
+  end
+  currency = currency.to_s.upcase
+
   amount = amount.to_f
   if amount == 0
     return currency_sym(currency).to_s + "0"
@@ -397,8 +419,9 @@ def format_currency(amount, currency='usd', opts={})
   #   return currency_sym(currency).to_s + "#{amount}"
   else
     sigdig = opts[:sigdig] ? opts[:sigdig].to_i : 2 # max decimal digits
-    min_sigdig = opts[:min_sigdig] ? opts[:min_sigdig].to_i : 2 # min decimal digits
+    min_sigdig = opts[:min_sigdig] ? opts[:min_sigdig].to_i : (sigdig || 2) # min decimal digits
     display_value = format_sig_dig(amount, sigdig, min_sigdig, opts[:pad_zeros])
+    display_value = format_number(display_value) # commas
     rtn = currency_sym(currency).to_s + display_value
     if amount.to_i < 0
       rtn = "(#{rtn})"
@@ -415,3 +438,37 @@ alias :format_money :format_currency
 # def format_money(amount, currency='usd', opts={})
 #   format_currency(amount, currency, opts)
 # end
+
+def format_list(items, conjunction="", limit=nil)
+  items = items ? items.clone : []
+  num_items = items.size
+  if limit
+    items = items.first(limit)
+  end
+  last_item = items.pop
+  if items.empty?
+    return "#{last_item}"
+  else
+    if limit && limit < num_items
+      items << last_item
+      last_item = "(#{num_items - items.size} more)"
+    end
+    return items.join(", ") + (conjunction.to_s.empty? ? ", " : " #{conjunction} ") + "#{last_item}"
+  end
+end
+
+def anded_list(items, limit=nil)
+  format_list(items, "and", limit)
+end
+
+def ored_list(items, limit=nil)
+  format_list(items, "or", limit)
+end
+
+def format_name_values(obj)
+  if obj.is_a?(Hash)
+    obj.collect {|k,v| "#{k}: #{v}"}.join(", ")
+  else
+    ""
+  end
+end

data/lib/morpheus/terminal.rb

@@ -277,8 +277,12 @@ module Morpheus
         end
       end
       out << "Commands:\n"
-      Morpheus::Cli::CliRegistry.all.keys.sort.each {|cmd|
-        out << "\t#{cmd.to_s}\n"
+      sorted_commands = Morpheus::Cli::CliRegistry.all.values.sort { |x,y| x.command_name.to_s <=> y.command_name.to_s }
+      sorted_commands.each {|cmd|
+        # JD: not ready to show description yet, gotta finish filling in every command first
+        # maybe change 'View and manage' to something more concise like 'Manage'
+        # out << "\t#{cmd.command_name.to_s.ljust(28, ' ')} #{cmd.command_description}\n"
+        out << "\t#{cmd.command_name.to_s}\n"
       }
       # out << "Options:\n"
       out << optparse.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.2.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -207,6 +207,7 @@ files:
 - lib/morpheus/api/execute_schedules_interface.rb
 - lib/morpheus/api/execution_request_interface.rb
 - lib/morpheus/api/file_copy_request_interface.rb
+- lib/morpheus/api/forgot_password_interface.rb
 - lib/morpheus/api/group_policies_interface.rb
 - lib/morpheus/api/groups_interface.rb
 - lib/morpheus/api/guidance_interface.rb
@@ -273,10 +274,12 @@ files:
 - lib/morpheus/api/reports_interface.rb
 - lib/morpheus/api/rest_interface.rb
 - lib/morpheus/api/roles_interface.rb
+- lib/morpheus/api/search_interface.rb
 - lib/morpheus/api/security_group_rules_interface.rb
 - lib/morpheus/api/security_groups_interface.rb
 - lib/morpheus/api/server_types_interface.rb
 - lib/morpheus/api/servers_interface.rb
+- lib/morpheus/api/service_catalog_interface.rb
 - lib/morpheus/api/service_plans_interface.rb
 - lib/morpheus/api/setup_interface.rb
 - lib/morpheus/api/storage_providers_interface.rb
@@ -284,6 +287,7 @@ files:
 - lib/morpheus/api/subnets_interface.rb
 - lib/morpheus/api/task_sets_interface.rb
 - lib/morpheus/api/tasks_interface.rb
+- lib/morpheus/api/usage_interface.rb
 - lib/morpheus/api/user_groups_interface.rb
 - lib/morpheus/api/user_settings_interface.rb
 - lib/morpheus/api/user_sources_interface.rb
@@ -307,7 +311,7 @@ files:
 - lib/morpheus/cli/blueprints_command.rb
 - lib/morpheus/cli/boot_scripts_command.rb
 - lib/morpheus/cli/budgets_command.rb
-- lib/morpheus/cli/catalog_command.rb
+- lib/morpheus/cli/catalog_item_types_command.rb
 - lib/morpheus/cli/change_password_command.rb
 - lib/morpheus/cli/cli_command.rb
 - lib/morpheus/cli/cli_registry.rb
@@ -354,6 +358,7 @@ files:
 - lib/morpheus/cli/execution_request_command.rb
 - lib/morpheus/cli/expression_parser.rb
 - lib/morpheus/cli/file_copy_request_command.rb
+- lib/morpheus/cli/forgot_password.rb
 - lib/morpheus/cli/groups.rb
 - lib/morpheus/cli/guidance_command.rb
 - lib/morpheus/cli/health_command.rb
@@ -384,7 +389,6 @@ files:
 - lib/morpheus/cli/logs_command.rb
 - lib/morpheus/cli/mixins/accounts_helper.rb
 - lib/morpheus/cli/mixins/backups_helper.rb
-- lib/morpheus/cli/mixins/catalog_helper.rb
 - lib/morpheus/cli/mixins/deployments_helper.rb
 - lib/morpheus/cli/mixins/infrastructure_helper.rb
 - lib/morpheus/cli/mixins/library_helper.rb
@@ -428,8 +432,10 @@ files:
 - lib/morpheus/cli/remote.rb
 - lib/morpheus/cli/reports_command.rb
 - lib/morpheus/cli/roles.rb
+- lib/morpheus/cli/search_command.rb
 - lib/morpheus/cli/security_group_rules.rb
 - lib/morpheus/cli/security_groups.rb
+- lib/morpheus/cli/service_catalog_command.rb
 - lib/morpheus/cli/service_plans_command.rb
 - lib/morpheus/cli/setup.rb
 - lib/morpheus/cli/shell.rb

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

@@ -1,66 +0,0 @@
-require 'morpheus/cli/mixins/print_helper'
-# Mixin for Morpheus::Cli command classes
-# Provides common methods for infrastructure management
-module Morpheus::Cli::CatalogHelper
-
-  def self.included(klass)
-    klass.send :include, Morpheus::Cli::PrintHelper
-  end
-
-  def catalog_item_types_interface
-    raise "#{self.class} has not defined @catalog_item_types_interface" if @catalog_item_types_interface.nil?
-    @catalog_item_types_interface
-  end
-
-  # def service_catalog_interface
-  #   raise "#{self.class} has not defined @service_catalog_interface" if @service_catalog_interface.nil?
-  #   @service_catalog_interface
-  # end
-
-  def catalog_item_type_object_key
-    'catalogItemType'
-  end
-
-  def catalog_item_type_list_key
-    'catalogItemTypes'
-  end
-
-  def find_catalog_item_type_by_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return find_catalog_item_type_by_id(val)
-    else
-      return find_catalog_item_type_by_name(val)
-    end
-  end
-
-  def find_catalog_item_type_by_id(id)
-    begin
-      json_response = catalog_item_types_interface.get(id.to_i)
-      return json_response[catalog_item_type_object_key]
-    rescue RestClient::Exception => e
-      if e.response && e.response.code == 404
-        print_red_alert "catalog_item_type not found by id '#{id}'"
-      else
-        raise e
-      end
-    end
-  end
-
-  def find_catalog_item_type_by_name(name)
-    json_response = catalog_item_types_interface.list({name: name.to_s})
-    catalog_item_types = json_response[catalog_item_type_list_key]
-    if catalog_item_types.empty?
-      print_red_alert "catalog_item_type not found by name '#{name}'"
-      return nil
-    elsif catalog_item_types.size > 1
-      print_red_alert "#{catalog_item_types.size} catalog_item_types found by name '#{name}'"
-      puts_error as_pretty_table(catalog_item_types, [:id, :name], {color:red})
-      print_red_alert "Try using ID instead"
-      print reset,"\n"
-      return nil
-    else
-      return catalog_item_types[0]
-    end
-  end
-
-end