rtfm-filemanager 3.10 → 3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '080c0934da9294dbad21bd902a119ae0dd533348f19eaa4841ac90f039741fb0'
-  data.tar.gz: 3839a9ad45595ce3cdec6fd0c9e9e29bc97a268c7876b6e8df9d93a33a9f0ae9
+  metadata.gz: dbfb6d5c3e1963f33faa992f302ea07e11e8ead272799293958a4060b2c293a5
+  data.tar.gz: 13c4c9097507dd2bd73d98a75cf8e85fc72eaad7494aec8fe8ed9b9bf0069a03
 SHA512:
-  metadata.gz: 112a9732a52ca5d42405daf9e6405d6c86d54d434bfdbebb4da7bba5a1ef7dbfedad6a9293a3c65531320c2b317ae8300c7b0d49ebe15a83b51f21f991d07f19
-  data.tar.gz: e73ff6c29ee8e951bd255c21c2125b18431472f23d2e9a3876f5d738f8efd11748b4983ee34fd7ef5576e24c9d2c34ffe8fbd106ec4fd31b40668536d9818625
+  metadata.gz: cbd027f69aa06ab38750d352872d26670eb559cbf5c09c0221e00a40b492faa5a19db10b81858c088dbcd2efa39b1c7047c7670456d60492f4c4ee624968f7f3
+  data.tar.gz: 2702fad4c85c61f986d96d932505217ae05cc8a407649d9acb0494793ccc85e0ef896ad06dabd75cbda2b364e51ea87043ed6ded48abceb271de053a9faa6614

data/bin/rtfm

@@ -14,7 +14,7 @@
 #             for any damages resulting from its use. Further, I am under no
 #             obligation to maintain or extend this software. It is provided 
 #             on an 'as is' basis without any expressed or implied warranty.
-@version    = "3.10"
+@version    = "3.12"
 
 # PRELIMINARIES
 @help = <<HELPTEXT
@@ -211,42 +211,43 @@ begin # BASIC SETUP
 
   # INITIALIZE VARIABLES 
   ## These can be set by user in .rtfm.conf
-  @lsbase     = "--group-directories-first" # Basic ls setup
-  @lslong     = false # Set short form ls (toggled by pressing "l")
-  @lsall      = ""    # Set "ls -a" to false (toggled by pressing "a" - sets it to "-a")
-  @lsorder    = ""    # Change the order/sorting by pressing 'o' (circular toggle)
-  @lsinvert   = ""    # Set to "-r" to reverse/invert sorting order
-  @lsuser     = ""    # Set this variable in .rtfm.conf to any 'ls' switch you want to customize directory listings
-  @width      = 4     # Set width of the left pane to the default ⅓ of the terminal width
-  @history    = []    # Initialize the command line history array
-  @border     = false
-  @preview    = true
-  @runmailcap = false # Set to 'true' in .rtfm.conf if you want to use run-mailcap instead of xdg-open
-  @batuse     = true  # Use batcat for syntax highlighting
+  @lsbase      = "--group-directories-first" # Basic ls setup
+  @lslong      = false # Set short form ls (toggled by pressing "l")
+  @lsall       = ""    # Set "ls -a" to false (toggled by pressing "a" - sets it to "-a")
+  @lsorder     = ""    # Change the order/sorting by pressing 'o' (circular toggle)
+  @lsinvert    = ""    # Set to "-r" to reverse/invert sorting order
+  @lsuser      = ""    # Set this variable in .rtfm.conf to any 'ls' switch you want to customize directory listings
+  @width       = 4     # Set width of the left pane to the default ⅓ of the terminal width
+  @history     = []    # Initialize the command line history array
+  @rubyhistory = []    # Initialize the command line history array for ruby commands
+  @border      = false
+  @preview     = true
+  @runmailcap  = false # Set to 'true' in .rtfm.conf if you want to use run-mailcap instead of xdg-open
+  @batuse      = true  # Use batcat for syntax highlighting
   ## These are automatically written on exit
-  @marks      = {}    # Initialize (book)marks hash
-  @hash       = {}    # Initialize the sha directory hashing
-  @tagged     = []    # Initialize the tagged array - for collecting all tagged items
+  @marks       = {}    # Initialize (book)marks hash
+  @hash        = {}    # Initialize the sha directory hashing
+  @tagged      = []    # Initialize the tagged array - for collecting all tagged items
   ## These should not be set by user in .rtfm.conf
