ruby-shell 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99b63b13ddf019d5fbac48dd76cbd8c53b381c46eebbf0717499e9b904015209
-  data.tar.gz: 40c43d51e54bdf37d7bc35d5e127e824314ec7ea89956e0015f6b8673dce016d
+  metadata.gz: 6d3646331db7eac6ea26f07f0878354ca9b3ed9f46ebda4e2bd177d252ce67d3
+  data.tar.gz: deffdb053c7284ed35110c482a30adfd0ec732ce5eb0d2ea4188638cf92d1b0e
 SHA512:
-  metadata.gz: 035ee8876b1b89dcf4cea42e9d636a167e9909a44a629c130bbd09dda0487fcbae4d07ad5e148a48d06213486774cebc6e3e804107e842ce6a2e3544ee2b70d3
-  data.tar.gz: a5209bc92c252335efa4d07518cdab32b095c1e3c19dbae7dc2180f25e15997ed52f40c44f6186d03c668d7f6d65fd26630dd48548990f62831647d1794597fc
+  metadata.gz: 6dec4e805bf977dd4de28784a1e1bc4c71c7df0c865c73e479e54d053de0743b9592c4c1d331e321da23d1c1e4136709fd7fb269acb372dac50d4aa3f1196737
+  data.tar.gz: d50d00d2f0f9af08c1516941a808087936d512f43971eb2374b476c295137048c95bb0890960589dfdc35b9b402147d0c9d162ee1b1d75b0e6ae8b2bc541c7ed

data/README.md

@@ -4,7 +4,7 @@
 The Ruby SHell
 
 # Why?
-Ruby is my goto language (pun kinda intended). I want full control over my tools and I like challenges that I can tinker with late at night. This is an incomplete project continually being improved. Feel free to add suggestions or code.
+<img src="img/rsh-logo.jpg" align="left" width="150" height="150">Ruby is my goto language (pun kinda intended). I want full control over my tools and I like challenges that I can tinker with late at night. This is an incomplete project continually being improved. Feel free to add suggestions or code.
 
 # Design principles
 Simple. One file. Minimum external requirements.

data/bin/rsh

@@ -7,25 +7,20 @@
 # Author:     Geir Isene <g@isene.com>
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rsh
-# License:    I release all copyright claims. This code is in the public domain.
-#             Permission is granted to use, copy modify, distribute, and sell
-#             this software for any purpose. I make no guarantee about the
-#             suitability of this software for any purpose and I am not liable
-#             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    = "1.1"
+# License:    Public domain
+@version    = "1.2"
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
-  def c(code);  color(self, "\001\e[38;5;#{code}m\002"); end
-  def b;        color(self, "\001\e[1m\002"); end
-  def i;        color(self, "\001\e[3m\002"); end
-  def u;        color(self, "\001\e[4m\002"); end
-  def l;        color(self, "\001\e[5m\002"); end
+  def c(code);  color(self, "\001\e[38;5;#{code}m\002"); end  # Color code
+  def b;        color(self, "\001\e[1m\002"); end             # Bold
+  def i;        color(self, "\001\e[3m\002"); end             # Italic
+  def u;        color(self, "\001\e[4m\002"); end             # Underline
+  def l;        color(self, "\001\e[5m\002"); end             # Blink
+  def r;        color(self, "\001\e[7m\002"); end             # Reverse
   def color(text, color_code)  "#{color_code}#{text}\001\e[0m\002" end
 end
-module Cursor # Terminal cursor movement ANSI codes (thanks to https://github.com/piotrmurach/tty-cursor/tree/master)
+module Cursor # Terminal cursor movement ANSI codes (thanks to https://github.com/piotrmurach/tty-cursor)
   module_function
   ESC = "\e".freeze
   CSI = "\e[".freeze
@@ -102,13 +97,13 @@ begin # Requires
 end
 begin # Initialization
   # Theming
-  @c_prompt    = 196                      # Color for basic prompt
-  @c_cmd       = 48                       # Color for valid command
-  @c_nick      = 51                       # Color for matching nick
-  @c_gnick     = 87                       # Color for matching gnick
-  @c_path      = 208                      # Color for valid path
-  @c_switch    = 148                      # Color for switches/options
-  @c_tabselect = 207                      # Color for selected tabcompleted item
+  @c_prompt    = 10                       # Color for basic prompt
+  @c_cmd       = 2                        # Color for valid command
+  @c_nick      = 6                        # Color for matching nick
+  @c_gnick     = 14                       # Color for matching gnick
+  @c_path      = 3                        # Color for valid path
+  @c_switch    = 6                        # Color for switches/options
+  @c_tabselect = 5                        # Color for selected tabcompleted item
   @c_taboption = 244                      # Color for unselected tabcompleted item
   @c_stamp     = 244                      # Color for time stamp/command
   # Prompt
@@ -123,12 +118,14 @@ begin # Initialization
                   "/usr/bin", 
                   "/home/#{@user}/bin"]   # Basic paths for executables if not set in .rshrc
   # History
-  @histsize    = 100                      # Max history if not set in .rshrc
+  @histsize    = 200                      # Max history if not set in .rshrc
   @hloaded     = false                    # Variable to determine if history is loaded
-  # Use run-mailcap instead of xgd-open? Set = true in .rshrc if iyou want run-mailcap
+  # Use run-mailcap instead of xgd-open? Set "= true" in .rshrc if you want run-mailcap
   @runmailcap  = false
   # Variable initializations
   @dirs        = ["."]*10
+  def pre_cmd; end                        # User-defined function to be run BEFORE command execution
+  def post_cmd; end                       # User-defined function to be run AFTER  command execution
 end
 
 # HELP TEXT
