morpheus-cli 5.5.2.1 → 5.5.3

data/lib/morpheus/cli/commands/shell.rb

@@ -110,6 +110,13 @@ class Morpheus::Cli::Shell
   end
 
   def handle(args)
+    @clean_shell_mode = false
+    @execute_mode = false
+    @execute_mode_command = nil
+    @norc = false
+    @temporary_shell_mode = false
+    @temporary_home_directory = nil
+    @original_home_directory = nil
     usage = "Usage: morpheus #{command_name}"
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = usage
@@ -159,9 +166,7 @@ class Morpheus::Cli::Shell
       @parent_shell_directories ||= []
       @parent_shell_directories << my_terminal.home_directory
       @previous_home_directory = @parent_shell_directories.last
-      if @original_home_directory.nil?
-        @original_home_directory = @previous_home_directory
-      end
+      @original_home_directory ||= @previous_home_directory
       
       #@norc = true # perhaps?
       # instead of using TMPDIR, create tmp shell directory inside $MORPHEUS_CLI_HOME/tmp
@@ -171,18 +176,18 @@ class Morpheus::Cli::Shell
       if !tmpdir
         tmpdir = File.join(@original_home_directory, "tmp")
       end
-      if !File.exists?(tmpdir)
+      if !File.exist?(tmpdir)
         # Morpheus::Logging::DarkPrinter.puts "creating tmpdir #{tmpdir}" if Morpheus::Logging.debug?
         FileUtils.mkdir_p(tmpdir)
       end
       # this won't not happen since we mkdir above
-      if !File.exists?(tmpdir)
+      if !File.exist?(tmpdir)
         raise_command_error "Temporary directory not found. Use environment variable MORPHEUS_CLI_TMPDIR"
       end
       # change to a temporary home directory
       @temporary_home_directory = File.join(tmpdir, "tmpshell-#{rand().to_s[2..7]}")
       
-      #if !File.exists?(@temporary_home_directory)
+      #if !File.exist?(@temporary_home_directory)
         Morpheus::Logging::DarkPrinter.puts "starting temporary shell at #{@temporary_home_directory}" if Morpheus::Logging.debug?
         FileUtils.mkdir_p(@temporary_home_directory)
       # end
@@ -209,21 +214,21 @@ class Morpheus::Cli::Shell
         # not just in shell
         # .morpheus_profile has aliases
         # this has already been loaded, probably should reload it...
-        if File.exists?(File.join(@previous_home_directory, ".morpheus_profile"))
+        if File.exist?(File.join(@previous_home_directory, ".morpheus_profile"))
           FileUtils.cp(File.join(@previous_home_directory, ".morpheus_profile"), File.join(@temporary_home_directory, ".morpheus_profile"))
         end
         if @norc != true
-          if File.exists?(File.join(@previous_home_directory, ".morpheusrc"))
+          if File.exist?(File.join(@previous_home_directory, ".morpheusrc"))
             FileUtils.cp(File.join(@previous_home_directory, ".morpheusrc"), File.join(@temporary_home_directory, ".morpheusrc"))
           end
         end
-        if File.exists?(File.join(@previous_home_directory, "appliances"))
+        if File.exist?(File.join(@previous_home_directory, "appliances"))
           FileUtils.cp(File.join(@previous_home_directory, "appliances"), File.join(@temporary_home_directory, "appliances"))
         end
-        if File.exists?(File.join(@previous_home_directory, "credentials"))
+        if File.exist?(File.join(@previous_home_directory, "credentials"))
           FileUtils.cp(File.join(@previous_home_directory, "credentials"), File.join(@temporary_home_directory, "credentials"))
         end
-        if File.exists?(File.join(@previous_home_directory, "groups"))
+        if File.exist?(File.join(@previous_home_directory, "groups"))
           FileUtils.cp(File.join(@previous_home_directory, "groups"), File.join(@temporary_home_directory, "groups"))
         end
         # stay logged in
@@ -258,7 +263,7 @@ class Morpheus::Cli::Shell
 
     # execute startup script
     if !@norc
