gloo 5.3.9 → 6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5353f95b95c44382afa5fbd36d3f14681314dcee7a284bb60c51806f6b9be5a
-  data.tar.gz: cabbfad7080488c79b911a12d9c070885505b0926f414f821d4d3cc2222c01bd
+  metadata.gz: 8d1310b5690bb9901d7c5513d577e50455cc4320cb268ba55f8195e120ff7255
+  data.tar.gz: ee36ab64879e30780e3efcc6df46c78024576d0646c93567a847af13bcec48ff
 SHA512:
-  metadata.gz: d86a2a5c5476dab64505e1180fb43b6c24d9cb4bec414a9dc9703afb8748a85070eb33ba5db10ed2146ac1244380f8cf3fb7bc81773e892474d441615711c955
-  data.tar.gz: 8d41fd6c9ee3f5839e423721f8d23c2024f777caaddf60785209f2ad2d867360974c75697cb46fe62a45c81994fe41ff337794fe24118fe2bb5ca93cf2f22d6e
+  metadata.gz: fe42ac15476405b90663cf0949e1c8f60c002fb8fa3d7a4afd4076861c43968c658cb0ef6cb52cf2706809e2605a5efce2c3ef7932a0fc9ac66e2b3d27160e4b
+  data.tar.gz: 88172ca6ad464958c442c2cffee54105592b6462242dad1d297cf9e8a82e237b178dd110db9014fe47872806f4065599a44e8319c7a196ded59b2cfdd703faf9

data/lib/VERSION

@@ -1 +1 @@
-5.3.9
+6.0

data/lib/VERSION_NOTES

@@ -1,3 +1,13 @@
+6.0 - 2026.07.12
+ - General code cleanup, additional tests added.
+ - ERB object's template can now be an alias.
+ - Clean up the unused Utils directory.
+ - Adds format message to integer and decimal objects.
+ - Adds format message for time and datetime objects.
+ - Adds comparison operators for dates and times.
+ - Adds throw verb and exception error handling with on_exception.
+
+
 5.3.9 - 2026.06.11
  - Adds append message to file object
 

data/lib/gloo/app/engine.rb

@@ -37,6 +37,8 @@ module Gloo
         @platform = context.platform
         @log.debug "platform (class: #{@platform.class.name}) in use ..."
 
+        @handling_exception = false
+        @handling_error = false
         @log.debug 'engine intialized...'
       end
 
@@ -141,7 +143,7 @@ module Gloo
           @lib_manager.load_lib TEST_LIB_NAME
           TestRunner.new( self, @args.files ).run
         rescue => ex
-          log_exception ex
+          handle_exception ex
         end
 
         @log.debug 'Tests complete.'
@@ -215,7 +217,7 @@ module Gloo
         begin
           @parser.run @last_cmd
         rescue => e
-          log_exception e
+          handle_exception e
         end
       end
 
@@ -296,32 +298,74 @@ module Gloo
 
       #
       # Report an error.
-      # Write it to the log and set the heap error value.
+      # Write it to the log and set the heap error value. Always logged;
+      # runs the on_error script (if any) unless we're already inside
+      # one, so a broken handler can't loop.
       #
       def err( msg, backtrace=nil )
         @log.error msg
         @heap.error.set_to msg
 
-        @event_manager.on_error( msg, backtrace)
+        return if @handling_error
+
+        @handling_error = true
+        begin
+          @event_manager.on_error( msg, backtrace )
+        ensure
+          @handling_error = false
+        end
       end
 
-      # 
+      #
       # Log an exception.
-      # This function does not log the full backtrace, but 
+      # This function does not log the full backtrace, but
       # does write part of it to the log.
-      # 
+      #
       def log_exception ex
-        # Get the stack trace, and if needed truncate to fit.
+        backtrace = format_backtrace( ex )
+        @log.error backtrace
+
+        err( ex.message, backtrace)
+      end
+
+      #
+      # Handle an unanticipated Ruby exception caught at one of the
+      # engine's rescue points. Always logged; runs the on_exception
+      # script (if any) unless we're already inside one, so a broken
+      # handler can't loop.
+      #
+      def handle_exception ex
+        backtrace = format_backtrace( ex )
+        @log.error ex.message
+        @log.error backtrace
+
+        return if @handling_exception
+
+        @handling_exception = true
+        begin
+          @event_manager.on_exception( ex.message, backtrace )
+        ensure
+          @handling_exception = false
+        end
+      end
+
+      # ---------------------------------------------------------------------
+      #    Private functions
+      # ---------------------------------------------------------------------
+
+      private
+
+      #
+      # Get the stack trace as a string, truncating the middle if it's long.
+      #
+      def format_backtrace ex
         msg_lines = ex.backtrace
         if msg_lines.count > 27
           msg_lines = msg_lines[0..13] + [ '... truncated ...' ] + msg_lines[-13..-1]
         end
-        backtrace = msg_lines.join( "\n" )
-        @log.error backtrace
-
-        err( ex.message, backtrace)
+        return msg_lines.join( "\n" )
       end
-        
+
     end
   end
 end

data/lib/gloo/app/engine_context.rb

@@ -13,7 +13,7 @@ module Gloo
       #
       # Create the context, supplying defaults where relevant.
       #
-      def initialize( params = [], platform=nil, log=nil, user_root=nil )
+      def initialize( params = [], platform = nil, log = nil, user_root = nil )
         @params = params
         @platform = platform ? platform : Gloo::App::Platform.new
         @log = log ? log : Gloo::App::Log

data/lib/gloo/app/info.rb

@@ -48,7 +48,6 @@ module Gloo
       #
       def self.full_version
         return "#{display_title}\n#{ruby_info}"
-        return str
       end
 
       # 

data/lib/gloo/app/log.rb

@@ -36,7 +36,7 @@ module Gloo
       #
       def initialize( engine, quiet = true )
         @engine = engine
-        @quite = quiet
+        @quiet = quiet
         @debug = engine.settings.debug
 
         create_loggers

data/lib/gloo/app/platform.rb

@@ -41,7 +41,7 @@ module Gloo
       # 
       # Get the file mechanism for this platform.
       # 
-      def getFileMech( engine )
+      def get_file_mech( engine )
         return Gloo::Persist::DiscMech.new( engine )
       end
 
@@ -53,7 +53,7 @@ module Gloo
       # 
       # Get colorized string.
       # 
-      def getColorizedString( str, color )
+      def get_colorized_string( str, color )
         colorized = ColorizedString[ str.to_s ].colorize( color )
         return colorized.to_s
       end

data/lib/gloo/app/prompt.rb

@@ -16,6 +16,7 @@ module Gloo
       #
       # Set up Prompt.
       #
+      # Set up Prompt with the given platform.
       def initialize platform
         @platform = platform
       end

data/lib/gloo/app/settings.rb

@@ -110,11 +110,6 @@ module Gloo
       def init_root root
         if root
           @user_root = root
-        # if in_test_mode?
-        #   path = File.dirname( File.dirname( File.absolute_path( __FILE__ ) ) )
-        #   path = File.dirname( File.dirname( path ) )
-        #   path = File.join( path, 'test', 'gloo' )
-        #   @user_root = path
         else
           @user_root = File.join( Dir.home, 'gloo' )
         end

data/lib/gloo/app/table.rb

@@ -20,7 +20,7 @@ module Gloo
       # 
       # Put a box around the given string.
       def box( str_value )
-        puts str_value
+        # puts str_value
         box = Terminal::Table.new( :headings => [], :rows => [ [ str_value ] ] )
         return box.to_s
       end

data/lib/gloo/convert/nilclass_to_datetime.rb

@@ -10,7 +10,7 @@ module Gloo
     class NilClassToDateTime
 
       #
-      # Convert a nil to a date.
+      # Convert a nil to a datetime.
       #
       def convert( value )
         return Chronic.parse( '' )

data/lib/gloo/convert/nilclass_to_integer.rb

@@ -3,14 +3,12 @@
 #
 # Conversion tool:  Nil to Integer.
 #
-require 'chronic'
-
 module Gloo
   module Convert
     class NilClassToInteger
 
       #
-      # Convert a nil to a string.
+      # Convert a nil to an integer.
       #
       def convert( value )
         return 0

data/lib/gloo/convert/nilclass_to_string.rb

@@ -3,8 +3,6 @@
 #
 # Conversion tool:  Nil to String.
 #
-require 'chronic'
-
 module Gloo
   module Convert
     class NilClassToString

