gloo-lang 0.9.8 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd3e269694e1c7aef191b9fcd1bae34b29932fc2215f90f372cfd5d5d2748bc0
-  data.tar.gz: 7976911ab79e1679c1940e43217f4c8fc533bab59fbf2a71b857ee4a7aeefed2
+  metadata.gz: 7d059c3cd65790c4b384540889583e122d31f67369df848c74768839aeff6192
+  data.tar.gz: 9ba8cc80b297965dbd73d91902f81629b7753e1e19db00afe7f975cb1ba2da38
 SHA512:
-  metadata.gz: f9be9692d331f3767e78efc2e9a5fcb5d826e11429240cf77ae9d134a41408b2fbed7a144b54a6ba8291619ddc4bb108cecf3743deb53f96e425018937d8fc28
-  data.tar.gz: b29cc45d25aa4472d8112caaf08c20deccf245c9f3a0e3392e102a558e4c13daba147b9077d057d9fb67b847bc04e0ffdd5642292376857bacf1cf33896473ae
+  metadata.gz: 4b5ccb5f2c17fd4d2a1bb692fcfafbc8fa463d0a25c38a4db7174b1a0616b3f0b2fa039674336f45dd537f557133dee40bd3514ce930c07ffe33a0a9a66404a2
+  data.tar.gz: f78caa4e197479a56d91a7782ebbac77067897a3275a9ff6ccae2ee8473c8d30277b1cc49c0e90be55f1531716c36c5662eab3157cbf38cc65e7006a626ba379

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    gloo-lang (0.9.7)
+    gloo-lang (0.9.10)
+      activesupport (~> 6.1, >= 6.1.4.6)
       chronic (~> 0.10, >= 0.10.2)
       json (~> 2.1, >= 2.1.0)
       net-ssh (~> 6.1, >= 6.1.0)
