morpheus-cli 2.10.0 → 2.10.1

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

@@ -1,7 +1,7 @@
 require 'table_print'
 require 'morpheus/cli/mixins/print_helper'
 
-# Mixin for Morpheus::Cli command classes 
+# Mixin for Morpheus::Cli command classes
 # Provides common methods for fetching and printing accounts, roles, and users.
 # The including class must establish @accounts_interface, @roles_interface, @users_interface
 module Morpheus::Cli::WhoamiHelper
@@ -14,7 +14,7 @@ module Morpheus::Cli::WhoamiHelper
     whoami_interface = @whoami_interface || @api_client.whoami
     whoami_response = whoami_interface.get()
     # whoami_response = @whoami_interface.get()
-    @current_user = whoami_response["user"] 
+    @current_user = whoami_response["user"]
     if @current_user.empty?
       print_red_alert "Unauthenticated. Please login."
       exit 1

data/lib/morpheus/cli/option_parser.rb

@@ -0,0 +1,35 @@
+require 'optparse'
+
+module Morpheus
+  module Cli
+
+    # an enhanced OptionParser
+    # not used yet, maybe ever =o
+    class Morpheus::Cli::OptionParser < OptionParser
+
+      attr_reader :footer
+      
+      def footer=(msg)
+        @footer = msg
+      end
+
+      alias :original_to_s :to_s
+
+      def to_s
+        full_help_message
+      end
+
+      def full_help_message
+        out = ""
+        out << original_to_s
+        if footer
+          out << footer.to_s.strip
+          out << "\n"
+        end
+        out
+      end
+
+    end
+
+  end
+end

data/lib/morpheus/cli/option_types.rb

@@ -3,20 +3,28 @@ require 'readline'
 module Morpheus
   module Cli
     module OptionTypes
-        include Term::ANSIColor
+      include Term::ANSIColor
 
 
-        def self.confirm(message,options={})
-          if options[:yes] == true
-            return true
-          end
-          value_found = false
-          while value_found == false do
-            print "#{message} (yes/no): "
+      def self.confirm(message,options={})
+        if options[:yes] == true
+          return true
+        end
+        default_value = options[:default]
+        value_found = false
+        while value_found == false do
+            if default_value.nil?
+              print "#{message} (yes/no): "
+            else
+              print "#{message} (yes/no) [#{!!default_value ? 'yes' : 'no'}]: "
+            end
             input = $stdin.gets.chomp!
-            if input.downcase == 'yes'
+            if input.empty? && !default_value.nil?
+              return !!default_value
+            end
+            if input.downcase == 'yes' || input.downcase == 'y'
               return true
-            elsif input.downcase == 'no'
+            elsif input.downcase == 'no' || input.downcase == 'n'
               return false
             else
               puts "Invalid Option... Please try again."
@@ -62,7 +70,7 @@ module Morpheus
                   value_found = true
                 end
                 if !value_found
-                  # select type is special because it supports skipSingleOption 
+                  # select type is special because it supports skipSingleOption
                   # and prints the available options on error
                   if option_type['type'] == 'select'
                     value = select_prompt(option_type, api_client, api_params, true)
@@ -86,7 +94,7 @@ module Morpheus
               if option_type['type'] == 'number'
                 value = number_prompt(option_type)
               elsif option_type['type'] == 'password'
-               value = password_prompt(option_type)
+                value = password_prompt(option_type)
               elsif option_type['type'] == 'checkbox'
                 value = checkbox_prompt(option_type)
               elsif option_type['type'] == 'radio'
@@ -94,16 +102,17 @@ module Morpheus
               elsif option_type['type'] == 'textarea'
                 value = multiline_prompt(option_type)
               elsif option_type['type'] == 'code-editor'
-                value = multiline_prompt(option_type)  
+                value = multiline_prompt(option_type)
               elsif option_type['type'] == 'select'
                 value = select_prompt(option_type,api_client, api_params)
               elsif option_type['type'] == 'hidden'
                 value = option_type['defaultValue']
                 input = value
+              elsif option_type['type'] == 'file'
+                value = file_prompt(option_type)
               else
                 value = generic_prompt(option_type)
               end
-              
             end
             context_map[option_type['fieldName']] = value
           end
@@ -113,218 +122,249 @@ module Morpheus
 
 
         def self.radio_prompt(option_type)
