gloo-lang 0.9.8 → 0.9.9

data/lib/gloo_lang/objs/web/http_get.rb

@@ -53,7 +53,7 @@ module GlooLang
       # for default configurations.
       #
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string URL, DEFAULT_URL, self
         fac.create_can PARAMS, self
         fac.create_string RESULT, nil, self
@@ -75,7 +75,7 @@ module GlooLang
       #
       def msg_run
         url = full_url_value
-        $log.debug url
+        @engine.log.debug url
         r = GlooLang::Objs::HttpGet.invoke_request( url, skip_ssl_verify? )
         update_result r
       end
@@ -146,7 +146,7 @@ module GlooLang
         params.children.each do |child|
           p << ( p.empty? ? '?' : '&' )
 
-          child = GlooLang::Objs::Alias.resolve_alias( child )
+          child = GlooLang::Objs::Alias.resolve_alias( @engine, child )
 
           # TODO: Quote URL params for safety
           p << "#{child.name}=#{child.value}"

data/lib/gloo_lang/objs/web/http_post.rb

@@ -52,7 +52,7 @@ module GlooLang
 
         body = find_child BODY
         body.children.each do |child|
-          child_val = GlooLang::Objs::Alias.resolve_alias( child )
+          child_val = GlooLang::Objs::Alias.resolve_alias( @engine, child )
           h[ child.name ] = child_val.value
         end
 
@@ -88,7 +88,7 @@ module GlooLang
       # for default configurations.
       #
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string URL, 'https://web.site/', self
         fac.create_can BODY, self
       end
@@ -111,9 +111,9 @@ module GlooLang
         uri = uri_value
         return unless uri
 
-        $log.debug "posting to: #{uri}"
+        @engine.log.debug "posting to: #{uri}"
         body = self.body_as_json
-        $log.debug "posting body: #{body}"
+        @engine.log.debug "posting body: #{body}"
         data = GlooLang::Objs::HttpPost.post_json( uri, body, skip_ssl_verify? )
         self.update_result data
       end
@@ -136,8 +136,8 @@ module GlooLang
           request.body = body
 
           result = http.request request # Net::HTTPResponse object
-          $log.debug result.code
-          $log.debug result.message
+          @engine.log.debug result.code
+          @engine.log.debug result.message
           return result.body
         end
       end
@@ -157,8 +157,8 @@ module GlooLang
       #
       #   # Send the payload to the endpoint.
       #   result = n.start { |http| http.request( request ) }
-      #   $log.debug result.code
-      #   $log.debug result.message
+      #   @engine.log.debug result.code
+      #   @engine.log.debug result.message
       #   return result.body
       # end
 

data/lib/gloo_lang/objs/web/json.rb

@@ -74,14 +74,14 @@ module GlooLang
       #
       def msg_get
         if @params&.token_count&.positive?
-          expr = GlooLang::Expr::Expression.new( @params.tokens )
+          expr = GlooLang::Expr::Expression.new( @engine, @params.tokens )
           data = expr.evaluate
         end
         return unless data
 
         h = JSON.parse( self.value )
         field = h[ data ]
-        $engine.heap.it.set_to field
+        @engine.heap.it.set_to field
         return field
       end
 
@@ -92,13 +92,13 @@ module GlooLang
       #
       def msg_parse
         if @params&.token_count&.positive?
-          pn = GlooLang::Core::Pn.new @params.tokens.first
+          pn = GlooLang::Core::Pn.new( @engine, @params.tokens.first )
           unless pn&.exists?
-            $engine.err 'Destination path for parsed objects does not exist'
+            @engine.err 'Destination path for parsed objects does not exist'
             return
           end
         else
-          $engine.err 'Destination path for parsed objects is required'
+          @engine.err 'Destination path for parsed objects is required'
           return
         end
         parent = pn.resolve

data/lib/gloo_lang/objs/web/slack.rb

@@ -96,7 +96,7 @@ module GlooLang
       # for default configurations.
       #
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string URL, 'https://hooks.slack.com/services/...', self
         fac.create_string MSG, 'textual message', self
         fac.create_string USER, 'Slack Bot', self

data/lib/gloo_lang/objs/web/teams.rb

@@ -84,7 +84,7 @@ module GlooLang
       # for default configurations.
       #
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string URL, DEFAULT_URL, self
         fac.create_string TITLE, '', self
         fac.create_string COLOR, DEFAULT_COLOR, self

data/lib/gloo_lang/objs/web/uri.rb

@@ -68,7 +68,7 @@ module GlooLang
         cert = response.peer_cert
         o = cert.not_after
 
-        $engine.heap.it.set_to o
+        @engine.heap.it.set_to o
         return o
       end
 
@@ -80,7 +80,7 @@ module GlooLang
         return unless value
 
         o = URI( value ).fragment
-        $engine.heap.it.set_to o
+        @engine.heap.it.set_to o
         return o
       end
 
@@ -92,7 +92,7 @@ module GlooLang
         return unless value
 
         o = URI( value ).query
-        $engine.heap.it.set_to o
+        @engine.heap.it.set_to o
         return o
       end
 
@@ -104,7 +104,7 @@ module GlooLang
         return unless value
 
         o = URI( value ).path
-        $engine.heap.it.set_to o
+        @engine.heap.it.set_to o
         return o
       end
 
@@ -116,7 +116,7 @@ module GlooLang
         return unless value
 
         o = URI( value ).host
-        $engine.heap.it.set_to o
+        @engine.heap.it.set_to o
         return o
       end
 
@@ -128,7 +128,7 @@ module GlooLang
         return unless value
 
         o = URI( value ).scheme
-        $engine.heap.it.set_to o
+        @engine.heap.it.set_to o
         return o
       end
 

data/lib/gloo_lang/persist/file_loader.rb

@@ -17,7 +17,8 @@ module GlooLang
       #
       # Set up a file storage for an object.
       #
-      def initialize( pn )
+      def initialize( engine, pn )
+        @engine = engine
         @pn = pn
         @tabs = 0
         @obj = nil
@@ -33,14 +34,14 @@ module GlooLang
       #
       def load
         unless File.exist?( @pn )
-          $log.error "File '#{@pn}' does not exist."
+          @engine.log.error "File '#{@pn}' does not exist."
           return
         end
 
-        $log.debug "Loading file '#{@pn}'"
+        @engine.log.debug "Loading file '#{@pn}'"
         @tabs = 0
         @parent_stack = []
-        @parent = $engine.heap.root
+        @parent = @engine.heap.root
         @parent_stack.push @parent
         f = File.open( @pn, 'r' )
         f.each_line do |line|
@@ -150,7 +151,7 @@ module GlooLang
           @block_value = ''
         end
         params = { name: name, type: type, value: value, parent: @parent }
-        @last = $engine.factory.create( params )
+        @last = @engine.factory.create( params )
 
         if value.empty? && @last&.multiline_value?
           @multi_indent = 0

data/lib/gloo_lang/persist/file_saver.rb

@@ -11,7 +11,8 @@ module GlooLang
       #
       # Set up a file storage for an object.
       #
-      def initialize( pn, obj )
+      def initialize( engine, pn, obj )
+        @engine = engine
         @pn = pn
         @obj = obj
       end

data/lib/gloo_lang/persist/file_storage.rb

@@ -13,7 +13,8 @@ module GlooLang
       #
       # Set up a file storage for an object.
       #
-      def initialize( pn, obj = nil )
+      def initialize( engine, pn, obj = nil )
+        @engine = engine
         @obj = obj
         @pn = pn
       end
@@ -22,7 +23,7 @@ module GlooLang
       # Save the object to the file.
       #
       def save
-        fs = FileSaver.new @pn, @obj
+        fs = FileSaver.new( @engine, @pn, @obj )
         fs.save
       end
 
@@ -30,13 +31,13 @@ module GlooLang
       # Load the object from the file.
       #
       def load
-        fl = FileLoader.new @pn
+        fl = FileLoader.new( @engine, @pn )
         fl.load
         @obj = fl.obj
         if @obj
-          $log.debug "Loaded object: #{@obj.name}"
+          @engine.log.debug "Loaded object: #{@obj.name}"
         else
-          $log.error "Error loading file at #{@pn}"
+          @engine.log.error "Error loading file at #{@pn}"
         end
       end
 

data/lib/gloo_lang/persist/persist_man.rb

@@ -15,7 +15,8 @@ module GlooLang
       #
       # Contructor for the persistence manager.
       #
-      def initialize
+      def initialize( engine )
+        @engine = engine
         @maps = []
       end
 
@@ -41,10 +42,10 @@ module GlooLang
       # Save one object to the file.
       #
       def save_one( name )
-        ref = GlooLang::Core::Pn.new name
+        ref = GlooLang::Core::Pn.new( @engine, name )
         obj = ref.resolve
         pn = get_full_path_name name
-        fs = GlooLang::Persist::FileStorage.new( pn, obj )
+        fs = GlooLang::Persist::FileStorage.new( @engine, pn, obj )
         fs.save
       end
 
@@ -56,11 +57,11 @@ module GlooLang
         return unless pns
 
         pns.each do |pn|
-          $log.debug "Load file(s) at: #{pn}"
-          fs = GlooLang::Persist::FileStorage.new( pn )
+          @engine.log.debug "Load file(s) at: #{pn}"
+          fs = GlooLang::Persist::FileStorage.new( @engine, pn )
           fs.load
           @maps << fs
-          $engine.event_manager.on_load fs.obj
+          @engine.event_manager.on_load fs.obj
         end
       end
 
@@ -72,7 +73,7 @@ module GlooLang
 
         if name.strip[ -1 ] == '*'
           pns = []
-          dir = File.join( $settings.project_path, name[ 0..-2 ] )
+          dir = File.join( @engine.settings.project_path, name[ 0..-2 ] )
           Dir.glob( "#{dir}*.gloo" ).each do |f|
             pns << f
           end
@@ -82,7 +83,7 @@ module GlooLang
           return [ ext_path ] if self.gloo_file?( ext_path )
 
           full_name = "#{name}#{file_ext}"
-          return [ File.join( $settings.project_path, full_name ) ]
+          return [ File.join( @engine.settings.project_path, full_name ) ]
         end
       end
 

data/lib/gloo_lang/utils/stats.rb

@@ -17,7 +17,8 @@ module GlooLang
       #
       # Create a stats utility class for the given directory.
       #
-      def initialize( dir, types, skip = [] )
+      def initialize( engine, dir, types, skip = [] )
+        @engine = engine
         @dir = dir
         setup_loc types
         @skip = skip
@@ -34,8 +35,8 @@ module GlooLang
       def valid?
         return true if @dir && File.directory?( @dir )
 
-        $engine.err DIR_NOT_FOUND_ERR
-        $engine.heap.it.set_to false
+        @engine.err DIR_NOT_FOUND_ERR
+        @engine.heap.it.set_to false
 
         return false
       end
@@ -136,7 +137,7 @@ module GlooLang
       def generate
         return if @folders
 
-        $log.debug 'Generating...'
+        @engine.log.debug 'Generating...'
         @folders = []
         @types = {}
         @file_cnt = 0

data/lib/gloo_lang/verbs/context.rb

@@ -24,7 +24,7 @@ module GlooLang
       # Show the current context.
       #
       def show_context
-        $log.show "Context:  #{$engine.heap.context}"
+        @engine.log.show "Context:  #{@engine.heap.context}"
       end
 
       #
@@ -52,9 +52,9 @@ module GlooLang
       #
       def set_context
         path = @tokens.second
-        $engine.heap.context.set_to path
-        $engine.heap.it.set_to path
-        $log.debug "Context set to #{$engine.heap.context}"
+        @engine.heap.context.set_to path
+        @engine.heap.it.set_to path
+        @engine.log.debug "Context set to #{@engine.heap.context}"
       end
 
     end

data/lib/gloo_lang/verbs/create.rb

@@ -23,7 +23,7 @@ module GlooLang
         value = @tokens.after_token( VAL )
 
         unless name
-          $engine.err NO_NAME_ERR
+          @engine.err NO_NAME_ERR
           return
         end
         create name, type, value
@@ -57,10 +57,10 @@ module GlooLang
         if GlooLang::Expr::LString.string?( value )
           value = GlooLang::Expr::LString.strip_quotes( value )
         end
-        obj = $engine.factory.create( { name: name, type: type, value: value } )
+        obj = @engine.factory.create( { name: name, type: type, value: value } )
 
         obj.add_default_children if obj&.add_children_on_create?
-        $engine.heap.it.set_to value
+        @engine.heap.it.set_to value
       end
 
     end

data/lib/gloo_lang/verbs/execute.rb

@@ -17,20 +17,20 @@ module GlooLang
       #
       def run
         if @tokens.token_count < 2
-          $engine.err MISSING_EXPR_ERR
+          @engine.err MISSING_EXPR_ERR
           return
         end
 
-        expr = GlooLang::Expr::Expression.new( @tokens.params )
+        expr = GlooLang::Expr::Expression.new( @engine, @tokens.params )
         cmd = expr.evaluate
-        $log.debug "starting cmd: #{cmd}"
+        @engine.log.debug "starting cmd: #{cmd}"
 
         pid = fork { exec( cmd ) }
         Process.wait pid
 
         # pid = spawn cmd
         # Process.wait pid
-        $log.debug "done executing cmd: #{cmd}"
+        @engine.log.debug "done executing cmd: #{cmd}"
 
         # system expr.evaluate  #, chdir: Dir.pwd
         # `#{expr.evaluate}`

data/lib/gloo_lang/verbs/help.rb

@@ -36,7 +36,7 @@ module GlooLang
         if opts
           dispatch opts
         else
-          $engine.help.page_topic DEFAULT_HELP
+          @engine.help.page_topic DEFAULT_HELP
         end
       end
 
@@ -46,7 +46,7 @@ module GlooLang
       def get_verb_list
         out = "Verbs:\n"
         str = ''
-        verbs = $engine.dictionary.get_verbs.sort_by( &:keyword )
+        verbs = @engine.dictionary.get_verbs.sort_by( &:keyword )
         verbs.each_with_index do |v, i|
           cut = v.keyword_shortcut.ljust( 5, ' ' )
           str << " #{cut} #{v.keyword.ljust( 20, ' ' )}"
@@ -72,7 +72,7 @@ module GlooLang
       def get_obj_list
         out = "Object Types:\n"
         str = ''
-        objs = $engine.dictionary.get_obj_types.sort_by( &:typename )
+        objs = @engine.dictionary.get_obj_types.sort_by( &:typename )
         objs.each_with_index do |o, i|
           name = o.typename
           if o.short_typename != o.typename
@@ -94,7 +94,7 @@ module GlooLang
       def get_topics
         out = "Help Topics:\n"
         str = ''
-        objs = $engine.help.topics.keys.sort
+        objs = @engine.help.topics.keys.sort
         objs.each_with_index do |o, i|
           str << " #{o.ljust( 30, ' ' )}"
           if ( ( i + 1 ) % 4 ).zero?
@@ -130,7 +130,7 @@ module GlooLang
       # Report an error with the inline help.
       #
       def report_help_error( opts )
-        $engine.err "#{HELP_NOT_FOUND_ERR} '#{opts}'"
+        @engine.err "#{HELP_NOT_FOUND_ERR} '#{opts}'"
       end
 
       #
@@ -139,13 +139,13 @@ module GlooLang
       def dispatch( opts )
         return if dispatch_help_page( opts )
 
-        $log.debug 'looking for built in help topic'
+        @engine.log.debug 'looking for built in help topic'
         cmd = DISPATCH[ opts.to_sym ]
         if cmd
-          $log.debug 'found help index'
+          @engine.log.debug 'found help index'
           send cmd
         else
-          $log.debug 'looking for entity help'
+          @engine.log.debug 'looking for entity help'
           entity_help opts
         end
       rescue
@@ -156,16 +156,16 @@ module GlooLang
       # Dispatch to a help page if we can find one.
       #
       def dispatch_help_page( opts )
-        if $engine.help.topic? opts
-          $log.debug 'found expanded help topic'
-          $engine.help.page_topic opts
+        if @engine.help.topic? opts
+          @engine.log.debug 'found expanded help topic'
+          @engine.help.page_topic opts
           return true
         end
 
-        key = $engine.dictionary.lookup_keyword opts
-        if $engine.help.topic? key
-          $log.debug 'found expanded help topic'
-          $engine.help.page_topic key
+        key = @engine.dictionary.lookup_keyword opts
+        if @engine.help.topic? key
+          @engine.log.debug 'found expanded help topic'
+          @engine.help.page_topic key
           return true
         end
 
@@ -177,8 +177,8 @@ module GlooLang
       # silent mode.
       #
       def show_output( out )
-        $engine.heap.it.set_to out
-        puts out unless $engine.args.quiet?
+        @engine.heap.it.set_to out
+        puts out unless @engine.args.quiet?
       end
 
       #
@@ -205,8 +205,8 @@ module GlooLang
       # information about.
       #
       def try_verb_help( opts )
-        if $engine.dictionary.verb?( opts )
-          t = $engine.dictionary.find_verb( opts )
+        if @engine.dictionary.verb?( opts )
+          t = @engine.dictionary.find_verb( opts )
           out = t.send 'help'
           show_output out
           return true
@@ -220,8 +220,8 @@ module GlooLang
       # information about.
       #
       def try_object_help( opts )
-        if $engine.dictionary.obj?( opts )
-          t = $engine.dictionary.find_obj( opts )
+        if @engine.dictionary.obj?( opts )
+          t = @engine.dictionary.find_obj( opts )
           out = t.send 'help'
           show_output out
           return true
@@ -234,14 +234,14 @@ module GlooLang
       # Show application settings.
       #
       def show_settings
-        $settings.show
+        @engine.settings.show
       end
 
       #
       # Show all keywords: verbs and objects.
       #
       def show_keywords
-        $engine.dictionary.show_keywords
+        @engine.dictionary.show_keywords
       end
 
       #

data/lib/gloo_lang/verbs/if.rb

@@ -55,7 +55,7 @@ module GlooLang
           # The first token is the verb, so we drop it.
           value = value[ 1..-1 ]
         else
-          $engine.err MISSING_EXPR_ERR
+          @engine.err MISSING_EXPR_ERR
         end
 
         return value
@@ -67,7 +67,7 @@ module GlooLang
       def evals_true( value )
         eval_result = false
         if value.count.positive?
-          expr = GlooLang::Expr::Expression.new( value )
+          expr = GlooLang::Expr::Expression.new( @engine, value )
           result = expr.evaluate
           eval_result = true if result == true
           eval_result = true if result.is_a?( Numeric ) && result != 0
@@ -81,7 +81,7 @@ module GlooLang
       #
       def run_then
         cmd = @tokens.expr_after( THEN )
-        i = $engine.parser.parse_immediate cmd
+        i = @engine.parser.parse_immediate cmd
         return unless i
 
         i.run

data/lib/gloo_lang/verbs/list.rb

@@ -22,7 +22,7 @@ module GlooLang
         if obj
           show_target( obj, levels )
         else
-          $engine.err "#{TARGET_MISSING_ERR} #{target}"
+          @engine.err "#{TARGET_MISSING_ERR} #{target}"
         end
       end
 
@@ -30,9 +30,9 @@ module GlooLang
       # Determine the target object for the show command.
       #
       def determine_target
-        return $engine.heap.context if @tokens.token_count == 1
+        return @engine.heap.context if @tokens.token_count == 1
 
-        return GlooLang::Core::Pn.new( @tokens.second )
+        return GlooLang::Core::Pn.new( @engine, @tokens.second )
       end
 
       #
@@ -72,12 +72,12 @@ module GlooLang
       #
       def show_obj( obj, indent = '  ' )
         if obj.multiline_value? && obj.value_is_array?
-          $log.show "#{indent}#{obj.name} [#{obj.type_display}] :"
+          @engine.log.show "#{indent}#{obj.name} [#{obj.type_display}] :"
           obj.value.each do |line|
-            $log.show "#{indent}  #{line}"
+            @engine.log.show "#{indent}  #{line}"
           end
         else
-          $log.show "#{indent}#{obj.name} [#{obj.type_display}] : #{obj.value}"
+          @engine.log.show "#{indent}#{obj.name} [#{obj.type_display}] : #{obj.value}"
         end
       end
 
@@ -86,7 +86,7 @@ module GlooLang
       #
       def determine_levels
         # Check settings for the default value.
-        levels = $settings.list_indent
+        levels = @engine.settings.list_indent
         return levels if levels
 
         # Last chance: use the default

data/lib/gloo_lang/verbs/load.rb

@@ -19,10 +19,10 @@ module GlooLang
         fn = @tokens.second
 
         if fn
-          $log.debug "Getting ready to load file: #{fn}"
-          $engine.persist_man.load fn
+          @engine.log.debug "Getting ready to load file: #{fn}"
+          @engine.persist_man.load fn
         else
-          $engine.err MISSING_EXPR_ERR
+          @engine.err MISSING_EXPR_ERR
         end
       end