morpheus-cli 2.10.1 → 2.10.2

data/lib/morpheus/cli/instances.rb

@@ -11,7 +11,7 @@ class Morpheus::Cli::Instances
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::ProvisioningHelper
 
-  register_subcommands :list, :get, :add, :update, :remove, :stats, :stop, :start, :restart, :suspend, :eject, :backup, :backups, :stop_service, :start_service, :restart_service, :resize, :upgrade, :clone, :envs, :setenv, :delenv, :security_groups, :apply_security_groups, :firewall_enable, :firewall_disable, :run_workflow, :import_snapshot, :console, :status_check
+  register_subcommands :list, :get, :add, :update, :remove, :stats, :stop, :start, :restart, :suspend, :eject, :backup, :backups, :stop_service, :start_service, :restart_service, :resize, :clone, :envs, :setenv, :delenv, :security_groups, :apply_security_groups, :firewall_enable, :firewall_disable, :run_workflow, :import_snapshot, :console, :status_check
   alias_subcommand :details, :get
   set_default_subcommand :list
   
@@ -446,6 +446,67 @@ class Morpheus::Cli::Instances
     end
   end
 
+  def clone(args)
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[name] -g GROUP")
+      build_option_type_options(opts, options, clone_instance_option_types(false))
+      opts.on( '-g', '--group GROUP', "Group Name or ID for the new instance" ) do |val|
+        options[:group] = val
+      end
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+    if !options[:group]
+      print_red_alert "GROUP is required."
+      puts optparse
+      exit 1
+    end
+    connect(options)
+    begin
+      options[:options] ||= {}
+      # use the -g GROUP or active group by default
+      options[:options]['group'] ||= options[:group] # || @active_group_id # always choose a group for now?
+      # support [new-name] 
+      # if args[1]
+      #   options[:options]['name'] = args[1]
+      # end
+      payload = {
+
+      }
+      params = Morpheus::Cli::OptionTypes.prompt(clone_instance_option_types, options[:options], @api_client, options[:params])
+      group = find_group_by_name_or_id_for_provisioning(params.delete('group'))
+      payload.merge!(params)
+      payload['group'] = {id: group['id']}
+
+      instance = find_instance_by_name_or_id(args[0])
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to clone the instance '#{instance['name']}'?", options)
+        exit 1
+      end
+      
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.clone(instance['id'], payload)
+        return
+      end
+      json_response = @instances_interface.clone(instance['id'], payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Cloning instance #{instance['name']} to '#{payload['name']}'"
+      end
+      return
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+
   def envs(args)
     options = {}
     optparse = OptionParser.new do|opts|
@@ -904,11 +965,11 @@ class Morpheus::Cli::Instances
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
     end
+    optparse.parse!(args)
     if args.count < 1
       puts optparse
       exit 1
     end
-    optparse.parse!(args)
     connect(options)
     begin
       instance = find_instance_by_name_or_id(args[0])
@@ -1017,11 +1078,11 @@ class Morpheus::Cli::Instances
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
 
     end
+    optparse.parse!(args)
     if args.count < 1
       puts "\n#{optparse}\n\n"
       exit 1
     end
-    optparse.parse!(args)
     connect(options)
     begin
       instance = find_instance_by_name_or_id(args[0])
@@ -1051,11 +1112,11 @@ class Morpheus::Cli::Instances
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
     end
+    optparse.parse!(args)
     if args.count < 1
       puts optparse
       exit 1
     end
-    optparse.parse!(args)
     connect(options)
     begin
       instance = find_instance_by_name_or_id(args[0])
@@ -1082,11 +1143,11 @@ class Morpheus::Cli::Instances
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
     end
+    optparse.parse!(args)
     if args.count < 1
       puts optparse
       exit 1
     end
-    optparse.parse!(args)
     connect(options)
     begin
       instance = find_instance_by_name_or_id(args[0])
@@ -1113,11 +1174,11 @@ class Morpheus::Cli::Instances
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
+    optparse.parse!(args)
     if args.count < 1
       puts optparse
       exit 1
     end
-    optparse.parse!(args)
     connect(options)
     begin
       instance = find_instance_by_name_or_id(args[0])
@@ -1204,11 +1265,11 @@ class Morpheus::Cli::Instances
       opts.banner = subcommand_usage("[name] [workflow] [options]")
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
     end
+    optparse.parse!(args)
     if args.count < 2
       puts "\n#{optparse}\n\n"
       exit 1
     end
-    optparse.parse!(args)
     connect(options)
     instance = find_instance_by_name_or_id(args[0])
     workflow = find_workflow_by_name(args[1])
@@ -1263,11 +1324,11 @@ class Morpheus::Cli::Instances
       end
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
     end
+    optparse.parse!(args)
     if args.count < 1
       puts optparse
       exit 1
     end
-    optparse.parse!(args)
     connect(options)
     begin
       instance = find_instance_by_name_or_id(args[0])
@@ -1383,4 +1444,11 @@ class Morpheus::Cli::Instances
     end
     out
   end
+
+  def clone_instance_option_types(connected=true)
+    [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Enter a name for the new instance'},
+      {'fieldName' => 'group', 'fieldLabel' => 'Group', 'type' => 'select', 'selectOptions' => (connected ? get_available_groups() : []), 'required' => true},
+    ]
+  end
 end

data/lib/morpheus/cli/log_level_command.rb

@@ -0,0 +1,51 @@
+require 'optparse'
+require 'morpheus/cli/cli_command'
+require 'json'
+
+class Morpheus::Cli::LogLevelCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :'log-level' # :log_level
+  set_command_hidden
+
+  def handle(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus #{command_name} [debug|info|0|1]"
+      #build_common_options(opts, options, [])
+      opts.on('-h', '--help', "Prints this help" ) do
+        puts opts
+        exit
+      end
+      opts.footer = <<-EOT
+This is intended for use in your morpheus scripts.
+It allows you to set the global logging level.
+The only available levels right now are debug [0] and info [1].
+The default is info [1].
+EOT
+    end
+    optparse.parse!(args)
+    if args.count == 0
+      puts "#{Morpheus::Logging.log_level}"
+      return true
+    end
+    if args.count > 1
+      puts optparse
+      return false
+    end
+    if ["debug", "0"].include?(args[0].to_s.strip.downcase)
+      Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
+      ::RestClient.log = Morpheus::Logging.debug? ? STDOUT : nil
+    elsif ["info", "1"].include?(args[0].to_s.strip.downcase)
+      Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::INFO)
+      ::RestClient.log = Morpheus::Logging.debug? ? STDOUT : nil
+    elsif args[0].to_i < 6
+      Morpheus::Logging.set_log_level(args[0].to_i)
+      ::RestClient.log = Morpheus::Logging.debug? ? STDOUT : nil
+    else
+      puts optparse
+      return false
+    end
+    return true
+  end
+
+end

data/lib/morpheus/cli/option_parser.rb

@@ -7,12 +7,8 @@ module Morpheus
     # not used yet, maybe ever =o
     class Morpheus::Cli::OptionParser < OptionParser
 
-      attr_reader :footer
+      attr_accessor :footer
       
-      def footer=(msg)
-        @footer = msg
-      end
-
       alias :original_to_s :to_s
 
       def to_s
@@ -21,10 +17,20 @@ module Morpheus
 
       def full_help_message
         out = ""
-        out << original_to_s
+        #out << original_to_s
+        if banner
+          out << "#{banner}".sub(/\n?\z/, "\n")
+        end
+        if !self.to_a.empty?
+          #out << "Options:\n"
+          out << summarize().join("")
+        end
         if footer
-          out << footer.to_s.strip
+          # nice_footer = footer.split("\n").collect {|line| "#{summary_indent}#{line}" }.join("\n")
+          nice_footer = footer
           out << "\n"
+          out << "#{nice_footer}".sub(/\n?\z/, "\n")
+          # out << "\n"
         end
         out
       end

data/lib/morpheus/cli/option_types.rb

@@ -13,358 +13,378 @@ module Morpheus
         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.empty? && !default_value.nil?
-              return !!default_value
-            end
-            if input.downcase == 'yes' || input.downcase == 'y'
-              return true
-            elsif input.downcase == 'no' || input.downcase == 'n'
-              return false
-            else
-              puts "Invalid Option... Please try again."
-            end
+          if default_value.nil?
+            print "#{message} (yes/no): "
+          else
+            print "#{message} (yes/no) [#{!!default_value ? 'yes' : 'no'}]: "
+          end
+          input = $stdin.gets.chomp!
+          if input.empty? && !default_value.nil?
+            return !!default_value
+          end
+          if input.downcase == 'yes' || input.downcase == 'y'
+            return true
+          elsif input.downcase == 'no' || input.downcase == 'n'
+            return false
+          else
+            puts "Invalid Option... Please try again."
           end
         end
+      end
 
-        def self.prompt(option_types, options={}, api_client=nil,api_params={}, no_prompt=false)
-          results = {}
-          options = options || {}
-          # puts "Options Prompt #{options}"
-          option_types.sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i }.each do |option_type|
-            context_map = results
-            value = nil
-            value_found=false
-            if option_type['fieldContext']
-              results[option_type['fieldContext']] ||= {}
-              context_map = results[option_type['fieldContext']]
-              if options[option_type['fieldContext']] and options[option_type['fieldContext']].key?(option_type['fieldName'])
-                value = options[option_type['fieldContext']][option_type['fieldName']]
-                if option_type['type'] == 'number'
-                  value = value.to_i
-                end
-                value_found = true
-              end
-            end
-
-            if value_found == false && options.key?(option_type['fieldName'])
-              value = options[option_type['fieldName']]
+      def self.prompt(option_types, options={}, api_client=nil,api_params={}, no_prompt=false)
+        results = {}
+        options = options || {}
+        # puts "Options Prompt #{options}"
+        option_types.sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i }.each do |option_type|
+          context_map = results
+          value = nil
+          value_found=false
+          if option_type['fieldContext']
+            results[option_type['fieldContext']] ||= {}
+            context_map = results[option_type['fieldContext']]
+            if options[option_type['fieldContext']] and options[option_type['fieldContext']].key?(option_type['fieldName'])
+              value = options[option_type['fieldContext']][option_type['fieldName']]
               if option_type['type'] == 'number'
                 value = value.to_i
               end
               value_found = true
             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']
