cetus 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c689f29c889a219679641ca86f77c1d5ac5fc11b34fa4bda3cbb1b24c6b51465
-  data.tar.gz: 31f029702a9ab594e17dee2eeeedd6e1937feb222757d31e1657676c8767f78c
+  metadata.gz: 021f5de97b41df8fb3438258356b924b9101033088180d6315579083793eae4a
+  data.tar.gz: a1d07c2f93633c2655a004b67dfbcdcc45429135cc7e6d2adc84d514a0331fb0
 SHA512:
-  metadata.gz: b8ef2819bc7194bc090c7979cdeb979bfacf3abf9d74e533333a1497d3bb35c4c7c6ba39a8dadc4b14c4eef2b3a75b186a800799c4c06435fa1e5264a7a95d6b
-  data.tar.gz: 752365289cd8e1bb8d7418e44406a9e303971f3ed024bf25f4b36431bee15a2b57afdf6150267b9d0adfeb116fbe2254c6f04a2793619fc71f42a6049b996120
+  metadata.gz: d9fff90c5dc1e629e196dfafb880168450878ade3871093ddb908b5deaf3fb72d600f9766be3148318a1bbed35b8b80783ea621738dcb0f5ecf82180504f68bb
+  data.tar.gz: 4d53ac51c02fa54f5f002db9c54fd8083f406d7c498a66910f8095084880b2d284f1c3f1078aeba5e893dc831eb22d33cf13a4af5b9e2b9a2c62bf4697de0a7c

data/README.md

@@ -8,7 +8,8 @@ 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.
+           - trying not to pollute main screen/terminal with listings (i.e. use alt screen)
+           - C-s to select (toggle) current file
 
 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.
@@ -16,6 +17,50 @@ Previously RIGHT and LEFT arrows would move to next or previous columns, i have
 
 2018-03-13 - unable to push new gem 0.1.16 to rubygems.
 
+
+## Selecting a file
+
+There are two ways of selecting a file.
+
+1. Pressing C-s on a file.
+2. Use hotkey (on left of file) to select without having to navigate.
+
+While using C-s marks a file as selected, pressing the hotkey will either open
+the file using PAGER or EDITOR depending on current mode.
+
+## Multiple Selection of files
+
+1. Press C-s on multiple files.
+2. Press `@` to enter multiple select mode.
+Now press the hotkey (left of file) to select it.
+
+To execute an action on multiple (or single) files, you may press `C-x` and choose
+an action such as move or delete, etc.
+
+You may also select all files with the same extension as current file. Invoke the
+filter menu using Tilde-F. Now select `x` or `:extension`.
+
+`Tilde-y` is the selection menu. M-a is select all, M-A is unselect all.
+
+## Moving multiple files
+
+First select multiple files by the above means.
+
+Now there are two ways to move selected files to another directory.
+
+1. Press `C-x m` and type the name of the directory at the prompt.
+
+2. Navigate to the target directory, and then press `C-x m` and type "." at the prompt.
+
+## Copying files to another directory.
+
+Use the same procedure as for moving files but press `C-x c`
+
+1. Press `C-x c` and then type the name of the target directory at the prompt.
+
+2. Navigate to the target directory, and press `C-x c`, and type '.' at the prompt.
+
+
 fork of lyra with a different hotkey idea. Use this for quickly navigating your file system using hotkeys
 and bookmarks, and executing commands on single or multiple files easily.
 
@@ -48,7 +93,7 @@ The rest is similar to lyra. Some key points are highlighted here.
 
 * Single-quote and small letter jumps to the first file starting with given letter. e.g. `'s`
 
-* Space bar pages, also Alt n and p. Ctrl-d and Ctrl-b goes down 10 rows.
+* Space-bar pages, also Alt n and p. Ctrl-d and Ctrl-b goes down 10 rows.
 
 * 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.
 
@@ -56,7 +101,7 @@ Other than using bookmarks, you can jump quickly to other directories or open fi
 
 * 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.
 
-* By default selecting a file invokes $EDITOR, the default command can be changed from the menu.
+* By default selecting a file invokes $EDITOR, the default command can be changed from the menu. While on a file, pressing C-e opens in EDITOR, and C-p opens in PAGER.
 
 * 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.
 
@@ -66,7 +111,7 @@ Other than using bookmarks, you can jump quickly to other directories or open fi
 
 * Use slash "/" to run a regex on the dir listing.
 
-* Use question "?" view directory tree in order to jump down several levels at once
+* Use question "?" to view help (was directory tree earlier)
 
 * Use ESCAPE or C-c to clear any filter, regex, sort order, sub-listing etc
 
@@ -91,7 +136,7 @@ Thus, F2 gives only child dirs in current dir, F3 gives recursive directories an
 
 ## Requirements ##
 
-Requires ruby 1.9.3, and uses zsh for globbing.
+Requires ruby 1.9.3 or higher, 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.

data/bin/cetus

@@ -6,7 +6,7 @@
 #       Author: rkumar http://github.com/rkumar/cetus/
 #         Date: 2013-02-17 - 17:48
 #      License: GPL
-#  Last update: 2019-03-21 09:29
+#  Last update: 2019-03-22 00:12
 # --------------------------------------------------------------------------- #
 #  cetus.rb  Copyright (C) 2012-2019 rahul kumar
 # == CHANGELOG
@@ -26,7 +26,6 @@ require 'io/wait'
 require 'shellwords'
 # https://docs.ruby-lang.org/en/2.6.0/FileUtils.html
 require 'fileutils'
-# -- requires 1.9.3 for io/wait
 
 ## INSTALLATION
 # copy into PATH
@@ -35,7 +34,7 @@ require 'fileutils'
 
 # 2019-02-20 - added so alt-screen is used
 system 'tput smcup'
-VERSION = '0.1.27.0'.freeze
+VERSION = '0.1.28.0'.freeze
 CONFIG_FILE = '~/.config/cetus/conf.yml'.freeze
 
 $bindings = {}
