gloo 0.7.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a3e2cb80e6c835a4b74747356c94b4f67ce2ae0fa36d76324f1fb16d92b4baf
-  data.tar.gz: b4577bc7f5ef1aed113600c3df5b39bbbb3292bff4c050aa81a5d7f0031fd891
+  metadata.gz: 62d4c3076b0a61719c6a62ef65aa793a758074e0ab306376671b445582e70822
+  data.tar.gz: a2938182e0675a6992861da6dfea7da7a23e6998f235a9cb6b376ee823b7d8a7
 SHA512:
-  metadata.gz: 6dd3bff3c3e0dfe95dc82b53382d4c38528d0588007b1cb42d98747b2cf0fd06d2a9ca3486c7e29b836584e793f7eab18b74f51864f53a2dd86ca700116d8c1c
-  data.tar.gz: 41d2029d98b4d70472d822f3636c8ad5ed5c97c906f179751469e98e962ef8503582201d7aac7a8c5b5b1db7ce667f13e16e82d8f71103c6585ceb722349fff8
+  metadata.gz: a3de2e0895ec0da13278af8ea8e3ffca79bf69d65c503254198ad4441f2e29d84f5393db01768ec5a0458c12666de14f6e06a2d33f1005c083039b7dfa4abc80
+  data.tar.gz: 40e4aa7fc2a957e53cccc880c8aa2e0e9061fb0dd8eb2294ca6b93866e1820b086e694b06207897daabe89747e01cca6830952c8045078a5f4aa53ddf5b588a3

data/.gitignore

@@ -9,4 +9,5 @@
 *.gem
 *.log
 test/gloo/debug/*
-.DS_Store
+Gemfile.lock
+*.DS_Store

data/.ruby-gemset

@@ -0,0 +1 @@
+gloo-gem

data/.ruby-version

@@ -0,0 +1 @@
+ruby-3.0.2

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Eric Crane
+Copyright (c) 2022 Eric Crane
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/gloo.gemspec

@@ -27,19 +27,28 @@ Gem::Specification.new do |spec|
   spec.executables << 'o'
   spec.executables << 'gloo'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'minitest', '~> 5.0'
+  # 
+  # tty uses an older version of bundle
+  # 
+  # spec.add_development_dependency 'bundler', '~> 2.2.22'
+  # spec.add_development_dependency 'bundler', '~> 2.3.17'
+  spec.add_development_dependency 'bundler', '~> 1.17.3'
+  spec.add_development_dependency 'minitest', '~> 5.1', '>= 5.14.2'
   # spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency "rake", '~> 13.0', '>= 13.0.1'
 
-  spec.add_dependency "activesupport", '~> 5.2', ">= 5.2.4.3"
+  spec.add_dependency "gloo-lang", '~> 1.1', ">= 1.1.0"
+
+  spec.add_dependency "activesupport", '~> 6.1', ">= 6.1.5"
+  # spec.add_dependency "activesupport", '~> 6.1', ">= 6.1.4.6"
+  # spec.add_dependency "activesupport", '~> 5.2', ">= 5.2.4.3"
   # spec.add_dependency 'activesupport', '~> 5.2', '>= 5.2.1'
   spec.add_dependency 'chronic', '~> 0.10', '>= 0.10.2'
   spec.add_dependency 'colorize', '~> 0.8', '>= 0.8.1'
-  spec.add_dependency 'tty', '~> 0.8', '>= 0.8.1'
+  spec.add_dependency 'tty', '~> 0.10', '>= 0.10.0'
   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 'mysql2', '~> 0.5', '>= 0.5.3'
-  spec.add_dependency 'sqlite3', '~> 1.4', '>= 1.4.2'  
+  # 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.7.7
+1.1.0

data/lib/dependencies.rb

@@ -2,8 +2,8 @@
 # Script to build a list of dependencies
 #
 
-require 'gloo/core/baseo'
-require 'gloo/core/obj'
+require 'gloo_lang/core/baseo'
+require 'gloo_lang/core/obj'
 
 path = File.dirname( File.absolute_path( __FILE__ ) )
 
@@ -11,8 +11,8 @@ files = []
 #
 # We want to start with these to avoid dependency errors later on.
 #
-files << File.join( path, 'gloo', 'core', 'baseo.rb' )
-files << File.join( path, 'gloo', 'core', 'obj.rb' )
+# files << File.join( path, 'gloo_lang', 'core', 'baseo.rb' )
+# files << File.join( path, 'gloo_lang', 'core', 'obj.rb' )
 
 root = File.join( path, 'gloo', '**/*.rb' )
 Dir.glob( root ).each do |ruby_file|