-      if File.exists?(Morpheus::Cli::DotFile.morpheusrc_filename)
+      if File.exist?(Morpheus::Cli::DotFile.morpheusrc_filename)
         @history_logger.info("load source #{Morpheus::Cli::DotFile.morpheusrc_filename}") if @history_logger
         Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheusrc_filename).execute()
       end
@@ -277,6 +282,8 @@ class Morpheus::Cli::Shell
       result = 0
       @exit_now_please = false
       while !@exit_now_please do
+        #Readline.input = my_terminal.stdin
+        #Readline.input = $stdin
         Readline.completion_append_character = " "
         Readline.completion_proc = @auto_complete
         Readline.basic_word_break_characters = ""
@@ -335,7 +342,6 @@ class Morpheus::Cli::Shell
     if input[0..(prog_name.size)] == "#{prog_name} "
       input = input[(prog_name.size + 1)..-1] || ""
     end
-
     if !input.empty?
 
       if input == 'exit'
@@ -372,7 +378,7 @@ class Morpheus::Cli::Shell
           out <<  "\t#{cmd.to_s}\n"
         }
         out << "\n"
-        out << "For more information, see https://github.com/gomorpheus/morpheus-cli/wiki"
+        out << "For more information, see https://clidocs.morpheusdata.com"
         out << "\n"
         print out
         return 0
@@ -386,12 +392,12 @@ class Morpheus::Cli::Shell
         # clear registry
         Morpheus::Cli::CliRegistry.instance.flush
         # reload code
-        Morpheus::Cli.load!
+        Morpheus::Cli.reload!
         # execute startup scripts
-        if File.exists?(Morpheus::Cli::DotFile.morpheus_profile_filename)
+        if File.exist?(Morpheus::Cli::DotFile.morpheus_profile_filename)
           Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheus_profile_filename).execute()
         end
-        if File.exists?(Morpheus::Cli::DotFile.morpheusrc_filename)
+        if File.exist?(Morpheus::Cli::DotFile.morpheusrc_filename)
           Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheusrc_filename).execute()
         end
         # recalculate shell environment
@@ -486,7 +492,11 @@ class Morpheus::Cli::Shell
       rescue SystemExit => cmdexit
         # nothing to do, assume the command that exited printed an error already
         # print "\n"
-        exit_code, err = cmdexit.status, "Command exited early."
+        if cmdexit.success?
+          exit_code, err = cmdexit.status, nil
+        else
+          exit_code, err = cmdexit.status, "Command exited early."
+        end
       rescue => e
         # some other type of failure..
         @history_logger.error "#{e.message}" if @history_logger
@@ -514,6 +524,7 @@ class Morpheus::Cli::Shell
 
   end
 
+  # wha this?
   def get_prompt
 
     # print cyan,"morpheus > ",reset
@@ -538,10 +549,10 @@ class Morpheus::Cli::Shell
 
   def load_history_logger
     file_path = history_file_path
-    if !Dir.exists?(File.dirname(file_path))
+    if !Dir.exist?(File.dirname(file_path))
       FileUtils.mkdir_p(File.dirname(file_path))
     end
-    if !File.exists?(file_path)
+    if !File.exist?(file_path)
       FileUtils.touch(file_path)
       FileUtils.chmod(0600, file_path)
     end
@@ -561,7 +572,13 @@ class Morpheus::Cli::Shell
 
     begin
       file_path = history_file_path
-      FileUtils.mkdir_p(File.dirname(file_path))
+      # if !Dir.exist?(File.dirname(file_path))
+      #   FileUtils.mkdir_p(File.dirname(file_path))
+      # end
+      # if !File.exist?(file_path)
+      #   FileUtils.touch(file_path)
+      #   FileUtils.chmod(0600, file_path)
+      # end
 
       File.open(file_path).each_line do |line|
         # this is pretty goofy, but this looks for the format: (cmd $command_number) $command_string
@@ -578,7 +595,7 @@ class Morpheus::Cli::Shell
           # for Ctrl+R history searching
           Readline::HISTORY << cmd
         end
