gloo-lang 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd3e269694e1c7aef191b9fcd1bae34b29932fc2215f90f372cfd5d5d2748bc0
-  data.tar.gz: 7976911ab79e1679c1940e43217f4c8fc533bab59fbf2a71b857ee4a7aeefed2
+  metadata.gz: 402d31f29ed04334fc22758dd7aaa7cc230f66ccf341e3cc5b1cedc42fdf998d
+  data.tar.gz: 10d69c788bf1975b3beb2eb79eff6d18a919f2956678be2d6649b407b6b1ad9e
 SHA512:
-  metadata.gz: f9be9692d331f3767e78efc2e9a5fcb5d826e11429240cf77ae9d134a41408b2fbed7a144b54a6ba8291619ddc4bb108cecf3743deb53f96e425018937d8fc28
-  data.tar.gz: b29cc45d25aa4472d8112caaf08c20deccf245c9f3a0e3392e102a558e4c13daba147b9077d057d9fb67b847bc04e0ffdd5642292376857bacf1cf33896473ae
+  metadata.gz: 5887c6675f3ca5c7df494f351b7e25c06a118dcc73c84fe0e94242b59d1dcb3ce130216c4e164761a6e0a49855ce49ac88ede67f0a3434594069c8ac693fe937
+  data.tar.gz: 7849d0fc9c9dabcdb70238b0b1d5b5108fc7c3ed6e41c9d3608ada059ed1d0c514fdcdb8ddb1cb24d8a616beef3933e84e5c6faac2d81bc6a8019bdb00bcf5e6

data/lib/VERSION

@@ -1 +1 @@
-0.9.8
+0.9.9

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,
@@ -20,14 +21,13 @@ 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' ] )
+        @args = Args.new( self, params )
+        @settings = Settings.new( self, ENV[ 'GLOO_ENV' ] )
 
-        $log = log.new( @args.quiet? )
+        @log = Log.new( self, @args.quiet? )
         @platform = platform.new
 
-        $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/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

@@ -18,7 +18,8 @@ module GlooLang
       # Load setting from the yml file.
       # The mode parameter is used to determine if we are running in TEST.
       #
-      def initialize( mode )
+      def initialize( engine, mode )
+        @engine = engine
         @mode = mode
         init_root
         init_path_settings
@@ -49,8 +50,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 +95,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
 
       #

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
 
       # ---------------------------------------------------------------------

data/lib/gloo_lang/core/heap.rb

@@ -19,13 +19,14 @@ module GlooLang
       #
       # Set up the object heap.
       #
-      def initialize
-        $log.debug 'object heap intialized...'
+      def initialize( engine )
+        @engine = engine
+        @engine.log.debug 'object heap intialized...'
 
-        @root = GlooLang::Objs::Container.new
+        @root = GlooLang::Objs::Container.new( @engine)
         @root.name = 'root'
 
-        @context = Pn.root
+        @context = Pn.root engine
         @it = It.new
         @error = Error.new
       end

data/lib/gloo_lang/core/here.rb

@@ -21,8 +21,8 @@ module GlooLang
       #
       # Expand here reference if present.
       #
-      def self.expand_here( pn )
-        target = $engine.exec_env.here_obj
+      def self.expand_here( engine, pn )
+        target = engine.exec_env.here_obj
 
         here = pn.elements.first
         remainder = pn.elements[ 1..-1 ].join( '.' )

data/lib/gloo_lang/core/obj.rb

@@ -15,7 +15,8 @@ module GlooLang
       #
       # Set up the object.
       #
-      def initialize
+      def initialize( engine )
+        @engine = engine
         @value = ''
         @children = []
         @parent = nil
@@ -152,7 +153,7 @@ module GlooLang
                    :type => type,
                    :value => nil,
                    :parent => self }
-        return $engine.factory.create params
+        return @engine.factory.create params
       end
 
       #
@@ -193,7 +194,7 @@ module GlooLang
         end
 
         if self.type_display == GlooLang::Objs::Alias.typename
-          ln = GlooLang::Core::Pn.new( self.value )
+          ln = GlooLang::Core::Pn.new( @engine, self.value )
           redirect = ln.resolve
           return redirect.find_child( name )
         end
@@ -256,7 +257,7 @@ module GlooLang
         @params = params
         return self.dispatch msg if self.can_receive_message? msg
 
-        $log.error "Object #{self.name} cannot receive message #{msg}"
+        @engine.log.error "Object #{self.name} cannot receive message #{msg}"
         return false
       end
 
@@ -269,7 +270,7 @@ module GlooLang
           self.public_send( o )
           return true
         else
-          $log.error "Message #{msg} not implemented"
+          @engine.log.error "Message #{msg} not implemented"
           return false
         end
       end
@@ -279,12 +280,12 @@ module GlooLang
       #
       def msg_unload
         if self.root?
-          $log.error 'Cannot unload the root object.'
+          @engine.log.error 'Cannot unload the root object.'
           return
         end
 
-        $engine.event_manager.on_unload self
-        $engine.heap.unload self
+        @engine.event_manager.on_unload self
+        @engine.heap.unload self
       end
 
       # ---------------------------------------------------------------------

data/lib/gloo_lang/core/obj_finder.rb

@@ -13,13 +13,13 @@ module GlooLang
       # the given name.
       # If the container isn't provided, root will be used.
       #
-      def self.by_name( name, container = nil )
-        container = $engine.heap.root if container.nil?
+      def self.by_name( engine, name, container = nil )
+        container = engine.heap.root if container.nil?
         arr = []
 
         container.children.each do |o|
           arr << o if o.name == name
-          arr += by_name( name, o ) if o.child_count.positive?
+          arr += by_name( engine, name, o ) if o.child_count.positive?
         end
 
         return arr

data/lib/gloo_lang/core/parser.rb

@@ -12,8 +12,9 @@ module GlooLang
       #
       # Set up the parser.
       #
-      def initialize
-        $log.debug 'parser intialized...'
+      def initialize( engine )
+        @engine = engine
+        @engine.log.debug 'parser intialized...'
       end
 
       #
@@ -25,9 +26,9 @@ module GlooLang
         tokens = GlooLang::Core::Tokens.new( cmd )
         dic = GlooLang::Core::Dictionary.instance
         verb = dic.find_verb( tokens.verb )
-        return verb.new( tokens, params ) if verb
+        return verb.new( @engine, tokens, params ) if verb
 
-        $log.error "Verb '#{tokens.verb}' was not found."
+        @engine.log.error "Verb '#{tokens.verb}' was not found."
         return nil
       end
 
@@ -51,7 +52,7 @@ module GlooLang
       #
       def run( cmd )
         v = parse_immediate( cmd )
-        GlooLang::Exec::Runner.go( v ) if v
+        GlooLang::Exec::Runner.go( @engine, v ) if v
       end
 
     end