gloo 0.7.6 → 1.0.0

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

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.rb

@@ -3,19 +3,19 @@
 #
 # Start the Engine.
 #
-require 'gloo/core/baseo'
-require 'gloo/core/obj'
 
+# Look for all required dependencies.
 path = File.dirname( File.absolute_path( __FILE__ ) )
-root = File.join( path, 'gloo', '**/*.rb' )
-Dir.glob( root ).each do |ruby_file|
-  require ruby_file
-end
+require File.join( path, 'dependencies.rb' )
 
 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

@@ -4,13 +4,15 @@
 #
 # From the /lib/ directory:  ruby run.rb
 #
-require 'gloo/core/baseo'
-require 'gloo/core/obj'
 
+# Look for all required dependencies.
 path = File.dirname( File.absolute_path( __FILE__ ) )
-root = File.join( path, 'gloo', '**/*.rb' )
-Dir.glob( root ) { |ruby_file| require ruby_file }
+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