-      end
+      end unless !File.exist?(file_path)
     rescue => e
       # raise e
       puts_error "failed to load history from log: #{e}"
@@ -587,45 +604,6 @@ class Morpheus::Cli::Shell
     return @history
   end
 
-  # remove this..
-  def _old_load_history_from_log_file(n_commands=1000)
-    @history ||= {}
-    @last_command_number ||= 0
-
-    begin
-      if Gem.win_platform?
-        return @history
-      end
-      file_path = history_file_path
-      FileUtils.mkdir_p(File.dirname(file_path))
-      # grab extra lines because not all log entries are commands
-      n_lines = n_commands + 500
-      history_lines = `tail -n #{n_lines} #{file_path}`.split(/\n/)
-      command_lines = history_lines.select do |line|
-        line.match(/\(cmd (\d+)\) (.+)/)
-      end
-      command_lines = command_lines.last(n_commands)
-      command_lines.each do |line|
-        matches = line.match(/\(cmd (\d+)\) (.+)/)
-        if matches && matches.size == 3
-          cmd_number = matches[1].to_i
-          cmd = matches[2]
-
-          @last_command_number = cmd_number
-          @history[@last_command_number] = cmd
-
-          # for Ctrl+R history searching
-          Readline::HISTORY << cmd
-        end
-      end
-    rescue => e
-      # raise e
-      # puts "failed to load history from log"
-      @history = {}
-    end
-    return @history
-  end
-
   def log_history_command(cmd)
     load_history_from_log_file if !@history
     #todo: a fast log_history_command, that doesnt need to load the file..
@@ -745,7 +723,7 @@ class Morpheus::Cli::Shell
   def flush_history(n=nil)
     # todo: support only flushing last n commands
       file_path = history_file_path
-      if File.exists?(file_path)
+      if File.exist?(file_path)
         File.truncate(file_path, 0)
       end
       @history = {}

data/lib/morpheus/cli/commands/snapshots.rb

@@ -24,7 +24,7 @@ class Morpheus::Cli::Snapshots
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
       opts.footer = "Get Snapshot details." + "\n" +
-                    "[snapshotId] is required. This is the id of the snapshot."
+                    "[id] is required. This is the id of the snapshot."
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -96,14 +96,12 @@ class Morpheus::Cli::Snapshots
 
   def remove(args)
     options = {}
-    instance = nil
     snapshot_id = nil
-
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-     opts.banner = subcommand_usage("[instance]")
+     opts.banner = subcommand_usage("[id]")
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
       opts.footer = "Remove/Delete a snapshot." + "\n" +
-                    "[snapshotId] is required. This is the id of the snapshot to delete."
+                    "[id] is required. This is the id of the snapshot to delete."
     end
     
     optparse.parse!(args)

data/lib/morpheus/cli/commands/source_command.rb

@@ -7,7 +7,6 @@ class Morpheus::Cli::SourceCommand
   set_command_hidden
 
   def handle(args)
-    append_newline = true
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus #{command_name} [file] [file2]"
@@ -15,24 +14,17 @@ class Morpheus::Cli::SourceCommand
       opts.footer = "This will execute a file as a script where each line is a morpheus command or expression."
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      return false # exit 1
-    end
-
+    verify_args!(args:args, optparse:optparse, min:1)
+    exit_code, err = 0, nil
     source_files = args
+    bad_files = source_files.select { |source_file| !File.exist?(File.expand_path(source_file)) }
+    if !bad_files.empty?
+      raise_command_error("source file(s) not found: #{bad_files.join(', ')}")
+    end
     source_files.each do |source_file|
-      # execute a source script
-      source_file = File.expand_path(source_file)
-      if File.exists?(source_file)
-        cmd_results = Morpheus::Cli::DotFile.new(source_file).execute()
-      else
-        print_red_alert "file not found: '#{source_file}'"
-        # return false
-      end
+      Morpheus::Cli::DotFile.new(File.expand_path(source_file)).execute()
     end
