gloo 0.8.0 → 1.2.0

data/lib/gloo/objs/data/sqlite.rb

@@ -19,7 +19,7 @@ require 'sqlite3'
 
 module Gloo
   module Objs
-    class Sqlite < Gloo::Core::Obj
+    class Sqlite < GlooLang::Core::Obj
 
       KEYWORD = 'sqlite'.freeze
       KEYWORD_SHORT = 'sqlite'.freeze
@@ -63,7 +63,7 @@ module Gloo
       # for default configurations.
       #
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string DB, DEFAULT_DB, self
       end
 
@@ -84,20 +84,20 @@ module Gloo
       def msg_verify
         name = db_value
         if name.empty?
-          $engine.err DB_REQUIRED_ERR
-          $engine.heap.it.set_to false
+          @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
+          @engine.err DB_NOT_FOUND_ERR
+          @engine.heap.it.set_to false
           return
         end
 
         return unless connects?
 
-        $engine.heap.it.set_to true
+        @engine.heap.it.set_to true
       end
 
       # ---------------------------------------------------------------------
@@ -111,7 +111,7 @@ module Gloo
       def query( sql, params = nil )
         name = db_value
         unless name
-          $engine.err DB_REQUIRED_ERR
+          @engine.err DB_REQUIRED_ERR
           return
         end
 
@@ -147,8 +147,8 @@ module Gloo
           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
+          @engine.err e.message
+          @engine.heap.it.set_to false
           return false
         end
         return true

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

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

@@ -6,7 +6,7 @@
 
 module Gloo
   module Objs
-    class Stats < Gloo::Core::Obj
+    class Stats < GlooLang::Core::Obj
 
       KEYWORD = 'stats'.freeze
       KEYWORD_SHORT = 'stat'.freeze
@@ -72,7 +72,7 @@ module Gloo
       # for default configurations.
       #
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_file FOLDER, '', self
         fac.create_string TYPES, '', self
         fac.create_can SKIP, self
@@ -95,7 +95,8 @@ module Gloo
       # Show all project stats.
       #
       def msg_show_all
-        o = Gloo::Utils::Stats.new( path_value, types_value, skip_list )
+        o = GlooLang::Utils::Stats.new(
+          @engine, path_value, types_value, skip_list )
         o.show_all
       end
 
@@ -103,7 +104,8 @@ module Gloo
       # Show file types.
       #
       def msg_show_types
-        o = Gloo::Utils::Stats.new( path_value, types_value, skip_list )
+        o = GlooLang::Utils::Stats.new(
+          @engine, path_value, types_value, skip_list )
         o.file_types
       end
 
@@ -111,7 +113,8 @@ module Gloo
       # Show busy folders: those with the most files.
       #
       def msg_show_busy_folders
-        o = Gloo::Utils::Stats.new( path_value, types_value, skip_list )
+        o = GlooLang::Utils::Stats.new(
+          @engine, path_value, types_value, skip_list )
         o.busy_folders
       end
 

data/lib/gloo/objs/snd/play.rb

@@ -6,7 +6,7 @@
 
 module Gloo
   module Objs
-    class Play < Gloo::Core::Obj
+    class Play < GlooLang::Core::Obj
 
       KEYWORD = 'play'.freeze
       KEYWORD_SHORT = 'play'.freeze

data/lib/gloo/objs/snd/say.rb

@@ -7,7 +7,7 @@ require 'erb'
 
 module Gloo
   module Objs
-    class Say < Gloo::Core::Obj
+    class Say < GlooLang::Core::Obj
 
       KEYWORD = 'say'.freeze
       KEYWORD_SHORT = 'say'.freeze
@@ -68,7 +68,7 @@ module Gloo
       # for default configurations.
       #
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string VOICE, '', self
         fac.create_string MSG, DEFAULT_MSG, self
       end

data/lib/gloo/objs/system/file_handle.rb

@@ -7,7 +7,7 @@ require 'tty-pager'
 
 module Gloo
   module Objs
-    class FileHandle < Gloo::Core::Obj
+    class FileHandle < GlooLang::Core::Obj
 
       KEYWORD = 'file'.freeze
       KEYWORD_SHORT = 'dir'.freeze
@@ -47,7 +47,7 @@ module Gloo
       def msg_open
         return unless value && File.exist?( value )
 
-        cmd = Gloo::Core::GlooSystem.open_for_platform
+        cmd = GlooLang::Core::GlooSystem.open_for_platform
         cmd_with_param = "#{cmd} \"#{value}\""
         `#{cmd_with_param}`
       end
@@ -79,11 +79,11 @@ module Gloo
 
         data = File.read( value )
         if @params&.token_count&.positive?
-          pn = Gloo::Core::Pn.new @params.first
+          pn = GlooLang::Core::Pn.new( @engine, @params.first )
           o = pn.resolve
           o.set_value data
         else
-          $engine.heap.it.set_to data
+          @engine.heap.it.set_to data
         end
       end
 
@@ -95,7 +95,7 @@ module Gloo
         return unless value
 
         if @params&.token_count&.positive?
-          expr = Gloo::Expr::Expression.new( @params.tokens )
+          expr = GlooLang::Expr::Expression.new( @engine, @params.tokens )
           data = expr.evaluate
         end
         File.write( value, data )
@@ -106,7 +106,7 @@ module Gloo
       #
       def msg_check_exists
         result = File.exist? value
-        $engine.heap.it.set_to result
+        @engine.heap.it.set_to result
       end
 
       #
@@ -114,7 +114,7 @@ module Gloo
       #
       def msg_check_is_file
         result = File.file? value
-        $engine.heap.it.set_to result
+        @engine.heap.it.set_to result
       end
 
       #
@@ -122,7 +122,7 @@ module Gloo
       #
       def msg_check_is_dir
         result = File.directory? value
-        $engine.heap.it.set_to result
+        @engine.heap.it.set_to result
       end
 
       #
@@ -130,7 +130,7 @@ module Gloo
       #
       def msg_find_match
         result = !Dir.glob( value ).empty?
-        $engine.heap.it.set_to result
+        @engine.heap.it.set_to result
       end
 
     end

data/lib/gloo/objs/system/ssh_exec.rb

@@ -7,7 +7,7 @@ require 'net/ssh'
 
 module Gloo
   module Objs
-    class SshExec < Gloo::Core::Obj
+    class SshExec < GlooLang::Core::Obj
 
       KEYWORD = 'ssh_exec'.freeze
       KEYWORD_SHORT = 'ssh'.freeze
@@ -50,7 +50,7 @@ module Gloo
       # for default configurations.
       #
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string HOST, DEFAULT_HOST, self
         fac.create_string CMD, nil, self
         fac.create_string RESULT, nil, self
@@ -73,7 +73,7 @@ module Gloo
       def msg_run
         h = host_value
         unless h
-          $engine.err HOST_REQUIRED_ERR
+          @engine.err HOST_REQUIRED_ERR
           return
         end
 

data/lib/gloo/objs/system/system.rb

@@ -6,7 +6,7 @@
 
 module Gloo
   module Objs
-    class System < Gloo::Core::Obj
+    class System < GlooLang::Core::Obj
 
       KEYWORD = 'system'.freeze
       KEYWORD_SHORT = 'sys'.freeze
@@ -81,7 +81,7 @@ module Gloo
       # for default configurations.
       #
       def add_default_children
-        fac = $engine.factory
+        fac = @engine.factory
         fac.create_string CMD, DEFAULT_CMD, self
         fac.create_bool GET_OUTPUT, true, self
         fac.create_string RESULT, nil, self

data/lib/gloo/verbs/alert.rb

@@ -6,7 +6,7 @@
 
 module Gloo
   module Verbs
-    class Alert < Gloo::Core::Verb
+    class Alert < GlooLang::Core::Verb
 
       KEYWORD = 'alert'.freeze
       KEYWORD_SHORT = '!'.freeze
@@ -19,18 +19,18 @@ module Gloo
       #
       def run
         unless @tokens.token_count > 1
-          $engine.err MISSING_EXPR_ERR
+          @engine.err MISSING_EXPR_ERR
           return
         end
 
-        expr = Gloo::Expr::Expression.new( @tokens.params )
+        expr = GlooLang::Expr::Expression.new( @engine, @tokens.params )
         result = expr.evaluate
 
         if result
-          $engine.heap.it.set_to result
+          @engine.heap.it.set_to result
           post_alert result
         else
-          $engine.err NO_RESULT_ERR
+          @engine.err NO_RESULT_ERR
         end
       end
 
@@ -59,8 +59,8 @@ module Gloo
       # Notice is not posted if we're in quiet mode.
       #
       def post_alert( msg )
-        $log.info msg
-        return if $engine.args.quiet?
+        @engine.log.info msg
+        return if @engine.args.quiet?
 
         post_osx msg
       end

data/lib/gloo/verbs/beep.rb

@@ -6,7 +6,7 @@
 
 module Gloo
   module Verbs
-    class Beep < Gloo::Core::Verb
+    class Beep < GlooLang::Core::Verb
 
       KEYWORD = 'beep'.freeze
       KEYWORD_SHORT = 'b'.freeze

data/lib/gloo/verbs/cls.rb

@@ -6,7 +6,7 @@
 
 module Gloo
   module Verbs
-    class Cls < Gloo::Core::Verb
+    class Cls < GlooLang::Core::Verb
 
       KEYWORD = 'cls'.freeze
       KEYWORD_SHORT = 'cls'.freeze
@@ -15,7 +15,7 @@ module Gloo
       # Run the verb.
       #
       def run
-        $engine&.clear_screen
+        @engine.platform&.clear_screen
       end
 
       #

data/lib/gloo/verbs/help.rb

@@ -6,7 +6,7 @@
 
 module Gloo
   module Verbs
-    class Help < Gloo::Core::Verb
+    class Help < GlooLang::Core::Verb
 
       KEYWORD = 'help'.freeze
       KEYWORD_SHORT = '?'.freeze
@@ -30,80 +30,8 @@ module Gloo
       # Run the verb.
       #
       def run
-        opts = @tokens.second if @tokens
-        opts = opts.strip.downcase if opts
-
-        if opts
-          dispatch opts
-        else
-          $engine.help.page_topic DEFAULT_HELP
-        end
-      end
-
-      #
-      # Get the text for the list of verbs.
-      #
-      def get_verb_list
-        out = "Verbs:\n"
-        str = ''
-        verbs = $engine.dictionary.get_verbs.sort_by( &:keyword )
-        verbs.each_with_index do |v, i|
-          cut = v.keyword_shortcut.ljust( 5, ' ' )
-          str << " #{cut} #{v.keyword.ljust( 20, ' ' )}"
-          if ( ( i + 1 ) % 3 ).zero?
-            out << "#{str}\n"
-            str = ''
-          end
-        end
-
-        return out
-      end
-
-      #
-      # Lookup the opts in the dispatch table.
-      #
-      def lookup_opts( opts )
-        return DISPATCH[ opts.to_sym ]
-      end
-
-      #
-      # Get the text for the list of verbs.
-      #
-      def get_obj_list
-        out = "Object Types:\n"
-        str = ''
-        objs = $engine.dictionary.get_obj_types.sort_by( &:typename )
-        objs.each_with_index do |o, i|
-          name = o.typename
-          if o.short_typename != o.typename
-            name = "#{name} (#{o.short_typename})"
-          end
-          str << " #{name.ljust( 30, ' ' )}"
-          if ( ( i + 1 ) % 4 ).zero?
-            out << "#{str}\n"
-            str = ''
-          end
-        end
-
-        return out
-      end
-
-      #
-      # Get the list of help topics.
-      #
-      def get_topics
-        out = "Help Topics:\n"
-        str = ''
-        objs = $engine.help.topics.keys.sort
-        objs.each_with_index do |o, i|
-          str << " #{o.ljust( 30, ' ' )}"
-          if ( ( i + 1 ) % 4 ).zero?
-            out << "#{str}\n"
-            str = ''
-          end
-        end
-
-        return out
+        data = "\n For documentation use the gloo website. \n\n"
+        @engine.log.show data
       end
 
       #
@@ -126,137 +54,27 @@ module Gloo
 
       private
 
