morpheus-cli 4.2.8 → 4.2.10

data/lib/morpheus/cli/cli_registry.rb

@@ -1,7 +1,7 @@
 require 'term/ansicolor'
 require 'shellwords'
 require 'morpheus/logging'
-require 'morpheus/cli/command_error'
+require 'morpheus/cli/errors'
 require 'morpheus/cli/error_handler'
 require 'morpheus/cli/expression_parser'
 
@@ -81,7 +81,7 @@ module Morpheus
             instance.get(command_name).new.handle(args)
           else
             # todo: need to just return error instead of raise
-            raise Morpheus::Cli::CommandError.new("'#{command_name}' is not a command. See 'morpheus --help'.")
+            raise CommandNotFoundError.new("'#{command_name}' is not a morpheus command.")
           end
         end
 

data/lib/morpheus/cli/cloud_datastores_command.rb

@@ -251,7 +251,7 @@ class Morpheus::Cli::CloudDatastoresCommand
       end
       opts.add_hidden_option('-c') # prefer args[0] for [cloud]
       opts.on('--group-access-all [on|off]', String, "Toggle Access for all groups.") do |val|
-        group_access_all = val.to_s == 'on' || val.to_s == 'true'
+        group_access_all = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
       opts.on('--group-access LIST', Array, "Group Access, comma separated list of group IDs.") do |list|
         if list.size == 1 && list[0] == 'null' # hacky way to clear it

data/lib/morpheus/cli/clouds.rb

@@ -257,13 +257,10 @@ class Morpheus::Cli::Clouds
       payload = nil
       if options[:payload]
         payload = options[:payload]
-        # support -O OPTION switch on top of --payload
-        if options[:options]
-          payload['zone'] ||= {}
-          payload['zone'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
-        end
+        payload.deep_merge!({'zone' => parse_passed_options(options)})
       else
         cloud_payload = {name: args[0], description: params[:description]}
+        cloud_payload.deep_merge!(parse_passed_options(options))
         # use active group by default
         params[:group] ||= @active_group_id
 
@@ -462,7 +459,7 @@ class Morpheus::Cli::Clouds
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
-      opts.on( '-f', '--force', "Force Delete" ) do
+      opts.on( '-f', '--force', "Force refresh. Useful if the cloud is disabled." ) do
         query_params[:force] = 'true'
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
@@ -859,23 +856,11 @@ class Morpheus::Cli::Clouds
 
       link = "#{@appliance_url}/login/oauth-redirect?access_token=#{@access_token}\\&redirectUri=/infrastructure/clouds/#{cloud['id']}#!wiki"
 
-      open_command = nil
-      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
-        open_command = "start #{link}"
-      elsif RbConfig::CONFIG['host_os'] =~ /darwin/
-        open_command = "open #{link}"
-      elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
-        open_command = "xdg-open #{link}"
-      end
-
       if options[:dry_run]
-        puts "system: #{open_command}"
+        puts Morpheus::Util.open_url_command(link)
         return 0
       end
-
-      system(open_command)
-      
-      return 0
+      return Morpheus::Util.open_url(link)
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

data/lib/morpheus/cli/clusters.rb

@@ -355,23 +355,11 @@ class Morpheus::Cli::Clusters
         link << "#!#{options[:link_tab]}"
       end
 
-      open_command = nil
-      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
-        open_command = "start #{link}"
-      elsif RbConfig::CONFIG['host_os'] =~ /darwin/
-        open_command = "open #{link}"
-      elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
-        open_command = "xdg-open #{link}"
-      end
-
       if options[:dry_run]
-        puts "system: #{open_command}"
+        puts Morpheus::Util.open_url_command(link)
         return 0
       end
-
-      system(open_command)
-      
-      return 0
+      return Morpheus::Util.open_url(link)
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -2991,23 +2979,11 @@ class Morpheus::Cli::Clusters
 
       link = "#{@appliance_url}/login/oauth-redirect?access_token=#{@access_token}\\&redirectUri=/infrastructure/clusters/#{cluster['id']}#!wiki"
 
-      open_command = nil
-      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
-        open_command = "start #{link}"
-      elsif RbConfig::CONFIG['host_os'] =~ /darwin/
-        open_command = "open #{link}"
-      elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
-        open_command = "xdg-open #{link}"
-      end
-
       if options[:dry_run]
-        puts "system: #{open_command}"
+        puts Morpheus::Util.open_url_command(link)
         return 0
       end
-
-      system(open_command)
-      
-      return 0
+      return Morpheus::Util.open_url(link)
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

data/lib/morpheus/cli/commands/standard/alias_command.rb

@@ -63,11 +63,7 @@ EOT
       
     end
     optparse.parse!(args)
-    if args.count < 1
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 1-N and got #{args.count}\n#{optparse}"
-      return 1
-    end
+    verify_args!(args:args, optparse:optparse, min: 1)
     
     # make this super forgiving.. my name = command -j -O value=woot
     # the old way, as one argument "name='command'"
@@ -125,10 +121,7 @@ EOT
       opts.footer = "Export an alias, saving it to your .morpheus_profile for future use"
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
+    verify_args!(args:args, optparse:optparse, min: 1)
     alias_names = args
     alias_names.each do |arg|
       if !Morpheus::Cli::CliRegistry.has_alias?(arg)

data/lib/morpheus/cli/commands/standard/benchmark_command.rb

@@ -360,6 +360,8 @@ EOT
         else
           out << "\texit: 0 "
         end
+        total_time_str = "#{benchmark_record.duration.round((benchmark_record.duration > 0.002) ? 3 : 6)}s"
+        out << "\t #{total_time_str.ljust(9, ' ')}"
       else
         benchmark_records = []
         n.times do |iteration_index|

data/lib/morpheus/cli/commands/standard/curl_command.rb

@@ -58,11 +58,10 @@ EOT
       return false
     end
     
-    @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true}))
+    @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true, :skip_login => true}))
 
     if !@appliance_name