@@ -57,17 +56,17 @@ $bindings = {
   '!' => 'execute',
   ',' => 'goto_parent_dir',
   '~' => 'goto_home_dir',
-  '-' => 'goto_previous_dir', # 2019-03-07 - added. like 'cd ='
-  '+' => 'goto_dir',       # 2019-03-07 - TODO: change binding
+  '-' => 'goto_previous_dir',
+  '+' => 'goto_dir',          # 2019-03-07 - TODO: change binding
   '.' => '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',
+  'SPACE' => 'next_page:Page Down',
+  'M-f' => 'select_from_visited_files',
+  'M-d' => 'select_from_used_dirs',
   'M-b' => 'bookmark_menu',
   'M-m' => 'create_bookmark',
   'M-M' => 'view_bookmarks',
@@ -82,11 +81,11 @@ $bindings = {
   # "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',
+  ']' => 'column_next: goto next column',
+  '[' => 'column_next 1: goto previous column',
   'C-x' => 'file_actions',
-  'M--' => 'columns_incdec -1',
-  'M-+' => 'columns_incdec 1',
+  'M--' => 'columns_incdec -1: reduce column width',
+  'M-+' => 'columns_incdec 1: increase column width',
   'S' => 'command_file list y ls -lh',
   'L' => 'command_file Page n less',
   'C-d' => 'cursor_scroll_dn',
@@ -152,14 +151,6 @@ $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).
@@ -207,11 +198,16 @@ def setup_terminal
 end
 
 # wrap readline so C-c can be ignored, but blank is taken as default
-def readline
+def readline prompt='>'
+  # unhide cursor
+  print "\e[?25h"
   begin
-    target = Readline.readline('>', true)
+    target = Readline.readline(prompt, true)
   rescue Interrupt
     return nil
+  ensure
+    # hide cursor
+    print "\e[?25l"
   end
   target
 end
@@ -219,7 +215,7 @@ 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.
+# Need to take complex keys and match against a hash.
 def get_char
   system('stty raw -echo 2>/dev/null') # turn raw input on
   c = nil
@@ -262,13 +258,10 @@ def get_char
   # 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
 end
 
 ## GLOBALS
-# $IDX="123456789abcdefghijklmnoprstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-# $IDX="abcdefghijklmnopqrstuvwxy"
 $IDX = ('a'..'y').to_a
 $IDX.delete 'q'
 $IDX.concat ('za'..'zz').to_a
@@ -296,7 +289,8 @@ $pager_command = {
   unknown: 'open'
 }
 $dir_position = {}
-## CONSTANTS
+
+## ----------------- CONSTANTS ----------------- ##
 GMARK = '*'.freeze
 CURMARK = '>'.freeze
 MSCROLL = 10
@@ -314,6 +308,8 @@ ON_BLUE    = "\e[44m".freeze
 REVERSE    = "\e[7m".freeze
 UNDERLINE    = "\e[4m".freeze
 CURSOR_COLOR = ON_BLUE
+## --------------------------------------------- ##
+
 $patt = nil
 $ignorecase = true
 $quitting = false
@@ -331,10 +327,9 @@ $history = []
 $sta = $cursor = 0
 $visual_mode = false
 $status_color = 4 # status line, can be 2 3 4 5 6
-# $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} Execute #{BOLD}@#{BOLD_OFF} Selection Mode  #{BOLD}q#{BOLD_OFF} Quit"
 
 # Menubar on top of screen
-$help = "#{BOLD}?#{BOLD_OFF} Help   #{BOLD}`#{BOLD_OFF} Menu   #{BOLD}!#{BOLD_OFF} Execute   #{BOLD}=#{BOLD_OFF} Toggle   #{BOLD}C-x#{BOLD_OFF} File Actions  #{BOLD}q#{BOLD_OFF} Quit "
+@help = "#{BOLD}?#{BOLD_OFF} Help   #{BOLD}`#{BOLD_OFF} Menu   #{BOLD}!#{BOLD_OFF} Execute   #{BOLD}=#{BOLD_OFF} Toggle   #{BOLD}C-x#{BOLD_OFF} File Actions  #{BOLD}q#{BOLD_OFF} Quit "
 
 ## main loop which calls all other programs
 def run
@@ -349,11 +344,13 @@ def run
 
   fl = $files.size
 
-  # selectedix = nil
-  # $patt = ''
   $patt = nil
   $sta = 0
+
+  # forever loop that prints dir and takes a key
   loop do
+
+    # view consists of all files (filtered by pattern if necessary)
     $view = if $patt
               if $ignorecase
                 $files.grep(/#{$patt}/i)
@@ -363,17 +360,21 @@ def run
             else
               $files
             end
+
     fl = $view.size
     $sta = 0 if $sta >= fl || $sta < 0
     # 2019-03-18 - added to ensure cursor not going OOB when next_page
     $cursor = 0 if $cursor >= fl || $cursor < 0
+
     # NOTE if we make cursor zero, then it can be < sta so in the next line
     #  it will be made equal to sta which we may not want
     # $sta = $cursor if $sta > $cursor
     $cursor = $sta if $sta > $cursor
 
+    # viewport are the files that are visible, subset of view
     $viewport = $view[$sta, $pagesize]
     fin = $sta + $viewport.size
+
     # added 2019-03-20 - actually stact should be reduced not brought to zero
     # 2019-03-21 - NOTE this may be redundant since I set to zero in next_page
     #  due to various edge cases.
@@ -382,20 +383,18 @@ def run
       $stact -= $grows while $stact >= $viewport.size
       $stact += $grows if $stact < 0
     end
+
     $title ||= Dir.pwd.sub(home, '~')
     clear_screen
 
 
     # title
-    print "#{GREEN}#{$help}  #{BLUE}cetus #{VERSION}#{CLEAR}\n"
+    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
     print "#{BOLD}#{t}#{CLEAR}\n"
 
-
-    ## nilling the title means a superimposed one gets cleared.
-    # $title = nil
-    # split into 2 procedures so columnate can e clean and reused.
+    # add hint and format the line
     buff = _format $viewport
 
     # break into as many columns as required
@@ -407,24 +406,27 @@ def run
     print
 
     # prompt
-    # print "#{$files.size}, #{view.size} sta=#{sta} (#{patt}): "
-    v_mm = ''
-    v_mm = "[#{$mode}] " if $mode
+    v_mm = $mode ? "[#{$mode}] " : ''
     cf = current_file
     $message = "No file highlighted (#{cf})" if cf and !$highlighted_a_column
     $message = ' | No matches. Press ESCAPE' if $patt && !cf
     # 2019-03-19 - take cursor to last line
     system "tput cup #{$glines} 0"
-    # system "tput cup #{$glines} #{$gcols - cfl - 10}"
+
+    # print a colored line at bottom of screen
+    # \e[33;41m  - set color of status_line
+    # %*s        - set blank spaces for entire line
     print "\e[33;4%sm%*s" % [$status_color || '1', $gcols, " "]
 
+    # Print the filename at the right side of the status_line
     # sometimes due to search, there is no file
     if cf
       cfl = cf.size
-      # print right alighed
-      system "tput cup #{$glines} #{$gcols - cfl - 25}"
+      # print right aligned
+      padding = @debug_flag ? 15 : 3
+      system "tput cup #{$glines} #{$gcols - cfl - padding}"
       # print "#{REVERSE}#{cf}#{CLEAR}"
-      if $debug_flag
+      if @debug_flag
         print "#{$sta},#{$cursor},#{$stact},#{$viewport.size},#{$grows} | #{cf}"
       else
         print "#{cf}"
@@ -440,7 +442,7 @@ def run
     # elsif  ch =~ /^[1-9a-zA-Z]$/
     # 2019-03-04 - ignore q since that is quit key now
     # if  ch =~ /^[a-zZ]$/
-    if ch =~ /^[a-pr-zZ]$/
+    if ch.match?(/^[a-pr-zZ]$/)
       # hint mode
       select_hint $viewport, ch
       ctr = 0
@@ -449,8 +451,11 @@ def run
       $message = $patt = nil if $patt == ''
       ctr = 0
     else
-      # binding = $bindings[ch]
+      # fetch binding for key
       x = $bindings[ch]
+      # remove comment string so only binding is left
+      x, _ = x.split(':') if x
+      # split into binding and args
       x = x.split if x
       if x
         binding = x.shift
@@ -630,7 +635,7 @@ def _format(ary)
         stat ||= File.stat(File.expand_path(f))
         f = format('%10s  %s  %s', readable_file_size(stat.size, 1),
                    date_format(stat.mtime), f)
-      rescue Exception => e
+      rescue StandardError => e
         f = format('%10s  %s  %s', '?', '??????????', f)
       end
     end
@@ -782,22 +787,20 @@ def run_command(f)
   print "Run a command on #{files}: "
   begin
     # Readline::HISTORY.push(*values)
-    command = Readline.readline('>', true)
+    command = readline
     # command = gets().chomp
     return if command.empty?
 
     print 'Second part of command: '
     # command2 = gets().chomp
-    command2 = Readline.readline('>', true)
+    command2 = readline
     puts "#{command} #{files} #{command2}"
     system "#{command} #{files} #{command2}"
-  rescue Exception => ex
+    setup_terminal
+  rescue StandardError => ex
     perror "Canceled command, (#{ex}) press a key"
     return
   end
-  begin
-  rescue Exception => ex
-  end
 
   refresh
   puts 'Press a key ...'
@@ -876,15 +879,18 @@ end
 
 ## accept dir to goto and change to that ( can be a file too)
 def goto_dir
+  print "\e[?25h"
   print 'Enter path: '
   begin
     # path = gets.chomp
-    path = Readline.readline('>', true)
+    path = readline
     return if path == ''
     # rescue => ex
-  rescue Exception => ex
+  rescue StandardError => ex
     perror 'Cancelled cd, press a key'
     return
+  ensure
+    print "\e[?25l"
   end
   f = File.expand_path(path)
   unless File.directory? f
@@ -994,7 +1000,7 @@ def enter_regex
   # print 'Enter (regex) pattern: '
   # move to beginning of line, and clear till EOL
   print "\r\e[K"
-  $patt = Readline.readline('/', true)
+  $patt = readline '/'
 end
 
 # page/scroll down.
@@ -1020,34 +1026,6 @@ def prev_page
   $cursor -= $pagesize
 end
 
-# print help on key-bindings
-# 2019-03-08 - write to temp file and user PAGER
-def old_print_help
-  require 'tempfile'
-  file = Tempfile.new('help')
-  begin
-    file.puts '    HELP'
-
-    file.puts
-    file.puts 'To open a file or dir press 1-9 a-z A-Z (on left of file)'
-    file.puts 'Ctrl-s to select file under cursor'
-    file.puts 'Selection Mode: Each selection adds to selection list (toggles)'
-    file.puts '   Execute commands on selected files. e.g D C-x   '
-    file.puts '   Upon exiting mode, selection is cleared'
-    file.puts 'Use left and right arrows to move through directories'
-    file.puts
-    ary = []
-    $bindings.each_pair { |k, v| ary.push "#{k.ljust(7)}  =>  #{v}" }
-    ary = columnate ary, (ary.size/2)+1
-    ary.each { |line| file.puts line }
-    file.flush
-    system "$PAGER #{file.path}"
-  rescue
-    file.close
-    file.unlink
-  end
-end
-
 def print_help
   page_with_tempfile do |file|
     file.puts '    HELP'
@@ -1061,9 +1039,12 @@ def print_help
     file.puts 'Use left and right arrows to move through directories'
     file.puts
     ary = []
-    # TODO: 2019-03-19 -  replace _ with space in value
-    # TODO: 2019-03-19 -  if : then show text after colon
-    $bindings.each_pair { |k, v| ary.push "#{k.ljust(7)}  =>  #{v}" }
+    # 2019-03-19 -  if : then show text after colon
+    $bindings.each_pair { |k, v|
+      vv = v.tr('_', ' ')
+      vv = vv.split(':')[1].strip if vv.include?(':')
+      ary.push "#{k.ljust(7)}  =>  #{vv}"
+    }
     # FIXME this works but not properly when long_listing is true.
     # We should avoid using columnate as there are several file related things.
     ary = columnate ary, (ary.size/2)+1
@@ -1088,14 +1069,15 @@ def page_with_tempfile
     yield file
     file.flush
     system "$PAGER #{file.path}"
-  rescue
+    setup_terminal
+  rescue StandardError
     file.close
     file.unlink
   end
 end
 
 def debug_vars
-  $debug_flag = true
+  @debug_flag = true
   page_with_tempfile do |file|
     file.puts 'DEBUG VARIABLES ARE:'
     file.puts
@@ -1131,8 +1113,8 @@ def main_menu
     :z => :z_interface,
     :d => :child_dirs,
     :r => :recent_files,
-    '1' => :select_visited_files,
-    '2' => :select_used_dirs,
+    '1' => :select_from_visited_files,
+    '2' => :select_from_used_dirs,
     :t => :dirtree,
     '4' => :tree,
     :s => :sort_menu,
@@ -1141,8 +1123,8 @@ def main_menu
     :b => :bookmark_menu,
     :y => :selection_menu,
     :B => :bindkey_ext_command,
-    :M => :newdir,
-    '%' => :newfile,
+    :M => :create_a_dir,
+    '%' => :create_a_file,
     'S' => :scripts,
     :x => :extras
   }
@@ -1163,38 +1145,14 @@ end
 
 def bookmark_menu
   h = {
-    :v => :view_bookmarks,
-    :c => :create_bookmark,
-    :g => :goto_bookmark
+    v: :view_bookmarks,
+    c: :create_bookmark,
+    g: :goto_bookmark
   }
   menu 'Bookmark Menu', h
 end
 
-# trying out fzf instead
-# 2019-03-08 - 23:46
-# FIXME returns a String not symbol, so some callers can fail
-def fzfmenu(title, h)
-  return unless h
-
-  pbold title.to_s
-  values = h.values.join("\n")
-  binding = `echo "#{values}" | fzf --prompt="#{title.to_s} :"`
-  # h.each_pair { |k, v| puts " #{k}: #{v}" }
-  # ch = get_char
-  # binding = h[ch]
-  # binding ||= h[ch.to_sym]
-  # FIXME we have converted symbol to string
-  ch = nil
-  if binding
-    binding = binding.chomp
-    send(binding) if respond_to?(binding, true)
-    ch = h.key(binding)
-  end
-  [ch, binding]
-end
-
-# this style used hotkeys which I remember. But it can get long.
-#  and I have to fix a hotkey for each new entry
+# Create a menu using title, and hash of key and binding
 def menu(title, h)
   return unless h
 
@@ -1209,6 +1167,8 @@ def menu(title, h)
   ch = get_char
   binding = h[ch]
   binding ||= h[ch.to_sym]
+  # TODO: 2019-03-21 - menu's do not have comments, they are symbols
+  # binding, _ = binding.split(':')
   if binding
     send(binding) if respond_to?(binding, true)
   end
@@ -1219,7 +1179,6 @@ def toggle_menu
   h = { :h => :toggle_hidden, :c => :toggle_case, :l => :toggle_long_list, '1' => :toggle_columns,
         :p => :toggle_pager_mode, :e => :toggle_enhanced_list }
   _, menu_text = menu 'Toggle Menu', h
-  # NOTE fzfmenu returns string not symbol
   return unless menu_text
 
   case menu_text
@@ -1237,11 +1196,15 @@ def toggle_menu
   when :toggle_columns
     # FIXME: 2019-03-20 - if 3 then 1
     # adjust stact and sta, if moving from panned position
-    $gviscols = 3 if $gviscols == 1
+    if $gviscols == 1
+      $gviscols = 3
+    else
+      $gviscols = 1
+    end
     # $long_listing = false if $gviscols > 1
     x = $grows * $gviscols
     $pagesize = $pagesize == x ? $grows : x
-    pause "Visible columns now set to #{$gviscols}"
+    message "Visible columns now set to #{$gviscols}"
   when :toggle_pager_mode
     $editor_mode = !$editor_mode
     $default_command = if $editor_mode
@@ -1258,9 +1221,11 @@ def toggle_menu
   when :toggle_long_list
     $long_listing = !$long_listing
     if $long_listing
+      $saved_gviscols = $gviscols
       $gviscols = 1
       $pagesize = $grows
     else
+      $gviscols = $saved_gviscols || 3
       x = $grows * $gviscols
       $pagesize = $pagesize == x ? $grows : x
     end
@@ -1269,18 +1234,18 @@ def toggle_menu
       $sta = $stact
       $stact = 0 # in case user was panned 2019-03-20 -
     end
-    message "Long listing is #{$long_listing}"
+    message "Long listing is #{$long_listing}, vis cols is #{$gviscols}"
     refresh
   end
 end
 
 def sort_menu
   lo = nil
-  h = { n: :newest, a: :accessed, o: :oldest,
-        l: :largest, s: :smallest, m: :name, r: :rname, d: :dirs, c: :clear }
+  h = { m: :modified, a: :accessed, M: :oldest,
+        l: :largest, s: :smallest, n: :name, r: :rev_name, d: :dirs, c: :clear }
   ch, menu_text = menu 'Sort Menu', h
   case menu_text
-  when :newest
+  when :modified
     lo = 'om'
   when :accessed
     lo = 'oa'
@@ -1292,7 +1257,7 @@ def sort_menu
     lo = 'oL'
   when :name
     lo = 'on'
-  when :rname
+  when :rev_name
     lo = 'On'
   when :dirs
     lo = '/'
@@ -1422,19 +1387,20 @@ def filter_for_current_extension
   reduce extn
 end
 
-def select_used_dirs
+def select_from_used_dirs
   $title = 'Used Directories'
   home = File.expand_path '~'
   $files = $used_dirs.uniq.map { |path| path.sub("#{home}", '~') }
 end
 
-def select_visited_files
+def select_from_visited_files
   # not yet a unique list, needs to be unique and have latest pushed to top
   $title = 'Visited Files'
   home = File.expand_path '~'
   $files = $visited_files.uniq.map { |path| path.sub("#{home}", '~') }
 end
 
+# maybe unused ??? XXX
 def select_bookmarks
   $title = 'Bookmarks'
   $files = $bookmarks.values
@@ -1551,9 +1517,9 @@ end
 def subcommand
   print 'Enter command: q x wq p w e r h '
   begin
-    command = Readline.readline('>', true)
+    command = readline
     return if command == ''
-  rescue Exception => ex
+  rescue StandardError => ex
     return
   end
   if command == 'q'
@@ -1729,6 +1695,7 @@ def command_file(prompt, *command)
     file = Shellwords.escape(file)
     pbold "#{command} #{file} (#{pauseyn})"
     system "#{command} #{file}"
+    setup_terminal
     pause if pauseyn == 'y'
     refresh
   else
@@ -1907,7 +1874,8 @@ def file_actions(action = nil)
   when :zip
     print 'Archive name: '
     # target = gets().chomp
-    target = Readline.readline('>', true)
+    target = readline
+    return unless target
     return if target == ''
 
     # don't want a blank space or something screwing up
@@ -1916,6 +1884,7 @@ def file_actions(action = nil)
         perror "Target (#{target}) exists"
       else
         system "tar zcvf #{target} #{files}"
+        setup_terminal
         refresh
       end
     end
@@ -1924,7 +1893,7 @@ def file_actions(action = nil)
     # 2019-03-07 NOTE works for single file FIXME
     # 2019-03-07 - TODO for n files replace pattern with string
     print "rename #{text} to : "
-    target = Readline.readline('>', true)
+    target = readline
     return if target == ''
 
     text = File.expand_path(text)
@@ -1937,6 +1906,7 @@ def file_actions(action = nil)
     end
   when :most, :less, :vim
     system "#{menu_text} #{files}"
+    setup_terminal
     # should we remove from selection ?
 
   when :remspace
@@ -1974,6 +1944,7 @@ def file_actions(action = nil)
     pause
     print
     system "#{menu_text} #{files}"
+    setup_terminal
     refresh
     pause
   end
@@ -2026,7 +1997,7 @@ end
 
 def ag
   print 'Enter a pattern to search (ag): '
-  pattern = Readline.readline('>', true)
+  pattern = readline
   return if pattern == ''
 
   $title = "Files found using 'ag' #{pattern}"
@@ -2042,7 +2013,7 @@ end
 
 def ffind
   print 'Enter a file name pattern to find: '
-  pattern = Readline.readline('>', true)
+  pattern = readline
   return if pattern == ''
 
   $title = "Files found using 'find' #{pattern}"
@@ -2056,7 +2027,7 @@ end
 
 def locate
   print 'Enter a file name pattern to locate: '
-  pattern = Readline.readline('>', true)
+  pattern = readline
   return if pattern == ''
 
   $title = "Files found using 'locate' #{pattern}"
@@ -2075,12 +2046,11 @@ end
 #
 def viminfo
   file = File.expand_path('~/.viminfo')
-  if File.exist? file
-    $title = 'Files from ~/.viminfo'
-    # $files = `grep '^>' ~/.viminfo | cut -d ' ' -f 2- | sed "s#~#$HOME#g"`.split("\n")
-    $files = `grep '^>' ~/.viminfo | cut -d ' ' -f 2- `.split("\n")
-    $files.select! { |x| x = File.expand_path(x); File.exist?(x) }
-  end
+  return unless File.exist? file
+  $title = 'Files from ~/.viminfo'
+  # $files = `grep '^>' ~/.viminfo | cut -d ' ' -f 2- | sed "s#~#$HOME#g"`.split("\n")
+  $files = `grep '^>' ~/.viminfo | cut -d ' ' -f 2- `.split("\n")
+  $files.select! { |x| x = File.expand_path(x); File.exist?(x) }
 end
 
 ##  takes directories from the z program, if you use autojump you can
@@ -2088,24 +2058,24 @@ end
 #
 def z_interface
   file = File.expand_path('~/.z')
-  if File.exist? file
-    $title = 'Directories from ~/.z'
-    $files = `sort -rn -k2 -t '|' ~/.z | cut -f1 -d '|'`.split("\n")
-    home = ENV['HOME']
-    # shorten file names
-    $files.collect! do |f|
-      f.sub(/#{home}/, '~')
-    end
+  return unless File.exist? file
+  $title = 'Directories from ~/.z'
+  $files = `sort -rn -k2 -t '|' ~/.z | cut -f1 -d '|'`.split("\n")
+  home = ENV['HOME']
+  # shorten file names
+  $files.collect! do |f|
+    f.sub(/#{home}/, '~')
   end
 end
 
 def vidir
-  system "vidir"
+  system 'vidir'
+  setup_terminal
 end
 ## there is no one consisten way i am getting.
 #  i need to do a shell join if I am to pipe ffiles to say: xargs ls -t
 #  but if i want to pipe names to grep xxx then i need to join with newlines
-def pipe; end
+# def pipe; end
 
 ## some cursor movement functions
 # TODO: 2019-03-18 - cursor should also be updated
@@ -2304,10 +2274,10 @@ def revert_dir_pos
   end
 end
 
-def newdir
+def create_a_dir
   print
   print 'Enter directory name: '
-  str = Readline.readline('>', true)
+  str = readline
   return if str == ''
 
   if File.exist? str
@@ -2318,21 +2288,22 @@ def newdir
     FileUtils.mkdir str
     $used_dirs.insert(0, str) if File.exist?(str)
     refresh
-  rescue Exception => ex
+  rescue StandardError => ex
     perror "Error in newdir: #{ex}"
   end
 end
 
-def newfile
+def create_a_file
   print
   print 'Enter file name: '
-  str = Readline.readline('>', true)
+  str = readline
   return if str == ''
 
   # FIXME a file with space will not create single file
   # 2019-03-10 - maybe touch a file
 
   system %($EDITOR "#{str}")
+  setup_terminal
   $visited_files.insert(0, str) if File.exist?(str)
   refresh
 end
@@ -2350,9 +2321,11 @@ end
 
 # ------------------- scripts ------------------ #
 # prompt for scripts to execute, giving selected file names
+# NOTE: TODO 2019-03-21 - some scripts can output a filelist to display
 def scripts
   title = 'Select a script'
   script_path = '~/.config/cetus/scripts'
+  # TODO write selected files to a known file before calling
   binding = `find #{script_path} -type f | fzf --prompt="#{title.to_s} :"`
   return unless binding
 
@@ -2377,12 +2350,14 @@ def view_selected_files
     $selected_files.each { |row| file.puts row }
     file.flush
     system "$PAGER #{file.path}"
+    setup_terminal
   rescue
     file.close
     file.unlink
   end
 end
 # ------------- end of view_selected_files --------------------------------#
+
 ##
 # Editing of the User Dir List.
 # remove current entry from used dirs list, since we may not want some entries being there
@@ -2504,13 +2479,14 @@ def enhance_file_list
   end
 end
 
+# insert important files to end of $files
 def insert_into_list(_dir, file)
   # ix = $files.index(dir)
   # 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.push *file
+  $files.push(*file)
 end
 
 def get_important_files(dir)
@@ -2530,6 +2506,7 @@ def get_important_files(dir)
   list
 end
 
+# set message which will be displayed in status line
 def message mess
   $message = mess
 end
@@ -2539,6 +2516,8 @@ Signal.trap('EXIT') do
   # system 'tput rmcup'
   exit
 end
+
+setup_terminal
 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.27'
+  spec.version       = '0.1.28'
   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.27
+  version: 0.1.28
 platform: ruby
 authors:
 - Rahul Kumar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler