gloo-lang 0.9.5 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d19934c8b9f0ae7c4b7770b353555c19c4acb4b755775222e14cde8aa1a4bbee
-  data.tar.gz: b88f21b0a86cf71b92fcc3fe8c018884109b83293e54db266bb17cef5111e7c0
+  metadata.gz: dd3e269694e1c7aef191b9fcd1bae34b29932fc2215f90f372cfd5d5d2748bc0
+  data.tar.gz: 7976911ab79e1679c1940e43217f4c8fc533bab59fbf2a71b857ee4a7aeefed2
 SHA512:
-  metadata.gz: f3475c8c03da31aa4a05feb948b10a89a3b0fae818800ef14329c5028add3e5a788f3a6e7fff7b21c762c53fb67619ffa875dd6586044373110316e78c494480
-  data.tar.gz: 27d759c5e86633db59786a3a7db230c4f26c2e54d94a3d339af759983799fd6a4dccb21b84f0dd4cd8de80f1f3a46650c0d3bb283cee246ce95f5cca439ace4e
+  metadata.gz: f9be9692d331f3767e78efc2e9a5fcb5d826e11429240cf77ae9d134a41408b2fbed7a144b54a6ba8291619ddc4bb108cecf3743deb53f96e425018937d8fc28
+  data.tar.gz: b29cc45d25aa4472d8112caaf08c20deccf245c9f3a0e3392e102a558e4c13daba147b9077d057d9fb67b847bc04e0ffdd5642292376857bacf1cf33896473ae

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    gloo-lang (0.9.4)
+    gloo-lang (0.9.7)
       chronic (~> 0.10, >= 0.10.2)
       json (~> 2.1, >= 2.1.0)
       net-ssh (~> 6.1, >= 6.1.0)
       openssl (~> 2.1, >= 2.1.0)
+      tty-platform (~> 0.3, >= 0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -37,6 +38,7 @@ GEM
     rubocop-ast (1.16.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
+    tty-platform (0.3.0)
     unicode-display_width (2.1.0)
 
 PLATFORMS

data/lib/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.8

data/lib/gloo_lang/app/engine.rb

@@ -19,12 +19,14 @@ module GlooLang
       #
       # Set up the engine with basic elements.
       #
-      def initialize( params = [], platform=nil )
+      def initialize( params = [], platform=Platform, log=Log )
         $engine = self
         @args = Args.new( params )
         $settings = Settings.new( ENV[ 'GLOO_ENV' ] )
-        $log = Log.new( @args.quiet? )
-        @platform = platform ? platform : Platform.new
+
+        $log = log.new( @args.quiet? )
+        @platform = platform.new
+
         $log.debug 'engine intialized...'
       end
 

data/lib/gloo_lang/app/log.rb

@@ -4,8 +4,6 @@
 # Application Logging wrapper.
 #
 require 'active_support'
-require 'colorize'
-require 'colorized_string'
 
 module GlooLang
   module App
@@ -18,11 +16,11 @@ module GlooLang
       # If quiet is true, then message are written to the log
       # but not to the console.
       #
-      def initialize( quiet )
+      def initialize( quiet=true )
         f = File.join( $settings.log_path, 'gloo.log' )
         @logger = Logger.new( f )
         @logger.level = Logger::DEBUG
-        @quiet = quiet
+        @quite = quiet
       end
 
       #
@@ -45,7 +43,7 @@ module GlooLang
       #
       def info( msg )
         @logger.info msg
-        puts msg.blue unless @quiet
+        puts msg unless @quiet
       end
 
       #
@@ -54,7 +52,7 @@ module GlooLang
       #
       def warn( msg )
         @logger.warn msg
-        puts msg.yellow unless @quiet
+        puts msg unless @quiet
       end
 
       #
@@ -68,11 +66,11 @@ module GlooLang
         if ex
           @logger.error ex.message
           @logger.error ex.backtrace
-          puts msg.red unless @quiet
-          puts ex.message.red unless @quiet
+          puts msg unless @quiet
+          puts ex.message unless @quiet
           puts ex.backtrace unless @quiet
         else
-          puts msg.red unless @quiet
+          puts msg unless @quiet
         end
       end
 

data/lib/gloo_lang/app/settings.rb

@@ -5,7 +5,6 @@
 #
 
 require 'yaml'
-require 'colorize'
 
 module GlooLang
   module App
@@ -47,11 +46,11 @@ module GlooLang
       # Can be seen in app with 'help settings'
       #
       def show
-        puts "\nApplication Settings:".blue
-        puts '  Startup with:  '.yellow + @start_with.white
-        puts '  Indent in Listing:  '.yellow + @list_indent.to_s.white
-        puts '  Screen Lines:  '.yellow + GlooLang::App::Settings.lines.to_s.white
-        puts '  Page Size:  '.yellow + GlooLang::App::Settings.page_size.to_s.white
+        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 ''
         self.show_paths
         puts ''
@@ -61,12 +60,37 @@ module GlooLang
       # Show path settings
       #
       def show_paths
-        puts '  User Root Path is here:  '.yellow + @user_root.white
-        puts '  Projects Path:  '.yellow + @project_path.white
-        puts '  Tmp Path:  '.yellow + @tmp_path.white
-        puts '  Debug Path:  '.yellow + @debug_path.white
+        puts '  User Root Path is here:  ' + @user_root
+        puts '  Projects Path:  ' + @project_path
+        puts '  Tmp Path:  ' + @tmp_path
+        puts '  Debug Path:  ' + @debug_path
       end
 
+      # #
+      # # Show the current application settings.
+      # # Can be seen in app with 'help settings'
+      # #
+      # def show
+      #   puts "\nApplication Settings:".blue
+      #   puts '  Startup with:  '.yellow + @start_with.white
+      #   puts '  Indent in Listing:  '.yellow + @list_indent.to_s.white
+      #   puts '  Screen Lines:  '.yellow + GlooLang::App::Settings.lines.to_s.white
+      #   puts '  Page Size:  '.yellow + GlooLang::App::Settings.page_size.to_s.white
+      #   puts ''
+      #   self.show_paths
+      #   puts ''
+      # end
+      #
+      # #
+      # # Show path settings
+      # #
+      # def show_paths
+      #   puts '  User Root Path is here:  '.yellow + @user_root.white
+      #   puts '  Projects Path:  '.yellow + @project_path.white
+      #   puts '  Tmp Path:  '.yellow + @tmp_path.white
+      #   puts '  Debug Path:  '.yellow + @debug_path.white
+      # end
+
       #
       # Get the number of vertical lines on screen.
       #

data/lib/gloo_lang/verbs/show.rb

@@ -3,7 +3,7 @@
 #
 # Show a single object's value.
 #
-require 'colorized_string'
+# require 'colorized_string'
 
 module GlooLang
   module Verbs
@@ -54,7 +54,8 @@ module GlooLang
           expr = GlooLang::Expr::Expression.new( @params.tokens )
           val = expr.evaluate
           color = val.to_sym
-          return ColorizedString[ str.to_s ].colorize( color )
+          # return ColorizedString[ str.to_s ].colorize( color )
+          return str.to_s
         end
         return str
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gloo-lang
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.8
 platform: ruby
 authors:
 - Eric Crane
@@ -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