morpheus-cli 5.0.0 → 5.2.2

data/lib/morpheus/cli/{catalog_command.rb → catalog_item_types_command.rb}

@@ -1,17 +1,16 @@
 require 'morpheus/cli/cli_command'
 
 # CLI command self service
-# UI is Tools: Self Service - Catalog Items
+# UI is Tools: Self Service - Catalog
 # API is /catalog-item-types and returns catalogItemTypes
-class Morpheus::Cli::CatalogCommand
+class Morpheus::Cli::CatalogItemTypesCommand
   include Morpheus::Cli::CliCommand
-  include Morpheus::Cli::CatalogHelper
   include Morpheus::Cli::LibraryHelper
   include Morpheus::Cli::OptionSourceHelper
 
-  # hide until 5.1 when update api is fixed and service-catalog endpoints are available
-  set_command_hidden  
-  set_command_name :'catalog'
+  # set_command_name :'catalog-types'
+  set_command_name :'self-service'
+  set_command_description "Self Service: View and manage catalog item types"
 
   register_subcommands :list, :get, :add, :update, :remove
   
@@ -38,7 +37,7 @@ class Morpheus::Cli::CatalogCommand
         params['featured'] = (val.to_s != 'false' && val.to_s != 'off')
       end
       build_standard_list_options(opts, options)
-      opts.footer = "List catalog items."
+      opts.footer = "List catalog item types."
     end
     optparse.parse!(args)
     connect(options)
@@ -55,11 +54,14 @@ class Morpheus::Cli::CatalogCommand
     json_response = @catalog_item_types_interface.list(params)
     catalog_item_types = json_response[catalog_item_type_list_key]
     render_response(json_response, options, catalog_item_type_list_key) do
-      print_h1 "Morpheus Catalog Items", parse_list_subtitles(options), options
+      print_h1 "Morpheus Catalog Item Types", parse_list_subtitles(options), options
       if catalog_item_types.empty?
-        print cyan,"No catalog items found.",reset,"\n"
+        print cyan,"No catalog item types found.",reset,"\n"
       else
         list_columns = catalog_item_type_column_definitions.upcase_keys!
+        list_columns.delete("Blueprint")
+        list_columns.delete("Workflow")
+        list_columns.delete("Context")
         #list_columns["Config"] = lambda {|it| truncate_string(it['config'], 100) }
         print as_pretty_table(catalog_item_types, list_columns.upcase_keys!, options)
         print_results_pagination(json_response)
@@ -67,7 +69,7 @@ class Morpheus::Cli::CatalogCommand
       print reset,"\n"
     end
     if catalog_item_types.empty?
-      return 1, "no catalog items found"
+      return 1, "no catalog item types found"
     else
       return 0, nil
     end
@@ -77,17 +79,20 @@ class Morpheus::Cli::CatalogCommand
     params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[catalog item type]")
+      opts.banner = subcommand_usage("[type]")
       opts.on( '-c', '--config', "Display raw config only. Default is YAML. Combine with -j for JSON instead." ) do
         options[:show_config] = true
       end
-      # opts.on('--no-config', "Do not display config content." ) do
+      # opts.on('--no-config', "Do not display Config YAML." ) do
       #   options[:no_config] = true
       # end
+      opts.on('--no-content', "Do not display Content." ) do
+        options[:no_content] = true
+      end
       build_standard_get_options(opts, options)
       opts.footer = <<-EOT
 Get details about a specific catalog item type.
-[catalog item type] is required. This is the name or id of a catalog item type.
+[type] is required. This is the name or id of a catalog item type.
 EOT
     end
     optparse.parse!(args)
@@ -131,6 +136,8 @@ EOT
       print cyan
       show_columns = catalog_item_type_column_definitions
       show_columns.delete("Blueprint") unless catalog_item_type['blueprint']
+      show_columns.delete("Workflow") unless catalog_item_type['workflow']
+      show_columns.delete("Context") unless catalog_item_type['context'] # workflow context
       print_description_list(show_columns, catalog_item_type)
 
       if catalog_item_type['optionTypes'] && catalog_item_type['optionTypes'].size > 0
@@ -149,25 +156,62 @@ EOT
         # print cyan,"No option types found for this catalog item.","\n",reset
       end
 
