gloo 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02f90941d4a489efde1a15b50d55c85af80e1ac02e012102644a21613ce23e90
-  data.tar.gz: 3216f0732a0e59b258453ce5d929f751477a264586e73f668ced1332cb601d61
+  metadata.gz: 34119d3b6c3fc676b45d7172a6300e1bef50e7bfd480ecaaeab9ad39be040cc4
+  data.tar.gz: b812253883e7589dea4b6588b85661a1cf6e849a61e2c36a658be8279a0a6411
 SHA512:
-  metadata.gz: b68948e64413281d9a1f51542888b6818adf28adfb0a625e0c8415c596600207365d761a6c5ebe36c5cebbeb6ab7ee6a6244dc1e8f215b58f5b7000909032d18
-  data.tar.gz: 9cef0e42026158497bf424828e691958a196ff7a6cd65771dff504a59c2a205691b997485e7cd1b50e8882d349076b0d8f8b8564f794d953021cf2e4a2310667
+  metadata.gz: 33d90fe0f4135042d0d5d6cfa4323438183e43e034ce525542bff0aa34bd16baf703ed7819de51c5ad19b38dd51fec8423a4999179e08e41e0dbc89ad0f3d20c
+  data.tar.gz: 017e592805017fc75f776a9a1673eb50aba32ef227260c573f382e8dc83d067ac2429b1f18d722df22672b8f7c57cd941769180d517398db74cde98aeb56a64d

data/.ruby-version

@@ -1 +1 @@
-ruby-3.0.2
+ruby-3.2.5

data/gloo.gemspec

@@ -33,10 +33,14 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport", '~> 6.1', ">= 6.1.5"
   spec.add_dependency 'chronic', '~> 0.10', '>= 0.10.2'
-  spec.add_dependency 'colorize', '~> 0.8', '>= 0.8.1'
-  spec.add_dependency 'tty', '~> 0.10', '>= 0.10.0'
+
+  spec.add_dependency 'colorize', '~> 1.1.0', '>= 1.1.0'
+  spec.add_dependency 'inquirer'
+  spec.add_dependency 'reline'  
+  spec.add_dependency 'terminal-table'
+  
   spec.add_dependency 'json', '~> 2.1', '>= 2.1.0'
-  spec.add_dependency 'openssl', '~> 2.1', '>= 2.1.0'
+  spec.add_dependency 'openssl'
   spec.add_dependency 'net-ssh', '~> 6.1', '>= 6.1.0'
   spec.add_dependency 'mysql2', '~> 0.5', '>= 0.5.3'
   spec.add_dependency 'sqlite3', '~> 1.4', '>= 1.4.2'
@@ -44,4 +48,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'pg', '~> 1.5.4'
   spec.add_dependency 'thin', '~> 1.8.2'
   spec.add_dependency 'redcarpet', '~> 3.6.0'
+  spec.add_dependency 'bcrypt', '~> 3.1.20'
 end

data/lib/VERSION

@@ -1 +1 @@
-3.3.0
+3.4.0

data/lib/VERSION_NOTES

@@ -1,3 +1,10 @@
+3.4.0 - 2024.09.22
+ - Refactor for old TTY lib
+ - Additional web server functionality
+ - Web session and security helpers
+ - Other functions in support of serving web pages and running web server
+
+
 3.3.0 - 2024.08.16
  - Adds nil converters to string and integer.
  - Adds render to markdown object to convert to html

data/lib/gloo/app/engine.rb

@@ -182,7 +182,7 @@ module Gloo
       #
       def loop
         while @running
-          @last_cmd = @platform.prompt_cmd
+          @last_cmd = @platform.prompt.ask
           process_cmd
         end
       end

data/lib/gloo/app/log.rb

@@ -34,7 +34,7 @@ module Gloo
       # If quiet is true, then message are written to the log
       # but not to the console.
       #
-      def initialize( engine, quiet=true )
+      def initialize( engine, quiet = true )
         @engine = engine
         @quite = quiet
         @debug = engine.settings.debug
@@ -59,30 +59,30 @@ module Gloo
       #    Files
       # ---------------------------------------------------------------------
 
-      # 
+      #
       # Get the log file.
