morpheus-cli 3.6.16 → 3.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2965857867a8deda2e9e0c8e6033823838c48710cde42a3d6f27b0ee5287faa6
-  data.tar.gz: f16690f4f149d1f17814059ae6e385bc9fe550964044c9deecf54e352c7e333e
+  metadata.gz: 1ab0c8fe5a857968851e03071645663f2c0ca449577b3c2e62106ed9ef57c9fe
+  data.tar.gz: 85e741a356d27d1729eb9e51cd9be7aebe7b3f9d11f17132f342992131b6c7d7
 SHA512:
-  metadata.gz: 580ca508572a8f69dc7d14626cf24df8fac27f148041272d01a71b943a256fe283ba880141685d243fb08bdb5b82a41f40bd80fd91d8d92227699901401552f2
-  data.tar.gz: 6852abdd9d76fa2f3a20e8e1b268eb3012c08906c02c5404a6fdc33378427036a2dbe66df5000bfa78339e8a10307d3020435cb17fbcc4dffd6171037cb2d53d
+  metadata.gz: 9780024822d8ff3eda9cb7ce718f3bd0fe18975e97ba6a883e88d22d4c311b72d8e2eba0de07ec265fb4789391ba3ea004737072a8b13bebb85f2a198c9d5631
+  data.tar.gz: 3dbdd462ee7e562561ba0d3ec94cb7fd96a2af842b610f04e3524301136ac80dd9c7d33b79cc87b0e2fdb99a3ebc33c3c0cd85986ae4da4bcbe090c1f3945e6c

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

@@ -46,7 +46,8 @@ EOT
       return 1
     end
     if options[:do_flush]
-      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to flush your command history?")
+      command_count = Morpheus::Cli::Shell.instance.history_commands_count
+      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to flush your command history (#{format_number(command_count)} #{command_count == 1 ? 'command' : 'commands'})?")
         return 9, "aborted command"
       end
       Morpheus::Cli::Shell.instance.flush_history

data/lib/morpheus/cli/shell.rb

@@ -723,8 +723,8 @@ class Morpheus::Cli::Shell
   # @return Hash like {:commands => [], :command_count => total}
   def load_history_commands(options={})
     phrase = options[:phrase]
-    sort = options[:sort] ? options[:sort].to_sym : :number
-    direction = options[:direction] == 'desc' ? 'desc' : 'asc'
+    sort_key = options[:sort] ? options[:sort].to_sym : nil
+    
     offset = options[:offset].to_i > 0 ? options[:offset].to_i : 0
     max = options[:max].to_i > 0 ? options[:max].to_i : 25
     
@@ -739,15 +739,15 @@ class Morpheus::Cli::Shell
     
     # sort is a bit different for this command, the default sort is by number
     # it sorts oldest -> newest, but shows the very last page by default.
-    sort_key = :number
-    if sort.to_sym == :command
-      sort_key = :command
+    if options[:sort] && ![:number, :command].include?(options[:sort])
+      options[:sort] = nil
     end
     
-    if phrase || sort_key != :number
+
+    if options[:phrase] || sort_key || options[:direction] || options[:offset]
       # 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]} }
-      if direction == 'desc'
+      if options[:direction] == 'desc'
         history_records = history_records.sort {|x,y| y[sort_key] <=> x[sort_key] }
       else
         history_records = history_records.sort {|x,y| x[sort_key] <=> y[sort_key] }
@@ -756,26 +756,20 @@ class Morpheus::Cli::Shell
         history_records = history_records.select {|it| it[:command].include?(phrase) || it[:number].to_s == phrase }
       end
       command_count = history_records.size
-      history_records = history_records[offset..max-1]
+      history_records = history_records[offset..(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
-      cmd_count = @history.keys.size
-      cmd_numbers = []
-      if direction == 'desc'
-        cmd_numbers = @history.keys[offset..(offset + max-1)]
+      if offset != 0
+        cmd_numbers = @history.keys.last(max + offset).first(max)
       else
-        if offset != 0
-          cmd_numbers = @history.keys.last(max + offset).first(max)
-        else
-          cmd_numbers = @history.keys.last(max)
-        end
-        history_records = cmd_numbers.collect { |k| {number: k, command: @history[k]} }
-        command_count = @history.size
+        cmd_numbers = @history.keys.last(max)
       end
+      history_records = cmd_numbers.collect { |k| {number: k, command: @history[k]} }
+      command_count = @history.size
     end
-    return {:commands => history_records, :command_count => command_count}
+    meta = {size:history_records.size, total:command_count.to_i, max:max, offset:offset}
+    return {:commands => history_records, :command_count => command_count, :meta => meta}
   end
 
   def print_history(options={})
@@ -794,7 +788,12 @@ class Morpheus::Cli::Shell
         puts "#{history_record[:number].to_s.rjust(3, ' ')}  #{history_record[:command]}"
       end
       if options[:show_pagination]
-        print_results_pagination({size:history_records.size,total:command_count.to_i})
+        if options[:phrase] || options[:sort] || options[:direction] || options[:offset]
+          print_results_pagination({:meta => history_result[:meta]})
+        else
+          # default order is weird, it's the last page of results, 1-25 is misleading and showing the indexes is stranger
+          print_results_pagination({:meta => history_result[:meta]}, {:message =>"Viewing most recent %{size} of %{total} %{label}"})
+        end
         print reset, "\n"
       end
     end
@@ -816,7 +815,7 @@ class Morpheus::Cli::Shell
       @history = {}
       @last_command_number = 0
       @history_logger = load_history_logger
-      print cyan, "Command history flushed!", reset, "\n"
+      print green, "Command history flushed", reset, "\n"
       return 0
   end
 end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.16"
+    VERSION = "3.6.17"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.16
+  version: 3.6.17
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler