gloo-lang 0.9.3 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a97b50f311067cb36399d283816c85ab0ca4756ffbd1e9c90c06776be38cf5fa
-  data.tar.gz: c5bdb27db5edcb57fab3ec8bd0e50a4a2e6a2cd7f6c1b46001741da96c5b68c6
+  metadata.gz: 42b1ca8c03074ae64ac797bfcdc72b17479cabead579fb94dd8232cbeef3fc6a
+  data.tar.gz: 34c0a1d8d4aabfd76f8d34d170de91760030ce15f49cdbceacad202cd43dfa55
 SHA512:
-  metadata.gz: bc547e429ebe3ee5cc948d7647ef6a5226fa4d499adb467b832a276d1d9b83fb2f3ad56f91d1bc2033df46c3241f02257e05ea02369ad41f90a74897bbeab105
-  data.tar.gz: c415a1953ceb79b38e6b445cecf566547fa5d1fcac4cd6b8b93f980dcdf087d4ecb4ed31b317b8cb2354c560905329e3e9e9473691b19dc68fe8fa1a2af6bdd6
+  metadata.gz: 8578816796520b92afdc8671fd914d2612dd5a512b6cc03bff9602ea3f9851902fe61753a59c58526e2aedafbe4f00eb6647c25df49cfbbf046d4c02545ad5b8
+  data.tar.gz: 132b981e50798bfdada690d892ddb67677d001036b08faa058c705317bf995006c2d40e022ca79269d45610e0535f9b0f2422f77f6b48b79b03c04f95ec67958

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gloo-lang (0.9.0)
+    gloo-lang (0.9.4)
       chronic (~> 0.10, >= 0.10.2)
       json (~> 2.1, >= 2.1.0)
       net-ssh (~> 6.1, >= 6.1.0)

data/gloo-lang.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json', '~> 2.1', '>= 2.1.0'
   spec.add_dependency 'openssl', '~> 2.1', '>= 2.1.0'
   spec.add_dependency 'net-ssh', '~> 6.1', '>= 6.1.0'
+  spec.add_dependency 'tty-platform', '~> 0.3', '>= 0.3.0'
   # spec.add_dependency 'mysql2', '~> 0.5', '>= 0.5.3'
   # spec.add_dependency 'sqlite3', '~> 1.4', '>= 1.4.2'
 end

data/lib/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.6

data/lib/gloo_lang/app/args.rb

@@ -6,7 +6,6 @@
 # in the constructor.
 #
 require 'active_support'
-require 'colorize'
 
 module GlooLang
   module App

data/lib/gloo_lang/app/engine.rb

@@ -7,15 +7,11 @@
 # to the relevant element.
 #
 
-require 'tty-prompt'
-require 'tty-cursor'
-require 'colorize'
-
 module GlooLang
   module App
     class Engine
 
-      attr_reader :args, :mode, :running,
+      attr_reader :args, :mode, :running, :platform,
                   :dictionary, :parser, :heap, :factory
       attr_accessor :last_cmd, :persist_man, :event_manager,
                     :exec_env, :help, :converter
@@ -23,12 +19,15 @@ module GlooLang
       #
       # Set up the engine with basic elements.
       #
-      def initialize( params = [] )
+      def initialize( params = [], platform=nil, log=nil )
         $engine = self
         @args = Args.new( params )
         $settings = Settings.new( ENV[ 'GLOO_ENV' ] )
-        $log = Log.new( @args.quiet? )
-        $prompt = TTY::Prompt.new
+
+        $log = log ? log : Log.new
+        $log.quiet = @args.quiet?
+
+        @platform = platform ? platform : Platform.new
         $log.debug 'engine intialized...'
       end
 
@@ -113,23 +112,6 @@ module GlooLang
         @persist_man.load( name ) if name
       end
 
-      #
-      # Prompt for the next command.
-      #
-      def prompt_cmd
-        @last_cmd = $prompt.ask( default_prompt )
-      end
-
-      #
-      # 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
-
       #
       # Is the last command entered blank?
       #
@@ -145,7 +127,7 @@ module GlooLang
       #
       def loop
         while @running
-          prompt_cmd
+          @last_cmd = @platform.prompt_cmd
           process_cmd
         end
       end
@@ -155,7 +137,7 @@ module GlooLang
       #
       def process_cmd
         if last_cmd_blank?
-          clear_screen
+          @platform.clear_screen
           return
         end
 
@@ -184,7 +166,7 @@ module GlooLang
       # Show the version information and then quit.
       #
       def run_version
