morpheus-cli 5.5.2.2 → 5.5.3

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

@@ -144,7 +144,7 @@ module Morpheus::Cli::PrintHelper
     data = {}
     begin
       data = JSON.parse(e.response.to_s)
-    rescue => ex
+    rescue
       # Morpheus::Logging::DarkPrinter.puts "Failed to parse error response as JSON: #{ex}" if Morpheus::Logging.debug?
     end
     return data
@@ -1329,19 +1329,19 @@ module Morpheus::Cli::PrintHelper
     outfile = nil
     begin
       full_filename = File.expand_path(filename)
-      if File.exists?(full_filename)
+      if File.exist?(full_filename)
         if !overwrite
           print "#{red}Output file '#{filename}' already exists.#{reset}\n"
           print "#{red}Use --overwrite to overwrite the existing file.#{reset}\n"
           return 1
         end
       end
-      if Dir.exists?(full_filename)
+      if Dir.exist?(full_filename)
         print "#{red}Output file '#{filename}' is invalid. It is the name of an existing directory.#{reset}\n"
         return 1
       end
       target_dir = File.dirname(full_filename)
-      if !Dir.exists?(target_dir)
+      if !Dir.exist?(target_dir)
         FileUtils.mkdir_p(target_dir)
       end
       outfile = File.open(full_filename, access_mode)
@@ -1362,19 +1362,19 @@ module Morpheus::Cli::PrintHelper
     outfile = nil
     begin
       full_filename = File.expand_path(filename)
-      if File.exists?(full_filename)
+      if File.exist?(full_filename)
         if !overwrite
           print "#{red}Output file '#{filename}' already exists.#{reset}\n"
           print "#{red}Use --overwrite to overwrite the existing file.#{reset}\n"
           return 1
         end
       end
-      if Dir.exists?(full_filename)
+      if Dir.exist?(full_filename)
         print "#{red}Output file '#{filename}' is invalid. It is the name of an existing directory.#{reset}\n"
         return 1
       end
       target_dir = File.dirname(full_filename)
-      if !Dir.exists?(target_dir)
+      if !Dir.exist?(target_dir)
         FileUtils.mkdir_p(target_dir)
       end
       outfile = File.open(full_filename, access_mode)
@@ -1402,13 +1402,17 @@ module Morpheus::Cli::PrintHelper
     end
   end
 
-  def format_percent(val, sig_dig=2)
+  def format_percent(val, sig_dig=2, hide_zero=false)
     if val.nil?
       return ""
     end
     percent_value = val.to_f
     if percent_value == 0
-      return "0%"
+      if hide_zero
+        ""
+      else
+        return "0%"
+      end
     else
       return percent_value.round(sig_dig).to_s + "%"
     end
@@ -1431,8 +1435,8 @@ module Morpheus::Cli::PrintHelper
 
   # convert JSON or YAML string to a map
   def parse_json_or_yaml(config, parsers = [:json, :yaml])
-    rtn = {success: false, data: nil, err: nil}
-    err = nil
+    rtn = {success: false, data: nil, error: nil}
+    error = nil
     config = config.strip
     if config[0..2] == "---"
       parsers = [:yaml]
@@ -1455,7 +1459,7 @@ module Morpheus::Cli::PrintHelper
           rtn[:success] = true
           break
         rescue => ex
-          rtn[:err] = ex if rtn[:err].nil?
+          rtn[:error] = ex if rtn[:error].nil?
         end
       elsif parser == :json
         begin
@@ -1464,7 +1468,7 @@ module Morpheus::Cli::PrintHelper
           rtn[:success] = true
           break
         rescue => ex
-          rtn[:err] = ex if rtn[:err].nil?
+          rtn[:error] = ex if rtn[:error].nil?
         end
       end
     end

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

@@ -43,7 +43,7 @@ module Morpheus::Cli::RestCommand
     # It is used to derive all other default rest settings key, label, etc.  
     # The default name the command name with underscores `_` instead of dashes `-`.
     def rest_name
-      @rest_name || default_rest_name
+      defined?(@rest_name) ? @rest_name : default_rest_name
     end
 
     def default_rest_name
@@ -58,7 +58,7 @@ module Morpheus::Cli::RestCommand
 
     # rest_key is the singular name of the resource eg. "neat_thing"
     def rest_key
-      @rest_key || default_rest_key
+      defined?(@rest_key) ? @rest_key : default_rest_key
     end
 
     def default_rest_key
@@ -73,7 +73,7 @@ module Morpheus::Cli::RestCommand
 
     # rest_arg is a label for the arg in the command usage eg. "thing" gets displayed as [thing]
     def rest_arg
-      @rest_arg || default_rest_arg
+      defined?(@rest_arg) ? @rest_arg : default_rest_arg
     end
 
     def default_rest_arg
@@ -89,7 +89,7 @@ module Morpheus::Cli::RestCommand
     # rest_has_name indicates a resource has a name and can be retrieved by name or id
     # true by default, set to false for lookups by only id
     def rest_has_name
-      @rest_has_name != nil ? @rest_has_name :  default_rest_has_name
+      defined?(@rest_has_name) ? @rest_has_name :  default_rest_has_name
     end
 
     def default_rest_has_name
@@ -104,7 +104,7 @@ module Morpheus::Cli::RestCommand
 
     # rest_label is the capitalized resource label eg. "Neat Thing"    
     def rest_label
-      @rest_label || default_rest_label
+      defined?(@rest_label) ? @rest_label : default_rest_label
     end
 
     def default_rest_label
@@ -119,7 +119,7 @@ module Morpheus::Cli::RestCommand
 
     # the plural version of the label eg. "Neat Things"
     def rest_label_plural
-      @rest_label_plural || default_rest_label_plural
+      defined?(@rest_label_plural) ? @rest_label_plural : default_rest_label_plural
     end
     
     def default_rest_label_plural
@@ -135,7 +135,7 @@ module Morpheus::Cli::RestCommand
 
     # rest_interface_name is the interface name for the resource. eg. "neat_things"
     def rest_interface_name
-      @rest_interface_name || default_rest_interface_name
+      defined?(@rest_interface_name) ? @rest_interface_name : default_rest_interface_name
     end
 
     def default_rest_interface_name
@@ -150,7 +150,7 @@ module Morpheus::Cli::RestCommand
 
     # rest_perms_config enables and configures permissions prompt
     def rest_perms_config
-      @rest_perms_config || {}
+      defined?(@rest_perms_config) ? @rest_perms_config : {}
     end
 
     def rest_perms_config=(v)
@@ -161,7 +161,7 @@ module Morpheus::Cli::RestCommand
 
     # rest_option_context_map specifies context mapping during option prompt. default is domain => ''
     def rest_option_context_map
-      @option_context_map || {'domain' => ''}
+      defined?(@option_context_map) ? @option_context_map : {'domain' => ''}
     end
 
     def rest_option_context_map=(v)
@@ -172,7 +172,7 @@ module Morpheus::Cli::RestCommand
 
     # rest_has_type indicates a resource has a type. default is false
     def rest_has_type
-      @rest_has_type == true
+      defined?(@rest_has_type) && @rest_has_type
     end
 
     def default_rest_has_type
@@ -189,7 +189,7 @@ module Morpheus::Cli::RestCommand
 
     # rest_type_name is the rest_name for the type, only applicable if rest_has_type
     def rest_type_name
-      @rest_type_name || default_rest_type_name
+      defined?(@rest_type_name) ? @rest_type_name : default_rest_type_name
     end
 
     def default_rest_type_name
@@ -206,7 +206,7 @@ module Morpheus::Cli::RestCommand
 
     # rest_type_key is the singular name of the resource eg. "neat_thing"
     def rest_type_key
-      @rest_type_key || default_rest_type_key
+      defined?(@rest_type_key) ? @rest_type_key : default_rest_type_key
     end
 
     def default_rest_type_key
@@ -220,7 +220,7 @@ module Morpheus::Cli::RestCommand
     alias :set_rest_type_key :rest_type_key=
 
     def rest_type_arg
-      @rest_type_arg || default_rest_type_arg
+      defined?(@rest_type_arg) ? @rest_type_arg : default_rest_type_arg
     end
 
     def default_rest_type_arg
@@ -236,7 +236,7 @@ module Morpheus::Cli::RestCommand
 
     # rest_type_label is the capitalized resource label eg. "Neat Thing"    
     def rest_type_label
-      @rest_type_label || default_rest_type_label
+      defined?(@rest_type_label) ? @rest_type_label : default_rest_type_label
     end
 
     def default_rest_type_label
@@ -251,7 +251,7 @@ module Morpheus::Cli::RestCommand
 
     # the plural version of the label eg. "Neat Things"
     def rest_type_label_plural
-      @rest_type_label_plural || default_rest_type_label_plural
+      defined?(@rest_type_label_plural) ? @rest_type_label_plural : default_rest_type_label_plural
     end
     
     def default_rest_type_label_plural
@@ -267,7 +267,7 @@ module Morpheus::Cli::RestCommand
 
     # the name of the default interface, matches the rest name eg. "neat_things"
     def rest_type_interface_name
-      @rest_type_interface_name || default_rest_type_interface_name
+      defined?(@rest_type_interface_name) ? @rest_type_interface_name : default_rest_type_interface_name
     end
 
     def default_rest_type_interface_name
@@ -742,7 +742,6 @@ EOT
   end
 
   def update(args)
-    id = args[0]
     record_type = nil
     record_type_id = nil
     options = {}
@@ -762,6 +761,7 @@ EOT
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
+    id = args[0]
     record = rest_find_by_name_or_id(id)
     if record.nil?
       return 1, "#{rest_name} not found for '#{id}'"
@@ -857,7 +857,6 @@ EOT
   end
 
   def remove(args)
-    id = args[0]
     params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -872,6 +871,7 @@ EOT
     verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
     params.merge!(parse_query_options(options))
+    id = args[0]
     record = rest_find_by_name_or_id(id)
     if record.nil?
       return 1, "#{rest_name} not found for '#{id}'"

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

@@ -33,7 +33,7 @@ module Morpheus::Cli::SecondaryRestCommand
 
     # rest_parent_name is the rest_name for the parent
     def rest_parent_name
-      @rest_parent_name || default_rest_parent_name
+      defined?(@rest_parent_name) ? @rest_parent_name : default_rest_parent_name
     end
 
     def default_rest_parent_name
@@ -58,7 +58,7 @@ module Morpheus::Cli::SecondaryRestCommand
 
     # rest_parent_key is the singular name of the resource eg. "neat_thing"
     def rest_parent_key
-      @rest_parent_key || default_rest_parent_key
+      defined?(@rest_parent_key) ? @rest_parent_key : default_rest_parent_key
     end
 
     def default_rest_parent_key
@@ -72,7 +72,7 @@ module Morpheus::Cli::SecondaryRestCommand
     alias :set_rest_parent_key :rest_parent_key=
 
     def rest_parent_arg
-      @rest_parent_arg || default_rest_parent_arg
+      defined?(@rest_parent_arg) ? @rest_parent_arg : default_rest_parent_arg
     end
 
     def default_rest_parent_arg
@@ -86,7 +86,7 @@ module Morpheus::Cli::SecondaryRestCommand
     alias :set_rest_parent_arg :rest_parent_arg=
 
     def rest_parent_param
-      @rest_parent_param || default_rest_parent_param
+      defined?(@rest_parent_param) ? @rest_parent_param : default_rest_parent_param
     end
 
     def default_rest_parent_param
@@ -103,7 +103,7 @@ module Morpheus::Cli::SecondaryRestCommand
     # rest_parent_has_name indicates a resource has a name and can be retrieved by name or id
     # true by default, set to false for lookups by only id
     def rest_parent_has_name
-      @rest_parent_has_name != nil ? @rest_parent_has_name :  default_rest_parent_has_name
+      defined?(@rest_parent_has_name) ? @rest_parent_has_name : default_rest_parent_has_name
     end
 
     def default_rest_parent_has_name
@@ -118,7 +118,7 @@ module Morpheus::Cli::SecondaryRestCommand
 
     # rest_parent_label is the capitalized resource label eg. "Neat Thing"    
     def rest_parent_label
-      @rest_parent_label || default_rest_parent_label
+      defined?(@rest_parent_label) ? @rest_parent_label : default_rest_parent_label
     end
 
     def default_rest_parent_label
@@ -133,7 +133,7 @@ module Morpheus::Cli::SecondaryRestCommand
 
     # the plural version of the label eg. "Neat Things"
     def rest_parent_label_plural
-      @rest_parent_label_plural || default_rest_parent_label_plural
+      defined?(@rest_parent_label_plural) ? @rest_parent_label_plural : default_rest_parent_label_plural
     end
     
     def default_rest_parent_label_plural
@@ -149,7 +149,7 @@ module Morpheus::Cli::SecondaryRestCommand
 
     # the name of the default interface, matches the rest name eg. "neat_things"
     def rest_parent_interface_name
-      @rest_parent_interface_name || default_rest_parent_interface_name
+      defined?(@rest_parent_interface_name) ? @rest_parent_interface_name : default_rest_parent_interface_name
     end
 
     def default_rest_parent_interface_name
@@ -514,8 +514,6 @@ EOT
   end
 
   def update(args)
-    parent_id = args[0]
-    id = args[1]
     record_type = nil
     record_type_id = nil
     options = {}
@@ -533,6 +531,8 @@ EOT
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:2)
     connect(options)
+    parent_id = args[0]
+    id = args[1]
     parent_record = rest_parent_find_by_name_or_id(parent_id)
     if parent_record.nil?
       return 1, "#{rest_parent_label} not found for '#{parent_id}"
@@ -633,8 +633,6 @@ EOT
   end
 
   def remove(args)
-    parent_id = args[0]
-    id = args[1]
     params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -649,6 +647,8 @@ EOT
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:2)
     connect(options)
+    parent_id = args[0]
+    id = args[1]
     parent_record = rest_parent_find_by_name_or_id(parent_id)
     if parent_record.nil?
       return 1, "#{rest_parent_label} not found for '#{parent_id}"

data/lib/morpheus/cli/option_parser.rb

@@ -43,7 +43,7 @@ module Morpheus
             my_summaries.each do |full_line|
               opt_description = full_line.to_s.strip
               if opt_description.start_with?("-")
-                is_hidden = (@hidden_options || []).find { |hidden_switch|
+                is_hidden = (hidden_options || []).find { |hidden_switch|
                   if hidden_switch.start_with?("-")
                     opt_description.start_with?("#{hidden_switch} ")
                   else
@@ -74,6 +74,10 @@ module Morpheus
         out
       end
 
+      def hidden_options
+        @hidden_options ||= []
+      end
+
       def add_hidden_option(opt_name)
         opt_array = [opt_name].flatten.compact
         @hidden_options ||= []

data/lib/morpheus/cli/option_types.rb

@@ -14,12 +14,25 @@ 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!
+
+          # should use Readline.readline to probably
+          Readline.completion_append_character = ""
+          Readline.basic_word_break_characters = ''
+          Readline.completion_proc = nil
           if default_value.nil?
-            print "#{message} (yes/no): "
+            confirm_prompt = "#{message} (yes/no): "
           else
-            print "#{message} (yes/no) [#{!!default_value ? 'yes' : 'no'}]: "
+            confirm_prompt = "#{message} (yes/no) [#{!!default_value ? 'yes' : 'no'}]: "
           end
-          input = $stdin.gets.chomp!
+          input = Readline.readline(confirm_prompt, false).to_s
+          input = input.chomp.strip
+
           if input.empty? && !default_value.nil?
             return !!default_value
           end
@@ -86,6 +99,25 @@ module Morpheus
           context_map = results
           value = nil
           value_found = false
+
+          # allow for mapping of domain to relevant type: domain.zone => router.zone
+          option_type['fieldContext'] = (options[:context_map] || {})[option_type['fieldContext']] || option_type['fieldContext']
+          field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
+          help_field_key = option_type[:help_field_prefix] ? "#{option_type[:help_field_prefix]}.#{field_key}" : field_key
+          namespaces = field_key.split(".")
+          field_name = namespaces.pop
+
+
+          # support --no-options --skip-option x,y,z --only-option x,y,z
+          if options[:no_options]
+            next
+          elsif options[:skip_options] && options[:skip_options].find {|it| it.to_s.downcase == option_type['fieldName'].to_s.downcase || it.to_s.downcase == option_type['fieldLabel'].to_s.downcase }
+            next
+          elsif options[:only_options] && !options[:only_options].find {|it| it.to_s.downcase == option_type['fieldName'].to_s.downcase || it.to_s.downcase == option_type['fieldLabel'].to_s.downcase }
+            next
+          end            
+          
+
           field_group = (option_type['fieldGroup'] || 'default').to_s.sub(/options\Z/i, "").strip # avoid "ADVANCED OPTION OPTIONS"
 
           if cur_field_group != field_group
@@ -105,12 +137,6 @@ module Morpheus
           #   end
           # end
 
-          # allow for mapping of domain to relevant type: domain.zone => router.zone
-          option_type['fieldContext'] = (options[:context_map] || {})[option_type['fieldContext']] || option_type['fieldContext']
-          field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
-          help_field_key = option_type[:help_field_prefix] ? "#{option_type[:help_field_prefix]}.#{field_key}" : field_key
-          namespaces = field_key.split(".")
-          field_name = namespaces.pop
 
           # respect optionType.dependsOnCode
           # i guess this switched to visibleOnCode, respect one or the other
@@ -612,6 +638,7 @@ module Morpheus
         end
 
         while !value_found do
+          #Readline.input = $stdin
           Readline.completion_append_character = ""
           Readline.basic_word_break_characters = ''
           Readline.completion_proc = proc {|s| 
@@ -703,6 +730,7 @@ module Morpheus
           elsif no_prompt
             input = default_value
           else
+            #Readline.input = $stdin
             Readline.completion_append_character = ""
             Readline.basic_word_break_characters = ''
             Readline.completion_proc = proc {|s| 
@@ -970,8 +998,26 @@ module Morpheus
       def self.password_prompt(option_type)
         value_found = false
         while !value_found do
-          print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+'************'+']' : ''}: "
-          input = $stdin.noecho(&:gets).chomp!
+          # readline is still echoing secret with 'NUL:'' so just use $stdin on windows for now
+          if Morpheus::Cli.windows?
+            print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+'************'+']' : ''}: "
+            input = $stdin.noecho(&:gets).chomp!
+          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_prompt = "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+'************'+']' : ''}: "
+            input = Readline.readline(password_prompt, false).to_s.chomp
+            Readline.pre_input_hook = nil
+            Readline.output = Morpheus::Terminal.instance.stdout #my_terminal.stdout
+          end
+
           value = input
           print "\n"
           if input == '?'
@@ -991,6 +1037,7 @@ module Morpheus
         value = nil
         while !value_found do
           #print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
+          #Readline.input = $stdin
           Readline.completion_append_character = ""
           Readline.basic_word_break_characters = ''
           Readline.completion_proc = proc {|s| Readline::FILENAME_COMPLETION_PROC.call(s) }
@@ -1005,7 +1052,7 @@ module Morpheus
             value_found = true
           elsif value
             filename = File.expand_path(value)
-            if !File.exists?(filename)
+            if !File.exist?(filename)
               # print_red_alert "File not found: #{filename}"
               # exit 1
               print Term::ANSIColor.red,"  File not found: #{filename}",Term::ANSIColor.reset, "\n"

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.5.2.2"
+    VERSION = "5.5.3"
   end
 end

data/lib/morpheus/cli.rb

@@ -36,38 +36,48 @@ module Morpheus
       begin
         require 'rbconfig'
         @@is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
-      rescue => ex
+      rescue
         # $stderr.puts "unable to determine if this is a Windows machine."
       end
       return @@is_windows
     end
 
-    # load all the well known commands and utilties they need
+    # load! does the initial loading of all the CLI utilities and commands
     def self.load!()
-      # load interfaces
-      require 'morpheus/api/api_client.rb'
-      require 'morpheus/api/rest_interface.rb'
-      require 'morpheus/api/read_interface.rb'
-      Dir[File.dirname(__FILE__)  + "/api/**/*.rb"].each {|file| load file }
-
-      # load mixins
-      Dir[File.dirname(__FILE__)  + "/cli/mixins/**/*.rb"].each {|file| load file }
+      
+      # api interfaces
+      require 'morpheus/api'
+      Dir[File.dirname(__FILE__)  + "/api/**/*.rb"].each { |file| require file }
 
-      # load utilites
+      # utilites
+      # Dir[File.dirname(__FILE__)  + "/cli/*.rb"].each { |file| require file }
       require 'morpheus/cli/cli_registry.rb'
       require 'morpheus/cli/expression_parser.rb'
       require 'morpheus/cli/dot_file.rb'
       require 'morpheus/cli/errors'
+      require 'morpheus/cli/cli_command.rb'
+      require 'morpheus/cli/option_types.rb'
+      require 'morpheus/cli/credentials.rb'
 
-      load 'morpheus/cli/cli_command.rb'
-      load 'morpheus/cli/option_types.rb'
-      load 'morpheus/cli/credentials.rb'
+      # mixins
+      Dir[File.dirname(__FILE__)  + "/cli/mixins/**/*.rb"].each {|file| require file }
       
-      # load all commands
-      Dir[File.dirname(__FILE__)  + "/cli/commands/**/*.rb"].each {|file| load file }
+      # commands
+      Dir[File.dirname(__FILE__)  + "/cli/commands/**/*.rb"].each {|file| require file }
 
     end
 
+    # reload! can be used for live reloading changes while developing
+    def self.reload!()
+      # api interfaces
+      Dir[File.dirname(__FILE__)  + "/api/**/*.rb"].each { |file| load file }
+      # mixins
+      Dir[File.dirname(__FILE__)  + "/cli/mixins/**/*.rb"].each {|file| load file }
+      # commands
+      Dir[File.dirname(__FILE__)  + "/cli/commands/**/*.rb"].each {|file| load file }
+    end
+
+    # require all CLI modules now (on require)
     load!
     
   end

data/lib/morpheus/ext/rest_client.rb

@@ -5,6 +5,7 @@ require 'rest-client'
 module RestClient  
   class Request
 
+    alias_method :original_log_request, :log_request
     def log_request
       begin
         return unless RestClient.log
@@ -14,10 +15,10 @@ module RestClient
         out << payload.short_inspect if payload
         out << processed_headers.to_a.sort.map { |(k, v)| [k.inspect, v.inspect].join("=>") }.join(", ")
         RestClient.log << out.join(', ') + "\n"
-      rescue => ex
+      rescue
         # something went wrong, wrong gem version maybe...above is from rest-client 2.0.2
         # do it the old way
-        super
+        original_log_request()
       end
     end
 =begin

data/lib/morpheus/formatters.rb

@@ -355,7 +355,7 @@ def format_bytes_short(bytes)
 end
 
 def no_colors(str)
-  str.to_s.gsub /\e\[\d+m/, ""
+  str.to_s.gsub(/\e\[\d+m/, "")
 end
 
 

data/lib/morpheus/logging.rb

@@ -85,18 +85,18 @@ module Morpheus::Logging
       msg = msg.clone
       # looks for RestClient format (hash.inspect) and request/curl output name: value
       msg.gsub!(/Authorization\"\s?\=\>\s?\"Bearer [^"]+/i, 'Authorization"=>"Bearer ************')
-      msg.gsub!(/Authorization\:\s?Bearer [^"'']+/i, 'Authorization: Bearer ************')
+      msg.gsub!(/Authorization\:\s?Bearer [^"']+/i, 'Authorization: Bearer ************')
       # msg.gsub!(/#{AUTHORIZATION_HEADER}\"\s?\=\>\s?\"Bearer [^"]+/, "#{AUTHORIZATION_HEADER}"=>"Bearer ************")
-      # msg.gsub!(/#{AUTHORIZATION_HEADER}\:\s?Bearer [^"'']+/, "#{AUTHORIZATION_HEADER}: Bearer ************")
+      # msg.gsub!(/#{AUTHORIZATION_HEADER}\:\s?Bearer [^"']+/, "#{AUTHORIZATION_HEADER}: Bearer ************")
       SECRET_TOKEN_HEADERS.each do |header|
         msg.gsub!(/#{header}\"\s?\=\>\s?\"[^"]+/, "#{header}\"=>\"************")
-        msg.gsub!(/#{header}\:\s?[^"'']+/, "#{header}: ************")
+        msg.gsub!(/#{header}\:\s?[^"']+/, "#{header}: ************")
       end
       msg.gsub!(/password\"\: "[^"]+/, 'password": "************') # json properties ending with password
       msg.gsub!(/Password\"\: "[^"]+/, 'Password": "************') # json properties ending with Password
       msg.gsub!(/password\"\s?\=\>\s?\"[^"]+/i, 'password"=>"************')
       msg.gsub!(/password\=\"[^"]+/i, 'password="************')
-      msg.gsub!(/password\=[^"'&\Z]+/i, 'password=************') # buggy, wont work with ampersand or quotes in passwords! heh
+      msg.gsub!(/password\=[^"'&]+/i, 'password=************') # buggy, wont work with ampersand or quotes in passwords! heh
       msg.gsub!(/passwordConfirmation\=[^" ]+/i, 'passwordConfirmation="************')
       msg.gsub!(/passwordConfirmation\=[^" ]+/i, 'passwordConfirmation=************')
     end