-                  value = option_type['defaultValue']
-                  value_found = true
-                end
-                if !value_found
-                  # 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)
-                    value_found = !!value
-                  end
-                  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"
-                      print "\n"
-                      exit 1
-                    else
-                      next
-                    end
-                  end
-                end
-              end
-            end
-
-            if !value_found
-              if option_type['type'] == 'number'
-                value = number_prompt(option_type)
-              elsif option_type['type'] == 'password'
-                value = password_prompt(option_type)
-              elsif option_type['type'] == 'checkbox'
-                value = checkbox_prompt(option_type)
-              elsif option_type['type'] == 'radio'
-                value = radio_prompt(option_type)
-              elsif option_type['type'] == 'textarea'
-                value = multiline_prompt(option_type)
-              elsif option_type['type'] == 'code-editor'
-                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
 
-          return results
-        end
-
-
-        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
+          if value_found == false && options.key?(option_type['fieldName'])
+            value = options[option_type['fieldName']]
+            if option_type['type'] == 'number'
+              value = value.to_i
             end
-            return value
+            value_found = true
           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
+          # 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']
+                value = option_type['defaultValue']
                 value_found = true
-                value = select_options[0]['value']
               end
-              if no_prompt
+              if !value_found
+                # 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)
+                  value_found = !!value
+                end
                 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