-
-    return true
+    return exit_code, err
   end
 
 end

data/lib/morpheus/cli/commands/storage_providers_command.rb

@@ -794,7 +794,7 @@ class Morpheus::Cli::StorageProvidersCommand
       puts_error  "#{command_name} missing argument: [local-file]\n#{optparse}"
       return 1
     end
-    if !File.exists?(local_file_path)
+    if !File.exist?(local_file_path)
       print_error Morpheus::Terminal.angry_prompt
       puts_error  "#{command_name} bad argument: [local-file]\nFile '#{local_file_path}' was not found.\n#{optparse}"
       return 1
@@ -918,7 +918,7 @@ class Morpheus::Cli::StorageProvidersCommand
       else
 
         # upload file
-        if !File.exists?(local_file_path) && !File.file?(local_file_path)
+        if !File.exist?(local_file_path) && !File.file?(local_file_path)
           print_error Morpheus::Terminal.angry_prompt
           puts_error  "#{command_name} bad argument: [local-file]\nFile '#{local_file_path}' was not found.\n#{optparse}"
           return 1
@@ -1016,15 +1016,15 @@ class Morpheus::Cli::StorageProvidersCommand
 
       file_path = file_path.squeeze('/')
       outfile = File.expand_path(outfile)
-      if Dir.exists?(outfile)
+      if Dir.exist?(outfile)
         outfile = File.join(outfile, File.basename(file_path))
       end
-      if Dir.exists?(outfile)
+      if Dir.exist?(outfile)
         print_red_alert "[local-file] is invalid. It is the name of an existing directory: #{outfile}"
         return 1
       end
       destination_dir = File.dirname(outfile)
-      if !Dir.exists?(destination_dir)
+      if !Dir.exist?(destination_dir)
         if do_mkdir
           print cyan,"Creating local directory #{destination_dir}",reset,"\n"
           FileUtils.mkdir_p(destination_dir)
@@ -1033,7 +1033,7 @@ class Morpheus::Cli::StorageProvidersCommand
           return 1
         end
       end
-      if File.exists?(outfile)
+      if File.exist?(outfile)
         if do_overwrite
           # uhh need to be careful wih the passed filepath here..
           # don't delete, just overwrite.
@@ -1069,7 +1069,7 @@ class Morpheus::Cli::StorageProvidersCommand
             print red + "ERROR" + reset + " HTTP #{http_response.code}" + "\n"
           end
           # F it, just remove a bad result
-          if File.exists?(outfile) && File.file?(outfile)
+          if File.exist?(outfile) && File.file?(outfile)
             Morpheus::Logging::DarkPrinter.puts "Deleting bad file download: #{outfile}" if Morpheus::Logging.debug?
             File.delete(outfile)
           end

data/lib/morpheus/cli/commands/tasks.rb

@@ -290,7 +290,7 @@ class Morpheus::Cli::Tasks
       opts.on('--file FILE', "File containing the task script. This can be used instead of --content" ) do |filename|
         file_params['sourceType'] = 'local' if file_params['sourceType'].nil?
         full_filename = File.expand_path(filename)
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           file_params['content'] = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"
@@ -673,7 +673,7 @@ class Morpheus::Cli::Tasks
       opts.on('--file FILE', "File containing the task script. This can be used instead of --content" ) do |filename|
         file_params['sourceType'] = 'local' if file_params['sourceType'].nil?
         full_filename = File.expand_path(filename)
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           file_params['content'] = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"

data/lib/morpheus/cli/commands/vdi_pools_command.rb

@@ -184,7 +184,7 @@ EOT
         options[:config_file] = val.to_s
         file_content = nil
         full_filename = File.expand_path(options[:config_file])
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           file_content = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"
@@ -194,7 +194,7 @@ EOT
         config_map = parse_result[:data]
         if config_map.nil?
           # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
           #raise_command_error "Failed to parse config as valid YAML or JSON."
         else
           params['config'] = config_map
@@ -244,7 +244,7 @@ EOT
         config_map = parse_result[:data]
         if config_map.nil?
           # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
           #raise_command_error "Failed to parse config as valid YAML or JSON."
         else
           params['config'] = config_map
@@ -290,7 +290,7 @@ EOT
         options[:config_file] = val.to_s
         file_content = nil
         full_filename = File.expand_path(options[:config_file])
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           file_content = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"
@@ -300,7 +300,7 @@ EOT
         config_map = parse_result[:data]
         if config_map.nil?
           # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
           #raise_command_error "Failed to parse config as valid YAML or JSON."
         else
           params['config'] = config_map
@@ -345,7 +345,7 @@ EOT
         config_map = parse_result[:data]
         if config_map.nil?
           # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
           #raise_command_error "Failed to parse config as valid YAML or JSON."
         else
           params['config'] = config_map

data/lib/morpheus/cli/commands/view.rb

@@ -17,9 +17,13 @@ class Morpheus::Cli::View
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[path] [id]")
       # debate: should login using /login/ouath-redirect
-      opts.on('-L', '--login', "Login with the CLI access token before loading the path." ) do
+      opts.on('-l', '--login', "Login with the CLI access token before loading the path." ) do
         options[:login] = true
       end
+      opts.on('-L', '--old-login', "Alias for -l, --login" ) do
+        options[:login] = true
+      end
+      opts.add_hidden_option('-L, --old-login')
       opts.on('--absolute', "Absolute path, do not search for a matching route to use") do
         options[:absolute_path] = true
       end

data/lib/morpheus/cli/commands/whitelabel_settings_command.rb

@@ -596,11 +596,11 @@ class Morpheus::Cli::WhitelabelSettingsCommand
       outfile = File.expand_path(args[1])
       outdir = File.dirname(outfile)
 
-      if Dir.exists?(outfile)
+      if Dir.exist?(outfile)
         print_red_alert "[local-file] is invalid. It is the name of an existing directory: #{outfile}"
         return 1
       end
-      if !Dir.exists?(outdir)
+      if !Dir.exist?(outdir)
         if options[:mkdir]
           print cyan,"Creating local directory #{outdir}",reset,"\n"
           FileUtils.mkdir_p(outdir)
@@ -609,7 +609,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
           return 1
         end
       end
-      if File.exists?(outfile) && !options[:overwrite]
+      if File.exist?(outfile) && !options[:overwrite]
         print_red_alert "[local-file] is invalid. File already exists: #{outfile}\nUse -f to overwrite the existing file."
         return 1
       end
@@ -636,7 +636,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
         if !options[:quiet]
           print red + "ERROR" + reset + " HTTP #{http_response.code}" + "\n"
         end
-        if File.exists?(outfile) && File.file?(outfile)
+        if File.exist?(outfile) && File.file?(outfile)
           Morpheus::Logging::DarkPrinter.puts "Deleting bad file download: #{outfile}" if Morpheus::Logging.debug?
           File.delete(outfile)
         end

data/lib/morpheus/cli/commands/whoami.rb

@@ -92,7 +92,7 @@ EOT
         # no permissions, or even name stored atm, we should start storing that.
         # then we can start checking permissions nd restricting command visibility.
         whoami_response = {
-          "user": {
+          "user" => {
             "username" => @remote_appliance ? @remote_appliance[:username] : nil
           },
           # "isMasterAccount" => true,
@@ -263,7 +263,7 @@ EOT
 
     def save_whoami_file(appliance_name, user_id, json_response)
       fn = File.join(whoami_file_path, appliance_name.to_s, user_id.to_s + ".json")
-      if !Dir.exists?(File.dirname(fn))
+      if !Dir.exist?(File.dirname(fn))
         FileUtils.mkdir_p(File.dirname(fn))
       end
       Morpheus::Logging::DarkPrinter.puts "writing file #{fn}" if Morpheus::Logging.debug?

data/lib/morpheus/cli/credentials.rb

@@ -112,16 +112,38 @@ module Morpheus
                 end
               end
               if username.empty?
-                print "Username: #{required_blue_prompt} "
-                username = $stdin.gets.chomp!
+                # print "Username: #{required_blue_prompt} "
+                # username = $stdin.gets.chomp!
+                Readline.completion_append_character = ""
+                Readline.basic_word_break_characters = ''
+                Readline.completion_proc = nil
+                username = Readline.readline("Username: #{required_blue_prompt} ", false).to_s.chomp
               else
                 print "Username: #{required_blue_prompt} #{username}\n"
               end
               if password.empty?
-                print "Password: #{required_blue_prompt} "
-                # this should be my_terminal.stdin instead of STDIN and $stdin
-                password = STDIN.noecho(&:gets).chomp!
-                print "\n"
+                # readline is still echoing secret with 'NUL:'' so just use $stdin on windows for now
+                if Morpheus::Cli.windows?
+                  print "Password: #{required_blue_prompt} "
+                  # this should be my_terminal.stdin instead of STDIN and $stdin
+                  password = $stdin.noecho(&:gets).chomp!
+                  print "\n"
+                else                
+
+                  Readline.completion_append_character = ""
+                  Readline.basic_word_break_characters = ''
+                  Readline.completion_proc = nil
+                  # needs to work like $stdin.noecho
+                  Readline.pre_input_hook = lambda {
+                    Readline.output = File.open('/dev/null', 'w')
+                    #Readline.output = File.open(Morpheus::Cli.windows? ? 'NUL:' : '/dev/null', 'w')
+                    #$stdout = File.open(Morpheus::Cli.windows? ? 'NUL:' : '/dev/null', 'w')
+                  }
+                  password = Readline.readline("Password: #{required_blue_prompt} ", false).to_s.chomp
+                  Readline.pre_input_hook = nil
+                  Readline.output = Morpheus::Terminal.instance.stdout #my_terminal.stdout
+                  print "\n"
+                end
               else
                 print "Password: #{required_blue_prompt} \n"
               end
@@ -396,7 +418,7 @@ module Morpheus
         credential_map.delete(appliance_name.to_sym)
         begin
           fn = credentials_file_path
-          if !Dir.exists?(File.dirname(fn))
+          if !Dir.exist?(File.dirname(fn))
             FileUtils.mkdir_p(File.dirname(fn))
           end
           #Morpheus::Logging::DarkPrinter.puts "adding credentials for #{appliance_name} to #{fn}" if Morpheus::Logging.debug?
@@ -433,7 +455,7 @@ module Morpheus
         credential_map.delete(appliance_name.to_sym)
         begin
           fn = credentials_file_path
-          if !Dir.exists?(File.dirname(fn))
+          if !Dir.exist?(File.dirname(fn))
             FileUtils.mkdir_p(File.dirname(fn))
           end
           #Morpheus::Logging::DarkPrinter.puts "renaming credentials from #{appliance_name} to #{new_appliance_name}" if Morpheus::Logging.debug?

data/lib/morpheus/cli/dot_file.rb

@@ -32,13 +32,10 @@ class Morpheus::Cli::DotFile
   end
 
   # execute this file as a morpheus shell script
-  # @param stop_on_failure [true, false] the will halt execution if a command returns false. 
-  #   Default is false, keep going...
-  # @block [Proc] if a block is given, each command in the file will be yielded to it
-  #   The default is executes the command with the CliRegistry.exec(cmd, args)
+  # executes each line in the file as a morpheus expression, ignores empty lines and comments '#'
   # @return [Array] exit codes of all the commands that were run.
-  def execute(stop_on_failure=false, &block)
-    if !File.exists?(@filename)
+  def execute()
+    if !File.exist?(@filename)
       print "#{Term::ANSIColor.red}source file not found: #{@filename}#{Term::ANSIColor.reset}\n" # if Morpheus::Logging.debug?
     else
       Morpheus::Logging::DarkPrinter.puts "executing source file #{@filename}" if Morpheus::Logging.debug?
@@ -70,11 +67,7 @@ class Morpheus::Cli::DotFile
         puts "#{red} source file: #{@filename}, line: #{line_num}, command: #{line}, error: #{err}#{reset}"
         cmd_result = false
       end
-      if cmd_result == false
-        if stop_on_failure
-          return cmd_results
-        end
-      end
+      cmd_results << cmd_result
     end
     return cmd_results
   end
@@ -89,10 +82,10 @@ class Morpheus::Cli::DotFile
       print "#{Term::ANSIColor.dark}Skipping source file save because filename has not been set#{Term::ANSIColor.reset}\n" if Morpheus::Logging.debug?
       return false
     end
-    if !Dir.exists?(File.dirname(@filename))
+    if !Dir.exist?(File.dirname(@filename))
       FileUtils.mkdir_p(File.dirname(@filename))
     end
-    if !File.exists?(@filename)
+    if !File.exist?(@filename)
       print "#{Term::ANSIColor.dark}Initializing source file #{@filename}#{Term::ANSIColor.reset}\n" if Morpheus::Logging.debug?
       FileUtils.touch(@filename)
     else
@@ -158,10 +151,10 @@ class Morpheus::Cli::DotFile
       print "#{Term::ANSIColor.dark}Skipping source file save because filename has not been set#{Term::ANSIColor.reset}\n" if Morpheus::Logging.debug?
       return false
     end
-    if !Dir.exists?(File.dirname(@filename))
+    if !Dir.exist?(File.dirname(@filename))
       FileUtils.mkdir_p(File.dirname(@filename))
     end
-    if !File.exists?(@filename)
+    if !File.exist?(@filename)
       print "#{Term::ANSIColor.dark}Initializing source file #{@filename}#{Term::ANSIColor.reset}\n" if Morpheus::Logging.debug?
       FileUtils.touch(@filename)
     else

data/lib/morpheus/cli/error_handler.rb

@@ -25,6 +25,16 @@ class Morpheus::Cli::ErrorHandler
     #@stderr.puts "#{dark}Handling error #{err.class} - #{err}#{reset}"
 
     case (err)
+    when SystemExit
+      # nothing to do, assume the command that exited printed an error already
+      # print "\n"
+      cmdexit = err
+      if cmdexit.success?
+        exit_code, err = 0, nil
+      else
+        exit_code, err = cmdexit.status, "Command exited with status: #{cmdexit.status}"
+      end
+      return exit_code, err
     # when Morpheus::Cli::CommandNotFoundError
     #   puts_angry_error err.message
     #   @stderr.puts "Try help to see a list of available commands"
@@ -32,6 +42,12 @@ class Morpheus::Cli::ErrorHandler
     #   if err.exit_code
     #     exit_code = err.exit_code
     #   end
+      when Morpheus::Cli::CommandAborted
+        # user declined a confirmation prompt, do not print anything and exit 9
+        do_print_stacktrace = false
+        exit_code = err.exit_code if err.exit_code
+        # err = err.message
+    return 
     when ::OptionParser::InvalidOption, ::OptionParser::AmbiguousOption, 
         ::OptionParser::MissingArgument, ::OptionParser::InvalidArgument, 
         ::OptionParser::NeedlessArgument

data/lib/morpheus/cli/errors.rb

@@ -14,7 +14,7 @@ module Morpheus::Cli
 
   end
 
-  # An error indicating the command was not recoginzed
+  # An error indicating the command was not recognized, assigned exit code 127
   class CommandNotFoundError < CommandError
     
     def initialize(msg, args=[], optparse=nil, exit_code=nil)
@@ -40,7 +40,14 @@ module Morpheus::Cli
     def initialize(msg, args=[], optparse=nil, exit_code=nil)
       super(msg, args, optparse, exit_code || 1)
     end
+  end
+
+  # An error indicating the user declined to accept a confirmation prompt, assigned exit code 9
+  class CommandAborted < CommandError
 
+    def initialize(msg, args=[], optparse=nil, exit_code=nil)
+      super(msg, args, optparse, exit_code || 9)
+    end
   end
 
 end