-      print yellow,"Please specify a Morpheus Appliance with -r or see the command `remote use`#{reset}\n"
-      return false
+      raise_command_error "#{command_name} requires a remote to be specified, use -r [remote] or set the active remote with `remote use`"
     end
 
     # curry --insecure to curl

data/lib/morpheus/cli/commands/standard/history_command.rb

@@ -40,17 +40,14 @@ EOT
     end
     raw_cmd = "#{command_name} #{args.join(' ')}"
     optparse.parse!(args)
-    if args.count != 0
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
-      return 1
-    end
+    verify_args!(args:args, count: 0, optparse:optparse)
     if options[:do_flush]
       command_count = Morpheus::Cli::Shell.instance.history_commands_count
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to flush your command history (#{format_number(command_count)} #{command_count == 1 ? 'command' : 'commands'})?")
         return 9, "aborted command"
       end
-      Morpheus::Cli::Shell.instance.flush_history
+      flush_n = options[:max] ? options[:max] : nil
+      Morpheus::Cli::Shell.instance.flush_history(flush_n)
       return 0
     else
       Morpheus::Cli::Shell.instance.print_history(options)

data/lib/morpheus/cli/commands/standard/man_command.rb

@@ -51,7 +51,7 @@ The -g switch be used to regenerate the file.
 EOT
     end
     optparse.parse!(args)
-
+    verify_args!(args:args, optparse:optparse, count:0)
     if goto_wiki
       link = "https://github.com/gomorpheus/morpheus-cli/wiki/CLI-Manual"
       if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
@@ -153,13 +153,15 @@ EOT
     begin
 
       manpage.print <<-ENDTEXT
+morpheus v#{Morpheus::Cli::VERSION}
+
 ## NAME
 
-    morpheus - the command line interface for interacting with the Morpheus Data appliance
+    morpheus - the command line interface for interacting with the Morpheus appliance
 
 ## SYNOPSIS
 
-    morpheus [command] [<args>]
+    morpheus [command] [<args>] [options]
 
 ## DESCRIPTION
 
@@ -168,9 +170,9 @@ EOT
     This is a command line interface for managing a Morpheus Appliance.
     All communication with the remote appliance is done via the Morpheus API.
 
-    To setup a new appliance, see the `remote add` and `remote setup` commands.
+    To get started, see the command `remote add` command.
 
-    To get started, visit https://github.com/gomorpheus/morpheus-cli/wiki/Getting-Started
+    To learn more, visit https://github.com/gomorpheus/morpheus-cli/wiki/Getting-Started
 
     To learn more about the Morpheus Appliance, visit https://www.morpheusdata.com/features
 
@@ -220,7 +222,7 @@ ENDTEXT
       exit_code, err = terminal.execute("--help")
       manpage.print "```\n"
       manpage.print "\n"
-      # output help for every unhidden command
+      # output help for every command (that is not hidden)
       Morpheus::Cli::CliRegistry.all.keys.sort.each do |cmd|
         cmd_klass = Morpheus::Cli::CliRegistry.instance.get(cmd)
         cmd_instance = cmd_klass.new
@@ -237,7 +239,8 @@ ENDTEXT
           raise err unless err.success?
         end
         manpage.print "```\n"
-        subcommands = cmd_klass.subcommands
+        # subcommands = cmd_klass.subcommands
+        subcommands = cmd_klass.visible_subcommands
         if subcommands && subcommands.size > 0
           subcommands.sort.each do |subcommand, subcommand_method|
             Morpheus::Logging::DarkPrinter.puts "appending command help `morpheus #{cmd} #{subcommand} --help`" if Morpheus::Logging.debug? && !options[:quiet]

data/lib/morpheus/cli/commands/standard/ssl_verification_command.rb

@@ -8,12 +8,14 @@ class Morpheus::Cli::SslVerificationCommand
   include Morpheus::Cli::CliCommand
   set_command_name :'ssl-verification'
   set_command_hidden
-def usage
+
+  def usage
     <<-EOT
 Usage: morpheus #{command_name} [on|off]
-\tThis is intended for use in your morpheus scripts.
-\t"Enable [on] or Disable [off] SSL Verification for all your api requests."
-\tThe default is on.
+
+Set SSL Verification on or off.
+Enable [on] or disable [off] SSL Verification.
+If no arguments are passed, the current value is printed.
 EOT
   end
 
@@ -28,14 +30,13 @@ EOT
       end
     end
     optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, max:1)
     if args.count == 0
       puts Morpheus::RestClient.ssl_verification_enabled? ? "on" : "off"
