morpheus-cli 2.10.3 → 2.11.0

data/lib/morpheus/cli/roles.rb

@@ -60,9 +60,14 @@ class Morpheus::Cli::Roles
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print "\n" ,cyan, bold, "Morpheus Roles\n","==================", reset, "\n\n"
+        title = "Morpheus Roles"
+        subtitles = []
+        if params[:phrase]
+          subtitles << "Search: #{params[:phrase]}".strip
+        end
+        print_h1 title, subtitles
         if roles.empty?
-          puts yellow,"No roles found.",reset
+          print cyan,"No roles found.",reset,"\n"
         else
           print_roles_table(roles, {is_master_account: @is_master_account})
           print_results_pagination(json_response)
@@ -105,46 +110,68 @@ class Morpheus::Cli::Roles
       puts optparse
       exit 1
     end
-    name = args[0]
 
     connect(options)
     begin
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
       if options[:dry_run]
-        print_dry_run @roles_interface.dry.list(account_id, {name: name})
+        if args[0].to_s =~ /\A\d{1,}\Z/
+          print_dry_run @roles_interface.dry.get(account_id, args[0].to_i)
+        else
+          print_dry_run @roles_interface.dry.list(account_id, {name: args[0]})
+        end
         return
       end
 
-      role = find_role_by_name_or_id(account_id, name)
-      exit 1 if role.nil?
+      # role = find_role_by_name_or_id(account_id, args[0])
+      # exit 1 if role.nil?
+      # refetch from show action, argh
+      # json_response = @roles_interface.get(account_id, role['id'])
+      # role = json_response['role']
 
-      json_response = @roles_interface.get(account_id, role['id'])
-      role = json_response['role']
+      json_response = nil
+      if args[0].to_s =~ /\A\d{1,}\Z/
+        json_response = @roles_interface.get(account_id, args[0].to_i)
+        role = json_response['role']
+      else
+        role = find_role_by_name_or_id(account_id, args[0])
+        exit 1 if role.nil?
+        # refetch from show action, argh
+        json_response = @roles_interface.get(account_id, role['id'])
+        role = json_response['role']
+      end
 
       if options[:json]
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print "\n" ,cyan, bold, "Role Details\n","==================", reset, "\n\n"
         print cyan
