cetus 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 040badb6cd9462f5d5a2fe5f5b5e320c03fbbd80984d71e526c500bdd0781822
-  data.tar.gz: c48f55c076c32815785341986791e680b990b3fbf3bf1d519835b70331790a52
+  metadata.gz: 5b9d18e0f61df366b1977e94b4492e2d5d89db8459082859c96325bb30459cc4
+  data.tar.gz: 698d7c3e64d40e533d3fe1d028e2e2425d2fcd4db09cebb5803d9d64450009d5
 SHA512:
-  metadata.gz: a7a6655724e7b3e5e46d20d8bf0cc90a3032aacdca0dbbbb4d4348c87c845e8a974574f2530781ff44a7860ed1d3f9eb8e0c5caa952411963106ac3622fc39f9
-  data.tar.gz: c61c40989b45d3e4c2ecc04d6a04ceae2722fbf3d0d582e37fb86b4e00b5d78582c16edd18fef1c58ad86e3c20038d4ae3b5455270c7da25dba2bcdb19f27c75
+  metadata.gz: 55a5c875ecf98f26123a9d3f7dac5e8cdc8731fede1c3767cad9f84a117827473ccb598f2ca5fc96f2e839a5bdfd2a50ce739a16c65f4aa1205afb20d0bfa053
+  data.tar.gz: c444a54d8675e4c7d6953f3da43e07d1ac8f464b4f6cd835ec5e51da625e0e9ee55067ddb6fb00d8ed4cc78583515db23fca11c9b35bfe2d49eb10c2e16f3642

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-10 15:07
+#  Last update: 2019-03-16 10:17
 # --------------------------------------------------------------------------- #
 #  cetus.rb  Copyright (C) 2012-2019 rahul kumar
 # == CHANGELOG
@@ -35,7 +35,7 @@ require 'fileutils'
 
 # 2019-02-20 - added so alt-screen is used
 system 'tput smcup'
-VERSION = '0.1.22.0'.freeze
+VERSION = '0.1.23.0'.freeze
 O_CONFIG = true
 # CONFIG_FILE = '~/.lyrainfo'.freeze
 CONFIG_FILE = '~/.config/cetus/conf.yml'.freeze
