morpheus-cli 3.6.11 → 3.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d463857d867530a0377c41c1dc74f7ef7a70263e98d24b9a161a245c602fb6
-  data.tar.gz: b54e2067737379a676e48feefe1c347a7a5bbb1df4694651b2e55195e4c91f3c
+  metadata.gz: 662d9e93e1e871b6f955e6db6da0534fd9018f303fa9f77be33b4985e9b7aeff
+  data.tar.gz: e9728d099bc08d4f9a2ffbd1292e8d9d8ebe337e56673e10673fd464e9d03a46
 SHA512:
-  metadata.gz: b23d4bcb6342da85c55c27b641a13bb6277071beb9e925774317d61c96db96d1fdabbf36ab2f344bf82dbc6cb9dabd477354a42b1e9e7c2cfb576953e5a3c891
-  data.tar.gz: fa239481d1a0498b45aaeb1db54a34620891ea308b2a386cec31483b5345bafb2b7f3b0bd34c05bbda678644c6d61c6c4b0fdbe8cdd81061adbd60fbca4be969
+  metadata.gz: 9e55742378c6bd60dff897dad5b773e8127e82eae92b77b896954beb419b0853c5a576865ead400cad65fa4a6617a2b6d8e308a9d5d604725ada4b7dd1d49550
+  data.tar.gz: b8237f9eae9f570e0efc86ebb05f322a723bcf9b349c9621d7335732e96009d249d0089c88e6a41e26f51c611f5130c44058cbca3e7614393a9469bbfeae0ed0

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

@@ -45,9 +45,15 @@ EOT
       puts_error  "wrong number of arguments, expected 0 and got #{args.count} #{args.join(' ')}\n#{optparse}"
       return 1
     end
+    benchmark_was_enabled = Morpheus::Benchmarking.enabled
     Morpheus::Benchmarking.enabled = true
     my_terminal.benchmarking = Morpheus::Benchmarking.enabled
-    puts "#{cyan}benchmark: #{green}on#{reset}" unless options[:quiet]
+    unless options[:quiet]
+      # if benchmark_was_enabled == false
+      #   Morpheus::Logging::DarkPrinter.puts "benchmark enabled" if Morpheus::Logging.debug?
+      # end
+      puts "#{cyan}benchmark: #{green}on#{reset}"
+    end
     return 0 
   end
 
@@ -69,9 +75,15 @@ EOT
       puts_error  "wrong number of arguments, expected 0 and got #{args.count} #{args.join(' ')}\n#{optparse}"
       return 1
     end
+    benchmark_was_enabled = Morpheus::Benchmarking.enabled
     Morpheus::Benchmarking.enabled = false
     my_terminal.benchmarking = Morpheus::Benchmarking.enabled
-    puts "#{cyan}benchmark: #{dark}off#{reset}" unless options[:quiet]
+    unless options[:quiet]
+      # if benchmark_was_enabled == true
+      #   Morpheus::Logging::DarkPrinter.puts "benchmark disabled" if Morpheus::Logging.debug?
+      # end
+      puts "#{cyan}benchmark: #{dark}off#{reset}"
+    end
     return 0 
   end
 

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

@@ -15,29 +15,35 @@ class Morpheus::Cli::ColoringCommand
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus #{command_name} [on|off]"
       #build_common_options(opts, options, [])
+      opts.on('-q','--quiet', "No Output, do not print to stdout") do
+        options[:quiet] = true
+      end
       opts.on('-h', '--help', "Print this help" ) do
         puts opts
         exit
       end
       opts.footer = "Enable [on] or Disable [off] ANSI Colors for all output.\n" + 
                     "Use [on?] or [off?] to print the current value and exit accordingly." + "\n" +
-                    "Pass no arguments to just print the current value."
+                    "Passing no arguments is the same as `#{command_name} on`"
     end
     optparse.parse!(args)
     if args.count > 1
       raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
     end
     
+    coloring_was_enabled = Term::ANSIColor::coloring?
     exit_code = 0
 
     if args.count == 0
-      # just print
+      # no args means turn it on.
+      Term::ANSIColor::coloring = true
     else
       subcmd = args[0].to_s.strip
       if subcmd == "on"
         Term::ANSIColor::coloring = true
       elsif subcmd == "off"
         Term::ANSIColor::coloring = false
