ruby-shell 3.4.7 → 3.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70cf831b842cb78920de4f541751dc71b1ec87d4d2619eb813d726aa9abe844d
-  data.tar.gz: 3a1baee44aa63c583f62485d6df477b5aeca1f04801ce2dd6c9b92a35795e27e
+  metadata.gz: c2eadccdac83c394da85a64a138d36cad24de2603aeb2867bce52f4aa00d0568
+  data.tar.gz: 0b54ea26c9f82db1f1c29fffbc6e69d19c0c4ad3e5d94d490ba33aaf268be3c5
 SHA512:
-  metadata.gz: 96e26e3cb1788d7aa04eea7d8aabf034ac59f904fcc808151c3297d6a896794330be4e92c372c71f96376605e9943cd734c8871373fe6c4bf07e5fb3a0bbd891
-  data.tar.gz: ef2907de7d2758f996beb911677430b1e1e674b388ebfa726d2dbead4e8b9670dc03baa7009b534ca268064ae4feaf8c1c6dc474552c1f6a6e60a86068cbd147
+  metadata.gz: 8448bde19ed12fb02b3b28a7295f928ce643caa43ce7045f8693a733729bd8dea2b23c01cbae44fcf3d39f412238a5aa5a17281e9d55cf64f5ec2bf5c56fe38d
+  data.tar.gz: bd903733344c8aa9b0d42a2dfbcaf63339861bc7db5a289425881fea0a8c10fcbfc705a0840000ef165a99a843ebdd39c155263fe393fbd09ce8885dad6513c0

data/bin/rsh

@@ -8,7 +8,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rsh
 # License:    Public domain
-@version    = "3.4.7" # Added :rehash command to manually rebuild executable cache
+@version    = "3.4.9" # Improved :calc with safer eval, Math sandbox, better error messages
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -1077,6 +1077,16 @@ def suggest_command(cmd) # Smart command suggestions for typos
   candidates.sort_by! { |c| levenshtein_distance(cmd, c) }
   candidates.first(3)
 end