data/lib/gloo/convert/nilclass_to_time.rb

@@ -10,7 +10,7 @@ module Gloo
     class NilClassToTime
 
       #
-      # Convert a nil to a date.
+      # Convert a nil to a time.
       #
       def convert( value )
         return Chronic.parse( '' )

data/lib/gloo/convert/string_to_decimal.rb

@@ -9,7 +9,7 @@ module Gloo
     class StringToDecimal
 
       #
-      # Convert the given string value to an integer.
+      # Convert the given string value to a decimal.
       #
       def convert( value )
         return value.to_f

data/lib/gloo/core/dictionary.rb

@@ -52,7 +52,6 @@ module Gloo
       # Initialize verbs and objects in the dictionary.
       #
       def init
-        # @engine.log.debug 'initializing dictionaries'
         init_verbs
         init_objs
       end
@@ -192,7 +191,6 @@ module Gloo
       #
       def add_key( keyword )
         if @keywords.include?( keyword )
-          # @engine.err "duplicate keyword '#{keyword}'"
           return
         end
 
@@ -203,7 +201,6 @@ module Gloo
       # Init the list of objects.
       #
       def init_objs
-        # @engine.log.debug "initializing #{@obj_references.count} objects"
         @obj_references.each do |o|
           add_object o
         end
@@ -213,7 +210,6 @@ module Gloo
       # Init the list of verbs.
       #
       def init_verbs
-        # @engine.log.debug "initializing #{@verb_references.count} verbs"
         @verb_references.each do |v|
           add_verb v
         end
@@ -222,35 +218,33 @@ module Gloo
       # 
       # Add an object to the dictionary
       # 
-      def add_object o
+      def add_object( obj )
         # Make sure it hasn't already been registered
-        if ( @objs.key?(o.typename) || @objs.key?(o.short_typename) )
-          @engine.err "duplicate object type '#{o.typename}' or '#{o.short_typename}'"
+        if ( @objs.key?(obj.typename) || @objs.key?(obj.short_typename) )
+          @engine.err "duplicate object type '#{obj.typename}' or '#{obj.short_typename}'"
           return
         end
 
-        @objs[ o.typename ] = o
-        @objs[ o.short_typename ] = o
-        add_key o.typename
-        add_key o.short_typename if o.typename != o.short_typename
+        @objs[ obj.typename ] = obj
+        @objs[ obj.short_typename ] = obj
+        add_key obj.typename
+        add_key obj.short_typename if obj.typename != obj.short_typename
       end
 
-      # 
+      #
       # Add a verb to the dictionary
-      # 
-      def add_verb v
+      #
+      def add_verb( verb )
         # Make sure it hasn't already been registered
-        if ( verb?( v.keyword ) || verb?( v.keyword_shortcut ))
-          puts "duplicate verb keyword '#{v.keyword}' or '#{v.keyword_shortcut}'"
-          @engine.err "duplicate verb keyword '#{v.keyword}' or '#{v.keyword_shortcut}'"
+        if ( verb?( verb.keyword ) || verb?( verb.keyword_shortcut ) )
+          @engine.err "duplicate verb keyword '#{verb.keyword}' or '#{verb.keyword_shortcut}'"
           return
         end
 
-        @verbs[ v.keyword ] = v
-        @verbs[ v.keyword_shortcut ] = v
-        # v.send( :new ).run
-        add_key v.keyword
-        add_key v.keyword_shortcut if v.keyword != v.keyword_shortcut
+        @verbs[ verb.keyword ] = verb
+        @verbs[ verb.keyword_shortcut ] = verb
+        add_key verb.keyword
+        add_key verb.keyword_shortcut if verb.keyword != verb.keyword_shortcut
       end
 
     end

data/lib/gloo/core/event_manager.rb

@@ -91,6 +91,25 @@ module Gloo
         end
       end
 
+      #
+      # Run the on_exception scripts in any open objects.
+      # For each on_exception script found, look for the exception_data
+      # container and set the exception message and backtrace.
+      #
+      def on_exception msg, backtrace
+        @engine.log.debug 'on_exception event'
+        arr = Gloo::Core::ObjFinder.by_name( @engine, 'on_exception' )
+        arr.each do |o|
+          data = o.parent.find_child 'exception_data'
+          if data
+            data.find_child( 'message' ).set_value msg
+            data.find_child( 'backtrace' ).set_value backtrace
+          end
+
+          Gloo::Exec::Dispatch.message( @engine, 'run', o )
+        end
+      end
+
     end
   end
 end