-      # 
+      #
       def log_file
         return File.join( @engine.settings.log_path, LOG_FILE )
       end
 
-      # 
+      #
       # Get the error log file.
-      # 
+      #
       def err_file
         return File.join( @engine.settings.log_path, ERROR_FILE )
       end
 
-
       # ---------------------------------------------------------------------
       #    Static Helpers
       # ---------------------------------------------------------------------
 
-      # 
+      #
       # Does the given str represent a logging level?
-      # 
-      def self.is_level? str
+      #
+      def self.is_level?( str )
         return false unless str.is_a? String
+
         return LEVELS.include? str.strip.downcase
       end
 
@@ -90,9 +90,9 @@ module Gloo
       #    Log file clearing
       # ---------------------------------------------------------------------
 
-      # 
+      #
       # Clear the log files.
-      # 
+      #
       def clear
         File.write( log_file, CLEARED )
         File.write( err_file, CLEARED )
@@ -100,7 +100,6 @@ module Gloo
         create_loggers
       end
 
-
       # ---------------------------------------------------------------------
       #    Standard Output
       # ---------------------------------------------------------------------
@@ -108,13 +107,13 @@ module Gloo
       #
       # Show a message unless we're in quite mode.
       #
-      def show( msg, color=nil )
+      def show( msg, color = nil )
         return if @quiet
 
         if color
           puts ColorizedString[ msg ].colorize( color.to_sym )
         else
-          puts msg 
+          puts msg
         end
       end
 
@@ -122,9 +121,9 @@ module Gloo
       #    Logging functions
       # ---------------------------------------------------------------------
 
-      # 
+      #
       # Write to the specified level.
-      # 
+      #
       def write( msg, level )
         if level == DEBUG
           debug msg

data/lib/gloo/app/platform.rb

@@ -4,16 +4,8 @@
 # Handle input and output for the CLI platform.
 #
 require 'active_support'
-require 'tty-prompt'
-require 'tty-cursor'
-require 'tty-screen'
-require 'tty-pager'
-require 'tty-markdown'
-require 'tty-editor'
-require 'tty-table'
 require 'colorize'
 require 'colorized_string'
-require 'pastel'
 
 module Gloo
   module App
@@ -21,62 +13,28 @@ module Gloo
 
       DEFAULT_TMP_FILE = 'tmp.txt'.freeze
 
-      attr_reader :prompt
+      attr_reader :prompt, :table
 
       #
       # Set up Platform.
       #
       def initialize
-        @prompt = TTY::Prompt.new
+        @prompt = Gloo::App::Prompt.new( self )
+        @table = Gloo::App::Table.new( self )
       end
 
       #
       # Show a message.
       #
-      def show( msg, md=false, page=false )
-        if md
-          # 2024.08.16 - TTY::Markdown.parse msg was not working.
-          # Tried with redcarpet and it was not working either.
-          # So just leaving it for now.  Not sure I even really need it.
-          # TODO: Revisit and clean up.
-
-          # msg = TTY::Markdown.parse msg
-          # msg = Gloo::Objs::Markdown.md_2_manpage( msg )
-        end
-
-        if page
-          # pager = TTY::Pager::SystemPager.new command: 'less -R'
-          pager = TTY::Pager.new
-          pager.page( msg )
-        else
-          puts msg
-        end
-      end
-
-      #
-      # Prompt for the next command.
-      #
-      def prompt_cmd
-        return @prompt.ask( default_prompt )
+      def show( msg )
+        puts msg
       end
 
       #
       # Clear the screen.
       #
       def clear_screen
-        @cursor ||= TTY::Cursor
-        print @cursor.clear_screen
-        print @cursor.move_to( 0, 0 )
-      end
-
-      #
-      # Edit some temporary text and return the edited text.
-      #
-      def edit initial_value
-        tmp = File.join( $settings.tmp_path, DEFAULT_TMP_FILE )
-        File.open( tmp, 'w' ) { |file| file.write( initial_value ) }
-        TTY::Editor.open( tmp )
-        return File.read( tmp )
+        puts "\e[H\e[2J"
       end
 
       # 
@@ -86,6 +44,7 @@ module Gloo
         return Gloo::Persist::DiscMech.new( engine )
       end
 
+
       # ---------------------------------------------------------------------
       #    Color helper
       # ---------------------------------------------------------------------
@@ -98,36 +57,6 @@ module Gloo
         return colorized.to_s
       end
 
-      # ---------------------------------------------------------------------
-      #    Table helper
-      # ---------------------------------------------------------------------
-
-      #
-      # Show the given table data.
-      #
-      def show_table( headers, data, title = nil )
-        pastel = ::Pastel.new
-        if headers
-          table = TTY::Table.new headers, data
-        else
-          table = TTY::Table.new rows: data
-        end
-        pad = [ 0, 1, 0, 1 ]
-        rendered = table.render( :ascii, indent: 2, padding: pad ) do |r|
-          r.border.style = :blue
-          r.filter = proc do |val, row_index, _col_index|
-            # col_index % 2 == 1 ? pastel.red.on_green(val) : val
-            if headers && row_index.zero?
-              pastel.blue( val )
-            else
-              row_index.odd? ? pastel.white( val ) : pastel.yellow( val )
-            end
-          end
-        end
-        puts
-        puts "#{title.white}" if title
-        puts "#{rendered}\n\n"
-      end
 
       # ---------------------------------------------------------------------
       #    Sceen helpers
@@ -136,14 +65,16 @@ module Gloo
       # Get the number of vertical lines on screen.
       #
       def lines
-        TTY::Screen.rows
+        rows, columns = $stdout.winsize
+        return rows
       end
 
       #
       # Get the number of horizontal columns on screen.
       #
       def cols
-        TTY::Screen.cols
+        rows, columns = $stdout.winsize
+        return columns
       end
 
       # ---------------------------------------------------------------------
@@ -152,16 +83,6 @@ module Gloo
 
       private
 
-      #
-      # Get the default prompt text.
-      #
-      def default_prompt
-        dt = DateTime.now
-        d = dt.strftime( '%Y.%m.%d' )
-        t = dt.strftime( '%I:%M:%S' )
-        return "#{'gloo'.blue} #{d.yellow} #{t.white} >"
-      end
-
     end
   end
 end

data/lib/gloo/app/prompt.rb

@@ -0,0 +1,90 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# CLI input.
+#
+require 'active_support'
+require 'colorize'
+require 'colorized_string'
+require 'inquirer'
+require "reline"
+
+module Gloo
+  module App
+    class Prompt
+
+      #
+      # Set up Prompt.
+      #
+      def initialize platform
+        @platform = platform
+      end
+
+      #
+      # Show the prompt and get input.
+      # Use the default prompt if none is provided.
+      #
+      def ask( prompt=nil )
+        prompt ||= default_prompt
+
+        response = Reline.readline( "#{prompt} ", true)
+
+        # I don't like this one because it appends a ':' to the prompt.
+        # response = Ask.input prompt
+
+        # This was just the brute force way to do it.
+        # puts prompt
+        # return $stdin.gets.chomp
+
+        return response
+      end
+
+      # 
+      # Prompt for multiline input.
+      # 
+      def multiline( prompt )
+        puts 'To end input, type a period on a line by itself.'
+        text = Reline.readmultiline( "#{prompt} ", true ) do |input|
+          input.split.last == '.'
+        end
+    
+        return text.lines[0..-2]
+      end
+
+      # 
+      # Confirmation prompt.
+      # Answer is yes or no.
+      # 
+      def yes?( prompt )
+        value = Ask.confirm "#{prompt} "
+        return value
+      end
+
+      # 
+      # Show a selection list to choose from.
+      # 
+      def select( prompt, options )
+        i = Ask.list prompt, options
+        return options[ i ]
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Private Functions
+      # ---------------------------------------------------------------------
+
+      private
+
+      #
+      # Get the default prompt text.
+      #
+      def default_prompt
+        dt = DateTime.now
+        d = dt.strftime( '%Y.%m.%d' )
+        t = dt.strftime( '%I:%M:%S' )
+        return "#{'gloo'.blue} #{d.yellow} #{t.white} >"
+      end
+
+    end
+  end
+end

data/lib/gloo/app/table.rb