+def ensure_type(var_name, type, default) # Helper to ensure instance variable has correct type
+  var = instance_variable_get(var_name)
+  instance_variable_set(var_name, default) unless var.is_a?(type)
+end
+def persist_var(conf, var_name, value, condition = true) # Helper to persist variable to config
+  return conf unless condition
+  conf.sub!(/^#{Regexp.escape(var_name)}.*(\n|$)/, "")
+  conf += "#{var_name} = #{value.inspect}\n"
+  conf
+end
 def hist_clean # Clean up @history
   @history.compact!
   @history.delete("")
@@ -1378,31 +1388,19 @@ def rshrc # Write user configuration to .rshrc (portable between machines)
     conf = ""
   end
 
-  # Only update user-editable items in .rshrc
-  conf.sub!(/^@nick.*(\n|$)/, "")
-  conf += "@nick = #{@nick}\n"
-  conf.sub!(/^@gnick.*(\n|$)/, "")
-  conf += "@gnick = #{@gnick}\n"
-  conf.sub!(/^@bookmarks.*(\n|$)/, "")
-  conf += "@bookmarks = #{@bookmarks}\n" unless @bookmarks.empty?
-  conf.sub!(/^@defuns.*(\n|$)/, "")
-  conf += "@defuns = #{@defuns}\n" unless @defuns.empty?
-  conf.sub!(/^@history_dedup.*(\n|$)/, "")
-  conf += "@history_dedup = '#{@history_dedup}'\n" if @history_dedup && @history_dedup != 'smart'
-  conf.sub!(/^@session_autosave.*(\n|$)/, "")
-  conf += "@session_autosave = #{@session_autosave}\n" if @session_autosave && @session_autosave > 0
-  conf.sub!(/^@auto_correct.*(\n|$)/, "")
-  conf += "@auto_correct = #{@auto_correct}\n" if @auto_correct
-  conf.sub!(/^@slow_command_threshold.*(\n|$)/, "")
-  conf += "@slow_command_threshold = #{@slow_command_threshold}\n" if @slow_command_threshold && @slow_command_threshold > 0
-  conf.sub!(/^@completion_learning.*(\n|$)/, "")
-  conf += "@completion_learning = #{@completion_learning}\n" unless @completion_learning
-  conf.sub!(/^@completion_show_metadata.*(\n|$)/, "")
-  conf += "@completion_show_metadata = #{@completion_show_metadata}\n" if @completion_show_metadata
-  conf.sub!(/^@plugin_enabled.*(\n|$)/, "")
-  conf += "@plugin_enabled = #{@plugin_enabled}\n" unless @plugin_enabled.empty?
-  conf.sub!(/^@validation_rules.*(\n|$)/, "")
-  conf += "@validation_rules = #{@validation_rules}\n" unless @validation_rules.empty?
+  # Persist user-editable configuration using helper
+  conf = persist_var(conf, '@nick', @nick)
+  conf = persist_var(conf, '@gnick', @gnick)
+  conf = persist_var(conf, '@bookmarks', @bookmarks, !@bookmarks.empty?)
+  conf = persist_var(conf, '@defuns', @defuns, !@defuns.empty?)
+  conf = persist_var(conf, '@history_dedup', @history_dedup, @history_dedup && @history_dedup != 'smart')
+  conf = persist_var(conf, '@session_autosave', @session_autosave, @session_autosave && @session_autosave > 0)
+  conf = persist_var(conf, '@auto_correct', @auto_correct, @auto_correct)
+  conf = persist_var(conf, '@slow_command_threshold', @slow_command_threshold, @slow_command_threshold && @slow_command_threshold > 0)
+  conf = persist_var(conf, '@completion_learning', @completion_learning, !@completion_learning)
+  conf = persist_var(conf, '@completion_show_metadata', @completion_show_metadata, @completion_show_metadata)
+  conf = persist_var(conf, '@plugin_disabled', @plugin_disabled, !@plugin_disabled.empty?)
+  conf = persist_var(conf, '@validation_rules', @validation_rules, !@validation_rules.empty?)
 
   File.write(Dir.home+'/.rshrc', conf)
   rshstate  # Also save runtime state
@@ -1562,6 +1560,8 @@ def help
   col3 << ":help        This help"
   col3 << ":info        About rsh"
   col3 << ":version     Version info"
+  col3 << ":history     Show history"
+  col3 << ":rehash      Rebuild cache"
 
   # Pad columns to same length
   max_lines = [col1.length, col2.length, col3.length].max
@@ -1622,12 +1622,17 @@ def nick(nick_str = nil)  # Define a new nick like this: `:nick "ls = ls --color
     puts
   elsif nick_str.match(/^\s*-/)
     source = nick_str.sub(/^\s*-/, '')
-    @nick.delete(source)
-    rshrc
+    if @nick.delete(source)
+      puts "Nick '#{source}' deleted"
+      rshrc
+    else
+      puts "Nick '#{source}' not found"
+    end
   else
     source = nick_str.sub(/ =.*/, '')
     target = nick_str.sub(/.*= /, '')
     @nick[source] = target
+    puts "Nick '#{source}' → '#{target}'"
     rshrc
   end
 end
@@ -1643,12 +1648,17 @@ def gnick(nick_str = nil) # Define a generic/global nick to match not only comma
     puts
   elsif nick_str.match(/^\s*-/)
     source = nick_str.sub(/^\s*-/, '')
-    @gnick.delete(source)
-    rshrc
+    if @gnick.delete(source)
+      puts "Gnick '#{source}' deleted"
+      rshrc
+    else
+      puts "Gnick '#{source}' not found"
+    end
   else
     source = nick_str.sub(/ =.*/, '')
     target = nick_str.sub(/.*= /, '')
     @gnick[source] = target
+    puts "Gnick '#{source}' → '#{target}'"
     rshrc
   end
 end
@@ -2505,24 +2515,46 @@ def validate_command(cmd) # Syntax validation before execution
 end
 def calc(*args) # Inline calculator using Ruby's Math library
   if args.empty?
-    puts "Usage: calc <expression>"
+    puts "Usage: :calc <expression>"
     puts "Examples:"
-    puts "  calc 2 + 2"
-    puts "  calc \"Math.sqrt(16)\""
-    puts "  calc \"Math::PI * 2\""
+    puts "  :calc 2 + 2"
+    puts "  :calc Math.sqrt(16)"
+    puts "  :calc Math::PI * 2"
+    puts "  :calc sin(PI/4)"
+    puts "Available: +, -, *, /, **, %, sqrt, sin, cos, tan, log, exp, abs, PI, E, etc."
     return
   end
 
   expression = args.join(' ')
 
+  # Create sandbox with Math module for safer evaluation
+  sandbox = Object.new
+  sandbox.extend(Math)
+
   begin
-    # Safe evaluation with Math library
-    result = eval(expression, binding, __FILE__, __LINE__)
+    result = sandbox.instance_eval(expression)
     puts result
+  rescue ZeroDivisionError
+    puts "Error: Division by zero"
+  rescue NameError => e
+    # Extract the undefined name
+    if e.message =~ /undefined local variable or method `(\w+)'/
+      undefined = $1
+      puts "Error: Unknown function or variable '#{undefined}'"
+      puts "Available Math functions: sqrt, sin, cos, tan, log, exp, abs, ceil, floor, round"
+      puts "Constants: PI, E"
+    else
+      puts "Error: #{e.message}"
+    end
   rescue SyntaxError => e
-    puts "Syntax error in expression: #{e.message}"
+    puts "Error: Invalid expression syntax"
+    puts "Check parentheses, operators, and spacing"
+  rescue ArgumentError => e
+    puts "Error: Invalid argument - #{e.message}"
+  rescue TypeError => e
+    puts "Error: Type mismatch - #{e.message}"
   rescue => e
-    puts "Error evaluating expression: #{e.message}"
+    puts "Error: #{e.message}"
   end
 end
 def validate(rule_str = nil) # Custom validation rule management
@@ -3055,26 +3087,26 @@ def load_rshrc_safe
     # Try to load the .rshrc file
     load(Dir.home+'/.rshrc')
 
-    # Validate critical variables
-    @history = [] unless @history.is_a?(Array)
-    @nick = {} unless @nick.is_a?(Hash)
-    @gnick = {} unless @gnick.is_a?(Hash)
-    @cmd_frequency = {} unless @cmd_frequency.is_a?(Hash)
-    @cmd_stats = {} unless @cmd_stats.is_a?(Hash)
-    @bookmarks = {} unless @bookmarks.is_a?(Hash)
-    @defuns = {} unless @defuns.is_a?(Hash)
-    @history_dedup = 'smart' unless @history_dedup.is_a?(String)
-    @session_autosave = 0 unless @session_autosave.is_a?(Integer)
-    @auto_correct = false unless [@auto_correct].any? { |v| v == true || v == false }
-    @slow_command_threshold = 0 unless @slow_command_threshold.is_a?(Integer)
-    @plugin_enabled = [] unless @plugin_enabled.is_a?(Array)
-    @plugins = [] unless @plugins.is_a?(Array)
-    @plugin_commands = {} unless @plugin_commands.is_a?(Hash)
-    @validation_rules = [] unless @validation_rules.is_a?(Array)
-    @completion_weights = {} unless @completion_weights.is_a?(Hash)
+    # Validate critical variables using helper
+    ensure_type(:@history, Array, [])
+    ensure_type(:@nick, Hash, {})
+    ensure_type(:@gnick, Hash, {})
+    ensure_type(:@cmd_frequency, Hash, {})
+    ensure_type(:@cmd_stats, Hash, {})
+    ensure_type(:@bookmarks, Hash, {})
+    ensure_type(:@defuns, Hash, {})
+    ensure_type(:@history_dedup, String, 'smart')
+    ensure_type(:@session_autosave, Integer, 0)
+    ensure_type(:@slow_command_threshold, Integer, 0)
+    ensure_type(:@plugin_disabled, Array, [])  # FIXED: was @plugin_enabled
+    ensure_type(:@plugins, Array, [])
+    ensure_type(:@plugin_commands, Hash, {})
+    ensure_type(:@validation_rules, Array, [])
+    ensure_type(:@completion_weights, Hash, {})
+    ensure_type(:@recording, Hash, {active: false, name: nil, commands: []})
+    ensure_type(:@recordings, Hash, {})
+    @auto_correct = false unless [true, false].include?(@auto_correct)
     @completion_learning = true if @completion_learning.nil?
-    @recording = {active: false, name: nil, commands: []} unless @recording.is_a?(Hash)
-    @recordings = {} unless @recordings.is_a?(Hash)
 
     # Restore defuns from .rshrc
     if @defuns && !@defuns.empty?
@@ -3205,31 +3237,34 @@ def auto_heal_rshrc
 end
 
 def load_defaults
-  @history ||= []
-  @nick ||= {"ls" => "ls --color -F"}
-  @gnick ||= {}
+  # Use ensure_type for consistency
+  ensure_type(:@history, Array, [])
+  ensure_type(:@nick, Hash, {"ls" => "ls --color -F"})
+  ensure_type(:@gnick, Hash, {})
+  ensure_type(:@cmd_frequency, Hash, {})
+  ensure_type(:@cmd_stats, Hash, {})
+  ensure_type(:@bookmarks, Hash, {})
+  ensure_type(:@defuns, Hash, {})
+  ensure_type(:@switch_cache, Hash, {})
+  ensure_type(:@switch_cache_time, Hash, {})
+  ensure_type(:@plugin_disabled, Array, [])  # FIXED: was @plugin_enabled
+  ensure_type(:@plugins, Array, [])
+  ensure_type(:@plugin_commands, Hash, {})
+  ensure_type(:@validation_rules, Array, [])
+  ensure_type(:@completion_weights, Hash, {})
+  ensure_type(:@recording, Hash, {active: false, name: nil, commands: []})
+  ensure_type(:@recordings, Hash, {})
+
   @completion_limit ||= 10
   @completion_case_sensitive ||= false
   @completion_show_descriptions ||= false
   @completion_fuzzy ||= true
-  @cmd_frequency ||= {}
-  @cmd_stats ||= {}
-  @bookmarks ||= {}
-  @defuns ||= {}
-  @switch_cache ||= {}
-  @switch_cache_time ||= {}
   @history_dedup ||= 'smart'
   @session_autosave ||= 0
   @auto_correct ||= false
   @slow_command_threshold ||= 0
-  @plugin_enabled ||= []
-  @plugins ||= []
-  @plugin_commands ||= {}
-  @validation_rules ||= []
-  @completion_weights ||= {}
   @completion_learning = true if @completion_learning.nil?
-  @recording ||= {active: false, name: nil, commands: []}
-  @recordings ||= {}
+
   puts "Loaded with default configuration."
 end
 

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 3.4.7
+  version: 3.4.9
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-29 00:00:00.000000000 Z
+date: 2025-10-30 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. UPDATE
-  v3.4.7: Added :rehash command to manually rebuild executable cache (like zsh''s
-  rehash builtin). Plus v3.4.6: Plugin help system, 4 new plugins, plugins disabled
-  by default!'
+  v3.4.9: Improved :calc with Math sandbox for safer evaluation, better error messages
+  (division by zero, unknown functions, syntax errors). Suggested by havenwood from
+  #ruby IRC!'
 email: g@isene.com
 executables:
 - rsh