data/lib/gloo/core/here.rb

@@ -28,7 +28,8 @@ module Gloo
         remainder = pn.elements[ 1..-1 ].join( '.' )
 
         here.length.times { target = target.parent }
-        pn.set_to "#{target.pn}.#{remainder}"
+        full_path = target.pn.empty? ? remainder : "#{target.pn}.#{remainder}"
+        pn.set_to full_path
       end
 
     end

data/lib/gloo/core/literal.rb

@@ -12,7 +12,7 @@ module Gloo
       attr_reader :value
 
       #
-      # Create the expression from a list of tokens.
+      # Create the literal with the given value.
       #
       def initialize( value )
         set_value( value )

data/lib/gloo/core/obj.rb

@@ -55,7 +55,7 @@ module Gloo
       #
       def root?
         return false if @parent
-        return false unless name.downcase == 'root'
+        return false unless name&.downcase == 'root'
 
         return true
       end
@@ -69,8 +69,12 @@ module Gloo
 
       #
       # Get the path and name to this object.
+      # Paths are always relative to root, so root itself has no
+      # path/name segment of its own.
       #
       def pn
+        return '' if self.root?
+
         str = self.name
         p = self.parent
         while p && !p.root?

data/lib/gloo/core/obj_finder.rb

@@ -38,7 +38,6 @@ module Gloo
         arr = []
 
         container.children.each do |o|
-          # puts "#{o.class.typename} == #{type}"
           arr << o if o.class.typename == type
           arr += by_type( engine, type, o ) if o.child_count.positive?
         end

data/lib/gloo/core/pn.rb

@@ -13,6 +13,7 @@ module Gloo
       IT = 'it'.freeze
       ERROR = 'error'.freeze
       CONTEXT = '@'.freeze
+      NAMED_COLORS = %w[red blue green white black yellow].freeze
 
       attr_reader :src, :elements
 
@@ -177,8 +178,9 @@ module Gloo
       # Is the reference to a color?
       #
       def named_color?
-        colors = %w[red blue green white black yellow]
-        return true if colors.include?( @src.downcase )
+        return true if NAMED_COLORS.include?( @src.downcase )
+
+        return false
       end
 
       #

data/lib/gloo/exec/exec_env.rb

@@ -63,7 +63,6 @@ module Gloo
       #
       def push_action( action )
         @actions.push action
-        # @here.push action.to
       end
 
       #
@@ -71,7 +70,6 @@ module Gloo
       #
       def pop_action
         @actions.pop
-        # @here.pop
       end
 
     end

data/lib/gloo/exec/runner.rb

@@ -19,8 +19,13 @@ module Gloo
         engine.log.debug "running verb #{verb.type_display}"
         engine.heap.error.start_tracking
         engine.exec_env.verbs.push verb
-        verb&.run
-        engine.exec_env.verbs.pop
+        begin
+          verb&.run
+        rescue => ex
+          engine.handle_exception( ex )
+        ensure
+          engine.exec_env.verbs.pop
+        end
         engine.heap.error.clear_if_no_errors
       end
 

data/lib/gloo/expr/l_decimal.rb

@@ -19,7 +19,7 @@ module Gloo
       end
 
       #
-      # Set the value, converting to an integer.
+      # Set the value, converting to a decimal.
       #
       def set_value( value )
         value = value.to_s if value.is_a? Numeric

data/lib/gloo/expr/l_string.rb

@@ -9,7 +9,7 @@ module Gloo
     class LString < Gloo::Core::Literal
 
       #
-      # Set the value, triming opening and closing
+      # Set the value, trimming opening and closing
       # quotations if necessary.
       #
       def set_value( value )

data/lib/gloo/expr/op_eq.rb

@@ -15,13 +15,15 @@ module Gloo
       # Perform the operation and return the result.
       #
       def perform( left, right )
+        cmp = DtTools.compare_dt( left, right )
+        return cmp == 0 unless cmp == :not_dt
+
         return left == right.to_s if left.is_a? String
 
         return left == right.to_i if left.is_a? Integer
 
         return left == right.to_f if left.is_a? Numeric
 