-      return true
-    end
-    if args.count > 1
-      puts optparse
-      return false
+      return Morpheus::RestClient.ssl_verification_enabled? ? 0 : 1
     end
+
+
     if ["on", "enabled", "true", "1"].include?(args[0].to_s.strip.downcase)
       Morpheus::RestClient.enable_ssl_verification = true
     elsif ["off", "disabled", "false", "0"].include?(args[0].to_s.strip.downcase)

data/lib/morpheus/cli/containers_command.rb

@@ -362,7 +362,7 @@ class Morpheus::Cli::ContainersCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[id list]")
-      opts.footer = "This outputs the list of the actions available to specified container(s)."
+      opts.footer = "List the actions available to specified container(s)."
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -657,9 +657,9 @@ class Morpheus::Cli::ContainersCommand
       execution_request = json_response['executionRequest']
       print_green_success "Executing request #{execution_request['uniqueId']}"
       if do_refresh
-        Morpheus::Cli::ExecutionRequestCommand.new.handle(["get", execution_request['uniqueId'], "--refresh"])
+        Morpheus::Cli::ExecutionRequestCommand.new.handle(["get", execution_request['uniqueId'], "--refresh"]+ (options[:remote] ? ["-r",options[:remote]] : []))
       else
-        Morpheus::Cli::ExecutionRequestCommand.new.handle(["get", execution_request['uniqueId']])
+        Morpheus::Cli::ExecutionRequestCommand.new.handle(["get", execution_request['uniqueId']]+ (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e

data/lib/morpheus/cli/credentials.rb

@@ -40,7 +40,15 @@ module Morpheus
         password = nil
         wallet = nil
 
-        
+        # should not need this logic in here
+        if options[:remote_url]
+          # @appliance_name = options[:remote_url] 
+          # name should change too though or printing may be misleading.
+          # @appliance_name = "remote-url"
+          # @appliance_url = options[:remote_url]
+          # do not save when using --remote-url
+          do_save = false
+        end
 
         if options[:remote_token]
           # user passed in a token to login with.
@@ -48,7 +56,8 @@ module Morpheus
           # OR whoami should return other wallet info like access token or maybe just the expiration date
           # for now, it just stores the access token without other wallet info
           begin
-            whoami_interface = Morpheus::WhoamiInterface.new(options[:remote_token], nil, nil, @appliance_url)
+            # @setup_interface = Morpheus::SetupInterface.new({url:@appliance_url,access_token:@access_token})
+            whoami_interface = Morpheus::WhoamiInterface.new({url: @appliance_url, token: options[:remote_token]})
             whoami_interface.setopts(options)
             if options[:dry_run]
               print_dry_run whoami_interface.dry.get()
@@ -84,24 +93,15 @@ module Morpheus
             wallet = nil
           end
         else
-          
           # ok prompt for creds..
           username = options['username'] || options[:username] || nil
           password = options['password'] || options[:password] || nil
           
+          # what are these for? just use :username and :password
           if options[:remote_username]
             username = options[:remote_username]
             password = options[:remote_password]
-            if do_save == true
-              do_save = (options[:remote_url] ? false : true)
-            end
-          else
-            # maybe just if check if options[:test_only] != true
-            # if do_save == true
-            #   wallet = load_saved_credentials
-            # end  
           end
-
           if wallet.nil?
             unless options[:quiet] || options[:no_prompt]
               # if username.empty? || password.empty?
@@ -126,7 +126,7 @@ module Morpheus
               end
               if password.empty?
                 print "Password: #{required_blue_prompt} "
-                # wtf is this STDIN and $stdin and not my_terminal.stdin ?
+                # this should be my_terminal.stdin instead of STDIN and $stdin
                 password = STDIN.noecho(&:gets).chomp!
                 print "\n"
               else
@@ -185,14 +185,11 @@ module Morpheus
         end
 
         if do_save && @appliance_name
-
-
           begin
             # save pertinent session info to the appliance
             save_credentials(@appliance_name, wallet)
             now = Time.now.to_i
             appliance = ::Morpheus::Cli::Remote.load_remote(@appliance_name)
-            
             if wallet && wallet['access_token']
               save_credentials(@appliance_name, wallet)
             else

data/lib/morpheus/cli/error_handler.rb

@@ -4,7 +4,7 @@ require 'json'
 require 'rest_client'
 require 'net/https'
 require 'morpheus/logging'
-require 'morpheus/cli/command_error'
+require 'morpheus/cli/errors'
 require 'morpheus/cli/expression_parser'
 
 class Morpheus::Cli::ErrorHandler
@@ -31,34 +31,38 @@ class Morpheus::Cli::ErrorHandler
       # raise err
       # @stderr.puts "#{red}#{err.message}#{reset}"
       puts_angry_error err.message
-      @stderr.puts "Try -h for help with this command."
+      @stderr.puts "Use -h to get help with this command."
       do_print_stacktrace = false
       # exit_code = 127
+    # when Morpheus::Cli::CommandArgumentsError
     when Morpheus::Cli::CommandError
       # @stderr.puts "#{red}#{err.message}#{reset}"
-      puts_angry_error err.message
+      # this should probably print the whole thing as red, but just does the first line for now.
+      message_lines = err.message.split(/\r?\n/)
+      first_line = message_lines.shift
+      puts_angry_error first_line
+      @stderr.puts message_lines.join("\n") unless message_lines.empty?
+      @stderr.puts "Use -h to get help with this command."
       do_print_stacktrace = false
       if err.exit_code
         exit_code = err.exit_code
       end
-      # @stderr.puts "Try -h for help with this command."
     when Morpheus::Cli::ExpressionParser::InvalidExpression
       # @stderr.puts "#{red}#{err.message}#{reset}"
       puts_angry_error err.message
       do_print_stacktrace = false
       exit_code = 99
     when SocketError
-      @stderr.puts "#{red}Error Communicating with the Appliance.#{reset}"
+      @stderr.puts "#{red}Error Communicating with the remote appliance.#{reset}"
       @stderr.puts "#{red}#{err.message}#{reset}"
     when RestClient::Exceptions::Timeout
-      @stderr.puts "#{red}Error Communicating with the Appliance.#{reset}"
+      @stderr.puts "#{red}Error Communicating with the remote appliance.#{reset}"
       @stderr.puts "#{red}#{err.message}#{reset}"
     when Errno::ECONNREFUSED
-      @stderr.puts "#{red}Error Communicating with the Appliance.#{reset}"
+      @stderr.puts "#{red}Error Communicating with the remote appliance.#{reset}"
       @stderr.puts "#{red}#{err.message}#{reset}"
-      # @stderr.puts "Try -h for help with this command."
     when OpenSSL::SSL::SSLError
-      @stderr.puts "#{red}Error Communicating with the Appliance.#{reset}"
+      @stderr.puts "#{red}Error Communicating with the remote appliance.#{reset}"
       @stderr.puts "#{red}#{err.message}#{reset}"
     when RestClient::Exception
       print_rest_exception(err, options)
@@ -125,7 +129,7 @@ class Morpheus::Cli::ErrorHandler
         rescue TypeError, JSON::ParserError => ex
         end
       else
-        @stderr.print red, "Error Communicating with the Appliance. #{e}", reset, "\n"
+        @stderr.print red, "Error Communicating with the remote appliance. #{e}", reset, "\n"
         if options[:json] || options[:debug]
           begin
             response = JSON.parse(e.response.to_s)
@@ -145,7 +149,7 @@ class Morpheus::Cli::ErrorHandler
         end
       end
     else
-      @stderr.print red, "Error Communicating with the Appliance. #{e}", reset, "\n"
+      @stderr.print red, "Error Communicating with the remote appliance. #{e}", reset, "\n"
     end
     # uh, having this print method return exit_code, err to standardize return values of methods that are still calling it, at the end just by chance..
     # return exit_code, err
@@ -204,7 +208,7 @@ class Morpheus::Cli::ErrorHandler
   end
 
   def print_rest_exception_request_and_response(e)
-    @stderr.puts "#{red}Error Communicating with the Appliance. (#{e.response.code})#{reset}"
+    @stderr.puts "#{red}Error Communicating with the remote appliance. (HTTP #{e.response.code})#{reset}"
     response = e.response
     request = response.instance_variable_get("@request")
     @stderr.print red
@@ -220,7 +224,9 @@ protected
   def puts_angry_error(*msgs)
     # @stderr.print "#{Term::ANSIColor.red}morpheus: #{Term::ANSIColor.reset}#{msg}\n"
     @stderr.print(Morpheus::Terminal.angry_prompt)
+    @stderr.print(Term::ANSIColor.red)
     @stderr.puts(*msgs)
+    @stderr.print(reset)
   end
 
   # def puts(*args)