-            value_found = false
-            value = nil
-            options = []
-            if option_type['config'] and option_type['config']['radioOptions']
-                option_type['config']['radioOptions'].each do |radio_option|
-                    options << {key: radio_option['key'], checked: radio_option['checked']}
-                end
-            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}]: "
-                input = $stdin.gets.chomp!
-                if input == '?'
-                    help_prompt(option_type)
-                else
-                    if input.nil? || input.empty?
-                        selectedOption = options.find{|o| o[:checked] == true}
-                    else
-                        selectedOption = options.find{|o| o[:key].downcase == input.downcase}   
-                    end
-                    
-                    if selectedOption
-                        value = selectedOption[:key]
-                    else
-                        puts "Invalid Option. Please select from #{optionString}."
-                    end
-                    if !value.nil? || option_type['required'] != true
-                      value_found = true
-                    end
-                end
-            end
-            return value
-        end
-
-        def self.number_prompt(option_type)
-            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'] ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
-                input = $stdin.gets.chomp!
-                value = input.empty? ? option_type['defaultValue'] : input.to_i
-                if input == '?'
-                    help_prompt(option_type)
-                elsif !value.nil? || option_type['required'] != true
-                  value_found = true
-                end
-            end
-            return value
-        end
-
-        def self.select_prompt(option_type,api_client, api_params={}, no_prompt=false)
           value_found = false
           value = nil
-          if option_type['selectOptions']
-            select_options = option_type['selectOptions']
-          elsif option_type['optionSource']
-            select_options = load_source_options(option_type['optionSource'],api_client,api_params)
-          else
-            raise "select_prompt() requires selectOptions or optionSource!"
-          end
-          if !select_options.nil? && select_options.count == 1 && option_type['skipSingleOption'] == true
-            value_found = true
-            value = select_options[0]['value']
-          end
-          if no_prompt
-            if !value_found
-              if option_type['required']
-                print Term::ANSIColor.red, "\nMissing Required Option\n\n"
-                print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{option_type['fieldContext'] ? (option_type['fieldContext']+'.') : ''}#{option_type['fieldName']}=] - ", Term::ANSIColor.reset , "#{option_type['description']}\n"
-                display_select_options(select_options)
-                print "\n"
-                exit 1
-              else
-                return nil
-              end
+          options = []
+          if option_type['config'] and option_type['config']['radioOptions']
+            option_type['config']['radioOptions'].each do |radio_option|
+              options << {key: radio_option['key'], checked: radio_option['checked']}
             end
           end
+          optionString = options.collect{ |b| b[:checked] ? "(#{b[:key]})" : b[:key]}.join(', ')
           while !value_found do