-      #
-      # Report an error with the inline help.
-      #
-      def report_help_error( opts )
-        $engine.err "#{HELP_NOT_FOUND_ERR} '#{opts}'"
-      end
-
-      #
-      # Dispatch the help to the right place.
-      #
-      def dispatch( opts )
-        return if dispatch_help_page( opts )
-
-        $log.debug 'looking for built in help topic'
-        cmd = DISPATCH[ opts.to_sym ]
-        if cmd
-          $log.debug 'found help index'
-          send cmd
-        else
-          $log.debug 'looking for entity help'
-          entity_help opts
-        end
-      rescue
-        report_help_error opts
-      end
-
-      #
-      # Dispatch to a help page if we can find one.
-      #
-      def dispatch_help_page( opts )
-        if $engine.help.topic? opts
-          $log.debug 'found expanded help topic'
-          $engine.help.page_topic opts
-          return true
-        end
-
-        key = $engine.dictionary.lookup_keyword opts
-        if $engine.help.topic? key
-          $log.debug 'found expanded help topic'
-          $engine.help.page_topic key
-          return true
-        end
-
-        return false
-      end
-
       #
       # Write output to it and show it unless we are in
       # silent mode.
       #
       def show_output( out )
-        $engine.heap.it.set_to out
-        puts out unless $engine.args.quiet?
-      end
-
-      #
-      # List all help topics (articles)
-      #
-      def show_topics
-        out = self.get_topics
-        show_output out
-      end
-
-      #
-      # Dispatch the help command to a verb or object
-      # if we can find one matching the request.
-      #
-      def entity_help( opts )
-        return if try_verb_help opts
-        return if try_object_help opts
-
-        report_help_error opts
-      end
-
-      #
-      # See if there is a verb we can show help
-      # information about.
-      #
-      def try_verb_help( opts )
-        if $engine.dictionary.verb?( opts )
-          t = $engine.dictionary.find_verb( opts )
-          out = t.send 'help'
-          show_output out
-          return true
-        end
-
-        return false
-      end
-
-      #
-      # See if there is a verb we can show help
-      # information about.
-      #
-      def try_object_help( opts )
-        if $engine.dictionary.obj?( opts )
-          t = $engine.dictionary.find_obj( opts )
-          out = t.send 'help'
-          show_output out
-          return true
-        end
-
-        return false
+        @engine.heap.it.set_to out
+        puts out unless @engine.args.quiet?
       end
 
       #
       # Show application settings.
       #
       def show_settings
-        $settings.show
+        @engine.settings.show
       end
 
       #
       # Show all keywords: verbs and objects.
       #
       def show_keywords
-        $engine.dictionary.show_keywords
-      end
-
-      #
-      # List the verbs
-      #
-      def show_verbs
-        show_output get_verb_list
-      end
-
-      #
-      # List the object types
-      #
-      def show_objs
-        out = self.get_obj_list
-        show_output out
+        @engine.dictionary.show_keywords
       end
 
     end

data/lib/gloo/verbs/version.rb

@@ -4,9 +4,9 @@
 # Show the current application version.
 #
 
-module Gloo
+module GlooLang
   module Verbs
-    class Version < Gloo::Core::Verb
+    class Version < GlooLang::Core::Verb
 
       KEYWORD = 'version'.freeze
       KEYWORD_SHORT = 'v'.freeze
@@ -15,7 +15,7 @@ module Gloo
       # Run the verb.
       #
       def run
-        $log.show Gloo::App::Info.display_title
+        @engine.log.show GlooLang::App::Info.full_version
       end
 
       #

data/lib/gloo.rb

@@ -12,6 +12,10 @@ module Gloo
   def self.run
     params = []
     ( params << '--cli' ) if ARGV.count.zero?
-    Gloo::App::Engine.new( params ).start
+
+    platform = Gloo::App::Platform.new
+    context = GlooLang::App::EngineContext.new(
+      params, platform, Gloo::App::Log, nil )
+    GlooLang::App::Engine.new( context ).start
   end
 end

data/lib/run.rb

@@ -11,4 +11,8 @@ require File.join( path, 'dependencies.rb' )
 
 params = []
 ( params << '--cli' ) if ARGV.count.zero?
-Gloo::App::Engine.new( params ).start
+
+platform = Gloo::App::Platform.new
+context = GlooLang::App::EngineContext.new(
+  params, platform, Gloo::App::Log, nil )
+GlooLang::App::Engine.new( context ).start