+        
       elsif subcmd == "on?"
         exit_code = Term::ANSIColor::coloring? ? 0 : 1
       elsif subcmd == "off?"
@@ -49,8 +55,14 @@ class Morpheus::Cli::ColoringCommand
     end
     unless options[:quiet]
       if Term::ANSIColor::coloring?
+        if coloring_was_enabled == false
+          Morpheus::Logging::DarkPrinter.puts "coloring enabled" if Morpheus::Logging.debug?
+        end
         puts "#{cyan}coloring: #{bold}#{green}on#{reset}"
       else
+        if coloring_was_enabled == true
+          Morpheus::Logging::DarkPrinter.puts "coloring disabled" if Morpheus::Logging.debug?
+        end
         puts "coloring: off"
       end
     end

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

@@ -14,23 +14,30 @@ class Morpheus::Cli::DebugCommand
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus #{command_name} [on|off]"
       #build_common_options(opts, options, [])
+      opts.on('-q','--quiet', "No Output, do not print to stdout") do
+        options[:quiet] = true
+      end
       opts.on('-h', '--help', "Print this help" ) do
         puts opts
         exit
       end
       opts.footer = "Enable [on] or Disable [off] debugging for all output.\n" + 
                     "Use [on?] or [off?] to print the current value and exit accordingly." + "\n" +
-                    "Pass no arguments to just print the current value."
+                    "Passing no arguments is the same as `#{command_name} on`"
     end
     optparse.parse!(args)
     if args.count > 1
       raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
     end
     
+    debug_was_enabled = Morpheus::Logging.debug?
     exit_code = 0
 
     if args.count == 0
       # just print
+      # no way, debug means turn it on.
+      Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
+      ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil
     else
       subcmd = args[0].to_s.strip
       if subcmd == "on"
@@ -43,6 +50,8 @@ class Morpheus::Cli::DebugCommand
         exit_code = Morpheus::Logging.debug? ? 0 : 1
       elsif subcmd == "off?"
         exit_code = Morpheus::Logging.debug? ? 1 : 0
+      elsif subcmd == "status"
+        # just print current value
       else
         puts optparse
         return 127
@@ -50,8 +59,14 @@ class Morpheus::Cli::DebugCommand
     end
     unless options[:quiet]
       if Morpheus::Logging.debug?
+        if debug_was_enabled == false
+          Morpheus::Logging::DarkPrinter.puts "debug enabled" if Morpheus::Logging.debug?
+        end
         puts "#{cyan}debug: #{green}on#{reset}"
       else
+        if debug_was_enabled == true
+          Morpheus::Logging::DarkPrinter.puts "debug disabled" if Morpheus::Logging.debug?
+        end
         puts "#{cyan}debug: #{dark}off#{reset}"
       end
     end

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

@@ -47,8 +47,8 @@ EOT
       Morpheus::Cli::Shell.instance.flush_history
       return 0
     else
-      max_commands = options[:max] || 25
-      Morpheus::Cli::Shell.instance.print_history(max_commands)
+      # supports all the :list options
+      Morpheus::Cli::Shell.instance.print_history(options)
       return 0  
     end
   end

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

@@ -13,6 +13,9 @@ class Morpheus::Cli::LogLevelCommand
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus #{command_name} [debug|info|0|1]"
       #build_common_options(opts, options, [])
+      opts.on('-q','--quiet', "No Output, do not print to stdout") do
+        options[:quiet] = true
+      end
       opts.on('-h', '--help', "Print this help" ) do
         puts opts
         exit
@@ -33,10 +36,11 @@ EOT
       puts optparse
       return false
     end
+    debug_was_enabled = Morpheus::Logging.debug?
     if ["debug", "0"].include?(args[0].to_s.strip.downcase)
       Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
       ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil
-      Morpheus::Logging::DarkPrinter.puts "debug enabled"
+      Morpheus::Logging::DarkPrinter.puts "debug enabled" unless debug_was_enabled
     elsif ["info", "1"].include?(args[0].to_s.strip.downcase)
       Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::INFO)
       ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil

data/lib/morpheus/cli/cypher_command.rb

@@ -383,7 +383,6 @@ class Morpheus::Cli::CypherCommand
       end
       existing_cypher = nil
       json_response = @cypher_interface.list(item_key)
-      puts "json_response: #{json_response}"
       if json_response["data"] && json_response["data"]["keys"]
         existing_cypher = json_response["data"]["keys"].find {|k| k == item_key }
       end
@@ -481,7 +480,7 @@ key - Generates a Base 64 encoded AES Key of specified bit length in the key pat
 
   def cypher_ttl_help
     """
-Lease time in seconds (defaults to 32 days)
+Lease time in seconds
 Quick Second Time Reference:
 Hour: 3600
 Day: 86400
@@ -489,6 +488,8 @@ Week: 604800
 Month (30 days): 2592000
 Year: 31536000
 This can also be passed in abbreviated format with the unit as the suffix. eg. 32d, 90s, 5y
+This can be passed as 0 to disable expiration and never expire.
+The default is 32 days (2764800).
 """
   end
 

data/lib/morpheus/cli/shell.rb

@@ -681,22 +681,73 @@ class Morpheus::Cli::Shell
       nil
     end
   end
-
-  def print_history(n)
-    n ||= 25
+  
+  # load_history_commands paginates and sorts the command history
+  # the most recent 25 are returned by default.
+  # @return Hash like {:commands => [], :command_count => total}
+  def load_history_commands(options={})
+    options[:phrase] ||= nil
+    options[:sort] = options[:sort] ? options[:sort].to_sym : :number
+    options[:direction] ||= 'asc'
+    options[:offset] = options[:offset].to_i > 0 ? options[:offset].to_i : 0
+    options[:max] = options[:max].to_i > 0 ? options[:max].to_i : 25
+    
     load_history_from_log_file if !@history
-    cmd_numbers = @history.keys.last(n.to_i)
-    if cmd_numbers.size == 1
-      puts "Last command"
+    
+    # collect records as [{:number => 1, :command => "instances list"}, etc]
+    history_records = []
+    history_count = 0
+    if options[:sort].to_sym == :command
+      sort_key = :command
     else
-      puts "Last #{cmd_numbers.size} commands"
+      sort_key = :number
+    end
+    if options[:phrase] || sort_key != :number
+      # this could be a large object...need to index our shell_history file lol
+      history_records = @history.keys.collect { |k| {number: k, command: @history[k]} }
+      history_records = history_records.sort {|x,y| x[sort_key] <=> y[sort_key] }
+      if options[:phrase]
+        history_records = history_records.select {|it| it[:command].include?(options[:phrase]) || it[:number].to_s == options[:phrase] }
+      end
+      # get count and then slice it
+      command_count = history_records.size
+      history_records = history_records[options[:offset]..options[:max]-1]
+    else
+      # default should try to be as fast as possible..
+      # no searching or sorting, default order by :number works
+      # desc here means show oldest commands
+      if options[:direction] == 'desc'
+        if options[:offset]
+          cmd_numbers = @history.keys.first(options[:max] + options[:offset]).first(options[:max])
+        else
+          cmd_numbers = @history.keys.first(options[:max])
+        end
+        cmd_count = @history.keys.size
+      else
+        cmd_numbers = []
+        if options[:offset]
+          cmd_numbers = @history.keys.last(options[:max] + options[:offset]).first(options[:max])
+        else
+          cmd_numbers = @history.keys.last(options[:max])
+        end
+        history_records = cmd_numbers.collect { |k| {number: k, command: @history[k]} }
+        command_count = @history.size
+      end
     end
+    return {:commands => history_records, :command_count => command_count}
+  end
+
+  def print_history(options={})
+    history_result = load_history_commands(options)
+    history_records = history_result[:commands]
+    command_count = history_result[:command_count]
     print cyan
-    cmd_numbers.each do |cmd_number|
-      cmd = @history[cmd_number]
-      puts "#{cmd_number.to_s.rjust(3, ' ')}  #{cmd}"
+    history_records.each do |history_record|
+      puts "#{history_record[:number].to_s.rjust(3, ' ')}  #{history_record[:command]}"
     end
+    #print_results_pagination({size:history_records.size,total:command_count.to_i}, {:label => "command", :n_label => "commands"})
     print reset
+    #print "\n"
     return 0
   end
 

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.11"
+    VERSION = "3.6.12"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.11
+  version: 3.6.12
 platform: ruby
 authors:
 - David Estes