morpheus-cli 5.3.3 → 5.4.2

data/lib/morpheus/cli/option_types.rb

@@ -33,14 +33,21 @@ module Morpheus
         end
       end
 
+      # supresses prompting unless --prompt has been passed
       def self.no_prompt(option_types, options={}, api_client=nil,api_params={})
-        prompt(option_types, options, api_client, api_params, true)
+        if options[:always_prompt]
+          prompt(option_types, options, api_client, api_params)
+        else
+          prompt(option_types, options, api_client, api_params, true)
+        end
       end
 
       def self.prompt(option_types, options={}, api_client=nil, api_params={}, no_prompt=false, paging_enabled=false)
         paging_enabled = false if Morpheus::Cli.windows?
+        no_prompt = no_prompt || options[:no_prompt]
         results = {}
         options = options || {}
+
         # inject cli only stuff into option_types (should clone() here)
         option_types.each do |option_type|
           if options[:help_field_prefix]
@@ -54,11 +61,7 @@ module Morpheus
         # puts "Options Prompt #{options}"
         # Sort options by default, group, advanced
         cur_field_group = 'default'
-        (
-          option_types.reject {|it| (it['fieldGroup'] || 'default') != 'default'}.sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i} +
-          option_types.reject {|it| ['default', 'advanced'].include?(it['fieldGroup'] || 'default')}.sort{|a,b| a['displayOrder'] <=> b['displayOrder']}.group_by{|it| it['fieldGroup']}.values.collect { |it| it.sort{|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}}.flatten +
-          option_types.reject {|it| it['fieldGroup'] != 'advanced'}.sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}
-        ).each do |option_type|
+        self.sorted_option_types(option_types).each do |option_type|
           context_map = results
           value = nil
           value_found = false
@@ -66,7 +69,9 @@ module Morpheus
 
           if cur_field_group != field_group
             cur_field_group = field_group
-            print "\n#{cur_field_group.upcase} OPTIONS\n#{"=" * ("#{cur_field_group} OPTIONS".length)}\n\n"
+            if !no_prompt 
+              print "\n#{cur_field_group.upcase} OPTIONS\n#{"=" * ("#{cur_field_group} OPTIONS".length)}\n\n"
+            end
           end
 
           # How about this instead?
@@ -123,7 +128,11 @@ module Morpheus
                             get_object_value(options, depends_on_field_key) ||
                             get_object_value(api_params, depends_on_field_key)
 
-              if !field_value.nil? && (depends_on_value.nil? || depends_on_value.empty? || field_value.match?(depends_on_value))
+              if field_value.nil? && !options['_object_key'].nil?
+                field_value = get_object_value({options['_object_key'] => results}, depends_on_field_key)
+              end
+
+              if !field_value.nil? && (depends_on_value.nil? || depends_on_value.empty? || field_value.to_s.match?(depends_on_value))
                 found_dep_value = true if match_type != 'all'
               else
                 found_dep_value = false if match_type == 'all'
@@ -146,6 +155,10 @@ module Morpheus
             context_map = context_map[ns.to_s]
           end
 
+          # build parameters for option source api request
+          option_params = (option_type['noParams'] ? {} : (api_params || {}).merge(results))
+          option_params.merge!(option_type['optionParams']) if option_type['optionParams']
+
           # use the value passed in the options map
           if cur_namespace.respond_to?('key?') && cur_namespace.key?(field_name)
             value = cur_namespace[field_name]
@@ -156,25 +169,25 @@ module Morpheus
               end
             # these select prompts should just fall down through below, with the extra params no_prompt, use_value
             elsif option_type['type'] == 'select'
-              value = select_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), true)
+              value = select_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, option_params, true)
             elsif option_type['type'] == 'multiSelect'
               # support value as csv like "thing1, thing2"
               value_list = value.is_a?(String) ? value.parse_csv.collect {|v| v ? v.to_s.strip : v } : [value].flatten
               input_value_list = input_value.is_a?(String) ? input_value.parse_csv.collect {|v| v ? v.to_s.strip : v } : [input_value].flatten
               select_value_list = []
               value_list.each_with_index do |v, i|
-                select_value_list << select_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), true)
+                select_value_list << select_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, option_params, true)
               end
               value = select_value_list
             elsif option_type['type'] == 'typeahead'
-              value = typeahead_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), true)
+              value = typeahead_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, option_params, true)
             elsif option_type['type'] == 'multiTypeahead'
               # support value as csv like "thing1, thing2"
               value_list = value.is_a?(String) ? value.parse_csv.collect {|v| v ? v.to_s.strip : v } : [value].flatten
               input_value_list = input_value.is_a?(String) ? input_value.parse_csv.collect {|v| v ? v.to_s.strip : v } : [input_value].flatten
               select_value_list = []
               value_list.each_with_index do |v, i|
-                select_value_list << typeahead_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), true)
+                select_value_list << typeahead_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, option_params, true)
               end
               value = select_value_list
             end
@@ -190,7 +203,6 @@ module Morpheus
           end
           # no_prompt means skip prompting and instead
           # use default value or error if a required option is not present
-          no_prompt = no_prompt || options[:no_prompt]
           if no_prompt
             if !value_found
               if option_type['defaultValue'] != nil && !['select', 'multiSelect','typeahead','multiTypeahead'].include?(option_type['type'])
@@ -201,11 +213,11 @@ module Morpheus
                 # select type is special because it supports skipSingleOption
                 # and prints the available options on error
                 if ['select', 'multiSelect'].include?(option_type['type'])
-                  value = select_prompt(option_type, api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), true)
+                  value = select_prompt(option_type, api_client, option_params, true)
                   value_found = !!value
                 end
                 if ['typeahead', 'multiTypeahead'].include?(option_type['type'])
-                  value = typeahead_prompt(option_type, api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), true)
+                  value = typeahead_prompt(option_type, api_client, option_params, true)
                   value_found = !!value
                 end
                 if !value_found
@@ -242,11 +254,11 @@ module Morpheus
               # I suppose the entered value should take precedence
               # api_params = api_params.merge(options) # this might be good enough
               # dup it
-              value = select_prompt(option_type, api_client, (option_type['noParams'] ? {} : (api_params || {}).deep_merge(results)), options[:no_prompt], nil, paging_enabled)
+              value = select_prompt(option_type, api_client, option_params, options[:no_prompt], nil, paging_enabled)
               if value && option_type['type'] == 'multiSelect'
                 value = [value]
                 while self.confirm("Add another #{option_type['fieldLabel']}?", {:default => false}) do
-                  if addn_value = select_prompt(option_type, api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), options[:no_prompt], nil, paging_enabled)
+                  if addn_value = select_prompt(option_type, api_client, option_params, options[:no_prompt], nil, paging_enabled)
                     value << addn_value
                   else
                     break
@@ -254,11 +266,11 @@ module Morpheus
                 end
               end
             elsif ['typeahead', 'multiTypeahead'].include?(option_type['type'])
-              value = typeahead_prompt(option_type, api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), options[:no_prompt], nil, paging_enabled)
+              value = typeahead_prompt(option_type, api_client, option_params, options[:no_prompt], nil, paging_enabled)
               if value && option_type['type'] == 'multiTypeahead'
                 value = [value]
                 while self.confirm("Add another #{option_type['fieldLabel']}?", {:default => false}) do
-                  if addn_value = typeahead_prompt(option_type, api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), options[:no_prompt], nil, paging_enabled)
+                  if addn_value = typeahead_prompt(option_type, api_client, option_params, options[:no_prompt], nil, paging_enabled)
                     value << addn_value
                   else
                     break
@@ -266,12 +278,17 @@ module Morpheus
                 end
               end
             elsif option_type['type'] == 'hidden'
-              value = option_type['defaultValue']
-              input = value
+              if option_type['optionSource'].nil?
+                value = option_type['defaultValue']
+              else
+                value = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, api_params || {})
+              end
             elsif option_type['type'] == 'file'
               value = file_prompt(option_type)
             elsif option_type['type'] == 'file-content'
               value = file_content_prompt(option_type, options, api_client, {})
+            elsif option_type['type'] == 'multiText'
+              value = multitext_prompt(option_type)
             else
               value = generic_prompt(option_type)
             end
@@ -279,7 +296,11 @@ module Morpheus
 
           if option_type['type'] == 'multiSelect'
             value = [value] if !value.nil? && !value.is_a?(Array)
-            # parent_context_map[parent_ns] = value
+          elsif option_type['type'] == 'multiText'
+            # multiText expects csv value
+            if value && value.is_a?(String)
+              value = value.split(",").collect {|it| it.strip }
+            end
           end
           context_map[field_name] = value if !(value.nil? || (value.is_a?(Hash) && value.empty?))
           parent_context_map.reject! {|k,v| k == parent_ns && (v.nil? || (v.is_a?(Hash) && v.empty?))}
@@ -298,7 +319,7 @@ module Morpheus
         end
         optionString = options.collect{ |b| b[:checked] ? "(#{b[:key]})" : b[:key]}.join(', ')
         while !value_found do
-          print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }[#{optionString}]: "
+          print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }[#{optionString}]: "
           input = $stdin.gets.chomp!
           if input == '?'
             help_prompt(option_type)
@@ -325,7 +346,7 @@ 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+']' : ''}: "
+          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!
           value = input.empty? ? option_type['defaultValue'] : input
           if !value.to_s.empty?
@@ -349,7 +370,7 @@ module Morpheus
         Thread.current[:_last_select]
       end
 
-      def self.select_prompt(option_type,api_client, api_params={}, no_prompt=false, use_value=nil, paging_enabled=false)
+      def self.select_prompt(option_type, api_client, api_params={}, no_prompt=false, use_value=nil, paging_enabled=false)
         paging_enabled = false if Morpheus::Cli.windows?
         field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
         help_field_key = option_type[:help_field_prefix] ? "#{option_type[:help_field_prefix]}.#{field_key}" : field_key
@@ -358,7 +379,12 @@ module Morpheus
         value_field = (option_type['config'] ? option_type['config']['valueField'] : nil) || 'value'
         default_value = option_type['defaultValue']
         default_value = default_value['id'] if default_value && default_value.is_a?(Hash) && !default_value['id'].nil?
-        api_params ||= {}
+
+        if !option_type['params'].nil?
+          api_params = (api_params || {}).select {|k,v| option_type['params'].key?(k) || option_type['params'].key?(k.to_s)}
+          option_type['params'].select {|k,v| !v.empty?}.each {|k,v| api_params[k] = v}
+        end
+
         # local array of options
         if option_type['selectOptions']
           # calculate from inline lambda
@@ -417,7 +443,8 @@ module Morpheus
               default_value = found_default_option['name'] # name is prettier than value
             end
           else
-            found_default_option  = select_options.find {|opt| opt[value_field].to_s == default_value.to_s}
+            found_default_option = select_options.find {|opt| opt[value_field].to_s == default_value.to_s || opt['name'] == default_value.to_s}
+            found_default_option = select_options.find {|opt| opt[value_field].to_s.start_with?(default_value.to_s) || opt['name'].to_s.start_with?(default_value.to_s)} if !found_default_option
             if found_default_option
               default_value = found_default_option['name'] # name is prettier than value
             end
@@ -476,7 +503,7 @@ module Morpheus
           }
 
           has_more_pages = paging && (paging[:cur_page] * paging[:page_size]) < paging[:total]
-          input = Readline.readline("#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{!default_value.to_s.empty? ? ' ['+default_value.to_s+']' : ''} ['?' for#{has_more_pages && paging[:cur_page] > 0 ? ' more ' : ' '}options]: ", false).to_s
+          input = Readline.readline("#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{!default_value.to_s.empty? ? ' ['+default_value.to_s+']' : ''} ['?' for#{has_more_pages && paging[:cur_page] > 0 ? ' more ' : ' '}options]: ", false).to_s
           input = input.chomp.strip
           if input.empty? && default_value
             input = default_value.to_s
@@ -504,13 +531,19 @@ module Morpheus
         if value && !option_type['fieldInput'].nil?
           value = {option_type['fieldName'].split('.').last => value, option_type['fieldInput'] => (no_prompt ? option_type['defaultInputValue'] : field_input_prompt(option_type))}
         end
+
+        if value && !option_type['resultValueField'].nil?
+          value = {option_type['resultValueField'] => value}
+        end
         value
       end
 
       # this works like select_prompt, but refreshes options with ?query=value between inputs
       # paging_enabled is ignored right now
       def self.typeahead_prompt(option_type,api_client, api_params={}, no_prompt=false, use_value=nil, paging_enabled=false)
-        select_options = []
+        paging_enabled = false if Morpheus::Cli.windows?
+        paging = nil
+        select_options = nil
         field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
         help_field_key = option_type[:help_field_prefix] ? "#{option_type[:help_field_prefix]}.#{field_key}" : field_key
         input = ""
@@ -544,7 +577,8 @@ module Morpheus
               matches
             }
             # prompt for typeahead input value
-            input = Readline.readline("#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{!default_value.to_s.empty? ? ' ['+default_value.to_s+']' : ''} ['?' for options]: ", false).to_s
+            has_more_pages = paging && ((paging[:cur_page] + 1) * paging[:page_size]) < paging[:total]
+            input = Readline.readline("#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{!default_value.to_s.empty? ? ' ['+default_value.to_s+']' : ''} ['?' for#{has_more_pages ? ' more ' : ' '}options]: ", false).to_s
             input = input.chomp.strip
           end
 
@@ -571,8 +605,22 @@ module Morpheus
           # looking for help with this input
           if input == '?'
             help_prompt(option_type)
-            select_options = load_options(option_type, api_client, api_params)
-            display_select_options(option_type, select_options) unless select_options.empty?
+            select_options = select_options || load_options(option_type, api_client, api_params)
+
+            if !select_options.empty?
+              if paging_enabled
+                if paging.nil?
+                  option_count = select_options ? select_options.count : 0
+                  page_size = Readline.get_screen_size[0] - 6
+                  if page_size < option_count
+                    paging = {:cur_page => 0, :page_size => page_size, :total => option_count}
+                  end
+                else
+                  paging[:cur_page] = (paging[:cur_page] + 1) * paging[:page_size] < paging[:total] ? paging[:cur_page] + 1 : 0
+                end
+              end
+              display_select_options(option_type, select_options, paging)
+            end
             next
           end
 
@@ -719,7 +767,7 @@ 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+']' : ''}: "
+          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!
           value = input.empty? ? option_type['defaultValue'] : input
           if input == '?'
@@ -736,7 +784,7 @@ module Morpheus
         value = nil
         while !value_found do
           if value.nil?
-            print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)} [Type 'EOF' to stop input]: \n"
+            print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)} [Type 'EOF' to stop input]: \n"
           end
           input = $stdin.gets.chomp!
           # value = input.empty? ? option_type['defaultValue'] : input
@@ -760,7 +808,7 @@ module Morpheus
       def self.password_prompt(option_type)
         value_found = false
         while !value_found do
-          print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
+          print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
           input = $stdin.noecho(&:gets).chomp!
           value = input
           print "\n"
@@ -780,11 +828,11 @@ module Morpheus
         value_found = false
         value = nil
         while !value_found do
-          #print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
+          #print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
           Readline.completion_append_character = ""
           Readline.basic_word_break_characters = ''
           Readline.completion_proc = proc {|s| Readline::FILENAME_COMPLETION_PROC.call(s) }
-          input = Readline.readline("#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+option_type['defaultValue'].to_s+']' : ''}: ", false).to_s
+          input = Readline.readline("#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+option_type['defaultValue'].to_s+']' : ''}: ", false).to_s
           input = input.chomp.strip
           #input = $stdin.gets.chomp!
           value = input.empty? ? option_type['defaultValue'] : input.to_s
@@ -883,6 +931,32 @@ module Morpheus
         return file_params
       end
 
+      def self.multitext_prompt(option_type)
+        rtn = nil
+
+        # supports multi-part fields via config.fields
+        # {"fields": [{"name":"tag", "required":true, "label": "Tag"}, {"name":"value", "required":false, "label": "Scope"}]}
+        if option_type['config']['fields']
+          while (option_type['required'] && rtn.empty?) || self.confirm("Add#{rtn.empty? ? '': ' more'} #{option_type['fieldLabel']}?", {:default => false})
+            rtn ||= []
+            value = {}
+            option_type['config']['fields'].each do |field|
+              field_label = field['label'] || field['name'].capitalize
+              value[field['name']] = generic_prompt(option_type.merge({'fieldLabel' => field_label, 'required' => field['required'], 'description' => "#{option_type['fieldLabel']} #{field_label}"}))
+            end
+            rtn << value
+          end
+        else
+          if rtn = generic_prompt(option_type)
+            rtn = [rtn]
+            while self.confirm("Add more #{option_type['fieldLabel']}?", {:default => false}) do
+              rtn << generic_prompt(option_type)
+            end
+          end
+        end
+        rtn
+      end
+
       def self.load_options(option_type, api_client, api_params, query_value=nil)
         select_options = []
         # local array of options
@@ -902,6 +976,8 @@ module Morpheus
             select_options = filtered_options
           end
         elsif option_type['optionSource']
+          api_params = api_params.select {|k,v| option_type['params'].include(k)} if !option_type['params'].nil? && api_params
+
           # calculate from inline lambda
           if option_type['optionSource'].is_a?(Proc)
             select_options = option_type['optionSource'].call(api_client, api_params || {})
@@ -960,21 +1036,29 @@ module Morpheus
         return out
       end
 
+      def self.sorted_option_types(option_types)
+        option_types.reject {|it| (it['fieldGroup'] || 'default') != 'default'}.sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i} +
+        option_types.reject {|it| ['default', 'advanced'].include?(it['fieldGroup'] || 'default')}.sort{|a,b| a['displayOrder'] <=> b['displayOrder']}.group_by{|it| it['fieldGroup']}.values.collect { |it| it.sort{|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}}.flatten +
+        option_types.reject {|it| it['fieldGroup'] != 'advanced'}.sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}
+      end
+
       def self.display_select_options(opt, select_options = [], paging = nil)
-        puts format_select_options_help(opt, select_options, paging)
+        puts self.format_select_options_help(opt, select_options, paging)
       end
 
       def self.format_option_types_help(option_types, opts={})
+        option_types = self.sorted_option_types(option_types).reject {|it| it['hidden']}
+
         if option_types.empty?
           "#{opts[:color]}#{opts[:title] || "Available Options:"}\nNone\n\n"
         else
           if opts[:include_context]
-            option_lines = option_types.sort {|it| it['displayOrder']}.collect {|it|
+            option_lines = option_types.collect {|it|
               field_context = (opts[:context_map] || {})[it['fieldContext']] || it['fieldContext']
               "    -O #{field_context && field_context != '' ? "#{field_context}." : ''}#{it['fieldName']}=\"value\""
             }
           else
-            option_lines = option_types.sort {|it| it['displayOrder']}.collect {|it| "    -O #{it['fieldName']}=\"value\"" }
+            option_lines = option_types.collect {|it| "    -O #{it['fieldName']}=\"value\"" }
           end
           "#{opts[:color]}#{opts[:title] || "Available Options:"}\n#{option_lines.join("\n")}\n\n"
         end
@@ -992,6 +1076,31 @@ module Morpheus
           return option_type['required'] ? '' : ' (optional)'
         end
       end
+
+      def self.get_option_value(obj, option_type, format=false)
+        context = option_type['fieldContext'] == 'config' ? obj['config'] : obj
+        name = option_type['fieldName']
+        tokens = name.split('.')
+
+        if tokens.length > 1
+          tokens.slice(0, tokens.length - 1).each do |token|
+            context = context[token]
+          end
+          name = tokens.last
+        end
+
+        if context.kind_of?(Array)
+          rtn = context.collect {|it| it['name'] || it[name]}.join ', '
+        else
+          rtn = context[name]
+        end
+
+        if format
+          rtn = (rtn ? 'On' : 'Off') if option_type['type'] == 'checkbox'
+          rtn = rtn.join(', ') if rtn.is_a?(Array)
+        end
+        rtn
+      end
     end
   end
 end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.3.3"
+    VERSION = "5.4.2"
   end
 end

data/lib/morpheus/cli.rb

@@ -4,6 +4,7 @@ require 'morpheus/rest_client'
 require 'morpheus/formatters'
 require 'morpheus/logging'
 require 'morpheus/util'
+require 'morpheus/routes'
 require 'term/ansicolor'
 
 Dir[File.dirname(__FILE__)  + "/ext/*.rb"].each {|file| require file }
@@ -11,12 +12,12 @@ Dir[File.dirname(__FILE__)  + "/ext/*.rb"].each {|file| require file }
 module Morpheus
   module Cli
     
-    # get the home directory, where morpheus-cli stores things   
     # The default is $MORPHEUS_CLI_HOME or $HOME/.morpheus
     unless defined?(@@home_directory)
       @@home_directory = ENV['MORPHEUS_CLI_HOME'] || File.join(Dir.home, ".morpheus")
     end
     
+    # get the home directory, where morpheus-cli stores things
     def self.home_directory
       @@home_directory
     end
@@ -50,12 +51,9 @@ module Morpheus
       Dir[File.dirname(__FILE__)  + "/api/**/*.rb"].each {|file| load file }
 
       # load mixins
-      Dir[File.dirname(__FILE__)  + "/cli/mixins/*.rb"].each {|file| load file }
+      Dir[File.dirname(__FILE__)  + "/cli/mixins/**/*.rb"].each {|file| load file }
 
-      # load commands
-      # Dir[File.dirname(__FILE__)  + "/cli/*.rb"].each {|file| load file }
-
-      # utilites
+      # load utilites
       require 'morpheus/cli/cli_registry.rb'
       require 'morpheus/cli/expression_parser.rb'
       require 'morpheus/cli/dot_file.rb'
@@ -65,128 +63,8 @@ module Morpheus
       load 'morpheus/cli/option_types.rb'
       load 'morpheus/cli/credentials.rb'
       
-      # all standard commands
-      Dir[File.dirname(__FILE__)  + "/cli/commands/standard/**/*.rb"].each {|file| load file }
-
-      # all the known commands
-      load 'morpheus/cli/remote.rb'
-      load 'morpheus/cli/doc.rb'
-      load 'morpheus/cli/ping.rb'
-      load 'morpheus/cli/setup.rb'
-      load 'morpheus/cli/login.rb'
-      load 'morpheus/cli/logout.rb'
-      load 'morpheus/cli/forgot_password.rb'
-      load 'morpheus/cli/whoami.rb'
-      load 'morpheus/cli/access_token_command.rb'
-      load 'morpheus/cli/user_settings_command.rb'
-      load 'morpheus/cli/search_command.rb'
-      load 'morpheus/cli/dashboard_command.rb'
-      load 'morpheus/cli/recent_activity_command.rb' # deprecated, removing soon
-      load 'morpheus/cli/activity_command.rb'
-      load 'morpheus/cli/appliance_settings_command.rb'
-      load 'morpheus/cli/power_schedules_command.rb'
-      load 'morpheus/cli/execute_schedules_command.rb'
-      load 'morpheus/cli/groups.rb'
-      load 'morpheus/cli/clouds.rb'
-      load 'morpheus/cli/cloud_datastores_command.rb'
-      load 'morpheus/cli/cloud_resource_pools_command.rb'
-      load 'morpheus/cli/cloud_folders_command.rb'
-      load 'morpheus/cli/hosts.rb'
-      load 'morpheus/cli/load_balancers.rb'
-      load 'morpheus/cli/load_balancer_types.rb'
-      load 'morpheus/cli/shell.rb'
-      load 'morpheus/cli/tasks.rb'
-      load 'morpheus/cli/workflows.rb'
-      load 'morpheus/cli/deployments.rb'
-      load 'morpheus/cli/deploy.rb'
-      load 'morpheus/cli/deploys.rb'
-      load 'morpheus/cli/instances.rb'
-      load 'morpheus/cli/containers_command.rb'
-      load 'morpheus/cli/apps.rb'
-      load 'morpheus/cli/blueprints_command.rb'
-      load 'morpheus/cli/license.rb'
-      load 'morpheus/cli/instance_types.rb'
-      load 'morpheus/cli/jobs_command.rb'
-      load 'morpheus/cli/integrations_command.rb'
-      load 'morpheus/cli/security_groups.rb'
-      load 'morpheus/cli/security_group_rules.rb'
-      load 'morpheus/cli/clusters.rb'
-      load 'morpheus/cli/tenants_command.rb'
-      load 'morpheus/cli/account_groups_command.rb'
-      load 'morpheus/cli/users.rb'
-      load 'morpheus/cli/change_password_command.rb'
-      load 'morpheus/cli/user_groups_command.rb'
-      load 'morpheus/cli/user_sources_command.rb'
-      load 'morpheus/cli/roles.rb'
-      load 'morpheus/cli/key_pairs.rb'
-      load 'morpheus/cli/virtual_images.rb'
-      # load 'morpheus/cli/library.rb' # gone until we collapse these again
-      load 'morpheus/cli/library_instance_types_command.rb'
-      load 'morpheus/cli/library_cluster_layouts_command.rb'
-      load 'morpheus/cli/library_layouts_command.rb'
-      load 'morpheus/cli/library_upgrades_command.rb'
-      load 'morpheus/cli/library_container_types_command.rb'
-      load 'morpheus/cli/library_container_scripts_command.rb'
-      load 'morpheus/cli/library_container_templates_command.rb'
-      load 'morpheus/cli/library_option_types_command.rb'
-      load 'morpheus/cli/library_option_lists_command.rb'
-      load 'morpheus/cli/library_spec_templates_command.rb'
-      load 'morpheus/cli/monitoring_incidents_command.rb'
-      load 'morpheus/cli/monitoring_checks_command.rb'
-      load 'morpheus/cli/monitoring_contacts_command.rb'
-      load 'morpheus/cli/monitoring_alerts_command.rb'
-      load 'morpheus/cli/monitoring_groups_command.rb'
-      load 'morpheus/cli/monitoring_apps_command.rb'
-      load 'morpheus/cli/logs_command.rb'
-      load 'morpheus/cli/policies_command.rb'
-      load 'morpheus/cli/networks_command.rb'
-      load 'morpheus/cli/subnets_command.rb'
-      load 'morpheus/cli/network_groups_command.rb'
-      load 'morpheus/cli/network_pools_command.rb'
-      load 'morpheus/cli/network_services_command.rb'
-      load 'morpheus/cli/network_pool_servers_command.rb'
-      load 'morpheus/cli/network_domains_command.rb'
-      load 'morpheus/cli/network_proxies_command.rb'
-      load 'morpheus/cli/network_routers_command.rb'
-      load 'morpheus/cli/cypher_command.rb'
-      load 'morpheus/cli/image_builder_command.rb'
-      load 'morpheus/cli/preseed_scripts_command.rb'
-      load 'morpheus/cli/boot_scripts_command.rb'
-      load 'morpheus/cli/archives_command.rb'
-      load 'morpheus/cli/storage_providers_command.rb'
-      load 'morpheus/cli/execution_request_command.rb'
-      load 'morpheus/cli/file_copy_request_command.rb'
-      load 'morpheus/cli/processes_command.rb'
-      load 'morpheus/cli/packages_command.rb'
-      load 'morpheus/cli/reports_command.rb'
-      load 'morpheus/cli/environments_command.rb'
-      load 'morpheus/cli/backup_settings_command.rb'
-      load 'morpheus/cli/log_settings_command.rb'
-      load 'morpheus/cli/whitelabel_settings_command.rb'
-      load 'morpheus/cli/wiki_command.rb'
-      load 'morpheus/cli/approvals_command.rb'
-      load 'morpheus/cli/service_plans_command.rb'
-      load 'morpheus/cli/price_sets_command.rb'
-      load 'morpheus/cli/prices_command.rb'
-      load 'morpheus/cli/provisioning_settings_command.rb'
-      load 'morpheus/cli/provisioning_licenses_command.rb'
-      load 'morpheus/cli/budgets_command.rb'
-      load 'morpheus/cli/health_command.rb'
-      load 'morpheus/cli/invoices_command.rb'
-      load 'morpheus/cli/guidance_command.rb'
-      load 'morpheus/cli/projects_command.rb'
-      load 'morpheus/cli/backups_command.rb'
-      load 'morpheus/cli/backup_jobs_command.rb'
-      load 'morpheus/cli/catalog_item_types_command.rb' # self-service
-      load 'morpheus/cli/service_catalog_command.rb' # catalog (Service Catalog persona)
-      load 'morpheus/cli/usage_command.rb'
-      load 'morpheus/cli/vdi_pools_command.rb'
-      load 'morpheus/cli/vdi_allocations_command.rb'
-      load 'morpheus/cli/vdi_apps_command.rb'
-      load 'morpheus/cli/vdi_gateways_command.rb'
-      load 'morpheus/cli/vdi_command.rb' # (VDI persona)
-      load 'morpheus/cli/certificates_command.rb' # (VDI persona)
-      # add new commands here...
+      # load all commands
+      Dir[File.dirname(__FILE__)  + "/cli/commands/**/*.rb"].each {|file| load file }
 
     end