+                    next
                   end
                 end
               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)
-                    display_select_options(select_options)
-                  elsif !value.nil? || option_type['required'] != true
-                    value_found = true
-                  end
+            end
+          end
+
+          if !value_found
+            if option_type['type'] == 'number'
+              value = number_prompt(option_type)
+            elsif option_type['type'] == 'password'
+              value = password_prompt(option_type)
+            elsif option_type['type'] == 'checkbox'
+              value = checkbox_prompt(option_type)
+            elsif option_type['type'] == 'radio'
+              value = radio_prompt(option_type)
+            elsif option_type['type'] == 'textarea'
+              value = multiline_prompt(option_type)
+            elsif option_type['type'] == 'code-editor'
+              value = multiline_prompt(option_type)
+            elsif option_type['type'] == 'select'
+              # so, the /api/options/source is may need ALL the previously
+              # selected values that are being accumulated in options
+              # api_params is just extra params to always send
+              # I suppose the entered value should take precedence
+              # api_params = api_params.merge(options) # this might be good enough
+              # dup it
+              select_api_params = {}.merge(api_params || {})
+              results.each do |k,v|
+                if v.is_a?(Hash)
+                  # grailsify params k.k2, otherwise you'll get bracked param names like k[k2]
+                  v.each {|k2, v2| 
+                    select_api_params["#{k}.#{k2}"] = v2
+                  }
+                else
+                  # could be String/Symbol duplication issues here.
+                  select_api_params.delete(k.to_sym)
+                  select_api_params[k.to_s] = v
                 end
-                return value
               end
+            value = select_prompt(option_type,api_client, select_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
 
-              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
+      return results
+    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.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
+          end
+        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)
+            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'
+          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
+
+      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.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.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.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.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.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.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.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
+      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.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.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
+    end
+  end
+end