-              Readline.completion_append_character = ""
-              Readline.basic_word_break_characters = ''
-              Readline.completion_proc = proc {|s| select_options.clone.collect{|opt| opt['name']}.grep(/^#{Regexp.escape(s)}/)}
-              input = Readline.readline("#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{option_type['defaultValue'] ? ' ['+option_type['defaultValue'].to_s+']' : ''} ['?' for options]: ", false).to_s
-              input = input.chomp.strip
-              if input.empty?
-                value = option_type['defaultValue']
+              print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }[#{optionString}]: "
+              input = $stdin.gets.chomp!
+              if input == '?'
+                help_prompt(option_type)
               else
-                select_option = select_options.find{|b| b['name'] == input || (!b['value'].nil? && b['value'].to_s == input) || (b['value'].nil? && input.empty?)}
-                if select_option
-                  value = select_option['value']
-                elsif !input.nil?  && !input.empty?
-                  input = '?'
+                if input.nil? || input.empty?
+                  selectedOption = options.find{|o| o[:checked] == true}
+                else
+                  selectedOption = options.find{|o| o[:key].downcase == input.downcase}
                 end
-              end
-              
-              if input == '?'
-                  help_prompt(option_type)
-                  display_select_options(select_options)
-              elsif !value.nil? || option_type['required'] != true
-                value_found = true
-              end
-          end
-          return value
-        end
-
-        def self.checkbox_prompt(option_type)
-            value_found = false
-            value = nil
-            while !value_found do
-                print "#{option_type['fieldLabel']} (yes/no) [#{option_type['defaultValue'] == 'on' ? 'yes' : 'no'}]: "
-                input = $stdin.gets.chomp!
-                if input.downcase == 'yes'
-                  value = 'on'
-                elsif input.downcase == 'no'
-                  value = 'off'
+                if selectedOption
+                  value = selectedOption[:key]
                 else
-                  value = option_type['defaultValue']
+                  puts "Invalid Option. Please select from #{optionString}."
                 end
-                if input == '?'
-                    help_prompt(option_type)
-                elsif !value.nil? || option_type['required'] != true
+                if !value.nil? || option_type['required'] != true
                   value_found = true
                 end
+              end
             end
             return value
-        end
+          end
 
-        def self.generic_prompt(option_type)
+          def self.number_prompt(option_type)
             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'] ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
                 input = $stdin.gets.chomp!
-                value = input.empty? ? option_type['defaultValue'] : input
+                value = input.empty? ? option_type['defaultValue'] : input.to_i
                 if input == '?'
-                    help_prompt(option_type)
+                  help_prompt(option_type)
                 elsif !value.nil? || option_type['required'] != true
                   value_found = true
                 end
+              end
+              return value
             end
-            return value
-        end
 
-        def self.multiline_prompt(option_type)
-            value_found = false
-            value = nil
-            while !value_found do
-                if value.nil?
-                  print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''} [Type 'EOF' to stop input]: \n"
+            def self.select_prompt(option_type,api_client, api_params={}, no_prompt=false)
+              value_found = false
+              value = nil
+              if option_type['selectOptions']
+                select_options = option_type['selectOptions']
+              elsif option_type['optionSource']
+                select_options = load_source_options(option_type['optionSource'],api_client,api_params)
+              else
+                raise "select_prompt() requires selectOptions or optionSource!"
+              end
+              if !select_options.nil? && select_options.count == 1 && option_type['skipSingleOption'] == true
+                value_found = true
+                value = select_options[0]['value']
+              end
+              if no_prompt
+                if !value_found
+                  if option_type['required']
+                    print Term::ANSIColor.red, "\nMissing Required Option\n\n"
+                    print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{option_type['fieldContext'] ? (option_type['fieldContext']+'.') : ''}#{option_type['fieldName']}=] - ", Term::ANSIColor.reset , "#{option_type['description']}\n"
+                    display_select_options(select_options)
+                    print "\n"
+                    exit 1
+                  else
+                    return nil
+                  end
                 end
-                input = $stdin.gets.chomp!
-                # value = input.empty? ? option_type['defaultValue'] : input
-                if input == '?' && value.nil?
+              end
+              while !value_found do
+                  Readline.completion_append_character = ""
+                  Readline.basic_word_break_characters = ''
+                  Readline.completion_proc = proc {|s| select_options.clone.collect{|opt| opt['name']}.grep(/^#{Regexp.escape(s)}/)}
+                  input = Readline.readline("#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{option_type['defaultValue'] ? ' ['+option_type['defaultValue'].to_s+']' : ''} ['?' for options]: ", false).to_s
+                  input = input.chomp.strip
+                  if input.empty?
+                    value = option_type['defaultValue']
+                  else
+                    select_option = select_options.find{|b| b['name'] == input || (!b['value'].nil? && b['value'].to_s == input) || (b['value'].nil? && input.empty?)}
+                    if select_option
+                      value = select_option['value']
+                    elsif !input.nil?  && !input.empty?
+                      input = '?'
+                    end
+                  end
+                  if input == '?'
                     help_prompt(option_type)
-                elsif (!value.nil? || option_type['required'] != true) && input.chomp == 'EOF'
-                  value_found = true
-                else
-                  if value.nil?
-                    value = ''
+                    display_select_options(select_options)
+                  elsif !value.nil? || option_type['required'] != true
+                    value_found = true
                   end
-                  value << input + "\n"
                 end
-            end
-            return value
-        end
+                return value
+              end
 
-        def self.password_prompt(option_type)
-            value_found = false
-            while !value_found do
-                print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}: "
-                input = STDIN.noecho(&:gets).chomp!
-                value = input
-                print "\n"
-                if input == '?'
-                    help_prompt(option_type)
-                elsif !value.empty? || option_type['required'] != true
-                  value_found = true
+              def self.checkbox_prompt(option_type)
+                value_found = false
+                value = nil
+                while !value_found do
+                    print "#{option_type['fieldLabel']} (yes/no) [#{option_type['defaultValue'] == 'on' ? 'yes' : 'no'}]: "
+                    input = $stdin.gets.chomp!
+                    if input.downcase == 'yes'
+                      value = 'on'
+                    elsif input.downcase == 'no'
+                      value = 'off'
+                    else
+                      value = option_type['defaultValue']
+                    end
+                    if input == '?'
+                      help_prompt(option_type)
+                    elsif !value.nil? || option_type['required'] != true
+                      value_found = true
+                    end
+                  end
+                  return value
                 end
-            end
-            return value
-        end
 
-        def self.help_prompt(option_type)
-            print Term::ANSIColor.green,"  * #{option_type['fieldLabel']} [-O #{option_type['fieldContext'] ? (option_type['fieldContext']+'.') : ''}#{option_type['fieldName']}=] - ", Term::ANSIColor.reset , "#{option_type['description']}\n"
-        end
+                def self.generic_prompt(option_type)
+                  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'] ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
+                      input = $stdin.gets.chomp!
+                      value = input.empty? ? option_type['defaultValue'] : input
+                      if input == '?'
+                        help_prompt(option_type)
+                      elsif !value.nil? || option_type['required'] != true
+                        value_found = true
+                      end
+                    end
+                    return value
+                  end
 
+                  def self.multiline_prompt(option_type)
+                    value_found = false
+                    value = nil
+                    while !value_found do
+                        if value.nil?
+                          print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''} [Type 'EOF' to stop input]: \n"
+                        end
+                        input = $stdin.gets.chomp!
+                        # value = input.empty? ? option_type['defaultValue'] : input
+                        if input == '?' && value.nil?
+                          help_prompt(option_type)
+                        elsif (!value.nil? || option_type['required'] != true) && input.chomp == 'EOF'
+                          value_found = true
+                        else
+                          if value.nil?
+                            value = ''
+                          end
+                          value << input + "\n"
+                        end
+                      end
+                      return value
+                    end
 
-        def self.load_source_options(source,api_client,params)
-          api_client.options.options_for_source(source,params)['data']
-        end
+                    def self.password_prompt(option_type)
+                      value_found = false
+                      while !value_found do
+                          print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}: "
+                          input = $stdin.noecho(&:gets).chomp!
+                          value = input
+                          print "\n"
+                          if input == '?'
+                            help_prompt(option_type)
+                          elsif !value.empty? || option_type['required'] != true
+                            value_found = true
+                          end
+                        end
+                        return value
+                      end
 
-        def self.display_select_options(select_options = [])
-          puts "\nOptions"
-          puts "==============="
-          select_options.each do |option|
-            puts " * #{option['name']} [#{option['value']}]"
-          end
-          puts "\n\n"
-        end
+                      def self.file_prompt(option_type)
+                        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'] ? ' ['+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'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{option_type['defaultValue'] ? ' ['+option_type['defaultValue'].to_s+']' : ''} ['?' for options]: ", false).to_s
+                            input = input.chomp.strip
+                            #input = $stdin.gets.chomp!
+                            value = input.empty? ? option_type['defaultValue'] : input.to_s
+                            if input == '?'
+                              help_prompt(option_type)
+                            elsif value.empty? && option_type['required'] != true
+                              value = nil
+                              value_found = true
+                            elsif value
+                              filename = File.expand_path(value)
+                              if !File.exists?(filename)
+                                # print_red_alert "File not found: #{filename}"
+                                # exit 1
+                                print Term::ANSIColor.red,"  File not found: #{filename}",Term::ANSIColor.reset, "\n"
+                              elsif !File.file?(filename)
+                                print Term::ANSIColor.red,"  Argument is not a file: #{filename}",Term::ANSIColor.reset, "\n"
+                              else
+                                value = filename
+                                value_found = true
+                              end
+                            end
+                          end
+                          return value
+                        end
 
-        def self.format_option_types_help(option_types)
-          if option_types.empty?
-            "Available Options:\nNone\n\n"
-          else
-            option_lines = option_types.collect {|it| "    -O #{it['fieldName']}=\"value\"" }.join("\n")
-            "Available Options:\n#{option_lines}\n\n"
-          end
-        end
-        
-        def self.display_option_types_help(option_types)
-          puts self.format_option_types_help(option_types)
-        end
+                        def self.help_prompt(option_type)
+                          print Term::ANSIColor.green,"  * #{option_type['fieldLabel']} [-O #{option_type['fieldContext'] ? (option_type['fieldContext']+'.') : ''}#{option_type['fieldName']}=] - ", Term::ANSIColor.reset , "#{option_type['description']}\n"
+                        end
+
+
+                        def self.load_source_options(source,api_client,params)
+                          api_client.options.options_for_source(source,params)['data']
+                        end
+
+                        def self.display_select_options(select_options = [])
+                          puts "\nOptions"
+                          puts "==============="
+                          select_options.each do |option|
+                            puts " * #{option['name']} [#{option['value']}]"
+                          end
+                          puts "\n\n"
+                        end
 
-    end
-  end
-end
+                        def self.format_option_types_help(option_types)
+                          if option_types.empty?
+                            "Available Options:\nNone\n\n"
+                          else
+                            option_lines = option_types.collect {|it| "    -O #{it['fieldName']}=\"value\"" }.join("\n")
+                            "Available Options:\n#{option_lines}\n\n"
+                          end
+                        end
+                        def self.display_option_types_help(option_types)
+                          puts self.format_option_types_help(option_types)
+                        end
+
+                      end
+                    end
+                  end