-        # puts "left: #{left}, right: #{right}"
         if Gloo::Objs::Boolean.boolean?( left ) && Gloo::Objs::Boolean.boolean?( right )
           return left == right
         end

data/lib/gloo/expr/op_gt.rb

@@ -14,6 +14,9 @@ module Gloo
       # Perform the operation and return the result.
       #
       def perform( left, right )
+        cmp = DtTools.compare_dt( left, right )
+        return cmp.is_a?( Integer ) && cmp.positive? unless cmp == :not_dt
+
         return left > right.to_i if left.is_a? Integer
 
         return left > right.to_f if left.is_a? Numeric

data/lib/gloo/expr/op_gteq.rb

@@ -14,6 +14,9 @@ module Gloo
       # Perform the operation and return the result.
       #
       def perform( left, right )
+        cmp = DtTools.compare_dt( left, right )
+        return cmp.is_a?( Integer ) && !cmp.negative? unless cmp == :not_dt
+
         return left >= right.to_i if left.is_a? Integer
 
         return left >= right.to_f if left.is_a? Numeric

data/lib/gloo/expr/op_ineq.rb

@@ -14,6 +14,9 @@ module Gloo
       # Perform the operation and return the result.
       #
       def perform( left, right )
+        cmp = DtTools.compare_dt( left, right )
+        return cmp.is_a?( Integer ) && cmp != 0 unless cmp == :not_dt
+
         return left != right.to_s if left.is_a? String
 
         return left != right.to_i if left.is_a? Integer

data/lib/gloo/expr/op_lt.rb

@@ -14,6 +14,9 @@ module Gloo
       # Perform the operation and return the result.
       #
       def perform( left, right )
+        cmp = DtTools.compare_dt( left, right )
+        return cmp.is_a?( Integer ) && cmp.negative? unless cmp == :not_dt
+
         return left < right.to_i if left.is_a? Integer
 
         return left < right.to_f if left.is_a? Numeric

data/lib/gloo/expr/op_lteq.rb

@@ -14,6 +14,9 @@ module Gloo
       # Perform the operation and return the result.
       #
       def perform( left, right )
+        cmp = DtTools.compare_dt( left, right )
+        return cmp.is_a?( Integer ) && !cmp.positive? unless cmp == :not_dt
+
         return left <= right.to_i if left.is_a? Integer
 
         return left <= right.to_f if left.is_a? Numeric

data/lib/gloo/objs/basic/alias.rb

@@ -1,7 +1,7 @@
 # Author::    Eric Crane  (mailto:eric.crane@mac.com)
 # Copyright:: Copyright (c) 2020 Eric Crane.  All rights reserved.
 #
-# A String.
+# An Alias.
 #
 
 module Gloo

data/lib/gloo/objs/basic/boolean.rb

@@ -1,7 +1,7 @@
 # Author::    Eric Crane  (mailto:eric.crane@mac.com)
 # Copyright:: Copyright (c) 2019 Eric Crane.  All rights reserved.
 #
-# An object with an boolean value.
+# An object with a boolean value.
 #
 
 module Gloo

data/lib/gloo/objs/basic/decimal.rb

@@ -50,7 +50,7 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + %w[round]
+        return super + %w[round format]
       end
 
       #
@@ -71,6 +71,27 @@ module Gloo
         return i
       end
 
+      #
+      # Format the decimal.
+      # With no parameter, adds comma separators to the whole part
+      # (Ex: 1000.5 -> 1,000.5).
+      # With a parameter, uses it as a sprintf-style format string (Ex: '%.2f').
+      #
+      # @param format [String] The sprintf-style format to use.
+      #
+      def msg_format
+        if @params&.token_count&.positive?
+          expr = Gloo::Expr::Expression.new( @engine, @params.tokens )
+          fmt = expr.evaluate
+          formatted = format( fmt, value )
+        else
+          whole, frac = value.to_s.split( '.' )
+          grouped = whole.reverse.scan( /.{1,3}/ ).join( ',' ).reverse
+          formatted = frac ? "#{grouped}.#{frac}" : grouped
+        end
+        @engine.heap.it.set_to formatted
+      end
+
     end
   end
 end