-        puts Info.display_title unless @args.quiet?
+        @platform.show Info.display_title unless @args.quiet?
         quit
       end
 
@@ -196,15 +178,6 @@ module GlooLang
         quit
       end
 
-      #
-      # Clear the screen.
-      #
-      def clear_screen
-        @cursor ||= TTY::Cursor
-        print @cursor.clear_screen
-        print @cursor.move_to( 0, 0 )
-      end
-
       # ---------------------------------------------------------------------
       #    Error Handling
       # ---------------------------------------------------------------------

data/lib/gloo_lang/app/help.rb

@@ -4,9 +4,6 @@
 # Help system.
 #
 
-require 'tty-markdown'
-require 'tty-pager'
-
 module GlooLang
   module App
     class Help
@@ -61,11 +58,7 @@ module GlooLang
 
         data = self.get_topic_data( topic )
         page = data.lines.count > Settings.page_size
-        if topic_is_md?( topic )
-          show_markdown_data( data, page )
-        else
-          show_text_data( data, page )
-        end
+        $engine.platform.show( data, topic_is_md?( topic ), page )
       end
 
       #
@@ -75,39 +68,7 @@ module GlooLang
         return if $engine.args.quiet?
 
         data = self.get_topic_data( topic )
-        if topic_is_md?( topic )
-          show_markdown_data data
-        else
-          show_text_data data
-        end
-      end
-
-      #
-      # Show the markdown data.
-      #
-      def show_text_data( data, page = false )
-        if page
-          pager = TTY::Pager.new
-          pager.page( data )
-        else
-          puts data.white
-          puts
-        end
-      end
-
-      #
-      # Show the markdown data.
-      #
-      def show_markdown_data( data, page = false )
-        md = TTY::Markdown.parse data
-
-        if page
-          pager = TTY::Pager.new
-          pager.page( md )
-        else
-          puts md
-          puts
-        end
+        $engine.platform.show( data, topic_is_md?( topic ), false )
       end
 
       #

data/lib/gloo_lang/app/info.rb

@@ -8,6 +8,14 @@ module GlooLang
   module App
     class Info
 
+      #
+      # Register other Info classes when they are loaded.
+      #
+      def self.inherited( subclass )
+        $infos = [] unless $infos
+        $infos << subclass
+      end
+
       #
       # Load the version from the VERSION file.
       #
@@ -28,6 +36,32 @@ module GlooLang
         return "#{APP_NAME}, version #{VERSION}"
       end
 
+      #
+      # Get the full application version information,
+      # including engine version.
+      #
+      def self.full_version
+        str = "#{display_title}"
+        if $infos
+          $infos.each do |o|
+            str << "\n#{o.display_title}"
+          end
+        end
+        return str
+      end
+
     end
+
+    #
+    # Add the ruby version information.
+    #
+    class RubyInfo < Info
+
+      def self.display_title
+        return "Ruby version: #{RUBY_VERSION}"
+      end
+
+    end
+
   end
 end

data/lib/gloo_lang/app/log.rb

@@ -4,25 +4,23 @@
 # Application Logging wrapper.
 #
 require 'active_support'
-require 'colorize'
-require 'colorized_string'
 
 module GlooLang
   module App
     class Log
 
-      attr_reader :logger, :quiet
+      attr_reader :logger
+      attr_accessor :quiet
 
       #
       # Set up a logger.
       # 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
       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/platform.rb

@@ -0,0 +1,75 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2022 Eric Crane.  All rights reserved.
+#
+# Handle input and output for the current platform.
+#
+# This is an abstract base class and minimal implementation
+# is only to facilitate testing.
+#
+
+module GlooLang
+  module App
+    class Platform
+
+      #
+      # Set up Platform.
+      #
+      def initialize
+      end
+
+      #
+      # Show a message.
+      # Abstract--implment in subclass.
+      #
+      def show( msg, md=false, page=false )
+        puts msg
+      end
+
+      #
+      # Prompt for the next command.
+      # Abstract--implment in subclass.
+      #
+      def prompt_cmd
+        return ''
+      end
+
+      #
+      # Clear the screen.
+      # Abstract--implment in subclass.
+      #
+      def clear_screen
+      end
+
+      #
+      # Edit some temporary text and return the edited text.
+      # Abstract--implment in subclass.
+      #
+      def edit initial_value
+        return initial_value
+      end
+
+      #
+      # Show the given table data.
+      # Abstract--implment in subclass.
+      #
+      def show_table( headers, data, title = nil )
+      end
+
+      #
+      # Get the number of vertical lines on screen.
+      # Abstract--implment in subclass.
+      #
+      def lines
+        return 40
+      end
+
+      #
+      # Get the number of horizontal columns on screen.
+      # Abstract--implment in subclass.
+      #
+      def cols
+        return 80
+      end
+    end
+  end
+end

