cetus 0.1.18 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 246a8dbece2062ca2eadcd89e8c58f83347d9834
-  data.tar.gz: 496c240c085f96cf844ff9f0c87a993e5ef79af6
+SHA256:
+  metadata.gz: 3e35fd2792cfb584909c6ddadfaeb6b30e92ff09b4f838585a85f8de977c333e
+  data.tar.gz: f2b2f7e300a593f9ba2973d8451f4148f9057c5bc4680ad3c9ac77075ae6f19e
 SHA512:
-  metadata.gz: f8646f38eda77d0f87fda7b0108bbdc1ec65151a5b2263d2582fd1962613c9937a1444cb1e14c9b6f3a9cc494e931fa229d0293915695e5c52dabc4fe3449f00
-  data.tar.gz: ff0e0990662af40fac5e1a204d2d2247d64c8907d1cc831f9ca0c65b541afcd3866b186f5f685ed8caf558a108a8732177578f7822d434fdd051e5a3597a4508
+  metadata.gz: 6ab765cb054741e0d6951040d7b655d7235d1c583646c96f8bd1b12d74778fd05a735b0a3864e3f87e4b1652316a3bef6b966745bba3d3efe113d46cde306826
+  data.tar.gz: 1d723a6b666671544a081e426ecf34df28a6fa02bd158fed08f9c89873dbef12a050f66caf286f3231847aa622783abcb41da1285ce0b75104a9fe999658ee1c

data/README.md

@@ -6,6 +6,10 @@ lightning-fast file navigator
 Tested with ruby 2.5
 
 Latest changes:
+2019-03-04 - q is quit key, not Q
+           - show directories first, then files.
+           - trying not to pollute main screen with listings.
+
 2018-03-12 - now using LEFT and RIGHT arrow keys to go down into a directory, or up to higher directory.
 Also, pressing RIGHT ARROW on a file with open the file.
 Previously RIGHT and LEFT arrows would move to next or previous columns, i have put this on left and right square bracket.
@@ -40,7 +44,7 @@ You can bind other capital letters to any external command. If there are selecte
 The rest is similar to lyra. Some key points are highlighted here.
 
 * Create bookmarks for often used directories using Alt-m. Then access them using single-quote and upper character.
-  You have to be inside the directory when saving a new bookmark. e.g. `'P`. This is a fast way of jumping directories. I've got "P" mapped to projects, and "Z" to zfm, and so forth. 
+  You have to be inside the directory when saving a new bookmark. e.g. `'P`. This is a fast way of jumping directories. I've got "P" mapped to projects, and "Z" to zfm, and so forth.
 
 * Single-quote and small letter jumps to the first file starting with given letter. e.g. `'s`
 
@@ -48,7 +52,7 @@ The rest is similar to lyra. Some key points are highlighted here.
 
 * Backtick is the main menu, which has options for sorting, filtering, seeing often used dirs and files, choosing from dirs in the `z` database, choosing used files from the `.viminfo` file, etc.
 
-Other than using bookmarks, you can jump quickly to other directories or open files using BACKTICK and the releant option which should become part of muscle memory very fast. 
+Other than using bookmarks, you can jump quickly to other directories or open files using BACKTICK and the releant option which should become part of muscle memory very fast.
 
 * Use Alt-d and Alt-f to see used directories and used files. Used directories are those dirs in which you have opened a file, not all dirs you've traversed. Certain directories are added to this list to make it more useful such as GEM_HOME, RUBYPATH, GEM_PATH, RUBYLIB, PYTHONPATH and PYTHONHOME.
 
@@ -56,7 +60,7 @@ Other than using bookmarks, you can jump quickly to other directories or open fi
 
 * Switch between editor mode and page mode. OFten you wish to quickly view files (maybe for deleting or moving). You don't want these files to get listed in .viminfo. Switching to pager mode, invokes your $MANPAGER on selected files which makes navigation faster. Set `most` to your MANPAGER.
 
-* use Alt+ and Alt- to increase or decrease the number of columns shown on screen. By default 3 are shown. 
+* use Alt+ and Alt- to increase or decrease the number of columns shown on screen. By default 3 are shown.
 
 * Use '=' to toggle hidden files, long listing, ignore case , pager/editor mode, etc.
 
@@ -80,14 +84,14 @@ Thus, F2 gives only child dirs in current dir, F3 gives recursive directories an
 * Note that I use readline for most entries, so you can press UP arrow to get previous entries.
 
 * A new enhanced list mode (Which can be toggled off), which tries to add more files to the list if there are very few shown:
-   - it detects a rubygem dir and shows a few recent files from bin and lib 
+   - it detects a rubygem dir and shows a few recent files from bin and lib
    - if there's only one file in the dir and it is a dir, it expands it
    - if there are less than 15 files in list, it gets the recently modified and recently accessed
      dir/s and shows the most recent file from each.
 
 ## Requirements ##
 
-Requires ruby 1.9.3, and uses zsh for globbing. 
+Requires ruby 1.9.3, and uses zsh for globbing.
 Uses $EDITOR and $MANPAGER or $PAGER.
 
 Optionally uses ack, locate, find for options with that name. You may replace ack with ag or other.
@@ -105,7 +109,7 @@ Copy cetus to somewhere on your path, e.g. $HOME/bin
 
      $ c
 
-Or : 
+Or :
 
      gem install cetus
      alias c=cetus

data/bin/cetus

@@ -2,91 +2,101 @@
 # ----------------------------------------------------------------------------- #
 #         File: cetus
 #  Description: Fast file navigation, a tiny version of zfm
-#               but with a diffrent indexing mechanism
+#               but with a different indexing mechanism
 #       Author: rkumar http://github.com/rkumar/cetus/
 #         Date: 2013-02-17 - 17:48
 #      License: GPL
-#  Last update: 2019-01-19 15:09
+#  Last update: 2019-03-04 23:50
 # ----------------------------------------------------------------------------- #
 #  cetus.rb  Copyright (C) 2012-2013 rahul kumar
+# == CHANGELOG
+# 2019-02-20 - added smcup and rmcup so alt-screen is used. works a bit
+# 2019-03-04 - change clear to go to 0,0 and clear down to reduce pollution
+# 2019-03-04 - changed quit to q (earlier Q)
+# 2019-03-04 - first dirs then files
 #  == TODO
-#  To dirs add GEMHOME RUBYLIB PYTHONILB or PYTHONPATH, 
+#  To dirs add GEMHOME RUBYLIB PYTHONILB or PYTHONPATH,
 #  Make rubygem aware : gemspec or Gemfile the expand lib and bin
 #  fpath if existing
+
 require 'readline'
 require 'io/wait'
 # http://www.ruby-doc.org/stdlib-1.9.3/libdoc/shellwords/rdoc/Shellwords.html
 require 'shellwords'
 require 'fileutils'
 # -- requires 1.9.3 for io/wait
-# -- cannot do with Highline since we need a timeout on wait, not sure if HL can do that
+# -- cannot do with Highline since we need a timeout on wait,
+#   not sure if HL can do that
 
 ## INSTALLATION
 # copy into PATH
 # alias c=~/bin/cetus.rb
 # c
-VERSION="0.1.18"
-O_CONFIG=true
-CONFIG_FILE="~/.lyrainfo"
+
+# 2019-02-20 - added so alt-screen is used
+system 'tput smcup'
+VERSION = '0.1.21.0'
+O_CONFIG = true
+CONFIG_FILE = '~/.lyrainfo'
 
 $bindings = {}
 $bindings = {
-  "`"   => "main_menu",
-  "="   => "toggle_menu",
-  "!"   => "command_mode",
-  "@"   => "selection_mode_toggle",
-  "M-a" => "select_all",
-  "M-A" => "unselect_all",
-  ","   => "goto_parent_dir",
-  "+"   => "goto_dir",
-  "."   => "pop_dir",
-  ":"   => "subcommand",
-  "'"   => "goto_bookmark",
-  "/"   => "enter_regex",
-  "M-p"   => "prev_page",
-  "M-n"   => "next_page",
-  "SPACE"   => "next_page",
-  "M-f"   => "select_visited_files",
-  "M-d"   => "select_used_dirs",
-  "M-b"   => "select_bookmarks",
-  "M-m"   => "create_bookmark",
-  "M-M"   => "show_marks",
-  "C-c"   => "escape",
-  "ESCAPE"   => "escape",
-  "TAB"   => "views",
-  "C-i"   => "views",
-  "?"   => "dirtree",
-  "ENTER"   => "select_current",
-  "D"   => "delete_file",
-  "M"   => "file_actions most",
-  "Q"   => "quit_command",
+  '`'   => 'main_menu',
+  '='   => 'toggle_menu',
+  '!'   => 'command_mode',
+  '@'   => 'selection_mode_toggle',
+  'M-a' => 'select_all',
+  'M-A' => 'unselect_all',
+  ','   => 'goto_parent_dir',
+  '+'   => 'goto_dir',
+  '.'   => 'pop_dir',
+  ':'   => 'subcommand',
+  "'"   => 'goto_bookmark',
+  '/'   => 'enter_regex',
+  'M-p'   => 'prev_page',
+  'M-n'   => 'next_page',
+  'SPACE'   => 'next_page',
+  'M-f'   => 'select_visited_files',
+  'M-d'   => 'select_used_dirs',
+  'M-b'   => 'select_bookmarks',
+  'M-m'   => 'create_bookmark',
+  'M-M'   => 'show_marks',
+  'C-c'   => 'escape',
+  'ESCAPE'   => 'escape',
+  'TAB'   => 'views',
+  'C-i'   => 'views',
+  '?'   => 'dirtree',
+  'ENTER'   => 'select_current',
+  'D'   => 'delete_file',
+  'M'   => 'file_actions most',
+  'q'   => 'quit_command', # was Q now q 2019-03-04 -
   #"RIGHT"   => "column_next",
-  "RIGHT"   => "select_current", # changed 2018-03-12 - for faster navigation
-  "LEFT"   => "goto_parent_dir", # changed on 2018-03-12 - earlier column_next 1
-  "]"   => "column_next",
-  "["   => "column_next 1",
-  "C-x"   => "file_actions",
-  "M--"   => "columns_incdec -1",
-  "M-+"   => "columns_incdec 1",
-  "S"     =>  "command_file list y ls -lh",
-  "L"     =>  "command_file Page n less",
-  "C-d"   =>  "cursor_scroll_dn",
-  "C-b"   =>  "cursor_scroll_up",
-  "UP"   =>  "cursor_up",
-  "DOWN"   =>  "cursor_dn",
-  "C-SPACE" => "visual_mode_toggle",
-
-  "M-?"   => "print_help",
-  "F1"   => "print_help",
-  "F2"   => "child_dirs",
-  "F3"   => "dirtree",
-  "F4"   => "tree",
-  "S-F1"   => "dirtree",
-  "S-F2"   => "tree"
+  'RIGHT'   => 'select_current', # changed 2018-03-12 - for faster navigation
+  'LEFT'   => 'goto_parent_dir', # changed on 2018-03-12 - earlier column_next 1
+  ']'   => 'column_next',
+  '['   => 'column_next 1',
+  'C-x'   => 'file_actions',
+  'M--'   => 'columns_incdec -1',
+  'M-+'   => 'columns_incdec 1',
+  'S'     =>  'command_file list y ls -lh',
+  'L'     =>  'command_file Page n less',
+  'C-d'   =>  'cursor_scroll_dn',
+  'C-b'   =>  'cursor_scroll_up',
+  'UP'   =>  'cursor_up',
+  'DOWN'   =>  'cursor_dn',
+  'C-SPACE' => 'visual_mode_toggle',
+
+  'M-?'   => 'print_help',
+  'F1'   => 'print_help',
+  'F2'   => 'child_dirs',
+  'F3'   => 'dirtree',
+  'F4'   => 'tree',
+  'S-F1'   => 'dirtree',
+  'S-F2'   => 'tree'
 
 }
 
-## clean this up a bit, copied from shell program and macro'd 
+## clean this up a bit, copied from shell program and macro'd
 $kh=Hash.new
 $kh["OP"]="F1"
 $kh[""]="UP"
@@ -109,8 +119,8 @@ $kh[KEY_END]="End"
 $kh[KEY_F1]="F1"
 $kh[KEY_UP]="UP"
 $kh[KEY_DOWN]="DOWN"
-KEY_LEFT='' 
-KEY_RIGHT='' 
+KEY_LEFT=''
+KEY_RIGHT=''
 $kh["OQ"]="F2"
 $kh["OR"]="F3"
 $kh["OS"]="F4"
@@ -133,53 +143,109 @@ $kh[KEY_F10]="F10"
 $kh[KEY_S_F1]="S-F1"
 $kh['']="S-F2"
 
+def old_clear_screen
+  system 'clear'
+  return
+  system('tput cup 0 0')
+  # system 'tput ed'
+  print "\e[J"
+end
+
+# copied from fff
+def clear_screen
+  # Only clear the scrolling window (dir item list).
+  # '\e[%sH':    Move cursor to bottom of scroll area.
+  # '\e[9999C':  Move cursor to right edge of the terminal.
+  # '\e[1J':     Clear screen to top left corner (from cursor up).
+  # '\e[2J':     Clear screen fully (if using tmux) (fixes clear issues).
+  # '\e[1;%sr':  Clearing the screen resets the scroll region(?). Re-set it.
+  #              Also sets cursor to (0,0).
+  # ENV["TMUX:+\e[2J]"],
+  printf("\e[%sH\e[9999C\e[1J\e[1;%sr", \
+         $glines - 0, # was 2
+         $glines) # was grows
+end
+
+# copied from fff
+# Call before shelling to editor pager and when exiting
+def reset_terminal
+    # Reset the terminal to a useable state (undo all changes).
+    # '\e[?7h':  Re-enable line wrapping.
+    # '\e[?25h': Unhide the cursor.
+    # '\e[2J':   Clear the terminal.
+    # '\e[;r':   Set the scroll region to its default value.
+    #            Also sets cursor to (0,0).
+    print "\e[?7h\e[?25h\e[2J\e[;r"
+
+    # Show user input.
+    system 'stty echo'
+end
+
+# copied from fff
+# call AFTER shelling to most or vim
+def setup_terminal
+  # Setup the terminal for the TUI.
+  # '\e[?7l':    Disable line wrapping.
+  # '\e[?25l':   Hide the cursor.
+  # '\e[2J':     Clear the screen.
+  # '\e[1;Nr':   Limit scrolling to scrolling area.
+  #              Also sets cursor to (0,0).
+  printf("\e[?7l\e[?25l\e[2J\e[1;%sr", $glines)
+  # earlier glines was grows
+
+  # Hide echoing of user input
+  system 'stty -echo'
+end
+
 ## get a character from user and return as a string
 # Adapted from:
 #http://stackoverflow.com/questions/174933/how-to-get-a-single-character-without-pressing-enter/8274275#8274275
 # Need to take complex keys and matc against a hash.
 def get_char
   begin
-    system("stty raw -echo 2>/dev/null") # turn raw input on
+    system('stty raw -echo 2>/dev/null') # turn raw input on
     c = nil
     #if $stdin.ready?
-      c = $stdin.getc
-      cn=c.ord
-      return "ENTER" if cn == 10 || cn == 13
-      return "BACKSPACE" if cn == 127
-      return "C-SPACE" if cn == 0
-      return "SPACE" if cn == 32
-      # next does not seem to work, you need to bind C-i
-      return "TAB" if cn == 8
-      if cn >= 0 && cn < 27
-        x= cn + 96
-        return "C-#{x.chr}"
-      end
-      if c == ''
-        buff=c.chr
-        while true
-          k = nil
-          if $stdin.ready?
-            k = $stdin.getc
-            #puts "got #{k}"
-            buff += k.chr
-          else
-            x=$kh[buff]
-            return x if x
-            #puts "returning with  #{buff}"
-            if buff.size == 2
-              ## possibly a meta/alt char
-              k = buff[-1]
-              return "M-#{k.chr}"
-            end
-            return buff
+    c = $stdin.getc
+    cn = c.ord
+    return 'ENTER' if cn == 10 || cn == 13
+    return 'BACKSPACE' if cn == 127
+    return 'C-SPACE' if cn == 0
+    return 'SPACE' if cn == 32
+    # next does not seem to work, you need to bind C-i
+    return 'TAB' if cn == 8
+
+    if cn >= 0 && cn < 27
+      x = cn + 96
+      return "C-#{x.chr}"
+    end
+    if c == ''
+      buff=c.chr
+      while true
+        k = nil
+        if $stdin.ready?
+          k = $stdin.getc
+          #puts "got #{k}"
+          buff += k.chr
+        else
+          x = $kh[buff]
+          return x if x
+
+          # puts "returning with  #{buff}"
+          if buff.size == 2
+            ## possibly a meta/alt char
+            k = buff[-1]
+            return "M-#{k.chr}"
           end
+          return buff
         end
       end
+    end
     #end
     return c.chr if c
   ensure
     #system "stty -raw echo" # turn raw input off
-    system("stty -raw echo 2>/dev/null") # turn raw input on
+    system('stty -raw echo 2>/dev/null') # turn raw input on
   end
 end
 
@@ -187,6 +253,7 @@ end
 #$IDX="123456789abcdefghijklmnoprstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 #$IDX="abcdefghijklmnopqrstuvwxy"
 $IDX=('a'..'y').to_a
+$IDX.delete 'q'
 $IDX.concat ('za'..'zz').to_a
 $IDX.concat ('Za'..'Zz').to_a
 $IDX.concat ('ZA'..'ZZ').to_a