-      if config && options[:no_config] != true
-        print_h2 "Config YAML"
-        #print reset,(JSON.pretty_generate(config) rescue config),"\n",reset
-        #print reset,(as_yaml(config, options) rescue config),"\n",reset
-        config_string = as_yaml(config, options) rescue config
-        config_lines = config_string.split("\n")
-        config_line_count = config_lines.size
-        max_lines = 10
-        if config_lines.size > max_lines
-          config_string = config_lines.first(max_lines).join("\n")
-          config_string << "\n\n"
-          config_string << "(#{(config_line_count - max_lines)} more lines were not shown, use -c to show the config)"
-          #config_string << "\n"
-        end
-        # strip --- yaml header
-        if config_string[0..3] == "---\n"
-          config_string = config_string[4..-1]
+      item_type_code = catalog_item_type['type'].to_s.downcase
+      if options[:no_config] != true
+        if item_type_code == 'instance'
+          print_h2 "Config YAML"
+          if config
+            #print reset,(JSON.pretty_generate(config) rescue config),"\n",reset
+            #print reset,(as_yaml(config, options) rescue config),"\n",reset
+            config_string = as_yaml(config, options) rescue config
+            config_lines = config_string.split("\n")
+            config_line_count = config_lines.size
+            max_lines = 10
+            if config_lines.size > max_lines
+              config_string = config_lines.first(max_lines).join("\n")
+              config_string << "\n\n"
+              config_string << "#{dark}(#{(config_line_count - max_lines)} more lines were not shown, use -c to show the config)#{reset}"
+              #config_string << "\n"
+            end
+            # strip --- yaml header
+            if config_string[0..3] == "---\n"
+              config_string = config_string[4..-1]
+            end
+            print reset,config_string.chomp("\n"),"\n",reset
+          else
+            print reset,"(blank)","\n",reset
+          end
+        elsif item_type_code == 'blueprint' || item_type_code == 'apptemplate' || item_type_code == 'app'
+          print_h2 "App Spec"
+          if catalog_item_type['appSpec']
+            #print reset,(JSON.pretty_generate(config) rescue config),"\n",reset
+            #print reset,(as_yaml(config, options) rescue config),"\n",reset
+            config_string = catalog_item_type['appSpec'] || ""
+            config_lines = config_string.split("\n")
+            config_line_count = config_lines.size
+            max_lines = 10
+            if config_lines.size > max_lines
+              config_string = config_lines.first(max_lines).join("\n")
+              config_string << "\n\n"
+              config_string << "#{dark}(#{(config_line_count - max_lines)} more lines were not shown, use -c to show the config)#{reset}"
+              #config_string << "\n"
+            end
+            # strip --- yaml header
+            if config_string[0..3] == "---\n"
+              config_string = config_string[4..-1]
+            end
+            print reset,config_string.chomp("\n"),"\n",reset
+          else
+            print reset,"(blank)","\n",reset
+          end
+        elsif item_type_code == 'workflow' || item_type_code == 'operationalworkflow' || item_type_code == 'taskset'
         end
-        print reset,config_string.chomp("\n"),"\n",reset
+      end
+
+      # Content (Wiki Page)
+      if !catalog_item_type["content"].to_s.empty? && options[:no_content] != true
+        print_h2 "Content"
+        print reset,catalog_item_type["content"].chomp("\n"),"\n",reset
       end
 
       print reset,"\n"
@@ -180,6 +224,10 @@ EOT
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
+      # opts.on('-t', '--type [instance|blueprint|workflow]', "Item Type, default is instance.") do |val|
+      #   # params['type'] = val.to_s.downcase
+      #   options[:options]['type'] = val.to_s.downcase
+      # end
       build_option_type_options(opts, options, add_catalog_item_type_option_types)
       opts.on('--config-file FILE', String, "Config from a local JSON or YAML file") do |val|
         options[:config_file] = val.to_s
@@ -233,6 +281,8 @@ EOT
       payload.deep_merge!({catalog_item_type_object_key => parse_passed_options(options)})
     else
       payload.deep_merge!({catalog_item_type_object_key => parse_passed_options(options)})