data/lib/gloo_lang/app/settings.rb

@@ -5,8 +5,6 @@
 #
 
 require 'yaml'
-require 'tty-screen'
-require 'colorize'
 
 module GlooLang
   module App
@@ -48,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 ''
@@ -62,24 +60,49 @@ 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.
       #
       def self.lines
-        TTY::Screen.rows
+        $engine.platform.lines
       end
 
       #
       # Get the number of horizontal columns on screen.
       #
       def self.cols
-        TTY::Screen.cols
+        $engine.platform.cols
       end
 
       #

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

@@ -3,8 +3,6 @@
 #
 # An object that contains a collection of other objects.
 #
-require 'tty-table'
-require 'pastel'
 
 module GlooLang
   module Objs
@@ -59,16 +57,7 @@ module GlooLang
       #
       def msg_show_key_value_table
         data = self.children.map { |o| [ o.name, o.value ] }
-        pastel = ::Pastel.new
-        table = TTY::Table.new rows: data
-        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.zero? ? pastel.blue( val ) : pastel.white( val )
-          end
-        end
-        puts "\n  #{rendered}\n\n"
+        $engine.platform.show_table nil, data, title
       end
 
     end

data/lib/gloo_lang/objs/basic/text.rb

@@ -3,8 +3,6 @@
 #
 # A [multiline] block of text.
 #
-require 'tty-editor'
-require 'tty-pager'
 
 module GlooLang
   module Objs
@@ -12,7 +10,6 @@ module GlooLang
 
       KEYWORD = 'text'.freeze
       KEYWORD_SHORT = 'txt'.freeze
-      DEFAULT_TMP_FILE = 'tmp.txt'.freeze
 
       #
       # The name of the object type.
@@ -67,19 +64,14 @@ module GlooLang
       def msg_page
         return unless value
 
-        # pager = TTY::Pager::SystemPager.new command: 'less -R'
-        pager = TTY::Pager.new
-        pager.page( value )
+        $engine.platform.show( value, false, true )
       end
 
       #
       # Edit the text in the default editor.
       #
       def msg_edit
-        tmp = File.join( $settings.tmp_path, DEFAULT_TMP_FILE )
-        File.open( tmp, 'w' ) { |file| file.write( self.value ) }
-        TTY::Editor.open( tmp )
-        set_value File.read( tmp )
+        self.value = $engine.platform.edit( self.value )
       end
 
     end

data/lib/gloo_lang/objs/data/markdown.rb

@@ -3,8 +3,6 @@
 #
 # Markdown data.
 #
-require 'tty-markdown'
-require 'tty-pager'
 
 module GlooLang
   module Objs
@@ -64,7 +62,7 @@ module GlooLang
       # Show the markdown data in the terminal.
       #
       def msg_show
-        puts TTY::Markdown.parse self.value
+        $engine.platform.show( self.value, true, false )
       end
 
       #
@@ -73,10 +71,7 @@ module GlooLang
       def msg_page
         return unless self.value
 
-        md = TTY::Markdown.parse self.value
-        # pager = TTY::Pager::SystemPager.new command: 'less -R'
-        pager = TTY::Pager.new
-        pager.page( md )
+        $engine.platform.show( md, true, true )
       end
 
     end

data/lib/gloo_lang/objs/data/table.rb

@@ -4,8 +4,6 @@
 # A data table.
 # The table container headers and data.
 #
-require 'tty-table'
-require 'pastel'
 
 module GlooLang
   module Objs
@@ -106,33 +104,7 @@ module GlooLang
       #
       def msg_show
         title = self.value
-        GlooLang::Objs::Table.show headers, data, title
-      end
-
-      # ---------------------------------------------------------------------
-      #    Static table helper
-      # ---------------------------------------------------------------------
-
-      #
-      # Show the given table data.
-      #
-      def self.show( headers, data, title = nil )
-        pastel = ::Pastel.new
-        table = TTY::Table.new headers, data
-        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 row_index.zero?
-              pastel.blue( val )
-            else
-              row_index.odd? ? pastel.white( val ) : pastel.yellow( val )
-            end
-          end
-        end
-        puts "\n#{title.white}"
-        puts "#{rendered}\n\n"
+        $engine.platform.show_table headers, data, title
       end
 
     end

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