@@ -247,14 +314,15 @@ $sta = $cursor = 0
 $visual_mode = false
 #$help = "#{BOLD}1-9a-zA-Z#{BOLD_OFF} Select #{BOLD}/#{BOLD_OFF} Grep #{BOLD}'#{BOLD_OFF} First char  #{BOLD}M-n/p#{BOLD_OFF} Paging  #{BOLD}!#{BOLD_OFF} Command Mode  #{BOLD}@#{BOLD_OFF} Selection Mode  #{BOLD}q#{BOLD_OFF} Quit"
 
-$help = "#{BOLD}M-?#{BOLD_OFF} Help   #{BOLD}`#{BOLD_OFF} Menu   #{BOLD}!#{BOLD_OFF} Command   #{BOLD}=#{BOLD_OFF} Toggle   #{BOLD}@#{BOLD_OFF} Selection Mode  #{BOLD}Q#{BOLD_OFF} Quit "
+$help = "#{BOLD}M-?#{BOLD_OFF} Help   #{BOLD}`#{BOLD_OFF} Menu   #{BOLD}!#{BOLD_OFF} Command   #{BOLD}=#{BOLD_OFF} Toggle   #{BOLD}@#{BOLD_OFF} Selection Mode  #{BOLD}q#{BOLD_OFF} Quit "
 
   ## main loop which calls all other programs
-def run()
+def run
   home=ENV['HOME']
   ctr=0
   config_read
   $files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}M)'`.split("\n")
+  $files = sort_file_list $files
   enhance_file_list
   ## added by RK 2014-03-31 - 00:29 since too many duplicates
   $files = $files.uniq if $enhanced_mode
@@ -272,7 +340,7 @@ def run()
       else
         $view = $files.grep(/#{$patt}/)
       end
-    else 
+    else
       $view = $files
     end
     fl=$view.size
@@ -280,11 +348,11 @@ def run()
     $viewport = $view[$sta, $pagesize]
     fin = $sta + $viewport.size
     $title ||= Dir.pwd.sub(home, "~")
-    system("clear")
+    clear_screen
     # title
     print "#{GREEN}#{$help}  #{BLUE}cetus #{VERSION}#{CLEAR}\n"
     t = "#{$title}  #{$sta + 1} to #{fin} of #{fl}  #{$sorto} F:#{$filterstr}"
-    t = t[t.size-$gcols..-1] if t.size >= $gcols
+    t = t[t.size - $gcols..-1] if t.size >= $gcols
     print "#{BOLD}#{t}#{CLEAR}\n"
     ## nilling the title means a superimposed one gets cleared.
     #$title = nil
@@ -304,7 +372,9 @@ def run()
     #puts
     #break if ch == "q"
     #elsif  ch =~ /^[1-9a-zA-Z]$/
-    if  ch =~ /^[a-zZ]$/
+    # 2019-03-04 - ignore q since that is quit key now
+    #if  ch =~ /^[a-zZ]$/
+    if ch =~ /^[a-pr-zZ]$/
       # hint mode
       select_hint $viewport, ch
       ctr = 0
@@ -328,7 +398,7 @@ def run()
     end
     break if $quitting
   end
-  write_curdir 
+  write_curdir
   puts "bye"
   config_write if $writing
 end
@@ -364,7 +434,7 @@ end
 def date_format t
   t.strftime "%Y/%m/%d"
 end
-## 
+##
 #
 # print in columns
 # ary - array of data
@@ -373,7 +443,7 @@ end
 def columnate ary, sz
   buff=Array.new
   return buff if ary.nil? || ary.size == 0
-  
+
   # determine width based on number of files to show
   # if less than sz then 1 col and full width
   #
@@ -433,7 +503,7 @@ def columnate ary, sz
   end
   return buff
 end
-## formats the data with number, mark and details 
+## formats the data with number, mark and details
 def format ary
   #buff = Array.new
   buff = Array.new(ary.size)
@@ -513,6 +583,7 @@ def toggle_select f
     $selected_files.push f
   end
 end
+
 ## open file or directory
 def open_file f
   return unless f
@@ -520,7 +591,7 @@ def open_file f
     f = File.expand_path(f)
   end
   unless File.exist? f
-    # this happens if we use (T) in place of (M) 
+    # this happens if we use (T) in place of (M)
     # it places a space after normal files and @ and * which borks commands
     last = f[-1]
     if last == " " || last == "@" || last == '*'
@@ -555,7 +626,10 @@ def open_file f
     else
       comm = comm + " #{Shellwords.escape(f)}"
     end
+    clear_screen
+    reset_terminal
     system("#{comm}")
+    setup_terminal
     f = Dir.pwd + "/" + f if f[0] != '/'
     $visited_files.insert(0, f)
     push_used_dirs Dir.pwd
@@ -580,7 +654,7 @@ def run_command f
   end
   print "Run a command on #{files}: "
   begin
-    #Readline::HISTORY.push(*values) 
+    #Readline::HISTORY.push(*values)
     command = Readline::readline('>', true)
     #command = gets().chomp
     return if command.size == 0
@@ -604,12 +678,13 @@ def run_command f
 end
 
 ## cd to a dir
-def change_dir f, pos=nil
+def change_dir f, pos = nil
   $visited_dirs.insert(0, Dir.pwd)
   f = File.expand_path(f)
   Dir.chdir f
   $filterstr ||= "M"
   $files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}#{$filterstr})'`.split("\n")