+      # Type prompt first
+      #params['type'] = Morpheus::Cli::OptionTypes.no_prompt([{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Instance', 'value' => 'instance'}, {'name' => 'Blueprint', 'value' => 'blueprint'}, {'name' => 'Workflow', 'value' => 'workflow'}], 'defaultValue' => 'instance', 'required' => true}], options[:options], @api_client, options[:params])['type']
       v_prompt = Morpheus::Cli::OptionTypes.prompt(add_catalog_item_type_option_types(), options[:options], @api_client, options[:params])
       params.deep_merge!(v_prompt)
       advanced_config = Morpheus::Cli::OptionTypes.no_prompt(add_catalog_item_type_advanced_option_types, options[:options], @api_client, options[:params])
@@ -241,13 +291,15 @@ EOT
       # convert checkbox "on" and "off" to true and false
       params.booleanize!
       # convert type to refType until api accepts type
-      if params['type'] && !params['refType']
-        if params['type'].to_s.downcase == 'blueprint'
-          params['refType'] = 'AppTemplate'
-        else
-          params['refType'] = 'InstanceType'
-        end
-      end
+      # if params['type'] && !params['refType']
+      #   if params['type'].to_s.downcase == 'instance'
+      #     params['refType'] = 'InstanceType'
+      #   elsif params['type'].to_s.downcase == 'blueprint'
+      #     params['refType'] = 'AppTemplate'
+      #   elsif params['type'].to_s.downcase == 'workflow'
+      #     params['refType'] = 'OperationalWorkflow'
+      #   end
+      # end
       # convert config string to a map
       config = params['config']
       if config && config.is_a?(String)
@@ -261,14 +313,14 @@ EOT
           params['config'] = config_map
         end
       end
-      if params['optionTypes']
-        # todo: move to optionSource, so it will be /api/options/optionTypes  lol
-        prompt_results = prompt_for_option_types(params, options, @api_client)
-        if prompt_results[:success]
-          params['optionTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
-        else
-          return 1
-        end
+      # massage association params a bit
+      params['workflow'] = {'id' => params['workflow']}  if params['workflow'] && !params['workflow'].is_a?(Hash)
+      params['blueprint'] = {'id' => params['blueprint']}  if params['blueprint'] && !params['blueprint'].is_a?(Hash)
+      prompt_results = prompt_for_option_types(params, options, @api_client)
+      if prompt_results[:success]
+        params['optionTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
+      else
+        return 1, "failed to parse optionTypes"
       end
       payload[catalog_item_type_object_key].deep_merge!(params)
     end
@@ -280,7 +332,7 @@ EOT
     json_response = @catalog_item_types_interface.create(payload)
     catalog_item_type = json_response[catalog_item_type_object_key]
     render_response(json_response, options, catalog_item_type_object_key) do
-      print_green_success "Added catalog item #{catalog_item_type['name']}"
+      print_green_success "Added catalog item type #{catalog_item_type['name']}"
       return _get(catalog_item_type["id"], {}, options)
     end
     return 0, nil
@@ -291,7 +343,7 @@ EOT
     params = {}
     payload = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[catalog item type] [options]")
+      opts.banner = subcommand_usage("[type] [options]")
       build_option_type_options(opts, options, update_catalog_item_type_option_types)
       opts.on('--config-file FILE', String, "Config from a local JSON or YAML file") do |val|
         options[:config_file] = val.to_s
@@ -333,7 +385,7 @@ EOT
       build_standard_update_options(opts, options)
       opts.footer = <<-EOT
 Update a catalog item type.
-[catalog item type] is required. This is the name or id of a catalog item type.
+[type] is required. This is the name or id of a catalog item type.
 EOT
     end
     optparse.parse!(args)
@@ -356,14 +408,7 @@ EOT
       params.deep_merge!(advanced_config)
       # convert checkbox "on" and "off" to true and false
       params.booleanize!
-      # convert type to refType until api accepts type
-      if params['type'] && !params['refType']
-        if params['type'].to_s.downcase == 'blueprint'
-          params['refType'] = 'AppTemplate'
-        else
-          params['refType'] = 'InstanceType'
-        end
-      end
+      
       # convert config string to a map
       config = params['config']
       if config && config.is_a?(String)
@@ -377,6 +422,18 @@ EOT
           params['config'] = config_map
         end
       end
+      if params['optionTypes']
+        # todo: move to optionSource, so it will be /api/options/optionTypes  lol
+        prompt_results = prompt_for_option_types(params, options, @api_client)
+        if prompt_results[:success]
+          params['optionTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
+        else
+          return 1, "failed to parse optionTypes"
+        end
+      end
+      # massage association params a bit
+      params['workflow'] = {'id' => params['workflow']}  if params['workflow'] && !params['workflow'].is_a?(Hash)
+      params['blueprint'] = {'id' => params['blueprint']}  if params['blueprint'] && !params['blueprint'].is_a?(Hash)
       payload.deep_merge!({catalog_item_type_object_key => params})
       if payload[catalog_item_type_object_key].empty? # || options[:no_prompt]
         raise_command_error "Specify at least one option to update.\n#{optparse}"
@@ -390,7 +447,7 @@ EOT
     json_response = @catalog_item_types_interface.update(catalog_item_type['id'], payload)
     catalog_item_type = json_response[catalog_item_type_object_key]
     render_response(json_response, options, catalog_item_type_object_key) do
-      print_green_success "Updated catalog item #{catalog_item_type['name']}"
+      print_green_success "Updated catalog item type #{catalog_item_type['name']}"
       return _get(catalog_item_type["id"], {}, options)
     end
     return 0, nil
@@ -400,11 +457,11 @@ EOT
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[catalog item type] [options]")
+      opts.banner = subcommand_usage("[type] [options]")
       build_standard_remove_options(opts, options)
       opts.footer = <<-EOT
-Delete a catalog_item_type.
-[catalog item type] is required. This is the name or id of a catalog item type.
+Delete a catalog item type.
+[type] is required. This is the name or id of a catalog item type.
 EOT
     end
     optparse.parse!(args)
@@ -417,12 +474,12 @@ EOT
       print_dry_run @catalog_item_types_interface.dry.destroy(catalog_item_type['id'], params)
       return
     end
-    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the catalog item #{catalog_item_type['name']}?")
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the catalog item type #{catalog_item_type['name']}?")
       return 9, "aborted command"
     end
     json_response = @catalog_item_types_interface.destroy(catalog_item_type['id'], params)
     render_response(json_response, options) do
-      print_green_success "Removed catalog item #{catalog_item_type['name']}"
+      print_green_success "Removed catalog item type #{catalog_item_type['name']}"
     end
     return 0, nil
   end
@@ -436,6 +493,9 @@ EOT
       "Description" => 'description',
       "Type" => lambda {|it| format_catalog_type(it) },
       "Blueprint" => lambda {|it| it['blueprint'] ? it['blueprint']['name'] : nil },
+      "Workflow" => lambda {|it| it['workflow'] ? it['workflow']['name'] : nil },
+      "Context" => lambda {|it| it['context'] },
+      # "Content" => lambda {|it| it['content'] },
       "Enabled" => lambda {|it| format_boolean(it['enabled']) },
       "Featured" => lambda {|it| format_boolean(it['featured']) },
       #"Config" => lambda {|it| it['config'] },
@@ -455,6 +515,7 @@ EOT
         out << (catalog_item_type['type']['name'] || catalog_item_type['type']['code']) rescue catalog_item_type['type'].to_s
       end
     else
+      # refType is not returned
       ref_type = catalog_item_type['refType']
       if ref_type == 'InstanceType'
         out << "Instance"
@@ -469,18 +530,24 @@ EOT
     out
   end
 
-  # this is not so simple, need to first choose select instance, host or provider
   def add_catalog_item_type_option_types
     [
+      {'code' => 'catalogItemType.type', 'shorthand' => '-t', 'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Instance', 'value' => 'instance'}, {'name' => 'Blueprint', 'value' => 'blueprint'}, {'name' => 'Workflow', 'value' => 'workflow'}], 'defaultValue' => 'instance', 'required' => true},
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text'},
-      {'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Instance', 'value' => 'instance'}, {'name' => 'Blueprint', 'value' => 'blueprint'}], 'defaultValue' => 'instance'},
       {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'defaultValue' => true},
       {'fieldName' => 'featured', 'fieldLabel' => 'Featured', 'type' => 'checkbox', 'defaultValue' => false},
       {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'required' => true},
       {'fieldName' => 'iconPath', 'fieldLabel' => 'Logo', 'type' => 'select', 'optionSource' => 'iconList'},
       #{'fieldName' => 'optionTypes', 'fieldLabel' => 'Option Types', 'type' => 'text', 'description' => 'Option Types to include, comma separated list of names or IDs.'},
-      {'fieldName' => 'config', 'fieldLabel' => 'Config', 'type' => 'code-editor', 'required' => true, 'description' => 'JSON or YAML'}
+      {'dependsOnCode' => 'catalogItemType.type:instance', 'fieldName' => 'config', 'fieldLabel' => 'Config', 'type' => 'code-editor', 'description' => 'JSON or YAML', 'required' => true},
+      {'dependsOnCode' => 'catalogItemType.type:blueprint', 'fieldName' => 'blueprint', 'fieldLabel' => 'Blueprint', 'type' => 'select', 'optionSource' => 'blueprints', 'description' => 'Choose a blueprint to apply to the catalog item.', 'required' => true, 'noParams' => true},
+      {'dependsOnCode' => 'catalogItemType.type:blueprint', 'fieldName' => 'appSpec', 'fieldLabel' => 'App Spec', 'type' => 'code-editor', 'description' => 'Enter a spec in the for the App, the Scribe YAML format', 'required' => true},
+      {'dependsOnCode' => 'catalogItemType.type:workflow', 'fieldName' => 'workflow', 'fieldLabel' => 'Workflow', 'type' => 'select', 'optionSource' => 'operationWorkflows', 'description' => 'Enter a spec in the for the App, the Scribe YAML format', 'noParams' => true},
+      {'dependsOnCode' => 'catalogItemType.type:workflow', 'fieldName' => 'context', 'fieldLabel' => 'Context Type', 'type' => 'select', 'optionSource' => lambda { |api_client, api_params| 
+        [{'name' => "Select", 'value' => ""}, {'name' => "None", 'value' => "appliance"}, {'name' => "Instance", 'value' => "instance"}, {'name' => "Server", 'value' => "server"}]
+        }, 'description' => 'Context for operational workflow, determines target type', 'defaultValue' => 'Select', 'required' => false},
+      {'fieldName' => 'content', 'fieldLabel' => 'Content', 'type' => 'code-editor', 'description' => 'Wiki Page Content describing the catalog item'}
     ]
   end
 
@@ -489,11 +556,13 @@ EOT
   end
 
   def update_catalog_item_type_option_types
-    add_catalog_item_type_option_types.collect {|it|
+    list = add_catalog_item_type_option_types.collect {|it|
       it.delete('required')
       it.delete('defaultValue')
       it
     }
+    list = list.reject {|it| ["type"].include? it['fieldName'] }
+    list
   end
 
   def update_catalog_item_type_advanced_option_types
@@ -504,4 +573,50 @@ EOT
     }
   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

data/lib/morpheus/cli/cli_command.rb

@@ -203,7 +203,13 @@ module Morpheus
           #   value_label = 'SELECT'
           # elsif option['type'] == 'select'
           end
-          opts.on("--#{full_field_name} #{value_label}", String, description) do |val|
+          full_option = "--#{full_field_name} #{value_label}"
+          shorthand_option = option_type['shorthand']
+          arg1, arg2 = full_option, String
+          if option_type['shorthand']
+            arg1, arg2 = full_option, option_type['shorthand']
+          end
+          opts.on(arg1, arg2, description) do |val|
             if option_type['type'] == 'checkbox'
               val = (val.to_s != 'false' && val.to_s != 'off')
             else
@@ -269,6 +275,11 @@ module Morpheus
         build_standard_delete_options(opts, options, includes, excludes)
       end
       
+      # number of decimal places to show with curreny
+      def default_sigdig
+        2
+      end
+
       # appends to the passed OptionParser all the generic options
       # @param opts [OptionParser] the option parser object being constructed
       # @param options [Hash] the output Hash that is to being modified
@@ -309,6 +320,20 @@ module Morpheus
             opts.add_hidden_option('-a, --account') if opts.is_a?(Morpheus::Cli::OptionParser)
             opts.add_hidden_option('-A, --account-id') if opts.is_a?(Morpheus::Cli::OptionParser)
 
+          when :details
+            opts.on('-a', '--all', "Show all details." ) do
+              options[:details] = true
+            end
+            opts.on('--details', '--details', "Show more details" ) do
+              options[:details] = true
+            end
+            opts.add_hidden_option('--details')
+
+          when :sigdig
+            opts.on('--sigdig DIGITS', "Significant digits to display for prices (currency). Default is #{default_sigdig}.") do |val|
+              options[:sigdig] = val.to_i
+            end
+
           when :options
             options[:options] ||= {}
             opts.on( '-O', '--option OPTION', "Option in the format -O field=\"value\"" ) do |option|
