gloo-lang 0.9.6 → 0.9.9

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
 

data/lib/gloo_lang/verbs/move.rb

@@ -56,15 +56,15 @@ module GlooLang
       def lookup_obj
         arr = @tokens.before_token( TO )
         if arr.count == 1
-          $engine.err MISSING_SRC_ERR
+          @engine.err MISSING_SRC_ERR
           return
         end
 
         name = arr[ 1 ]
-        pn = GlooLang::Core::Pn.new name
+        pn = GlooLang::Core::Pn.new( @engine, name )
         o = pn.resolve
 
-        $engine.err( "#{MISSING_SRC_OBJ_ERR} #{name}" ) unless o
+        @engine.err( "#{MISSING_SRC_OBJ_ERR} #{name}" ) unless o
         return o
       end
 
@@ -74,13 +74,13 @@ module GlooLang
       def lookup_dst
         dst = @tokens.after_token( TO )
         unless dst
-          $engine.err MISSING_DST_ERR
+          @engine.err MISSING_DST_ERR
           return nil
         end
 
-        pn = GlooLang::Core::Pn.new dst
+        pn = GlooLang::Core::Pn.new( @engine, dst )
         o = pn.resolve
-        $engine.err( "#{MISSING_DST_OBJ_ERR} '#{dst}'" ) unless o
+        @engine.err( "#{MISSING_DST_OBJ_ERR} '#{dst}'" ) unless o
         return o
       end
 

data/lib/gloo_lang/verbs/put.rb

@@ -54,7 +54,7 @@ module GlooLang
       def fetch_value_tokens
         value = @tokens.before_token( INTO )
         if value.nil? || ( value.count <= 1 )
-          $engine.err MISSING_EXPR_ERR
+          @engine.err MISSING_EXPR_ERR
           return nil
         end
 
@@ -69,7 +69,7 @@ module GlooLang
         target = @tokens.after_token( INTO )
         return target if target
 
-        $engine.err INTO_MISSING_ERR
+        @engine.err INTO_MISSING_ERR
         return nil
       end
 
@@ -77,15 +77,15 @@ module GlooLang
       # Update the target with the new value.
       #
       def update_target( target, value )
-        pn = GlooLang::Core::Pn.new target
+        pn = GlooLang::Core::Pn.new( @engine, target )
         o = pn.resolve
         if o.nil?
-          $engine.err "#{TARGET_ERR} #{target}"
+          @engine.err "#{TARGET_ERR} #{target}"
         elsif value.count.positive?
-          expr = GlooLang::Expr::Expression.new( value )
+          expr = GlooLang::Expr::Expression.new( @engine, value )
           result = expr.evaluate
           o.set_value result
-          $engine.heap.it.set_to result
+          @engine.heap.it.set_to result
         end
       end
 

data/lib/gloo_lang/verbs/quit.rb

@@ -18,7 +18,7 @@ module GlooLang
       # engine stop gracefully next time through the loop.
       #
       def run
-        $engine.stop_running
+        @engine.stop_running
       end
 
       #

data/lib/gloo_lang/verbs/run.rb

@@ -19,7 +19,7 @@ module GlooLang
       #
       def run
         if @tokens.token_count < 2
-          $engine.err MISSING_EXPR_ERR
+          @engine.err MISSING_EXPR_ERR
           return
         end
 
@@ -54,7 +54,7 @@ module GlooLang
       # Run a script specified by pathname
       #
       def run_script
-        GlooLang::Exec::Runner.run @tokens.second
+        GlooLang::Exec::Runner.run( @engine, @tokens.second )
       end
 
       #
@@ -62,12 +62,12 @@ module GlooLang
       #
       def run_expression
         unless @tokens.token_count > 2
-          $engine.err MISSING_EXPR_ERR
+          @engine.err MISSING_EXPR_ERR
           return
         end
 
-        expr = GlooLang::Expr::Expression.new( @tokens.params[ 1..-1 ] )
-        $engine.parser.run expr.evaluate
+        expr = GlooLang::Expr::Expression.new( @engine, @tokens.params[ 1..-1 ] )
+        @engine.parser.run expr.evaluate
       end
 
     end

data/lib/gloo_lang/verbs/save.rb

@@ -17,7 +17,7 @@ module GlooLang
       def run
         # TODO:  Not currently using folders or keeping
         # track of where the object was loaded from.
-        $engine.persist_man.save @tokens.second
+        @engine.persist_man.save @tokens.second
       end
 
       #

data/lib/gloo_lang/verbs/show.rb

@@ -17,12 +17,12 @@ module GlooLang
       #
       def run
         if @tokens.token_count > 1
-          expr = GlooLang::Expr::Expression.new( @tokens.params )
+          expr = GlooLang::Expr::Expression.new( @engine, @tokens.params )
           result = expr.evaluate
-          $log.show get_formatted_string( result )
-          $engine.heap.it.set_to result
+          @engine.log.show get_formatted_string( result )
+          @engine.heap.it.set_to result
         else
-          $log.show ''
+          @engine.log.show ''
         end
       end
 
@@ -51,7 +51,7 @@ module GlooLang
       #
       def get_formatted_string( str )
         if @params&.token_count&.positive?
-          expr = GlooLang::Expr::Expression.new( @params.tokens )
+          expr = GlooLang::Expr::Expression.new( @engine, @params.tokens )
           val = expr.evaluate
           color = val.to_sym
           # return ColorizedString[ str.to_s ].colorize( color )

data/lib/gloo_lang/verbs/tell.rb

@@ -51,7 +51,7 @@ module GlooLang
       def setup_msg
         @msg = @tokens.after_token( TO )
 
-        $engine.err( UNKNOWN_MSG_ERR ) unless @msg
+        @engine.err( UNKNOWN_MSG_ERR ) unless @msg
       end
 
       #
@@ -59,7 +59,7 @@ module GlooLang
       #
       def setup_target
         @obj_name = @tokens.second
-        pn = GlooLang::Core::Pn.new @obj_name
+        pn = GlooLang::Core::Pn.new( @engine, @obj_name )
         @target_obj = pn.resolve
       end
 
@@ -68,9 +68,10 @@ module GlooLang
       #
       def dispatch_msg
         if @target_obj
-          GlooLang::Exec::Dispatch.message @msg, @target_obj, @params
+          GlooLang::Exec::Dispatch.message(
+            @engine, @msg, @target_obj, @params )
         else
-          $engine.err "#{OBJ_NOT_FOUND_ERR} #{@obj_name}"
+          @engine.err "#{OBJ_NOT_FOUND_ERR} #{@obj_name}"
         end
       end
 

data/lib/gloo_lang/verbs/unless.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_false( 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 == false
           eval_result = true if result.is_a?( Numeric ) && result.zero?
@@ -81,7 +81,7 @@ module GlooLang
       #
       def run_do
         cmd = @tokens.expr_after( DO )
-        i = $engine.parser.parse_immediate cmd
+        i = @engine.parser.parse_immediate cmd
         return unless i
 
         i.run

data/lib/gloo_lang/verbs/version.rb

@@ -15,7 +15,7 @@ module GlooLang
       # Run the verb.
       #
       def run
-        $log.show GlooLang::App::Info.full_version
+        @engine.log.show GlooLang::App::Info.full_version
       end
 
       #

data/lib/gloo_lang/verbs/wait.rb

@@ -17,7 +17,7 @@ module GlooLang
       def run
         x = 1
         if @tokens.token_count > 1
-          expr = GlooLang::Expr::Expression.new( @tokens.params )
+          expr = GlooLang::Expr::Expression.new( @engine, @tokens.params )
           x = expr.evaluate.to_i
         end
         sleep x

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloo-lang
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.9
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -309,9 +309,7 @@ files:
 - lib/gloo_lang/objs/ctrl/each.rb
 - lib/gloo_lang/objs/ctrl/repeat.rb
 - lib/gloo_lang/objs/data/markdown.rb
-- lib/gloo_lang/objs/data/mysql.rb
 - lib/gloo_lang/objs/data/query.rb
-- lib/gloo_lang/objs/data/sqlite.rb
 - lib/gloo_lang/objs/data/table.rb
 - lib/gloo_lang/objs/dt/date.rb
 - lib/gloo_lang/objs/dt/datetime.rb

data/lib/gloo_lang/objs/data/mysql.rb

@@ -1,192 +0,0 @@
-# Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 2020 Eric Crane.  All rights reserved.
-#
-# A MySQL database connection.
-#
-#
-# https://github.com/brianmario/mysql2
-# https://www.rubydoc.info/gems/mysql2/0.2.3/Mysql2/Client
-#
-# Connection Parameters
-#   user     = opts[:username]
-#   pass     = opts[:password]
-#   host     = opts[:host] || 'localhost'
-#   port     = opts[:port] || 3306
-#   database = opts[:database]
-#   socket   = opts[:socket]
-#   flags    = opts[:flags] || 0
-#
-require 'mysql2'
-
-module GlooLang
-  module Objs
-    class Mysql < GlooLang::Core::Obj
-
-      KEYWORD = 'mysql'.freeze
-      KEYWORD_SHORT = 'mysql'.freeze
-
-      HOST = 'host'.freeze
-      DB = 'database'.freeze
-      USER = 'username'.freeze
-      PASSWD = 'password'.freeze
-
-      #
-      # The name of the object type.
-      #
-      def self.typename
-        return KEYWORD
-      end
-
-      #
-      # The short name of the object type.
-      #
-      def self.short_typename
-        return KEYWORD_SHORT
-      end
-
-      # ---------------------------------------------------------------------
-      #    Children
-      # ---------------------------------------------------------------------
-
-      #
-      # Does this object have children to add when an object
-      # is created in interactive mode?
-      # This does not apply during obj load, etc.
-      #
-      def add_children_on_create?
-        return true
-      end
-
-      #
-      # Add children to this object.
-      # This is used by containers to add children needed
-      # for default configurations.
-      #
-      def add_default_children
-        fac = $engine.factory
-        fac.create_string HOST, nil, self
-        fac.create_string DB, nil, self
-        fac.create_string USER, nil, self
-        fac.create_string PASSWD, nil, self
-      end
-
-      # ---------------------------------------------------------------------
-      #    Messages
-      # ---------------------------------------------------------------------
-
-      #
-      # Get a list of message names that this object receives.
-      #
-      def self.messages
-        return super + [ 'verify' ]
-      end
-
-      #
-      # SSH to the host and execute the command, then update result.
-      #
-      def msg_verify
-        return unless connects?
-
-        $engine.heap.it.set_to true
-      end
-
-      # ---------------------------------------------------------------------
-      #    DB functions (all database connections)
-      # ---------------------------------------------------------------------
-
-      #
-      # Open a connection and execute the SQL statement.
-      # Return the resulting data.
-      #
-      def query( sql, params = nil )
-        h = {
-          host: host_value,
-          database: db_value,
-          username: user_value,
-          password: passwd_value
-        }
-        client = Mysql2::Client.new( h )
-        return client.query( sql ) unless params
-
-        pst = client.prepare( sql )
-        return pst.execute( *params )
-      end
-
-      # ---------------------------------------------------------------------
-      #    Private functions
-      # ---------------------------------------------------------------------
-
-      private
-
-      #
-      # Get the host from the child object.
-      # Returns nil if there is none.
-      #
-      def host_value
-        o = find_child HOST
-        return nil unless o
-
-        o = GlooLang::Objs::Alias.resolve_alias( o )
-        return o.value
-      end
-
-      #
-      # Get the Database name from the child object.
-      # Returns nil if there is none.
-      #
-      def db_value
-        o = find_child DB
-        return nil unless o
-
-        o = GlooLang::Objs::Alias.resolve_alias( o )
-        return o.value
-      end
-
-      #
-      # Get the Username from the child object.
-      # Returns nil if there is none.
-      #
-      def user_value
-        o = find_child USER
-        return nil unless o
-
-        o = GlooLang::Objs::Alias.resolve_alias( o )
-        return o.value
-      end
-
-      #
-      # Get the Password name from the child object.
-      # Returns nil if there is none.
-      #
-      def passwd_value
-        o = find_child PASSWD
-        return nil unless o
-
-        o = GlooLang::Objs::Alias.resolve_alias( o )
-        return o.value
-      end
-
-      #
-      # Try the connection and make sure it works.
-      # Returns true if we can establish a connection.
-      #
-      def connects?
-        begin
-          h = {
-            host: host_value,
-            database: db_value,
-            username: user_value,
-            password: passwd_value
-          }
-          Mysql2::Client.new( h )
-        rescue => e
-          $engine.err e.message
-          $engine.heap.it.set_to false
-          return false
-        end
-        return true
-      end
-
-    end
-  end
-end

data/lib/gloo_lang/objs/data/sqlite.rb

@@ -1,159 +0,0 @@
-# Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 2020 Eric Crane.  All rights reserved.
-#
-# A Sqlite3 database connection.
-#
-# https://www.rubydoc.info/gems/sqlite3/1.3.11
-# https://www.devdungeon.com/content/ruby-sqlite-tutorial
-#
-# db.results_as_hash = true
-#   Set results to return as Hash object.
-#   This is slower but offers a huge convenience.
-#   Consider turning it off for high performance situations.
-#   Each row will have the column name as the hash key.
-#
-# # Alternatively, to only get one row and discard the rest,
-# replace `db.query()` with `db.get_first_value()`.
-#
-require 'sqlite3'
-
-module GlooLang
-  module Objs
-    class Sqlite < GlooLang::Core::Obj
-
-      KEYWORD = 'sqlite'.freeze
-      KEYWORD_SHORT = 'sqlite'.freeze
-
-      DB = 'database'.freeze
-      DEFAULT_DB = 'test.db'.freeze
-
-      DB_REQUIRED_ERR = 'The database name is required!'.freeze
-      DB_NOT_FOUND_ERR = 'The database file was not found!'.freeze
-
-      #
-      # The name of the object type.
-      #
-      def self.typename
-        return KEYWORD
-      end
-
-      #
-      # The short name of the object type.
-      #
-      def self.short_typename
-        return KEYWORD_SHORT
-      end
-
-      # ---------------------------------------------------------------------
-      #    Children
-      # ---------------------------------------------------------------------
-
-      #
-      # Does this object have children to add when an object
-      # is created in interactive mode?
-      # This does not apply during obj load, etc.
-      #
-      def add_children_on_create?
-        return true
-      end
-
-      #
-      # Add children to this object.
-      # This is used by containers to add children needed
-      # for default configurations.
-      #
-      def add_default_children
-        fac = $engine.factory
-        fac.create_string DB, DEFAULT_DB, self
-      end
-
-      # ---------------------------------------------------------------------
-      #    Messages
-      # ---------------------------------------------------------------------
-
-      #
-      # Get a list of message names that this object receives.
-      #
-      def self.messages
-        return super + [ 'verify' ]
-      end
-
-      #
-      # Verify access to the Sqlite database specified.
-      #
-      def msg_verify
-        name = db_value
-        if name.empty?
-          $engine.err DB_REQUIRED_ERR
-          $engine.heap.it.set_to false
-          return
-        end
-
-        unless File.exist? name
-          $engine.err DB_NOT_FOUND_ERR
-          $engine.heap.it.set_to false
-          return
-        end
-
-        return unless connects?
-
-        $engine.heap.it.set_to true
-      end
-
-      # ---------------------------------------------------------------------
-      #    DB functions (all database connections)
-      # ---------------------------------------------------------------------
-
-      #
-      # Open a connection and execute the SQL statement.
-      # Return the resulting data.
-      #
-      def query( sql, params = nil )
-        name = db_value
-        unless name
-          $engine.err DB_REQUIRED_ERR
-          return
-        end
-
-        db = SQLite3::Database.open name
-        db.results_as_hash = true
-        return db.query( sql, params )
-      end
-
-      # ---------------------------------------------------------------------
-      #    Private functions
-      # ---------------------------------------------------------------------
-
-      private
-
-      #
-      # Get the Database file from the child object.
-      # Returns nil if there is none.
-      #
-      def db_value
-        o = find_child DB
-        return nil unless o
-
-        return o.value
-      end
-
-      #
-      # Try the connection and make sure it works.
-      # Returns true if we can connect and do a query.
-      #
-      def connects?
-        begin
-          db = SQLite3::Database.open db_value
-          sql = "SELECT COUNT(name) FROM sqlite_master WHERE type='table'"
-          db.get_first_value sql
-        rescue => e
-          $engine.err e.message
-          $engine.heap.it.set_to false
-          return false
-        end
-        return true
-      end
-
-    end
-  end
-end