data/lib/gloo/app/info.rb

@@ -4,9 +4,11 @@
 # Application information such as Version and public name.
 #
 
+require 'gloo-lang'
+
 module Gloo
   module App
-    class Info
+    class Info < GlooLang::App::Info
 
       #
       # Load the version from the VERSION file.

data/lib/gloo/app/log.rb

@@ -9,35 +9,7 @@ require 'colorized_string'
 
 module Gloo
   module App
-    class Log
-
-      attr_reader :logger, :quiet
-
-      #
-      # Set up a logger.
-      # If quiet is true, then message are written to the log
-      # but not to the console.
-      #
-      def initialize( quiet )
-        f = File.join( $settings.log_path, 'gloo.log' )
-        @logger = Logger.new( f )
-        @logger.level = Logger::DEBUG
-        @quiet = quiet
-      end
-
-      #
-      # Show a message unless we're in quite mode.
-      #
-      def show( msg )
-        puts msg unless @quiet
-      end
-
-      #
-      # Write a debug message to the log.
-      #
-      def debug( msg )
-        @logger.debug msg
-      end
+    class Log < GlooLang::App::Log
 
       #
       # Write an information message to the log.

data/lib/gloo/app/platform.rb

@@ -0,0 +1,142 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2022 Eric Crane.  All rights reserved.
+#
+# 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
+    class Platform < GlooLang::App::Platform
+
+      DEFAULT_TMP_FILE = 'tmp.txt'.freeze
+
+      attr_reader :prompt
+
+      #
+      # Set up Platform.
+      #
+      def initialize
+        @prompt = TTY::Prompt.new
+      end
+
+      #
+      # Show a message.
+      #
+      def show( msg, md=false, page=false )
+        if md
+          msg = TTY::Markdown.parse 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 )
+      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 )
+      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
+      # ---------------------------------------------------------------------
+      #
+      # Get the number of vertical lines on screen.
+      #
+      def lines
+        TTY::Screen.rows
+      end
+
+      #
+      # Get the number of horizontal columns on screen.
+      #
+      def cols
+        TTY::Screen.cols
+      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/objs/cli/banner.rb

@@ -8,7 +8,7 @@ require 'pastel'
 
 module Gloo
   module Objs
-    class Banner < Gloo::Core::Obj
+    class Banner < GlooLang::Core::Obj
 
       KEYWORD = 'banner'.freeze
       KEYWORD_SHORT = 'ban'.freeze
@@ -75,7 +75,7 @@ module Gloo
       # This is used by containers to add children needed
       # for default configurations.
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string TEXT, '', self
         fac.create_string STYLE, '', self
         fac.create_string COLOR, '', self

data/lib/gloo/objs/cli/bar.rb

@@ -7,7 +7,7 @@ require 'tty-progressbar'
 
 module Gloo
   module Objs
-    class Bar < Gloo::Core::Obj
+    class Bar < GlooLang::Core::Obj
 
       KEYWORD = 'bar'.freeze
       KEYWORD_SHORT = 'bar'.freeze
@@ -63,7 +63,7 @@ module Gloo
       # This is used by containers to add children needed
       # for default configurations.
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string NAME, '', self
         fac.create_int TOTAL, 100, self
       end
@@ -100,7 +100,7 @@ module Gloo
       def msg_advance
         x = 1
         if @params&.token_count&.positive?
-          expr = Gloo::Expr::Expression.new( @params.tokens )
+          expr = GlooLang::Expr::Expression.new( @engine, @params.tokens )
           x = expr.evaluate.to_i
         end
 
@@ -116,7 +116,7 @@ module Gloo
 
         x = 1
         if @params&.token_count&.positive?
-          expr = Gloo::Expr::Expression.new( @params.tokens )
+          expr = GlooLang::Expr::Expression.new( @engine, @params.tokens )
           x = expr.evaluate.to_i
         end
 

data/lib/gloo/objs/cli/colorize.rb

@@ -7,7 +7,7 @@ require 'colorized_string'
 
 module Gloo
   module Objs
-    class Colorize < Gloo::Core::Obj
+    class Colorize < GlooLang::Core::Obj
 
       KEYWORD = 'colorize'.freeze
       KEYWORD_SHORT = 'color'.freeze
@@ -41,7 +41,7 @@ module Gloo
       # This is used by containers to add children needed
       # for default configurations.
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string 'white', '', self
       end
 
@@ -65,7 +65,7 @@ module Gloo
           msg += ColorizedString[ o.value_display ].colorize( o.name.to_sym )
         end
         $log.show msg
-        $engine.heap.it.set_to msg.to_s
+        @engine.heap.it.set_to msg.to_s
       end
 
     end

data/lib/gloo/objs/cli/confirm.rb

@@ -6,7 +6,7 @@
 
 module Gloo
   module Objs
-    class Confirm < Gloo::Core::Obj
+    class Confirm < GlooLang::Core::Obj
 
       KEYWORD = 'confirm'.freeze
       KEYWORD_SHORT = 'confirm'.freeze
@@ -64,7 +64,7 @@ module Gloo
       # This is used by containers to add children needed
       # for default configurations.
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string PROMPT, DEFAULT_PROMPT, self
         fac.create_bool RESULT, nil, self
       end
@@ -87,7 +87,7 @@ module Gloo
         prompt = prompt_value
         return unless prompt
 
-        result = $prompt.yes?( prompt )
+        result = @engine.platform.prompt.yes?( prompt )
         set_result result
       end
 

data/lib/gloo/objs/cli/menu.rb

@@ -8,7 +8,7 @@
 
 module Gloo
   module Objs
-    class Menu < Gloo::Core::Obj
+    class Menu < GlooLang::Core::Obj
 
       KEYWORD = 'menu'.freeze
       KEYWORD_SHORT = 'menu'.freeze
@@ -74,7 +74,7 @@ module Gloo
       # for default configurations.
       #
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string PROMPT, '> ', self
         fac.create_can ITEMS, self
         fac.create_bool LOOP, true, self
@@ -102,9 +102,9 @@ module Gloo
             dt = DateTime.now
             d = dt.strftime( '%Y.%m.%d' )
             t = dt.strftime( '%I:%M:%S' )
-            cmd = $prompt.ask( "#{d.yellow} #{t.white} >" )
+            cmd = @engine.platform.prompt.ask( "#{d.yellow} #{t.white} >" )
           else
-            cmd = $prompt.ask( prompt_value )
+            cmd = @engine.platform.prompt.ask( prompt_value )
           end
           cmd ? run_command( cmd ) : run_default
           break unless loop?
@@ -137,7 +137,7 @@ module Gloo
         o = find_child BEFORE_MENU
         return unless o
 
-        Gloo::Exec::Dispatch.message 'run', o
+        GlooLang::Exec::Dispatch.message( @engine, 'run', o )
       end
 
       #
@@ -148,7 +148,7 @@ module Gloo
         return unless o
 
         o.children.each do |mitem|
-          mitem = Gloo::Objs::Alias.resolve_alias( mitem )
+          mitem = GlooLang::Objs::Alias.resolve_alias( @engine, mitem )
           puts "  #{mitem.shortcut_value} - #{mitem.description_value}"
         end
       end
@@ -161,7 +161,7 @@ module Gloo
         return nil unless o
 
         o.children.each do |mitem|
-          mitem = Gloo::Objs::Alias.resolve_alias( mitem )
+          mitem = GlooLang::Objs::Alias.resolve_alias( @engine, mitem )
           return mitem if mitem.shortcut_value.downcase == cmd.downcase
         end
 
@@ -175,7 +175,7 @@ module Gloo
         obj = find_child DEFAULT
         return unless obj
 
-        s = Gloo::Exec::Script.new obj
+        s = GlooLang::Exec::Script.new( @engine, obj )
         s.run
       end
 
@@ -197,7 +197,7 @@ module Gloo
         script = obj.do_script
         return unless script
 
-        s = Gloo::Exec::Script.new script
+        s = GlooLang::Exec::Script.new( @engine, script )
         s.run
       end
 

data/lib/gloo/objs/cli/menu_item.rb

@@ -6,7 +6,7 @@
 
 module Gloo
   module Objs
-    class MenuItem < Gloo::Core::Obj
+    class MenuItem < GlooLang::Core::Obj
 
       KEYWORD = 'menu_item'.freeze
       KEYWORD_SHORT = 'mitem'.freeze
@@ -73,7 +73,7 @@ module Gloo
       # This is used by containers to add children needed
       # for default configurations.
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string SHORTCUT, '', self
         fac.create_string DESCRIPTION, '', self
         fac.create_script DO, '', self

data/lib/gloo/objs/cli/pastel.rb

@@ -7,7 +7,7 @@ require 'pastel'
 
 module Gloo
   module Objs
-    class Pastel < Gloo::Core::Obj
+    class Pastel < GlooLang::Core::Obj
 
       KEYWORD = 'pastel'.freeze
       KEYWORD_SHORT = 'pastel'.freeze
@@ -67,7 +67,7 @@ module Gloo
       # for default configurations.
       #
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string TEXT, '', self
         fac.create_string COLOR, '', self
       end

data/lib/gloo/objs/cli/prompt.rb

@@ -6,7 +6,7 @@
 
 module Gloo
   module Objs
-    class Prompt < Gloo::Core::Obj
+    class Prompt < GlooLang::Core::Obj
 
       KEYWORD = 'prompt'.freeze
       KEYWORD_SHORT = 'ask'.freeze
@@ -67,7 +67,7 @@ module Gloo
       # for default configurations.
       #
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string PROMPT, '>', self
         fac.create_string RESULT, nil, self
       end
@@ -90,7 +90,7 @@ module Gloo
         prompt = prompt_value
         return unless prompt
 
-        result = $prompt.multiline( prompt )
+        result = @engine.platform.prompt.multiline( prompt )
         set_result result.join
       end
 
@@ -101,7 +101,7 @@ module Gloo
         prompt = prompt_value
         return unless prompt
 
-        result = $prompt.ask( prompt )
+        result = @engine.platform.prompt.ask( prompt )
         set_result result
       end
 

data/lib/gloo/objs/cli/select.rb

@@ -6,7 +6,7 @@
 
 module Gloo
   module Objs
-    class Select < Gloo::Core::Obj
+    class Select < GlooLang::Core::Obj
 
       KEYWORD = 'select'.freeze
       KEYWORD_SHORT = 'sel'.freeze
@@ -92,7 +92,7 @@ module Gloo
       # for default configurations.
       #
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string PROMPT, '>', self
         fac.create_can OPTIONS, self
         fac.create_string RESULT, nil, self
@@ -116,8 +116,8 @@ module Gloo
         prompt = prompt_value
         return unless prompt
 
-        per = Gloo::App::Settings.page_size
-        result = $prompt.select( prompt, options, :per_page => per )
+        per = GlooLang::App::Settings.page_size( @engine )
+        result = @engine.platform.prompt.select( prompt, options, :per_page => per )
         set_result self.key_for_option( result )
       end
 

data/lib/gloo/objs/dev/git.rb

@@ -6,7 +6,7 @@
 
 module Gloo
   module Objs
-    class Git < Gloo::Core::Obj
+    class Git < GlooLang::Core::Obj
 
       KEYWORD = 'git_repo'.freeze
       KEYWORD_SHORT = 'git'.freeze
@@ -56,7 +56,7 @@ module Gloo
           branch = branch.strip
         end
 
-        $engine.heap.it.set_to branch
+        @engine.heap.it.set_to branch
       end
 
       #
@@ -77,7 +77,7 @@ module Gloo
         path = path_value
         if path_is_dir?( path )
           if @params&.token_count&.positive?
-            expr = Gloo::Expr::Expression.new( @params.tokens )
+            expr = GlooLang::Expr::Expression.new( @engine, @params.tokens )
             msg = expr.evaluate
           end
           branch = `cd #{path}; git rev-parse --abbrev-ref HEAD`
@@ -87,7 +87,7 @@ module Gloo
           psh = 'git push origin '
           `cd #{path};#{add};#{cmt}"#{msg}";#{psh}#{branch}`
         end
-        $engine.heap.it.set_to msg
+        @engine.heap.it.set_to msg
       end
 
       #
@@ -97,7 +97,7 @@ module Gloo
         path = path_value
         result = `cd #{path}; git status -s` if path_is_dir?( path )
         result ||= ''
-        $engine.heap.it.set_to result
+        @engine.heap.it.set_to result
       end
 
       #
@@ -118,7 +118,7 @@ module Gloo
           result = true unless data.strip.empty?
         end
 
-        $engine.heap.it.set_to result
+        @engine.heap.it.set_to result
       end
 
       #
@@ -132,7 +132,7 @@ module Gloo
           result = File.exist? pn
         end
 
-        $engine.heap.it.set_to result
+        @engine.heap.it.set_to result
       end
 
     end