-        puts "ID: #{role['id']}"
-        puts "Name: #{role['authority']}"
-        puts "Description: #{role['description']}"
-        puts "Scope: #{role['scope']}"
-        puts "Type: #{format_role_type(role)}"
-        puts "Multitenant: #{role['multitenant'] ? 'Yes' : 'No'}"
-        puts "Owner: #{role['owner'] ? role['owner']['name'] : nil}"
-        puts "Date Created: #{format_local_dt(role['dateCreated'])}"
-        puts "Last Updated: #{format_local_dt(role['lastUpdated'])}"
-
-        print "\n" ,cyan, bold, "Role Instance Limits\n","==================", reset, "\n\n"
+        print_h1 "Role Details"
+        print cyan
+        description_cols = {
+          "ID" => 'id',
+          "Name" => 'name',
+          "Description" => 'description',
+          "Scope" => lambda {|it| it['scope'] },
+          "Type" => lambda {|it| format_role_type(it) },
+          "Multitenant" => lambda {|it| format_boolean(it['multitenant']) },
+          "Owner" => lambda {|it| role['owner'] ? role['owner']['name'] : '' },
+          #"Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+          "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+          "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+        }
+        print_description_list(description_cols, role)
+
+        print_h2 "Role Instance Limits"
         print cyan
-        puts "Max Storage (bytes): #{role['instanceLimits'] ? role['instanceLimits']['maxStorage'] : 0}"
-        puts "Max Memory (bytes): #{role['instanceLimits'] ? role['instanceLimits']['maxMemory'] : 0}"
-        puts "CPU Count: #{role['instanceLimits'] ? role['instanceLimits']['maxCpu'] : 0}"
+        print_description_list({
+          "Max Storage"  => lambda {|it| (it && it['maxStorage'].to_i != 0) ? Filesize.from("#{it['maxStorage']} B").pretty : "no limit" },
+          "Max Memory"  => lambda {|it| (it && it['maxMemory'].to_i != 0) ? Filesize.from("#{it['maxMemory']} B").pretty : "no limit" },
+          "CPU Count"  => lambda {|it| (it && it['maxCpu'].to_i != 0) ? it['maxCpu'] : "no limit" }
+        }, role['instanceLimits'])
 
-        print "\n" ,cyan, bold, "Feature Access\n","==================", reset, "\n\n"
+        print_h2 "Feature Access"
         print cyan
 
         if options[:include_feature_access]
@@ -160,7 +187,7 @@ class Morpheus::Cli::Roles
           puts "Use --feature-access to list feature access"
         end
 
-        print "\n" ,cyan, bold, "Group Access\n","==================", reset, "\n\n"
+        print_h2 "Group Access"
         print cyan
         puts "Global Group Access: #{get_access_string(json_response['globalSiteAccess'])}\n\n"
         if json_response['globalSiteAccess'] == 'custom'
@@ -177,7 +204,7 @@ class Morpheus::Cli::Roles
           end
         end
 
-        print "\n" ,cyan, bold, "Cloud Access\n","==================", reset, "\n\n"
+        print_h2 "Cloud Access"
         print cyan
         puts "Global Cloud Access: #{get_access_string(json_response['globalZoneAccess'])}\n\n"
         if json_response['globalZoneAccess'] == 'custom'
@@ -194,7 +221,7 @@ class Morpheus::Cli::Roles
           end
         end
 
-        print "\n" ,cyan, bold, "Instance Type Access\n","==================", reset, "\n\n"
+        print_h2 "Instance Type Access"
         print cyan
         puts "Global Instance Type Access: #{get_access_string(json_response['globalInstanceTypeAccess'])}\n\n"
         if json_response['globalInstanceTypeAccess'] == 'custom'

data/lib/morpheus/cli/security_group_rules.rb

@@ -167,9 +167,9 @@ EOT
         return
       end
       rules = json_response['rules']
-      print "\n" ,cyan, bold, "Morpheus Security Group Rules for Security Group ID:#{security_group_id}\n","==================", reset, "\n\n"
+      print_h1 "Morpheus Security Group Rules for Security Group ID: #{security_group_id}"
       if rules.empty?
-        puts yellow,"No Security Group Rules currently configured.",reset
+        print yellow,"No Security Group Rules currently configured.",reset,"\n"
       else
         rules = rules.sort {|x,y| x["id"] <=> y["id"] }
         rules.each do |rule|

data/lib/morpheus/cli/security_groups.rb

@@ -44,9 +44,9 @@ class Morpheus::Cli::SecurityGroups
         return
       end
       security_groups = json_response['securityGroups']
-      print "\n" ,cyan, bold, "Morpheus Security Groups\n","==================", reset, "\n\n"
+      print_h1 "Morpheus Security Groups"
       if security_groups.empty?
-        puts yellow,"No Security Groups currently configured.",reset
+        print yellow,"No Security Groups currently configured.",reset,"\n"
       else
         active_id = @active_security_group[@appliance_name.to_sym]
         security_groups.each do |security_group|
@@ -57,7 +57,7 @@ class Morpheus::Cli::SecurityGroups
           end
         end
         if active_id
-          print cyan, "\n\n# => - current", reset
+          print cyan, "\n# => - current", reset, "\n"
         end
       end
       print reset,"\n"
@@ -91,14 +91,17 @@ class Morpheus::Cli::SecurityGroups
         return
       end
       security_group = json_response['securityGroup']
-      print "\n" ,cyan, bold, "Morpheus Security Group\n","==================", reset, "\n\n"
-      if security_group.nil?
-        puts yellow,"Security Group not found by id #{args[0]}",reset
-      else
-        print cyan, "=  #{security_group['id']}: #{security_group['name']} (#{security_group['description']})\n"
-      end
-      print reset,"\n\n"
-          rescue RestClient::Exception => e
+      print_h1 "Morpheus Security Group"
+      print cyan
+      description_cols = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Description" => 'description',
+        #"Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+      }
+      print_description_list(description_cols, security_group)
+      print reset,"\n"
+    rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
     end
@@ -235,16 +238,17 @@ class Morpheus::Cli::SecurityGroups
   end
 
   def self.security_group_file_path
-    home_dir = Dir.home
-    morpheus_dir = File.join(home_dir,".morpheus")
-    if !Dir.exist?(morpheus_dir)
-      Dir.mkdir(morpheus_dir)
-    end
-    return File.join(morpheus_dir,"securitygroup")
+    File.join(Morpheus::Cli.home_directory,"securitygroup")
   end
 
-  def self.save_security_group(security_group_map)
-    File.open(security_group_file_path, 'w') {|f| f.write security_group_map.to_yaml } #Store
+  def self.save_security_group(new_config)
+    fn = security_group_file_path
+    if !Dir.exists?(File.dirname(fn))
+      FileUtils.mkdir_p(File.dirname(fn))
+    end
+    File.open(fn, 'w') {|f| f.write new_config.to_yaml } #Store
+    FileUtils.chmod(0600, fn)
+    new_config
   end
 
 end

data/lib/morpheus/cli/set_prompt_command.rb

@@ -0,0 +1,50 @@
+require 'optparse'
+require 'json'
+require 'morpheus/logging'
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::SetPromptCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :'set-prompt'
+  set_command_hidden
+
+  def handle(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus #{command_name} [shell-prompt]"
+      #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 shell prompt.
+This can be used as alternative to setting the MORPHEUS_PS1 environment variable
+
+Examples: 
+    set-prompt "morpheus $ "
+    set-prompt "%cyanmorpheus> "
+    set-prompt "[%magenta%remote%reset] %cyan%username morpheus> "
+
+The default prompt is: "%cyanmorpheus> "
+
+EOT
+    end
+    optparse.parse!(args)
+
+    if args.count != 1
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error "too many arguments"
+      puts_error optparse
+      return false
+    end
+    
+    self.my_terminal.prompt = args[0]
+    # Morpheus::Terminal.instance.prompt = args[0]
+    Morpheus::Cli::Shell.instance.recalculate_prompt()
+
+    return true
+  end
+
+end

data/lib/morpheus/cli/shell.rb

@@ -8,22 +8,43 @@ require 'logger'
 require 'fileutils'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/error_handler'
+require 'morpheus/terminal'
 
-
+#class Morpheus::Cli::Shell < Morpheus::Terminal
 class Morpheus::Cli::Shell
   include Morpheus::Cli::CliCommand
 
   @@instance = nil
 
   def self.instance
-    @@instance ||= self.new
+    @@instance ||= reload_instance
+  end
+
+  def self.reload_instance
+    @@instance = self.new
   end
 
+  attr_accessor :prompt #, :angry_prompt
+
   def initialize()
-    @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
+    @@instance = self
+    reinitialize()
+  end
+
+  def reinitialize()
+    # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
+    @current_remote = ::Morpheus::Cli::Remote.load_active_remote()
+    if @current_remote
+      @appliance_name, @appliance_url = @current_remote[:name], @current_remote[:host]
+      @current_username = @current_remote[:username] || '(anonymous)'
+    else
+      @appliance_name, @appliance_url = nil, nil
+      @current_username = nil
+    end
     #connect()
     #raise "one shell only" if @@instance
     @@instance = self
+    recalculate_prompt()
     recalculate_auto_complete_commands()
   end
 
@@ -31,6 +52,29 @@ class Morpheus::Cli::Shell
   #   @api_client = establish_remote_appliance_connection(opts)
   # end
 
+  def recalculate_prompt()
+    # custom prompts.. this is overkill and perhaps a silly thing..
+    # Example usage:
+    # MORPHEUS_PS1="[%remote] %cyan %username morph> " morpheus shell --debug
+    #@prompt = Morpheus::Terminal.instance.prompt.to_s #.dup
+    @prompt = my_terminal.prompt
+
+    var_map = {
+      '%cyan' => cyan, '%magenta' => magenta, '%reset' => reset, '%dark' => dark,
+      '%remote' => @appliance_name.to_s, '%username' => @current_username.to_s, 
+      '%remote_url' => @appliance_url.to_s
+    }
+    @calculated_prompt = @prompt.to_s.dup
+    var_map.each do |var_key, var_value|
+      @calculated_prompt.gsub!(var_key.to_s, var_value.to_s)
+    end
+    # cleanup empty brackets caused by var value
+    @calculated_prompt = @calculated_prompt.gsub("[]", "").gsub("<>", "").gsub("{}", "")
+    @calculated_prompt = @calculated_prompt.strip
+    @calculated_prompt = "#{@calculated_prompt}#{reset} "
+    @calculated_prompt
+  end
+
   def recalculate_auto_complete_commands
     @morpheus_commands = Morpheus::Cli::CliRegistry.all.keys.reject {|k| [:shell].include?(k) }
     @shell_commands = [:clear, :history, :'flush-history', :reload!, :help, :exit]
@@ -57,7 +101,6 @@ class Morpheus::Cli::Shell
 
   def handle(args)
     usage = "Usage: morpheus #{command_name}"
-    @command_options = {} # this is a way to curry options to all commands.. but meh
     optparse = OptionParser.new do|opts|
       opts.banner = usage
       opts.on('--norc','--norc', "Do not read and execute the personal initialization script .morpheusrc") do
@@ -67,13 +110,11 @@ class Morpheus::Cli::Shell
         Morpheus::RestClient.enable_ssl_verification = false
       end
       opts.on('-C','--nocolor', "Disable ANSI coloring") do
-        @command_options[:nocolor] = true
         Term::ANSIColor::coloring = false
       end
       opts.on('-V','--debug', "Print extra output for debugging. ") do |json|
         Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
-        ::RestClient.log = Morpheus::Logging.debug? ? STDOUT : nil
-        @command_options[:debug] = true
+        ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil
       end
       opts.on( '-h', '--help', "Prints this help" ) do
         puts opts
@@ -95,13 +136,17 @@ class Morpheus::Cli::Shell
       end
     end
 
+    reinitialize()
+    # recalculate_prompt()
+    # recalculate_auto_complete_commands()
+
     exit = false
     while !exit do
       Readline.completion_append_character = " "
       Readline.completion_proc = @auto_complete
       Readline.basic_word_break_characters = ""
       #Readline.basic_word_break_characters = "\t\n\"\‘`@$><=;|&{( "
-      input = Readline.readline("#{cyan}morpheus> #{reset}", true).to_s
+      input = Readline.readline(@calculated_prompt, true).to_s
       input = input.strip
 
       execute_commands(input)
@@ -109,7 +154,15 @@ class Morpheus::Cli::Shell
     
   end
 
+  # same as Terminal instance
+  def execute(input)
+    # args = Shellwords.shellsplit(input)
+    #cmd = args.shift
+    execute_commands(input)
+  end
+
   def execute_commands(input)
+    # input = input.to_s.sub(/^morpheus\s+/, "") # meh
     # split the command on unquoted semicolons.
     # so you can run multiple commands at once! eg hosts list; instances list
     # all_commands = input.gsub(/(\;)(?=(?:[^"]|"[^"]*")*$)/, '__CMDDELIM__').split('__CMDDELIM__').collect {|it| it.to_s.strip }.select {|it| !it.empty?  }.compact
@@ -126,12 +179,8 @@ class Morpheus::Cli::Shell
 
   def execute_command(input)
     #puts "shell execute_command(#{input})"
-    @command_options ||= {}
-
     input = input.to_s.strip
 
-    # print cyan,"morpheus > ",reset
-    # input = $stdin.gets.chomp!
     if !input.empty?
 
       if input == 'exit'
@@ -140,6 +189,9 @@ class Morpheus::Cli::Shell
         exit 0
       elsif input == 'help'
 
+        #print_h1 "Morpheus Shell Help", [], white
+        #print "\n"
+
         puts "You are in a morpheus client shell."
         puts "See the available commands below."
 
@@ -149,15 +201,29 @@ class Morpheus::Cli::Shell
         @morpheus_commands.sort.each {|cmd|
           puts "\t#{cmd.to_s}"
         }
-        puts "\n"
+        #puts "\n"
         puts "\nShell Commands:"
         @shell_commands.each {|cmd|
           puts "\t#{cmd.to_s}"
         }
         puts "\n"
-        puts "For more information."
-        puts "See https://github.com/gomorpheus/morpheus-cli/wiki"
-        print "\n"
+        puts "For more information, see https://github.com/gomorpheus/morpheus-cli/wiki"
+        #print "\n"
+        return 0
+      elsif input =~ /^sleep/
+        sleep_sec = input.sub("sleep ", "").to_f
+        if (!(sleep_sec > 0))
+          # raise_command_error "sleep requires the argument [seconds]. eg. sleep 3.14"
+          puts_error  "sleep requires argument [seconds]. eg. sleep 3.14"
+          return false
+        end
+        log_history_command(input)
+        Morpheus::Logging::DarkPrinter.puts "sleeping for #{sleep_sec}s ... zzzZzzzZ" if Morpheus::Logging.debug?
+        begin
+          sleep(sleep_sec)
+        rescue Interrupt
+          Morpheus::Logging::DarkPrinter.puts "\nInterrupt. waking up from sleep early"
+        end
         return 0
       elsif input =~ /^history/
         n_commands = input.sub(/^history\s?/, '').sub(/\-n\s?/, '')
@@ -182,32 +248,74 @@ class Morpheus::Cli::Shell
         @history_logger = load_history_logger
         puts "history cleared!"
         return 0
+      elsif input == "edit rc"
+        fn = Morpheus::Cli::DotFile.morpheusrc_filename
+        editor = ENV['EDITOR'] # || 'nano'
+        if !editor
+          puts "You have no EDITOR defined. Use 'export EDITOR=emacs'"
+          #puts "Trying nano..."
+          #editor = "nano"
+        end
+        system("which #{editor} > /dev/null 2>&1")
+        has_editor = $?.success?
+        if has_editor
+          puts "opening #{fn} for editing with #{editor} ..."
+          system("#{editor} #{fn}")
+          puts "Use 'reload' to re-execute your startup script #{File.basename(fn)}"
+        else
+          puts_error2 Morpheus::Terminal.angry_prompt
+          puts_error "The defined EDITOR '#{editor}' was not found on your system."
+        end
+        return 0 # $?
+      elsif input == "edit profile"
+        fn = Morpheus::Cli::DotFile.morpheus_profile_filename
+        editor = ENV['EDITOR'] # || 'nano'
+        if !editor
+          puts "You have no EDITOR defined. Use 'export EDITOR=emacs'."
+          #puts "Trying nano..."
+          #editor = "nano"
+        end
+        system("which #{editor} > /dev/null 2>&1")
+        has_editor = $?.success?
+        if has_editor
+          puts "opening #{fn} for editing with #{editor} ..."
+          `#{editor} #{fn}`
+          puts "Use 'reload' to re-execute your startup script #{File.basename(fn)}"
+        else
+          puts_error Morpheus::Terminal.angry_prompt
+          puts_error "The defined EDITOR '#{editor}' was not found on your system."
+        end
+        return 0 # $?
       elsif input == 'reload' || input == 'reload!'
+        # raise RestartShellPlease
         #log_history_command(input)
         # could just fork instead?
+        # clear registry
+        Morpheus::Cli::CliRegistry.instance.flush
+        # reload code
         Morpheus::Cli.load!
-        # initialize()
-        # gotta reload appliance, groups, credentials
-        @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
-        recalculate_auto_complete_commands()
-        # execute startup script
-        # if File.exists?(Morpheus::Cli::DotFile.morpheusrc_filename)
-        #   Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheusrc_filename).execute()
-        # end
-        begin
-          load __FILE__
-        rescue => err
-          print "failed to reload #{__FILE__}. oh well"
-          # print err
+
+        # raise RestartShellPlease
+
+        # execute startup scripts
+        if File.exists?(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)
+          Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheusrc_filename).execute()
         end
-        print dark," #=> shell has been reloaded",reset,"\n"  if Morpheus::Logging.debug?
+        
+        # recalculate shell environment
+        reinitialize()
+
+        Morpheus::Logging::DarkPrinter.puts "shell has been reloaded" if Morpheus::Logging.debug?
         return 0
       elsif input == '!!'
         cmd_number = @history.keys[-1]
         input = @history[cmd_number]
         if !input
           puts "There is no previous command"
-          return 1
+          return false
         end
         execute_commands(input)
       elsif input =~ /^\!.+/
@@ -237,76 +345,29 @@ class Morpheus::Cli::Shell
       #     puts "#{Morpheus::Logging.log_level}"
       elsif input == "debug"
         log_history_command(input)
-        Morpheus::Cli::LogLevelCommand.new.handle(["debug"])
-        @command_options[:debug] = true
-        return 0
-          # Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
-          # ::RestClient.log = Morpheus::Logging.debug? ? STDOUT : nil
-      #   elsif log_level == "info"
-      #     #log_history_command(input)
-      #     @command_options.delete(:debug)
-      #     Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::INFO)
-      #     ::RestClient.log = Morpheus::Logging.debug? ? STDOUT : nil
-      #   elsif log_level.to_s == "0" || (log_level.to_i > 0 && log_level.to_i < 7)
-      #     # other log levels are pointless right now..
-      #     @command_options.delete(:debug)
-      #     Morpheus::Logging.set_log_level(log_level.to_i)
-      #     ::RestClient.log = Morpheus::Logging.debug? ? STDOUT : nil
-      #   else
-      #     print_red_alert "unknown log level: #{log_level}"
-      #   end
-      #   return 0
-      # # lots of hidden commands
-      # elsif input == "debug"
-      #   @command_options[:debug] = true
-      #   Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
-      #   ::RestClient.log = Morpheus::Logging.debug? ? STDOUT : nil
-      #   return 0
+        return Morpheus::Cli::LogLevelCommand.new.handle(["debug"])
       elsif ["hello","hi","hey","hola"].include?(input.strip.downcase)
         print "#{input.capitalize}, how may I #{cyan}help#{reset} you?\n"
         return 0
-      # use morpheus coloring [on|off]
-      # elsif input == "colorize"
-      #   Term::ANSIColor::coloring = true
-      #   @command_options[:nocolor] = false
-      #   return 0
-      # elsif input == "uncolorize"
-      #   Term::ANSIColor::coloring = false
-      #   @command_options[:nocolor] = true
-      #   return 0
       elsif input == "shell"
         print "#{cyan}You are already in a shell.#{reset}\n"
         return false
-      # there is actually a Cli::SourceCommand !
-      # elsif input =~ /^source\s*/i
-      #   source_file = input.sub(/^source\s*/i, '')
-      #   # execute a source script
-      #   if File.exists?(source_file)
-      #     cmd_results = Morpheus::Cli::DotFile.new(source_file).execute()
-      #     # return !cmd_results.include?(false)
-      #     return true
-      #   else
-      #     print_red_alert "file not found: '#{source_file}'"
-      #     return false
-      #   end
-      # there is actually a Cli::EchoCommand !
-      # elsif input =~ /^echo\s*/i
-      #   your_words = input.sub(/^echo\s*/i, '')
-      #   print your_words.to_s + "\n"
-      #   return true
+      elsif input =~ /^\.\s/
+        # dot alias for source <file>
+        log_history_command(input)
+        return Morpheus::Cli::SourceCommand.new.handle(input.split[1..-1])
       end
 
       begin
         argv = Shellwords.shellsplit(input)
-
-
-        if Morpheus::Cli::CliRegistry.has_command?(argv[0]) || Morpheus::Cli::CliRegistry.has_alias?(argv[0])
+        cmd_name = argv[0]
+        cmd_args = argv[1..-1]
+        if Morpheus::Cli::CliRegistry.has_command?(cmd_name) || Morpheus::Cli::CliRegistry.has_alias?(cmd_name)
           #log_history_command(input)
-          Morpheus::Cli::CliRegistry.exec(argv[0], argv[1..-1])
+          Morpheus::Cli::CliRegistry.exec(cmd_name, cmd_args)
         else
-          print_yellow_warning "Unrecognized Command '#{argv[0]}'. Try 'help' to see a list of available commands."
-          @history_logger.warn "Unrecognized Command #{argv[0]}" if @history_logger
-          #puts optparse
+          puts_error "#{Morpheus::Terminal.angry_prompt}'#{cmd_name}' is not a morpheus command. Use 'help' to see the list of available commands."
+          @history_logger.warn "Unrecognized Command #{cmd_name}" if @history_logger
         end
         # rescue ArgumentError
         #   puts "Argument Syntax Error..."
@@ -319,13 +380,13 @@ class Morpheus::Cli::Shell
         # print "\n"
       rescue => e
         @history_logger.error "#{e.message}" if @history_logger
-        Morpheus::Cli::ErrorHandler.new.handle_error(e, @command_options)
+        Morpheus::Cli::ErrorHandler.new(my_terminal.stderr).handle_error(e) # lol
         # exit 1
       end
 
       if @return_to_log_level
         Morpheus::Logging.set_log_level(@return_to_log_level)
-        ::RestClient.log = Morpheus::Logging.debug? ? STDOUT : nil
+        ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil
         @return_to_log_level = nil
       end
 
@@ -334,84 +395,88 @@ class Morpheus::Cli::Shell
   end
 
   def get_prompt
+
+    # print cyan,"morpheus > ",reset
+    # input = $stdin.gets.chomp!
+
     input = ''
     while char=$stdin.getch do
-        if char == '\n'
-          print "\r\n"
-          puts "executing..."
-          break
-        end
-        print char
-        input << char
+      if char == '\n'
+        print "\r\n"
+        puts "executing..."
+        break
       end
-      return input
+      print char
+      input << char
     end
+    return input
+  end
 
-    def history_file_path
-      File.join(Morpheus::Cli.home_directory, "shell_history")
-    end
+  def history_file_path
+    File.join(Morpheus::Cli.home_directory, "shell_history")
+  end
 
-    def load_history_logger
-      file_path = history_file_path
-      if !Dir.exists?(File.dirname(file_path))
-        FileUtils.mkdir_p(File.dirname(file_path))
-      end
-      if !File.exists?(file_path)
-        FileUtils.touch(file_path)
-        FileUtils.chmod(0600, file_path)
-      end
-      logger = Logger.new(file_path)
-      # logger.formatter = proc do |severity, datetime, progname, msg|
-      #   "#{msg}\n"
-      # end
-      return logger
+  def load_history_logger
+    file_path = history_file_path
+    if !Dir.exists?(File.dirname(file_path))
+      FileUtils.mkdir_p(File.dirname(file_path))
     end
+    if !File.exists?(file_path)
+      FileUtils.touch(file_path)
+      FileUtils.chmod(0600, file_path)
+    end
+    logger = Logger.new(file_path)
+    # logger.formatter = proc do |severity, datetime, progname, msg|
+    #   "#{msg}\n"
+    # end
+    return logger
+  end
 
-    def load_history_from_log_file(n_commands=1000)
-      @history ||= {}
-      @last_command_number ||= 0
+  def 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
+    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
-      rescue => e
-        # raise e
-        # puts "failed to load history from log"
-        @history = {}
       end
-      return @history
+    rescue => e
+      # raise e
+      # puts "failed to load history from log"
+      @history = {}
     end
+    return @history
+  end
 
-    def log_history_command(cmd)
-      @history ||= {}
-      @last_command_number ||= 0
-      @last_command_number += 1
-      @history[@last_command_number] = cmd
-      if @history_logger
-        @history_logger.info "(cmd #{@last_command_number}) #{cmd}"
-      end
+  def log_history_command(cmd)
+    @history ||= {}
+    @last_command_number ||= 0
+    @last_command_number += 1
+    @history[@last_command_number] = cmd
+    if @history_logger
+      @history_logger.info "(cmd #{@last_command_number}) #{cmd}"
     end
   end
+end