-  @directory  = {}    # Initialize the directory hash for remembering directories visited
-  @searched   = ""    # Initialize the active searched for items
-  @lsfiles    = ""    # File types to show (initially set to all file types) - not saved on exit
-  @lsmatch    = ""    # Files to match (initially set to matching all files) - not saved on exit
-  @index      = 0     # Set chosen item to first on startup
-  @cont       = ""
-  @tagsize    = 0
-  @navi       = ""
-  @marks["'"] = Dir.pwd
+  @directory   = {}    # Initialize the directory hash for remembering directories visited
+  @searched    = ""    # Initialize the active searched for items
+  @lsfiles     = ""    # File types to show (initially set to all file types) - not saved on exit
+  @lsmatch     = ""    # Files to match (initially set to matching all files) - not saved on exit
+  @index       = 0     # Set chosen item to first on startup
+  @cont        = ""
+  @tagsize     = 0
+  @navi        = ""
+  @marks["'"]  = Dir.pwd
   ## File type recognizers
-  @imagefile  = /\.jpg$|\.JPG$|\.jpeg$|\.png$|\.bmp$|\.gif$|\.tif$|\.tiff$/
-  @pptfile    = /\.ppt$/
-  @xlsfile    = /\.xls$/
-  @docfile    = /\.doc$/
-  @docxfile   = /\.docx$/
-  @xlsxfile   = /\.xlsx$/
-  @pptxfile   = /\.pptx$/
-  @oolofile   = /\.odt$|\.odc$|\.odp$|\.odg$/
-  @pdffile    = /\.pdf$|\.ps$/
+  @imagefile   = /\.jpg$|\.JPG$|\.jpeg$|\.png$|\.bmp$|\.gif$|\.tif$|\.tiff$/
+  @pptfile     = /\.ppt$/
+  @xlsfile     = /\.xls$/
+  @docfile     = /\.doc$/
+  @docxfile    = /\.docx$/
+  @xlsxfile    = /\.xlsx$/
+  @pptxfile    = /\.pptx$/
+  @oolofile    = /\.odt$|\.odc$|\.odp$|\.odg$/
+  @pdffile     = /\.pdf$|\.ps$/
   ## Get variables from config file (written back to .rtf.conf upon exit via 'q')
   if File.exist?(Dir.home+'/.rtfm.conf')
     load(Dir.home+'/.rtfm.conf')
@@ -876,7 +877,7 @@ def main_getkey # GET KEY FROM USER
     @break = true
   when '@' # Enter "Ruby debug"
     @w_b.nohistory = false
-    cmd = w_b_getstr("◆ ", "")
+    cmd = w_b_getstr("◆ ", "", true)
     @w_b.clr
     @w_b.refresh
     @w_b.update = true
@@ -912,6 +913,10 @@ def conf_write
   conf += "@hash = #{@hash}\n"
   conf.sub!(/^@tagged.*\[.*\]\n/, "")
   conf += "@tagged = #{@tagged}\n"
+  conf.sub!(/^@history.*\[.*\]\n/, "")
+  conf += "@history = #{@history}\n"
+  conf.sub!(/^@rubyhistory.*\[.*\]\n/, "")
+  conf += "@rubyhistory = #{@rubyhistory}\n"
   if @write_conf_all
     conf.sub!(/^@lslong.*\n/, "") 
     conf += "@lslong = #{@lslong}\n"
@@ -1426,17 +1431,23 @@ def w_b_info(info) # SHOW INFO IN @W_B
   @w_b.write
   @w_b.update = false
 end
-def w_b_getstr(pretext, text) # A SIMPLE READLINE-LIKE ROUTINE
+def w_b_getstr(pretext, text, ruby=false) # A SIMPLE READLINE-LIKE ROUTINE
   Curses.curs_set(1)
   Curses.echo
   stk = 0
-  @history.insert(stk, text)
-  pos = @history[stk].length
   chr = ""
+  if ruby
+    @rubyhistory.insert(stk, text)
+    @history_copy = @rubyhistory.map(&:clone)
+  else
+    @history.insert(stk, text)
+    @history_copy = @history.map(&:clone)
+  end
+  pos = @history_copy[stk].length
   while chr != "ENTER"
     @w_b.setpos(0,0)
     init_pair(250, 250, 238)
