morpheus-cli 5.3.2.2 → 5.4.0

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,19 +61,17 @@ 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
+          value_found = false
+          field_group = (option_type['fieldGroup'] || 'default').to_s.sub(/options\Z/i, "").strip # avoid "ADVANCED OPTION OPTIONS"
 
-          if cur_field_group != (option_type['fieldGroup'] || 'default')
-            cur_field_group = option_type['fieldGroup']
-            cur_field_group = cur_field_group.to_s.sub(/options\Z/i, "").strip # avoid "ADVANCED OPTION OPTIONS"
-            print "\n#{cur_field_group.upcase} OPTIONS\n#{"=" * ("#{cur_field_group} OPTIONS".length)}\n\n"
+          if cur_field_group != field_group
+            cur_field_group = field_group
+            if !no_prompt 
+              print "\n#{cur_field_group.upcase} OPTIONS\n#{"=" * ("#{cur_field_group} OPTIONS".length)}\n\n"
+            end
           end
 
           # How about this instead?
@@ -102,10 +107,10 @@ module Morpheus
             end
 
             found_dep_value = match_type == 'all' ? true : false
-            visible_option_check_value.split(',').each do |value|
+            visible_option_check_value.sub(',', ' ').split(' ').each do |value|
               parts = value.split(':')
               depends_on_code = parts[0]
-              depends_on_value = parts.count > 1 ? parts[1].to_s.strip : '.'
+              depends_on_value = parts.count > 1 ? parts[1].to_s.strip : nil
               depends_on_option_type = option_types.find {|it| it["code"] == depends_on_code }
               if !depends_on_option_type
                 depends_on_option_type = option_types.find {|it|
@@ -115,13 +120,18 @@ module Morpheus
 
               if depends_on_option_type
                 depends_on_field_key = depends_on_option_type['fieldContext'].nil? || depends_on_option_type['fieldContext'].empty? ? "#{depends_on_option_type['fieldName']}" : "#{depends_on_option_type['fieldContext']}.#{depends_on_option_type['fieldName']}"
-                field_value = get_object_value(results, depends_on_field_key) || get_object_value(options, depends_on_field_key)
+              else
+                depends_on_field_key = depends_on_code
+              end
 
-                if !field_value.nil? && field_value.match?(depends_on_value)
-                  found_dep_value = true if match_type != 'all'
-                else
-                  found_dep_value = false if match_type == 'all'
-                end
+              field_value = get_object_value(results, depends_on_field_key) ||
+                            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))
+                found_dep_value = true if match_type != 'all'
+              else
+                found_dep_value = false if match_type == 'all'
               end
             end
             next if !found_dep_value
@@ -185,7 +195,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'])
@@ -237,7 +246,7 @@ 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 || {}).merge(results)), options[:no_prompt], nil, paging_enabled)
+              value = select_prompt(option_type, api_client, (option_type['noParams'] ? {} : (api_params || {}).deep_merge(results)), 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
@@ -261,8 +270,11 @@ 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'
@@ -276,7 +288,8 @@ module Morpheus
             value = [value] if !value.nil? && !value.is_a?(Array)
             # parent_context_map[parent_ns] = value
           end
-          context_map[field_name] = value
+          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?))}
         end
         results
       end
@@ -504,7 +517,9 @@ module Morpheus
       # 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 = ""
@@ -538,7 +553,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
 
@@ -565,8 +581,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
 
@@ -947,27 +977,36 @@ module Morpheus
         out << "\n"
         out << "#{header}\n"
         out << "#{'=' * header.length}\n"
+
         select_options.each do |option|
-          out << " * #{option['name']} [#{option['value']}]\n"
+          out << (option['isGroup'] ? "- #{option['name']}\n" : " * #{option['name']} [#{option['value']}]\n")
         end
         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
@@ -985,6 +1024,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.2.2"
+    VERSION = "5.4.0"
   end
 end

data/lib/morpheus/cli.rb

@@ -11,12 +11,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 +50,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 +62,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
 

data/lib/morpheus/terminal.rb

@@ -1,15 +1,13 @@
-#!/usr/bin/env ruby
-require 'term/ansicolor'
-require 'optparse'
 require 'morpheus/cli'
+require 'morpheus/benchmarking'
+require 'morpheus/logging'
 require 'morpheus/rest_client'
 require 'morpheus/cli/cli_registry'
 require 'morpheus/cli/dot_file'
 require 'morpheus/cli/error_handler'
 require 'morpheus/cli/expression_parser'
-require 'morpheus/logging'
-require 'morpheus/benchmarking'
-require 'morpheus/cli'
+require 'morpheus/cli/option_parser'
+require 'term/ansicolor'
 
 module Morpheus
   
@@ -478,6 +476,7 @@ module Morpheus
 
           # shell is a Singleton command class
           if args[0] == "shell"
+            require 'morpheus/cli/commands/shell'
             result = Morpheus::Cli::Shell.instance.handle(args[1..-1])
           else
             #result = Morpheus::Cli::CliRegistry.exec_expression(formatted_cmd)

data/morpheus-cli.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = '>= 2.5.1' # according to http.rb doc
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "rake"
   spec.add_dependency 'term-ansicolor', '~> 1.3.0'
   spec.add_dependency "rest-client", "2.0.2"