@@ -158,7 +155,7 @@ end
   Special functions/integrations:
   * Use `r` to launch rtfm (https://github.com/isene/RTFM) - if you have it installed
   * Use `f` to launch fzf (https://github.com/junegunn/fzf) - if you have it installed
-  * Use `=` followed by xrpn commands separated by commas (https://github.com/isene/xrpn)
+  * Use `=` followed by xrpn commands separated by commas or double-spaces (https://github.com/isene/xrpn)
   * Use `:` followed by a Ruby expression to access the whole world of Ruby
 
   Special commands:
@@ -219,6 +216,7 @@ def getchr # Process key presses
       when '6' then chr = "PgDOWN" ; chr = "C-PgDOWN" if STDIN.getc == "^"
       when '7' then chr = "HOME"   ; chr = "C-HOME"   if STDIN.getc == "^"
       when '8' then chr = "END"    ; chr = "C-END"    if STDIN.getc == "^"
+      else chr = ""
       end
     when 'O'   # Set Ctrl+ArrowKey equal to ArrowKey; May be used for other purposes in the future
       case STDIN.getc
@@ -226,6 +224,7 @@ def getchr # Process key presses
       when 'b' then chr = "C-DOWN"
       when 'c' then chr = "C-RIGHT"
       when 'd' then chr = "C-LEFT"
+      else chr = ""
       end
     end
   when "", "" then chr = "BACK"
@@ -245,6 +244,7 @@ def getchr # Process key presses
   when "\r" then chr = "ENTER"
   when "\t" then chr = "TAB"
   when /[[:print:]]/  then chr = c
+  else chr = ""
   end
   return chr
 end
@@ -261,9 +261,9 @@ def getstr # A custom Readline-like function
     print @prompt
     row, @pos0 = @c.pos
     print cmd_check(@history[0])
-    @ci  = @history[1..].find_index {|e| e =~ /^#{Regexp.escape(@history[0])}/}
+    @ci  = @history[1..].find_index {|e| e =~ /^#{Regexp.escape(@history[0])}./}
     @ci += 1 unless @ci == nil
-    if @history[0].length > 2 and @ci
+    if @history[0].length > 1 and @ci
       print @history[@ci][@history[0].length..].to_s.c(@c_stamp)
       right = true
     end
@@ -502,11 +502,11 @@ def tabselect(ary, hist=false) # Let user select from the incoming array
     when 'TAB'
       chr = "ENTER"
     when 'BACK'
+      @tabsearch.chop!
       if @tabsearch == ''
         @c.clear_screen_down
         return ""
       end
-      @tabsearch.chop!
       hist ? tab_hist(@tabsearch) : tab_all(@tabsearch)
       return @tabsearch
     when /^[[:print:]]$/
@@ -610,9 +610,9 @@ def gnick(nick_str) # Define a generic/global nick to match not only commands (f
 end
 def nick? # Show nicks
   puts "  Command nicks:".c(@c_nick)
-  @nick.each {|key, value| puts "  #{key} = #{value}"}
+  @nick.sort.each {|key, value| puts "  #{key} = #{value}"}
   puts "  General nicks:".c(@c_gnick)
-  @gnick.each {|key, value| puts "  #{key} = #{value}"}
+  @gnick.sort.each {|key, value| puts "  #{key} = #{value}"}
 end
 def dirs
   puts "Past direactories:"
@@ -676,7 +676,10 @@ loop do
       system("git status .") if Dir.exist?(".git")
       next
     end
-    @cmd = "echo \"#{@cmd[1...]},prx,off\" | xrpn" if @cmd =~ /^\=/ # Integration with xrpn (https://github.com/isene/xrpn)
+    if @cmd =~ /^\=/ # Integration with xrpn (https://github.com/isene/xrpn)
+      @cmd.gsub!("  ", ",")
+      @cmd = "echo \"#{@cmd[1...]},prx,off\" | xrpn" 
+    end
     if @cmd.match(/^\s*:/) # Ruby commands are prefixed with ":"
       begin
         eval(@cmd[1..-1])
@@ -689,7 +692,7 @@ loop do
     else # Execute command
       ca = @nick.transform_keys {|k| /((^\K\s*\K)|(\|\K\s*\K))\b(?<!-)#{Regexp.escape k}\b/}
       @cmd = @cmd.gsub(Regexp.union(ca.keys), @nick)
-      ga = @gnick.transform_keys {|k| /\b#{Regexp.escape k}\b/}
+      ga = @gnick.transform_keys {|k| /\b(?<!-)#{Regexp.escape k}\b/}
       @cmd = @cmd.gsub(Regexp.union(ga.keys), @gnick)
       @cmd = "~" if @cmd == "cd"
       @cmd.sub!(/^cd (\S*).*/, '\1')
@@ -717,7 +720,9 @@ loop do
           end
         else 
           begin
-            puts "No such command or nick: #{@cmd}" unless system (@cmd) # Try execute the command
+            pre_cmd
+            puts "Not executed: #{@cmd}" unless system (@cmd) # Try execute the command
+            post_cmd
           rescue StandardError => err
             puts "\n#{err}"
           end

metadata

@@ -1,19 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Geir Isene
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2024-10-10 00:00:00.000000000 Z
 dependencies: []
 description: 'A shell written in Ruby with extensive tab completions, aliases/nicks,
   history, syntax highlighting, theming, auto-cd, auto-opening files and more. In
-  continual development. New in 1.1: Added; Copy current command line to primary selection
-  (paste w/middle button) with Ctrl-y'
+  continual development. New in 1.2: Fixed bug on tab handling'
 email: g@isene.com
 executables:
 - rsh
@@ -28,7 +27,7 @@ licenses:
 - Unlicense
 metadata:
   source_code_uri: https://github.com/isene/rsh
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -43,8 +42,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: rsh - Ruby SHell
 test_files: []