@@ -602,13 +627,13 @@ module Morpheus
             end
             # opts.add_hidden_option('-H') if opts.is_a?(Morpheus::Cli::OptionParser)
             # opts.add_hidden_option('--header') if opts.is_a?(Morpheus::Cli::OptionParser)
-            opts.add_hidden_option('--headers') if opts.is_a?(Morpheus::Cli::OptionParser)
+            opts.add_hidden_option('-H, --header') if opts.is_a?(Morpheus::Cli::OptionParser)
 
           #when :timeout
             opts.on( '--timeout SECONDS', "Timeout for api requests. Default is typically 30 seconds." ) do |val|
               options[:timeout] = val ? val.to_f : nil
             end
-            # opts.add_hidden_option('--timeout') if opts.is_a?(Morpheus::Cli::OptionParser)
+            opts.add_hidden_option('--timeout') if opts.is_a?(Morpheus::Cli::OptionParser)
 
           when :auto_confirm
             opts.on( '-y', '--yes', "Auto Confirm" ) do
@@ -715,7 +740,7 @@ module Morpheus
           
 
           when :dry_run
-            opts.on('-d','--dry-run', "Dry Run, print the API request instead of executing it") do
+            opts.on('-d','--dry-run', "Dry Run, print the API request instead of executing it.") do
               # todo: this should print after parsing obv..
               # need a hook after parse! or a standard_handle(options) { ... } paradigm
               # either that or hook it up in every command somehow, maybe a hook on connect()
@@ -727,7 +752,7 @@ module Morpheus
               end
               options[:dry_run] = true
             end
-            opts.on(nil,'--curl', "Dry Run to output API request as a curl command.") do
+            opts.on(nil,'--curl', "Curl, print the API request as a curl command instead of executing it.") do
               # print once and dont munge json
               if !options[:dry_run] && !options[:json]
                 puts "#{cyan}#{bold}#{dark}DRY RUN#{reset}"
@@ -830,10 +855,18 @@ module Morpheus
         opts
       end
 
+      def prog_name
+        self.class.prog_name
+      end
+
       def command_name
         self.class.command_name
       end
 
+      def command_description
+        self.class.command_description
+      end
+
       def subcommands
         self.class.subcommands
       end
@@ -870,14 +903,14 @@ module Morpheus
 
       def usage
         if !subcommands.empty?
-          "Usage: morpheus #{command_name} [command] [options]"
+          "Usage: #{prog_name} #{command_name} [command] [options]"
         else
-          "Usage: morpheus #{command_name} [options]"
+          "Usage: #{prog_name} #{command_name} [options]"
         end
       end
 
       def my_help_command
-        "morpheus #{command_name} --help"
+        "#{prog_name} #{command_name} --help"
       end
 
       def subcommand_usage(*extra)
@@ -888,7 +921,7 @@ module Morpheus
           extra.shift
         end
         #extra = ["[options]"] if extra.empty?
-        "Usage: morpheus #{command_name} #{subcommand_name} #{extra.join(' ')}".squeeze(' ').strip
+        "Usage: #{prog_name} #{command_name} #{subcommand_name} #{extra.join(' ')}".squeeze(' ').strip
       end
 
       # a string to describe the usage of your command
@@ -908,6 +941,10 @@ module Morpheus
             out << "\n"
           }
         end
+        if command_description
+          out << "\n"
+          out << "#{command_description}\n"
+        end
         # out << "\n"
         out
       end
@@ -939,7 +976,7 @@ module Morpheus
         end
         cmd_method = subcommands[subcommand_name]
         if !cmd_method
-          error_msg = "'#{command_name} #{subcommand_name}' is not a morpheus command.\n#{full_command_usage}"
+          error_msg = "'#{command_name} #{subcommand_name}' is not a #{prog_name} command.\n#{full_command_usage}"
           raise CommandNotFoundError.new(error_msg)
         end
         self.send(cmd_method, args[1..-1])
@@ -1295,6 +1332,10 @@ module Morpheus
 
       module ClassMethods
 
+        def prog_name
+          "morpheus"
+        end
+
         def set_command_name(cmd_name)
           @command_name = cmd_name
           Morpheus::Cli::CliRegistry.add(self, self.command_name)