@@ -44,10 +44,16 @@ $bindings = {}
 $bindings = {
   '`' => 'main_menu',
   '=' => 'toggle_menu',
-  '!' => 'command_mode',
+  'M-y' => 'selection_menu',
+  'ENTER' => 'select_current',
+  'C-p' => 'page_current',
+  'C-e' => 'edit_current',
+  'C-o' => 'edit_current',
+  'C-s' => 'toggle_select',
   '@' => 'selection_mode_toggle',
   'M-a' => 'select_all',
   'M-A' => 'unselect_all',
+  '!' => 'execute',
   ',' => 'goto_parent_dir',
   '~' => 'goto_home_dir',
   '-' => 'goto_previous_dir', # 2019-03-07 - added. like 'cd ='
@@ -61,18 +67,14 @@ $bindings = {
   'SPACE' => 'next_page',
   'M-f' => 'select_visited_files',
   'M-d' => 'select_used_dirs',
-  'M-b' => 'select_bookmarks',
+  'M-b' => 'bookmark_menu',
   'M-m' => 'create_bookmark',
-  'M-M' => 'show_marks',
+  'M-M' => 'view_bookmarks',
   'C-c' => 'escape',
   'ESCAPE' => 'escape',
   'TAB' => 'views',
   'C-i' => 'views',
-  '?' => 'dirtree',
-  'ENTER' => 'select_current',
-  'C-p' => 'page_current',
-  'C-e' => 'edit_current',
-  'C-o' => 'edit_current',
+  # '?' => 'dirtree',
   'D' => 'delete_file',
   'M' => 'file_actions most',
   'q' => 'quit_command', # was Q now q 2019-03-04 -
@@ -92,7 +94,7 @@ $bindings = {
   'DOWN' => 'cursor_dn',
   'C-SPACE' => 'visual_mode_toggle',
 
-  'M-?' => 'print_help',
+  '?' => 'print_help',
   'F1' => 'print_help',
   'F2' => 'child_dirs',
   'F3' => 'dirtree',
@@ -326,9 +328,10 @@ $viewctr = 0
 $history = []
 $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}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"
 
-$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 "
+# 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 "
 
 ## main loop which calls all other programs
 def run
@@ -591,7 +594,7 @@ def select_hint(view, ch)
 end
 
 ## toggle selection state of file
-def toggle_select(f)
+def toggle_select(f=current_file)
   # dir = Dir.pwd
   # file = File.join(dir, f)
   if selected? f
@@ -680,8 +683,9 @@ end
 
 ## run command on given file/s
 #   Accepts command from user
-#   After putting readline in place of gets, pressing a C-c has a delayed effect. It goes intot
-#   exception bloack after executing other commands and still does not do the return !
+#   After putting readline in place of gets, pressing a C-c has a delayed effect.
+#   It goes into exception block after executing other commands and still
+#   does not do the return !
 def run_command(f)
   files = nil
   case f
@@ -719,6 +723,10 @@ end
 
 ## cd to a dir
 def change_dir(f, pos = nil)
+  unless File.directory? f
+    perror "#{p} is not a directory, or does not exist."
+    return
+  end
   $visited_dirs.insert(0, Dir.pwd)
   f = File.expand_path(f)
   Dir.chdir f
@@ -814,8 +822,7 @@ end
 #
 def selection_mode_toggle
   if $mode == 'SEL'
-    # we seem to be coming out of select mode with some files
-    run_command $selected_files unless $selected_files.empty?
+    unselect_all
     $mode = nil
   else
     # $selection_mode = !$selection_mode
@@ -824,6 +831,9 @@ def selection_mode_toggle
 end
 
 ## toggle command mode
+# 2019-03-15 - TODO FIXME preferable when we go into command mode
+#  run a command on current or selected files. But then is it a mode, do we remain
+#  there, or come out immediately ?
 def command_mode
   if $mode == 'COM'
     $mode = nil
@@ -854,6 +864,8 @@ def goto_entry_starting_with(fc = nil)
   $patt = "^#{fc}"
 end
 
+# Goes to directory bookmarked with number or upper case char.
+# If lower case character given, then go to first file starting with char.
 def goto_bookmark(ch = nil)
   unless ch
     print 'Enter bookmark char: '
@@ -906,10 +918,9 @@ def print_help
 
     file.puts
     file.puts 'To open a file or dir press 1-9 a-z A-Z '
-    file.puts 'Command Mode: Will prompt for a command to run on a file, after selecting using hotkey'
     file.puts 'Selection Mode: Each selection adds to selection list (toggles)'
-    file.puts '   Execute commands on selected files. e.g D    '
-    file.puts '   Upon exiting mode, user is prompted for a command to run on selected files'
+    file.puts '   Execute commands on selected files. e.g D C-x   '
+    file.puts '   Upon exiting mode, selection is cleared'
     file.puts
     ary = []
     $bindings.each_pair { |k, v| ary.push "#{k.ljust(7)}  =>  #{v}" }
@@ -923,7 +934,7 @@ def print_help
   end
 end #
 
-def show_marks
+def view_bookmarks
   puts
   puts 'Bookmarks: '
   $bookmarks.each_pair { |k, v| puts "#{k.ljust(7)}  =>  #{v}" }
@@ -951,6 +962,8 @@ def main_menu
     :s => :sort_menu,
     :F => :filter_menu,
     :c => :command_menu,
+    :b => :bookmark_menu,
+    :y => :selection_menu,
     :B => :bindkey_ext_command,
     :M => :newdir,
     '%' => :newfile,
@@ -960,6 +973,27 @@ def main_menu
   menu 'Main Menu', h
 end
 
+def selection_menu
+  h = {
+    :a => :select_all,
+    :u => :unselect_all,
+    :s => :toggle_select,
+    '@' => 'selection_mode_toggle',
+    'x' => 'visual_mode_toggle',
+    :v => :view_selected_files
+  }
+  menu 'Selection Menu', h
+end
+
+def bookmark_menu
+  h = {
+    :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
@@ -1015,20 +1049,24 @@ def toggle_menu
   case menu_text
   when :toggle_hidden
     $hidden = $hidden ? nil : 'D'
+    pause "Hidden is now #{$hidden}"
     refresh
   when :toggle_case
     # $ignorecase = $ignorecase ? "" : "i"
     $ignorecase = !$ignorecase
+    pause "Ignore Case  is now #{$ignorecase}"
     refresh
   when :toggle_columns
     $gviscols = 3 if $gviscols == 1
     # $long_listing = false if $gviscols > 1
     x = $grows * $gviscols
     $pagesize = $pagesize == x ? $grows : x
+    pause "Visible columns now set to #{$gviscols}"
   when :toggle_pager_mode
     $editor_mode = !$editor_mode
     $default_command = if $editor_mode
                          ENV['EDITOR'] # earlier nil # 2019-03-10 -
+                         # it was nil so we could set a default command
                        else
                          ENV['MANPAGER'] || ENV['PAGER']
                        end
@@ -1080,18 +1118,17 @@ def sort_menu
   # $files =$(eval "print -rl -- ${pattern}(${MFM_LISTORDER}$filterstr)")
 end
 
+# thse need to be placed in correct position, some do nothing
+#  and some like ffind have no menu item
 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
   # since we've basically overlaid the old listing
-  #
   # should be able to sort THIS listing and not rerun command. But for that I'd need to use
   # 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,
-        v: :page_selection }
+        v: :view_selected_files }
   h[:e] = if $editor_mode
             :pager_mode
           else
@@ -1113,7 +1150,9 @@ def command_menu
     $files = `zsh -c 'print -rl -- *(#{$hidden}Mm0)'`.split("\n")
     $title = "Today's files"
   when :default_command
-    print 'Selecting a file usually invokes $EDITOR, what command do you want to use repeatedly on selected files: '
+    puts " THis no longer works"
+    puts 'Selecting a file usually invokes $EDITOR'
+    puts 'What command do you want to use repeatedly on selected files: '
     $default_command = gets.chomp
     if $default_command != ''
       print 'Second part of command (maybe blank): '
@@ -1126,6 +1165,7 @@ def command_menu
   end
 end
 
+# This is quite badly placed and named. Maybe these should go elsewhere
 def extras
   h = { '1' => :one_column, '2' => :multi_column, :c => :columns, :r => :config_read, :w => :config_write }
   ch, menu_text = menu 'Extras Menu', h
@@ -1213,8 +1253,6 @@ def post_cd
   $patt = nil
   $sta = $cursor = 0
   $title = nil
-  # 2019-03-10 - why am I clearing selected when dir changed !!! FIXME
-  # $selected_files = [] unless $selected_files.empty?
   $visual_block_start = nil
   $stact = 0
   $current_dir = Dir.pwd # 2019-03-10 - so i don't keep doing in functions
@@ -1260,7 +1298,8 @@ def config_write
   hash = {}
   hash['DIRS'] = $used_dirs.select {|dir| File.exist? dir}
   hash['FILES'] = $visited_files.select {|file| File.exist? file}
-  hash['BOOKMARKS'] = $bookmarks
+  # NOTE bookmarks is a hash and contains FILE:cursor_pos
+  hash['BOOKMARKS'] = $bookmarks #.select {|file| File.exist? file}
   writeYML hash, f1
   $writing = $modified = false
 end
@@ -1283,7 +1322,7 @@ end
 # }}}
 ## accept a character to save this dir as a bookmark
 def create_bookmark
-  print 'Enter A to Z or 0-9 for bookmark: '
+  print 'Enter A to Z or 0-9 to create a bookmark: '
   ch = get_char
   if ch =~ /^[0-9A-Z]$/
     $bookmarks[ch] = "#{Dir.pwd}:#{$cursor}"
@@ -1293,10 +1332,12 @@ def create_bookmark
   end
 end
 
+# allow user to exit using :q :wq :x
+# Was this supposed to be augmented, or just remain limited like this
+# We should be able to do everything in the menus from here. TODO
 def subcommand
-  print 'Enter command: '
+  print 'Enter command: q x wq p w e r h '
   begin
-    # command = gets().chomp
     command = Readline.readline('>', true)
     return if command == ''
   rescue Exception => ex
@@ -1321,12 +1362,20 @@ def subcommand
   elsif command == 'wq'
     $quitting = true
     $writing = true
+  elsif command == 'w'
+    config_write
   elsif command == 'x'
     $quitting = true
     $writing = true if $modified
+  elsif command == 'e'
+    edit_current
+  elsif command == 'h' or command == 'help' or command = '?'
+    print_help
   elsif command == 'p'
     system 'echo $PWD | pbcopy'
     puts 'Stored PWD in clipboard (using pbcopy)'
+  else
+    perror "Don't know about command #{command}. Try :h or :help"
   end
 end
 
@@ -1511,8 +1560,9 @@ end
 # 2019-03-08 - TODO when a file name changes or moves it must be removed
 #  from selection
 def file_actions(action = nil)
+  # only add dtrx for gz
   h = { d: :delete, m: :move, r: :rename, v: ENV['EDITOR'] || :vim,
-        c: :copy, C: :chdir, W: :remspace,
+        c: :copy, C: :chdir, W: :remspace, e: :execute,
         l: :less, s: :most, f: :file, o: :open, x: :dtrx, z: :zip }
   # acttext = h[action.to_sym] || action
   acttext = action || ''
@@ -1561,8 +1611,9 @@ def file_actions(action = nil)
 
   when :delete
     delcommand = 'rmtrash'
-    print "#{delcommand} #{files} ?[yn]: "
+    print "#{delcommand} #{text} ?[yn?]: "
     ch = get_char
+    view_selected_files if ch == '?'
     return if ch != 'y'
 
     system "#{delcommand} #{files}"
@@ -1675,6 +1726,8 @@ def file_actions(action = nil)
       end
     end
     refresh
+  when :execute
+    execute
   else
     return unless menu_text
 
@@ -1723,6 +1776,15 @@ def bindkey_ext_command
   end
 end
 
+# execute a command on selected or current file
+def execute
+  if $selected_files.empty?
+    run_command current_file
+    return
+  end
+  run_command $selected_files
+end
+
 def ag
   print 'Enter a pattern to search (ag): '
   pattern = Readline.readline('>', true)
@@ -1733,10 +1795,10 @@ def ag
   pause
   files = `ag -l #{pattern}`.split("\n")
   if files.empty?
-    perror 'No files found.'
-  else
-    $files = files
+    perror 'No files found for #{pattern}.'
+    return
   end
+  $files = files
 end
 
 def ffind
@@ -1745,9 +1807,9 @@ def ffind
   return if pattern == ''
 
   $title = "Files found using 'find' #{pattern}"
-  files = `find . -name '#{pattern}'`.split("\n")
+  files = `find . -name "#{pattern}"`.split("\n")
   if files.empty?
-    perror 'No files found.'
+    perror 'No files found. Try adding *'
   else
     $files = files
   end
@@ -1867,7 +1929,7 @@ def add_to_selection(file)
   $current_dir ||= Dir.pwd
   ff.each do |f|
     full = File.join($current_dir, f)
-    $selected_files.push full
+    $selected_files.push(full) unless $selected_files.include?(full)
   end
 end
 
@@ -2048,8 +2110,8 @@ def scripts
 end
 # ------------- end of scripts --------------------------------#
 
-# ------------------- page_selection ------------------ #
-def page_selection
+# ------------------- view_selected_files ------------------ #
+def view_selected_files
   require 'tempfile'
   file = Tempfile.new('selected_files')
   begin
@@ -2061,7 +2123,7 @@ def page_selection
     file.unlink
   end
 end
-# ------------- end of page_selection --------------------------------#
+# ------------- 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

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.22'
+  spec.version       = '0.1.23'
   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.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Rahul Kumar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-10 00:00:00.000000000 Z
+date: 2019-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: lightning fast file navigator - ruby 1.9.3 .. ruby 2.6