+  $files = sort_file_list $files
   post_cd
   if pos
     # convert curpos to sta also
@@ -634,10 +709,18 @@ end
 def refresh
     $filterstr ||= "M"
     $files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}#{$filterstr})'`.split("\n")
-    $patt=nil
+    # first put dirs then files
+    $files = sort_file_list $files
+    $patt = nil
     $title = nil
 end
-#
+
+def sort_file_list files
+    _dirs  = $files.select { |f| File.directory?(f) }
+    _files = $files.select { |f| File.file?(f) }
+    return _dirs + _files
+end
+
 ## unselect all files
 def unselect_all
   $selected_files = []
@@ -666,7 +749,7 @@ def goto_dir
     ## check for env variable
     tmp = ENV[path]
     if tmp.nil? || !File.directory?( tmp )
-      ## check for dir in home 
+      ## check for dir in home
       tmp = File.expand_path("~/#{path}")
       if File.directory? tmp
         f = tmp
@@ -704,7 +787,7 @@ def command_mode
   $mode = 'COM'
 end
 def goto_parent_dir
-  change_dir ".."
+  change_dir '..'
 end
 ## This actually filters, in zfm it goes to that entry since we have a cursor there
 #
@@ -758,8 +841,9 @@ end
 def prev_page
   $sta -= $pagesize
 end
+
 def print_help
-  system("clear")
+  clear_screen
   puts "HELP"
   puts
   puts "To open a file or dir press 1-9 a-z A-Z "
@@ -785,7 +869,7 @@ def show_marks
 end
 # MENU MAIN -- keep consistent with zfm
 def main_menu
-  h = { 
+  h = {
     :a => :ack,
     "/" => :ffind,
     :l => :locate,
@@ -795,7 +879,7 @@ def main_menu
     :r => :recent_files,
     :t => :dirtree,
     "4" => :tree,
-    :s => :sort_menu, 
+    :s => :sort_menu,
     :F => :filter_menu,
     :c => :command_menu ,
     :B => :bindkey_ext_command,
@@ -821,7 +905,7 @@ def menu title, h
   return ch, binding
 end
 def toggle_menu
-  h = { :h => :toggle_hidden, :c => :toggle_case, :l => :toggle_long_list , "1" => :toggle_columns, 
+  h = { :h => :toggle_hidden, :c => :toggle_case, :l => :toggle_long_list , "1" => :toggle_columns,
   :p => :toggle_pager_mode, :e => :toggle_enhanced_list}
   ch, menu_text = menu "Toggle Menu", h
   case menu_text
@@ -834,7 +918,7 @@ def toggle_menu
     refresh
   when :toggle_columns
     $gviscols = 3 if $gviscols == 1
-    #$long_listing = false if $gviscols > 1 
+    #$long_listing = false if $gviscols > 1
     x = $grows * $gviscols
     $pagesize = $pagesize==x ? $grows : x
   when :toggle_pager_mode
@@ -862,7 +946,7 @@ end
 
 def sort_menu
   lo = nil
-  h = { :n => :newest, :a => :accessed, :o => :oldest, 
+  h = { :n => :newest, :a => :accessed, :o => :oldest,
     :l => :largest, :s => :smallest , :m => :name , :r => :rname, :d => :dirs, :c => :clear }
   ch, menu_text = menu "Sort Menu", h
   case menu_text
@@ -893,7 +977,7 @@ def sort_menu
 end
 
 def command_menu
-  ## 
+  ##
   #  since these involve full paths, we need more space, like only one column
   #
   ## in these cases, getting back to the earlier dir, back to earlier listing
@@ -903,7 +987,7 @@ def command_menu
   # xargs ls -t etc rather than the zsh sort order. But we can run a filter using |.
   #
   h = { :t => :today, :D => :default_command , :R => :remove_from_list}
-  if $editor_mode 
+  if $editor_mode
     h[:e] = :pager_mode
   else
     h[:e] = :editor_mode
@@ -1010,8 +1094,11 @@ def pop_dir
   Dir.chdir d
   $filterstr ||= "M"
   $files = `zsh -c 'print -rl -- *(#{$sorto}#{$hidden}#{$filterstr})'`.split("\n")
+  $files = sort_file_list $files
   post_cd
 end
+
+# after changing directory
 def post_cd
   $patt=nil
   $sta = $cursor = 0
@@ -1026,10 +1113,9 @@ def post_cd
   enhance_file_list
   ## added by RK 2014-03-31 - 00:29 since too many duplicates
   $files = $files.uniq if $enhanced_mode
-
   revert_dir_pos
 end
-#
+
 ## read dirs and files and bookmarks from file
 def config_read
   #f =  File.expand_path("~/.zfminfo")
@@ -1070,11 +1156,11 @@ def config_write
   f1 =  File.expand_path(CONFIG_FILE)
   d = $used_dirs.join ":"
   f = $visited_files.join ":"
-  File.open(f1, 'w+') do |f2|  
-    # use "\n" for two lines of text  
+  File.open(f1, 'w+') do |f2|
+    # use "\n" for two lines of text
     f2.puts "DIRS=\"#{d}\""
     f2.puts "FILES=\"#{f}\""
-    $bookmarks.each_pair { |k, val| 
+    $bookmarks.each_pair { |k, val|
       f2.puts "BM_#{k}=\"#{val}\""
       #f2.puts "BOOKMARKS[\"#{k}\"]=\"#{val}\""
     }
@@ -1125,20 +1211,20 @@ def subcommand
     $quitting = true
     $writing = true if $modified
   elsif command == "p"
-    system "echo $PWD | pbcopy"
-    puts "Stored PWD in clipboard (using pbcopy)"
+    system 'echo $PWD | pbcopy'
+    puts 'Stored PWD in clipboard (using pbcopy)'
   end
 end
 def quit_command
   if $modified
-    puts "Press w to save bookmarks before quitting " if $modified
-    print "Press another q to quit "
+    puts 'Press w to save bookmarks before quitting ' if $modified
+    print 'Press another q to quit '
     ch = get_char
   else
     $quitting = true
   end
-  $quitting = true if ch == "q"
-  $quitting = $writing = true if ch == "w"
+  $quitting = true if ch == 'q'
+  $quitting = $writing = true if ch == 'w'
 end
 
 def views
@@ -1175,6 +1261,7 @@ def recent_files
   $title = "Recent files"
   $files = `zsh -c 'print -rl -- **/*(Dom[1,15])'`.split("\n")
 end
+
 def select_current
   ## vp is local there, so i can do $vp[0]
   #open_file $view[$sta] if $view[$sta]
@@ -1262,7 +1349,7 @@ end
 def ask_hint deflt=nil
   f = nil
   ch = get_char
-  if ch == "ENTER" 
+  if ch == "ENTER"
     return deflt
   end
   ix = get_index(ch, $viewport.size)
@@ -1273,16 +1360,17 @@ end
 ## check screen size and accordingly adjust some variables
 #
 def screen_settings
-  $glines=%x(tput lines).to_i
-  $gcols=%x(tput cols).to_i
+  $glines = %x(tput lines).to_i
+  $gcols = %x(tput cols).to_i
   $grows = $glines - 3
   $pagesize = 60
   #$gviscols = 3
   $pagesize = $grows * $gviscols
 end
+
 ## moves column offset so we can reach unindexed columns or entries
 # 0 forward and any other back/prev
-def column_next dir=0
+def column_next dir = 0
   if dir == 0
     $stact += $grows
     $stact = 0 if $stact >= $viewport.size
@@ -1291,9 +1379,10 @@ def column_next dir=0
     $stact = 0 if $stact < 0
   end
 end
+
 # currently i am only passing the action in from the list there as a key
 # I should be able to pass in new actions that are external commands
-def file_actions action=nil
+def file_actions(action=nil)
   h = { :d => :delete, :m => :move, :r => :rename, :v => ENV["EDITOR"] || :vim,
     :c => :copy, :C => :chdir,
     :l => :less, :s => :most , :f => :file , :o => :open, :x => :dtrx, :z => :zip }
@@ -1326,7 +1415,7 @@ def file_actions action=nil
       menu_text = action
   else
     ch, menu_text = menu "File Menu for #{text}", h
-    menu_text = :quit if ch == "q"
+    menu_text = :quit if ch == 'q'
   end
   case menu_text.to_sym
   when :quit
@@ -1403,7 +1492,7 @@ end
 
 # bind a key to an external command wich can be then be used for files
 def bindkey_ext_command
-  print 
+  print
   pbold "Bind a capital letter to an external command"
   print "Enter a capital letter to bind: "
   ch = get_char
@@ -1484,7 +1573,7 @@ def z_interface
     $title = "Directories from ~/.z"
     $files = `sort -rn -k2 -t '|' ~/.z | cut -f1 -d '|'`.split("\n")
     home = ENV['HOME']
-    $files.collect! do |f| 
+    $files.collect! do |f|
       f.sub(/#{home}/,"~")
     end
   end
@@ -1525,7 +1614,7 @@ def moveto pos
   if $visual_mode
     # PWD has to be there in selction
     if $selected_files.index $view[$cursor]
-      # this depends on the direction 
+      # this depends on the direction
       $selected_files = $selected_files - $view[star..fin]
       ## current row remains in selection always.
       $selected_files.push $view[$cursor]
@@ -1541,6 +1630,7 @@ def visual_mode_toggle
     $selected_files.push $view[$cursor]
   end
 end
+
 def visual_block_clear
   if $visual_block_start
     star = [$visual_block_start, $cursor].min
@@ -1550,6 +1640,7 @@ def visual_block_clear
   $visual_block_start = nil
   $visual_mode = nil
 end
+
 def file_starting_with fc
   ix = return_next_match(method(:file_matching?), "^#{fc}")
   if ix
@@ -1567,7 +1658,7 @@ def return_next_match binding, *args
   $view.each_with_index do |elem,ii|
     if binding.call(elem, *args)
       first ||= ii
-      if ii > $cursor 
+      if ii > $cursor
         ix = ii
         break
       end
@@ -1603,7 +1694,7 @@ def filetype f
   nil
 end
 
-def save_dir_pos 
+def save_dir_pos
   return if $sta == 0 && $cursor == 0
   $dir_position[Dir.pwd] = [$sta, $cursor]
 end
@@ -1619,7 +1710,7 @@ def revert_dir_pos
   end
 end
 def newdir
-  print 
+  print
   print "Enter directory name: "
   str = Readline::readline('>', true)
   return if str == ""
@@ -1636,7 +1727,7 @@ def newdir
   end
 end
 def newfile
-  print 
+  print
   print "Enter file name: "
   str = Readline::readline('>', true)
   return if str == ""
@@ -1646,7 +1737,7 @@ def newfile
 end
 
 ##
-# Editing of the User Dir List. 
+# Editing of the User Dir List.
 # remove current entry from used dirs list, since we may not want some entries being there
 #
 def remove_from_list
@@ -1686,7 +1777,7 @@ def enhance_file_list
   return unless $enhanced_mode
   # if only one entry and its a dir
   # get its children and maybe the recent mod files a few
-  
+
   if $files.size == 1
     # its a dir, let give the next level at least
     if $files.first[-1] == "/"
@@ -1702,7 +1793,7 @@ def enhance_file_list
       return
     end
   end
-  # 
+  #
   # check if a ruby project dir, although it could be a backup file too,
   # if so , expand lib and maby bin, put a couple recent files
   #
@@ -1767,7 +1858,7 @@ def insert_into_list dir, file
   #raise "something wrong can find #{dir}." unless ix
   #$files.insert ix, *file
   # 2013-03-19 - 19:42 adding at end to avoid confusion
-  #$files.concat file 
+  #$files.concat file
   $files.push *file
 end
 def get_important_files dir
@@ -1789,4 +1880,11 @@ def get_important_files dir
   return list
 end
 
-run 
+Signal.trap('EXIT') {
+  reset_terminal
+  # system 'tput rmcup'
+  exit
+}
+run
+# 2019-02-20 - added so alt-screen is used
+system 'tput rmcup'

data/cetus.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "cetus"
-  spec.version       = "0.1.18"
+  spec.version       = "0.1.21"
   spec.authors       = ["Rahul Kumar"]
   spec.email         = ["oneness.univ@gmail.com"]
   spec.description   = %q{lightning fast file navigator}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cetus
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.21
 platform: ruby
 authors:
 - Rahul Kumar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-19 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,8 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: lightning fast file navigator - ruby 1.9.3 .. ruby 2.5