-    text = pretext + @history[stk]
+    text = pretext + @history_copy[stk]
     text += " " * (@w_b.maxx - text.length) if text.length < @w_b.maxx
     @w_b.attron(color_pair(250)) { @w_b << text }
     @w_b.setpos(0,pretext.length + pos)
@@ -1451,50 +1462,50 @@ def w_b_getstr(pretext, text) # A SIMPLE READLINE-LIKE ROUTINE
     case chr
     when 'UP'
       unless @w_b.nohistory
-        unless stk == @history.length - 1
+        unless stk == @history_copy.length - 1
           stk += 1 
-          pos = @history[stk].length
+          pos = @history_copy[stk].length
         end
       end
     when 'DOWN'
       unless @w_b.nohistory
         unless stk == 0
           stk -= 1 
-          pos = @history[stk].length
+          pos = @history_copy[stk].length
         end
       end
     when 'RIGHT'
-      pos += 1 unless pos > @history[stk].length
+      pos += 1 unless pos > @history_copy[stk].length
     when 'LEFT'
       pos -= 1 unless pos == 0
     when 'HOME'
       pos = 0
     when 'END'
-      pos = @history[stk].length
+      pos = @history_copy[stk].length
     when 'DEL'
-      @history[stk][pos] = ""
+      @history_copy[stk][pos] = ""
     when 'BACK'
       unless pos == 0
         pos -= 1
-        @history[stk][pos] = ""
+        @history_copy[stk][pos] = ""
       end
     when 'WBACK'
       unless pos == 0
-        until @history[stk][pos - 1] == " " or pos == 0
+        until @history_copy[stk][pos - 1] == " " or pos == 0
           pos -= 1
-          @history[stk][pos] = ""
+          @history_copy[stk][pos] = ""
         end
-        if @history[stk][pos - 1] == " "
+        if @history_copy[stk][pos - 1] == " "
           pos -= 1
-          @history[stk][pos] = ""
+          @history_copy[stk][pos] = ""
         end
       end
     when 'LDEL'
-      @history[stk] = ""
+      @history_copy[stk] = ""
       pos = 0
     when 'TAB' # Tab completion of dirs and files
       p1 = pos - 1
-      c  = @history[stk][0..(p1)].sub(/^.* /, '')
+      c  = @history_copy[stk][0..(p1)].sub(/^.* /, '')
       p0 = p1 - c.length
       compl = File.expand_path(c)
       compl += "/" if Dir.exist?(compl)
@@ -1529,24 +1540,28 @@ def w_b_getstr(pretext, text) # A SIMPLE READLINE-LIKE ROUTINE
           Curses.echo
         end
       end
-      @history[stk].sub!(c,compl)
+      @history_copy[stk].sub!(c,compl)
       pos = pos - c.length + compl.length
     when /^.$/
-      @history[stk].insert(pos,chr)
+      @history_copy[stk].insert(pos,chr)
       pos += 1
     end
     while STDIN.ready?
       chr = STDIN.getc
-      @history[stk].insert(pos,chr)
+      @history_copy[stk].insert(pos,chr)
       pos += 1
     end
   end
-  curstr = @history[stk]
-  @history.shift if @w_b.nohistory
+  curstr = @history_copy[stk]
+  @history_copy.shift if @w_b.nohistory
+  ruby ? @rubyhistory.insert(0, @history_copy[stk]) : @history.insert(0, @history_copy[stk])
   unless @w_b.nohistory
     @history.uniq!
     @history.compact!
     @history.delete("")
+    @rubyhistory.uniq!
+    @rubyhistory.compact!
+    @rubyhistory.delete("")
   end
   Curses.curs_set(0)
   Curses.noecho

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: '3.10'
+  version: '3.12'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-28 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -47,7 +47,8 @@ dependencies:
 description: 'A full featured terminal browser with syntax highlighted files, images
   shown in the terminal, videos thumbnailed, etc. You can bookmark and jump around
   easily, delete, rename, copy, symlink and move files. RTFM has a a wide range of
-  other features. New in 3.10: Critical bugfix on syntax highlighting.'
+  other features. New in 3.12: Ruby commands gets its own history. Histories are now
+  saved/restored.'
 email: g@isene.com
 executables:
 - rtfm