@@ -0,0 +1,51 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# CLI input.
+#
+require 'colorize'
+require 'terminal-table'
+
+module Gloo
+  module App
+    class Table
+
+      #
+      # Set up Table Helper.
+      #
+      def initialize platform
+        @platform = platform
+      end
+
+      # 
+      # Put a box around the given string.
+      def box( str_value )
+        puts str_value
+        box = Terminal::Table.new( :headings => [], :rows => [ [ str_value ] ] )
+        return box.to_s
+      end
+
+      #
+      # Show the given table data.
+      #
+      def show( headers, data, title = nil )
+        unless title.blank?
+          table = Terminal::Table.new( 
+            :title => title, :headings => headers, :rows => data )
+        else
+          table = Terminal::Table.new( :headings => headers, :rows => data )
+        end
+        puts table.to_s.colorize( color: :white, background: :black )
+      end
+
+      
+      # ---------------------------------------------------------------------
+      #    Private Functions
+      # ---------------------------------------------------------------------
+
+      private
+
+
+    end
+  end
+end

data/lib/gloo/core/gloo_system.rb

@@ -6,7 +6,6 @@
 # system level variables and functions.  But it is not
 # actually an object in the normal sense of the word.
 #
-require 'tty-platform'
 require 'os'
 
 module Gloo
@@ -217,20 +216,17 @@ module Gloo
 
       # Get the platform CPU
       def msg_platform_cpu
-        platform = TTY::Platform.new
-        return platform.cpu
+        return OS.host_cpu
       end
 
       # Get the platform Operating System
       def msg_platform_os
-        platform = TTY::Platform.new
-        return platform.os
+        return RUBY_PLATFORM
       end
 
       # Get the platform version
       def msg_platform_version
-        platform = TTY::Platform.new
-        return platform.version
+        return 'n/a'
       end
 
       # Is the platform Windows?
@@ -240,14 +236,12 @@ module Gloo
 
       # Is the platform Unix?
       def msg_platform_unix?
-        platform = TTY::Platform.new
-        return platform.unix?
+        return OS.posix?
       end
 
       # Is the platform Linux?
       def msg_platform_linux?
-        platform = TTY::Platform.new
-        return platform.linux?
+        return OS.posix?
       end
 
       # Is the platform Mac?
@@ -259,9 +253,8 @@ module Gloo
       # Get the command to open a file on this platform.
       #
       def self.open_for_platform
-        platform = TTY::Platform.new
-        return 'open' if platform.mac?
-        return 'xdg-open' if platform.linux?
+        return 'open' if OS.mac?
+        return 'xdg-open' if OS.posix?
         
         return 'Start-Process' if OS.windows?
 

data/lib/gloo/objs/basic/container.rb

@@ -58,8 +58,7 @@ module Gloo
       def msg_show_key_value_table
         data = self.children.map { |o| [ o.name, o.value ] }
 
-        # TODO: this doesn't work:
-        # @engine.platform.show_table nil, data, title
+        @engine.platform.table.show [], data
       end
 
       # 

data/lib/gloo/objs/basic/integer.rb

@@ -10,6 +10,7 @@ module Gloo
 
       KEYWORD = 'integer'.freeze
       KEYWORD_SHORT = 'int'.freeze
+      DEFAULT_RANDOM_RANGE = 100
 
       #
       # The name of the object type.
@@ -46,7 +47,7 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + %w[inc dec]
+        return super + %w[inc dec randomize]
       end
 
       #
@@ -69,6 +70,27 @@ module Gloo
         return i
       end
 
+      # 
+      # Set the value to a random number.
+      # The range is 0 to DEFAULT_RANDOM_RANGE (not including the range).
+      # To model a 6-sided die, 
+      # set range to 6 and add 1 to the result.
+      # 
+      def msg_randomize
+        range = DEFAULT_RANDOM_RANGE
+
+        # Check for a range.
+        if @params&.token_count&.positive?
+          expr = Gloo::Expr::Expression.new( @engine, @params.tokens )
+          range = expr.evaluate
+        end
+
+        rand_value = rand( range )
+        set_value rand_value
+        @engine.heap.it.set_to rand_value
+        return rand_value
+      end
+
     end
   end
 end