@@ -11,8 +12,17 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (6.1.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ast (2.4.2)
     chronic (0.10.2)
+    concurrent-ruby (1.1.10)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
     ipaddr (1.2.4)
     json (2.6.1)
     minitest (5.15.0)
@@ -39,7 +49,10 @@ GEM
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     tty-platform (0.3.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   x86_64-darwin-21

data/gloo-lang.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency "rake", '~> 13.0', '>= 13.0.1'
 
-  # spec.add_dependency "activesupport", '~> 6.1', ">= 6.1.4.6"
+  spec.add_dependency "activesupport", '~> 6.1', ">= 6.1.4.6"
   spec.add_dependency 'chronic', '~> 0.10', '>= 0.10.2'
   spec.add_dependency 'json', '~> 2.1', '>= 2.1.0'
   spec.add_dependency 'openssl', '~> 2.1', '>= 2.1.0'

data/lib/VERSION

@@ -1 +1 @@
-0.9.8
+0.9.11

data/lib/gloo_lang/app/args.rb

@@ -19,7 +19,8 @@ module GlooLang
       #
       # Create arguments and setup.
       #
-      def initialize( params = [] )
+      def initialize( engine, params = [] )
+        @engine = engine
         @switches = []
         @files = []
 
@@ -84,7 +85,7 @@ module GlooLang
                else
                  Mode.default_mode
                end
-        $log.debug "running in #{mode} mode"
+        @engine.log.debug "running in #{mode} mode"
 
         return mode
       end

data/lib/gloo_lang/app/engine.rb

@@ -11,6 +11,7 @@ module GlooLang
   module App
     class Engine
 
+      attr_reader :settings, :log
       attr_reader :args, :mode, :running, :platform,
                   :dictionary, :parser, :heap, :factory
       attr_accessor :last_cmd, :persist_man, :event_manager,
@@ -19,15 +20,14 @@ module GlooLang
       #
       # Set up the engine with basic elements.
       #
-      def initialize( params = [], platform=Platform, log=Log )
-        $engine = self
-        @args = Args.new( params )
-        $settings = Settings.new( ENV[ 'GLOO_ENV' ] )
+      def initialize( context )
+        @args = Args.new( self, context.params )
+        @settings = Settings.new( self, context.user_root )
 
-        $log = log.new( @args.quiet? )
-        @platform = platform.new
+        @log = Log.new( self, @args.quiet? )
+        @platform = context.platform
 
-        $log.debug 'engine intialized...'
+        @log.debug 'engine intialized...'
       end
 
       #
@@ -35,24 +35,24 @@ module GlooLang
       # Load object and verb definitions and setup engine elements.
       #
       def start
-        $log.debug 'starting the engine...'
-        $log.debug Info.display_title
+        @log.debug 'starting the engine...'
+        @log.debug Info.display_title
         @mode = @args.detect_mode
         @running = true
 
-        @dictionary = GlooLang::Core::Dictionary.instance
-        @dictionary.init
-        @parser = GlooLang::Core::Parser.new
-        @heap = GlooLang::Core::Heap.new
-        @factory = GlooLang::Core::Factory.new
-        @persist_man = GlooLang::Persist::PersistMan.new
-        @event_manager = GlooLang::Core::EventManager.new
+        @dictionary = GlooLang::Core::Dictionary.get
 
-        @exec_env = GlooLang::Exec::ExecEnv.new
-        @help = GlooLang::App::Help.new
-        @converter = GlooLang::Convert::Converter.new
+        @parser = GlooLang::Core::Parser.new( self )
+        @heap = GlooLang::Core::Heap.new( self )
+        @factory = GlooLang::Core::Factory.new( self )
+        @persist_man = GlooLang::Persist::PersistMan.new( self )
+        @event_manager = GlooLang::Core::EventManager.new( self )
 
-        $log.debug 'the engine has started'
+        @exec_env = GlooLang::Exec::ExecEnv.new( self )
+        @help = GlooLang::App::Help.new( self )
+        @converter = GlooLang::Convert::Converter.new( self )
+
+        @log.debug 'the engine has started'
         run_mode
       end
 
@@ -64,7 +64,7 @@ module GlooLang
       # Run gloo in the selected mode.
       #
       def run_mode
-        $log.debug "running gloo in #{@mode} mode"
+        @log.debug "running gloo in #{@mode} mode"
 
         if @mode == Mode::VERSION
           run_version
@@ -107,7 +107,7 @@ module GlooLang
       # Get the setting for the start_with file and open it.
       #
       def open_start_file
-        name = $settings.start_with
+        name = @settings.start_with
         @persist_man.load( name ) if name
       end
 
@@ -154,7 +154,7 @@ module GlooLang
       # Do any clean up and quit.
       #
       def quit
-        $log.debug 'quitting...'
+        @log.debug 'quitting...'
       end
 
       # ---------------------------------------------------------------------
@@ -193,8 +193,8 @@ module GlooLang
       # Write it to the log and set the heap error value.
       #
       def err( msg )
-        $log.error msg
-        self.heap.error.set_to msg
+        @log.error msg
+        @heap.error.set_to msg
       end
 
     end

data/lib/gloo_lang/app/engine_context.rb

@@ -0,0 +1,25 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2022 Eric Crane.  All rights reserved.
+#
+# The context (parameters) for the Gloo Script Engine.
+#
+
+module GlooLang
+  module App
+    class EngineContext
+
+      attr_accessor :params, :platform, :log, :user_root
+
+      #
+      # Create the context, supplying defaults where relevant.
+      #
+      def initialize( params = [], platform=nil, log=nil, user_root=nil )
+        @params = params
+        @platform = platform ? platform : Platform.new
+        @log = log ? log : Log
+        @user_root = user_root
+      end
+
+    end
+  end
+end

data/lib/gloo_lang/app/help.rb

@@ -16,7 +16,8 @@ module GlooLang
       # Set up the help system.
       # We won't load help topics until we know we need them.
       #
-      def initialize
+      def initialize( engine )
+        @engine = engine
         @topics = nil
       end
 
@@ -25,7 +26,7 @@ module GlooLang
       # This is the what is shown when help is run from the CLI.
       #
       def show_app_help
-        puts Info.display_title unless $engine.args.quiet?
+        puts Info.display_title unless @engine.args.quiet?
         self.show_topic APPLICATION
       end
 
@@ -54,21 +55,21 @@ module GlooLang
       # screen, it won't paginate.
       #
       def page_topic( topic )
-        return if $engine.args.quiet?
+        return if @engine.args.quiet?
 
         data = self.get_topic_data( topic )
-        page = data.lines.count > Settings.page_size
-        $engine.platform.show( data, topic_is_md?( topic ), page )
+        page = data.lines.count > Settings.page_size( @engine )
+        @engine.platform.show( data, topic_is_md?( topic ), page )
       end
 
       #
       # Show a help topic.
       #
       def show_topic( topic )
-        return if $engine.args.quiet?
+        return if @engine.args.quiet?
 
         data = self.get_topic_data( topic )
-        $engine.platform.show( data, topic_is_md?( topic ), false )
+        @engine.platform.show( data, topic_is_md?( topic ), false )
       end
 
       #
@@ -92,7 +93,7 @@ module GlooLang
         return if @topics
 
         @topics = {}
-        $log.debug 'loading help file index...'
+        @engine.log.debug 'loading help file index...'
 
         pn = File.dirname( File.absolute_path( __FILE__ ) )
         pn = File.dirname( pn )
@@ -109,7 +110,7 @@ module GlooLang
           @topics[ key ] = md_file
         end
 
-        $log.debug "Found #{@topics.count} help files"
+        @engine.log.debug "Found #{@topics.count} help files"
       end
 
     end

data/lib/gloo_lang/app/log.rb

@@ -9,15 +9,17 @@ module GlooLang
   module App
     class Log
 
-      attr_reader :logger, :quiet
+      attr_accessor :quiet
+      attr_reader :logger
 
       #
       # Set up a logger.
       # If quiet is true, then message are written to the log
       # but not to the console.
       #
-      def initialize( quiet=true )
-        f = File.join( $settings.log_path, 'gloo.log' )
+      def initialize( engine, quiet=true )
+        @engine = engine
+        f = File.join( @engine.settings.log_path, 'gloo.log' )
         @logger = Logger.new( f )
         @logger.level = Logger::DEBUG
         @quite = quiet

data/lib/gloo_lang/app/settings.rb

@@ -10,37 +10,24 @@ module GlooLang
   module App
     class Settings
 
-      attr_reader :user_root, :log_path, :config_path, :project_path,
-                  :start_with, :list_indent, :tmp_path,
-                  :debug_path, :debug
+      attr_reader :user_root, :log_path,
+        :config_path, :project_path,
+        :start_with, :list_indent, :tmp_path,
+        :debug_path, :debug
 
       #
       # Load setting from the yml file.
       # The mode parameter is used to determine if we are running in TEST.
       #
-      def initialize( mode )
-        @mode = mode
-        init_root
+      def initialize( engine, root=nil )
+        @engine = engine
+        # @mode = mode
+        init_root( root )
+
         init_path_settings
         init_user_settings
       end
 
-      #
-      # Are we in test mode?
-      #
-      def in_test_mode?
-        return @mode == 'TEST'
-      end
-
-      #
-      # Get the project path for the current mode.
-      #
-      def project_path_for_mode( settings )
-        return File.join( @user_root, 'projects' ) if in_test_mode?
-
-        return settings[ 'gloo' ][ 'project_path' ]
-      end
-
       #
       # Show the current application settings.
       # Can be seen in app with 'help settings'
@@ -49,8 +36,8 @@ module GlooLang
         puts "\nApplication Settings:"
         puts '  Startup with:  ' + @start_with
         puts '  Indent in Listing:  ' + @list_indent.to_s
-        puts '  Screen Lines:  ' + GlooLang::App::Settings.lines.to_s
-        puts '  Page Size:  ' + GlooLang::App::Settings.page_size.to_s
+        puts '  Screen Lines:  ' + GlooLang::App::Settings.lines( @engine ).to_s
+        puts '  Page Size:  ' + GlooLang::App::Settings.page_size( @engine ).to_s
         puts ''
         self.show_paths
         puts ''
@@ -94,23 +81,23 @@ module GlooLang
       #
       # Get the number of vertical lines on screen.
       #
-      def self.lines
-        $engine.platform.lines
+      def self.lines engine
+        engine.platform.lines
       end
 
       #
       # Get the number of horizontal columns on screen.
       #
-      def self.cols
-        $engine.platform.cols
+      def self.cols engine
+        engine.platform.cols
       end
 
       #
       # Get the default page size.
       # This is the number of lines of text we can show.
       #
-      def self.page_size
-        Settings.lines - 3
+      def self.page_size engine
+        Settings.lines( engine ) - 3
       end
 
       #
@@ -129,12 +116,14 @@ module GlooLang
       #
       # Initialize gloo's root path.
       #
-      def init_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
+      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
@@ -166,7 +155,11 @@ module GlooLang
       def init_user_settings
         settings = get_settings
 
-        @project_path = project_path_for_mode settings
+        @project_path = settings[ 'gloo' ][ 'project_path' ]
+        if @project_path.blank?
+          @project_path = File.join( @user_root, 'projects' )
+        end
+
         @start_with = settings[ 'gloo' ][ 'start_with' ]
         @list_indent = settings[ 'gloo' ][ 'list_indent' ]
 

data/lib/gloo_lang/convert/converter.rb

@@ -8,6 +8,13 @@ module GlooLang
   module Convert
     class Converter
 
+      #
+      # Initializer.
+      #
+      def initialize( engine )
+        @engine = engine
+      end
+
       # ---------------------------------------------------------------------
       #    Convert
       # ---------------------------------------------------------------------
@@ -23,8 +30,8 @@ module GlooLang
           o = clazz.new
           return o.convert( value )
         rescue => e
-          $log.error e.message
-          $engine.heap.error.set_to e.message
+          @engine.log.error e.message
+          @engine.heap.error.set_to e.message
         end
 
         return default

data/lib/gloo_lang/core/baseo.rb

@@ -14,7 +14,8 @@ module GlooLang
       NOT_IMPLEMENTED_ERR = 'Not implemented yet!'.freeze
 
       # Set up the object.
-      def initialize
+      def initialize( engine )
+        @engine = engine
         @name = ''
       end
 

data/lib/gloo_lang/core/dictionary.rb

@@ -24,6 +24,16 @@ module GlooLang
         @keywords = []
       end
 
+      #
+      # Get the singleton Dictionary and Initialize
+      # if this is the first time.
+      #
+      def self.get
+        o = GlooLang::Core::Dictionary.instance
+        o.init if o.verbs.count == 0
+        return o
+      end
+
       #
       # Register a verb.
       #
@@ -42,7 +52,7 @@ module GlooLang
       # Initialize verbs and objects in the dictionary.
       #
       def init
-        $log.debug 'initializing dictionaries'
+        # @engine.log.debug 'initializing dictionaries'
         init_verbs
         init_objs
       end
@@ -140,7 +150,7 @@ module GlooLang
       #
       def add_key( keyword )
         if @keywords.include?( keyword )
-          $log.error "duplicate keyword '#{keyword}'"
+          # @engine.log.error "duplicate keyword '#{keyword}'"
           return
         end
 
@@ -151,9 +161,9 @@ module GlooLang
       # Init the list of objects.
       #
       def init_objs
-        $log.debug "initializing #{@obj_references.count} objects"
+        # @engine.log.debug "initializing #{@obj_references.count} objects"
         @obj_references.each do |o|
-          $log.debug o
+          # @engine.log.debug o
           @objs[ o.typename ] = o
           @objs[ o.short_typename ] = o
           add_key o.typename
@@ -165,9 +175,9 @@ module GlooLang
       # Init the list of verbs.
       #
       def init_verbs
-        $log.debug "initializing #{@verb_references.count} verbs"
+        # @engine.log.debug "initializing #{@verb_references.count} verbs"
         @verb_references.each do |v|
-          $log.debug v
+          # @engine.log.debug v
           @verbs[ v.keyword ] = v
           @verbs[ v.keyword_shortcut ] = v
           # v.send( :new ).run

data/lib/gloo_lang/core/event_manager.rb

@@ -12,8 +12,9 @@ module GlooLang
       #
       # Set up the event manager.
       #
-      def initialize
-        $log.debug 'event manager intialized...'
+      def initialize( engine )
+        @engine = engine
+        @engine.log.debug 'event manager intialized...'
       end
 
       #
@@ -23,9 +24,9 @@ module GlooLang
       def on_load( obj = nil, in_heap = false )
         return unless obj || in_heap
 
-        $log.debug 'on_load event'
-        arr = GlooLang::Core::ObjFinder.by_name 'on_load', obj
-        arr.each { |o| GlooLang::Exec::Dispatch.message 'run', o }
+        @engine.log.debug 'on_load event'
+        arr = GlooLang::Core::ObjFinder.by_name( @engine, 'on_load', obj )
+        arr.each { |o| GlooLang::Exec::Dispatch.message( @engine, 'run', o ) }
       end
 
       #
@@ -34,9 +35,9 @@ module GlooLang
       def on_unload( obj )
         return unless obj
 
-        $log.debug 'on_unload event'
-        arr = GlooLang::Core::ObjFinder.by_name 'on_unload', obj
-        arr.each { |o| GlooLang::Exec::Dispatch.message 'run', o }
+        @engine.log.debug 'on_unload event'
+        arr = GlooLang::Core::ObjFinder.by_name( @engine, 'on_unload', obj )
+        arr.each { |o| GlooLang::Exec::Dispatch.message( @engine, 'run', o ) }
       end
 
     end

data/lib/gloo_lang/core/factory.rb

@@ -15,8 +15,9 @@ module GlooLang
       #
       # Set up the object factory.
       #
-      def initialize
-        $log.debug 'object factory intialized...'
+      def initialize( engine )
+        @engine = engine
+        @engine.log.debug 'object factory intialized...'
       end
 
       # ---------------------------------------------------------------------
@@ -140,7 +141,7 @@ module GlooLang
         objtype = find_type params[ :type ]
         return nil unless objtype
 
-        pn = GlooLang::Core::Pn.new params[ :name ]
+        pn = GlooLang::Core::Pn.new( @engine, params[ :name ] )
         parent = params[ :parent ]
         if parent.nil?
           parent = pn.get_parent
@@ -150,11 +151,11 @@ module GlooLang
         end
 
         if pn.exists? && params[ :squash_duplicates ]
-          $log.debug "Updating existing object: #{obj_name}"
+          @engine.log.debug "Updating existing object: #{obj_name}"
           return self.update_existing pn, params[ :value ]
         end
 
-        $log.debug "Creating new object: #{obj_name}"
+        @engine.log.debug "Creating new object: #{obj_name}"
         return create_new obj_name, params[ :value ], objtype, parent
       end
 
@@ -163,11 +164,11 @@ module GlooLang
       #
       def create_new( name, value, type, parent )
         unless parent
-          $log.error "Could not create object.  Bad path: #{name}"
+          @engine.log.error "Could not create object.  Bad path: #{name}"
           return nil
         end
 
-        o = type.new
+        o = type.new( @engine )
         o.name = name
         o.set_value value
         parent.add_child( o )
@@ -190,15 +191,15 @@ module GlooLang
       #
       def find_type( type_name )
         type_name = 'untyped' if type_name.nil? || type_name.strip.empty?
-        t = $engine.dictionary.find_obj( type_name )
+        t = @engine.dictionary.find_obj( type_name )
 
         if t.nil?
-          $log.warn "Could not find type, '#{type_name}'"
+          @engine.log.warn "Could not find type, '#{type_name}'"
           return nil
         end
 
         unless t.can_create?
-          $log.error "'#{type_name}' cannot be created."
+          @engine.log.error "'#{type_name}' cannot be created."
           return nil
         end
 

data/lib/gloo_lang/core/gloo_system.rb

@@ -18,7 +18,8 @@ module GlooLang
       attr_reader :pn
 
       # Set up the object.
-      def initialize( pn )
+      def initialize( engine, pn )
+        @engine = engine
         @pn = pn
       end
 
@@ -137,7 +138,7 @@ module GlooLang
         o = "msg_#{msg}"
         return self.public_send( o ) if self.respond_to? o
 
-        $log.error "Message #{msg} not implemented"
+        @engine.log.error "Message #{msg} not implemented"
         return false
       end
 
@@ -163,22 +164,22 @@ module GlooLang
 
       # Get the Gloo home directory
       def msg_gloo_home
-        return $settings.user_root
+        return @engine.settings.user_root
       end
 
       # Get the Gloo configuration directory
       def msg_gloo_config
-        return $settings.config_path
+        return @engine.settings.config_path
       end
 
       # Get the Gloo projects directory
       def msg_gloo_projects
-        return $settings.project_path
+        return @engine.settings.project_path
       end
 
       # Get the Gloo log directory
       def msg_gloo_log
-        return $settings.log_path
+        return @engine.settings.log_path
       end
 
       # ---------------------------------------------------------------------
@@ -196,12 +197,12 @@ module GlooLang
 
       # Get the number of lines on screen.
       def msg_screen_lines
-        return GlooLang::App::Settings.lines
+        return GlooLang::App::Settings.lines( @engine )
       end
 
       # Get the number of columns on screen.
       def msg_screen_cols
-        return GlooLang::App::Settings.cols
+        return GlooLang::App::Settings.cols( @engine )
       end
 
       # ---------------------------------------------------------------------