gloo 0.3.0 → 0.4.0

data/lib/gloo/app/help.rb

@@ -11,19 +11,25 @@ module Gloo
       # Get text to display when the application is run
       # in HELP mode.
       def self.get_help_text
-        str = "\nNAME\n\tgloo\n\n"
-        str << "\nDESCRIPTION\n\tGloo scripting language.  A scripting language built on ruby.\n"
-        str << "\tMore information coming soon.\n\n"
-        str << "\nSYNOPSIS\n\tgloo [global option] [file]\n\n"
-        str << "\nGLOBAL OPTIONS\n"
-        str << "\t--cli \t\t - Run in CLI mode\n"
-        str << "\t--version \t - Show application version\n"
-        str << "\t--help \t\t - Show this help page\n"
-        str << "\n"
-        return str
+        return <<~TEXT
+          NAME
+          \tgloo
+
+          DESCRIPTION
+          \tGloo scripting language.  A scripting language built on ruby.
+          \tMore information coming soon.
+
+          SYNOPSIS
+          \tgloo [global option] [file]
+
+          GLOBAL OPTIONS
+          \t--cli \t\t - Run in CLI mode
+          \t--version \t - Show application version
+          \t--help \t\t - Show this help page
+
+        TEXT
       end
 
     end
   end
 end
-

data/lib/gloo/app/info.rb

@@ -8,9 +8,10 @@ module Gloo
   module App
     class Info
 
-      VERSION = "0.3.0"
-      APP_NAME = "Gloo"
+      VERSION = '0.4.0'.freeze
+      APP_NAME = 'Gloo'.freeze
 
+      # Get the application display title.
       def self.display_title
         return "#{APP_NAME}, version #{VERSION}"
       end
@@ -18,4 +19,3 @@ module Gloo
     end
   end
 end
-

data/lib/gloo/app/log.rb

@@ -12,46 +12,46 @@ module Gloo
     class Log
 
       attr_reader :logger, :quiet
-      
+
       def initialize( quiet )
-        f = File.join( $settings.log_path, "gloo.log" )
+        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
+      def show( msg )
         puts msg unless @quiet
       end
-      
-      def debug msg
+
+      def debug( msg )
         @logger.debug msg
       end
 
-      def info msg
+      def info( msg )
         @logger.info msg
         puts msg.blue unless @quiet
       end
 
-      def warn msg
+      def warn( msg )
         @logger.warn msg
         puts msg.yellow unless @quiet
       end
 
-      def error msg, e = nil
-        if e
-          @logger.error msg
-          @logger.error e.message
-          @logger.error e.backtrace
+      def error( msg, ex = nil, engine = nil )
+        engine&.heap&.error&.set_to msg
+        @logger.error msg
+        if ex
+          @logger.error ex.message
+          @logger.error ex.backtrace
           puts msg.red unless @quiet
-          puts e.message.red unless @quiet
-          puts e.backtrace unless @quiet
+          puts ex.message.red unless @quiet
+          puts ex.backtrace unless @quiet
         else
-          @logger.error msg
           puts msg.red unless @quiet
         end
-      end  
+      end
 
     end
   end

data/lib/gloo/app/mode.rb

@@ -7,19 +7,19 @@
 module Gloo
   module App
     class Mode
-          
+
       EMBED = :embed      # Run as embedded script processor
       CLI = :cli          # Run in interactive (CLI) mode
       SCRIPT = :script    # Run a script
       VERSION = :version  # Show version information
       HELP = :help        # Show the help screen
       TEST = :test        # Running in Unit Test mode.
-            
+
       # Get the default mode.
       def self.default_mode
         return EMBED
       end
-      
+
     end
   end
-end
+end

data/lib/gloo/app/settings.rb

@@ -15,90 +15,93 @@ module Gloo
       attr_reader :user_root, :log_path, :config_path, :project_path
       attr_reader :start_with, :list_indent
 
-
       # Load setting from the yml file.
-      def initialize mode
+      def initialize( mode )
         @mode = mode
         init_root
         init_path_settings
         init_user_settings
       end
-      
+
       def init_root
         if in_test_mode?
           path = File.dirname( File.dirname( File.absolute_path( __FILE__ ) ) )
           path = File.dirname( File.dirname( path ) )
-          path = File.join( path, "test", "gloo" )
+          path = File.join( path, 'test', 'gloo' )
           @user_root = path
         else
-          @user_root = File.join( Dir.home, "gloo" )
+          @user_root = File.join( Dir.home, 'gloo' )
         end
       end
-      
+
       # Are we in test mode?
       def in_test_mode?
         return @mode == 'TEST'
       end
 
+      # Get the project path for the current mode.
+      def project_path_for_mode( settings )
+        return File.join( @user_root, 'projects' ) if in_test_mode?
+
+        return settings[ 'gloo' ][ 'project_path' ]
+      end
+
       # Get the app's required directories.
       def init_path_settings
-        Dir.mkdir( @user_root ) unless File.exists?( @user_root )
+        Dir.mkdir( @user_root ) unless File.exist?( @user_root )
 
-        @log_path = File.join( @user_root, "logs" )
-        Dir.mkdir( @log_path ) unless File.exists?( @log_path )
+        @log_path = File.join( @user_root, 'logs' )
+        Dir.mkdir( @log_path ) unless File.exist?( @log_path )
 
-        @config_path = File.join( @user_root, "config" )
-        Dir.mkdir( @config_path ) unless File.exists?( @config_path )
+        @config_path = File.join( @user_root, 'config' )
+        Dir.mkdir( @config_path ) unless File.exist?( @config_path )
       end
 
+      # Initialize the user settings for the currently
+      # running environment.
       def init_user_settings
         settings = get_settings
-        
-        if in_test_mode?
-          @project_path = File.join( @user_root, "projects" )
-        else
-          @project_path = settings[ 'gloo' ][ 'project_path' ]
-        end
+
+        @project_path = project_path_for_mode settings
         @start_with = settings[ 'gloo' ][ 'start_with' ]
         @list_indent = settings[ 'gloo' ][ 'list_indent' ]
       end
-      
+
       # Get the app's required directories.
       def get_settings
-        f = File.join( @config_path, "gloo.yml" )
-        create_settings( f ) unless File.exists?( f )
-        return YAML::load_file f
+        f = File.join( @config_path, 'gloo.yml' )
+        create_settings( f ) unless File.exist?( f )
+        return YAML.load_file f
       end
 
       # Create settings file.
-      def create_settings f
-        IO.write( f, get_default_settings )
+      def create_settings( file )
+        IO.write( file, get_default_settings )
       end
 
       # Get the value for default settings.
       def get_default_settings
-        home_dir = Dir.home
-        projects = File.join( @user_root, "projects" )
-        str = <<TEXT
-gloo:
-  project_path: #{projects}
-  start_with: 
-  list_indent: 1
-TEXT
+        projects = File.join( @user_root, 'projects' )
+        str = <<~TEXT
+          gloo:
+            project_path: #{projects}
+            start_with:
+            list_indent: 1
+        TEXT
         return str
       end
 
       # Show the current application settings.
       def show
         puts "\nApplication Settings:".blue
-        puts "  User Root Path is here:  ".yellow + @user_root.white
-        puts "  Projects directory:  ".yellow + @projects.white
-        puts "  Startup with:  ".yellow + @start_with.white
-        puts "  Indent in Listing:  ".yellow + @list_indent.white
-        puts ""
-        puts "  Screen Lines:  ".yellow + "#{Settings.lines}".white
-        puts "  Page Size:  ".yellow + "#{Settings.page_size}".white
-        puts ""
+        puts '  User Root Path is here:  '.yellow + @user_root.white
+        puts '  Projects directory:  '.yellow + @projects.white
+        puts '  Startup with:  '.yellow + @start_with.white
+        puts '  Indent in Listing:  '.yellow + @list_indent.white
+        puts ''
+        puts '  Screen Lines:  '.yellow + Settings.lines.to_s.white
+        puts '  Page Size:  '.yellow + Settings.page_size.to_s.white
+        puts ''
       end
 
       # Get the number of lines on screen.
@@ -122,4 +125,4 @@ TEXT
 
     end
   end
-end
+end

data/lib/gloo/core/baseo.rb

@@ -8,17 +8,17 @@
 module Gloo
   module Core
     class Baseo
-      
+
       attr_accessor :name
-      
+
       # Set up the object.
-      def initialize()
-        @name = ""
+      def initialize
+        @name = ''
       end
-      
-      # 
+
+      #
       # The object type, suitable for display.
-      # 
+      #
       def type_display
         raise 'this method should be overriden'
       end

data/lib/gloo/core/dictionary.rb

@@ -8,32 +8,32 @@ require 'singleton'
 module Gloo
   module Core
     class Dictionary
-      
+
       include Singleton
-      
+
       attr_reader :verbs, :objs
-      
+
       # Set up the object dictionary.
-      def initialize()
+      def initialize
         @verbs = {}
         @objs = {}
         @verb_references = []
         @obj_references = []
       end
-      
+
       # Register a verb.
-      def register_verb subclass
+      def register_verb( subclass )
         @verb_references << subclass
       end
-      
+
       # Register an object type.
-      def register_obj subclass
+      def register_obj( subclass )
         @obj_references << subclass
       end
 
       # Initialize verbs and objects in the dictionary.
       def init
-        $log.debug "initializing dictionaries"
+        $log.debug 'initializing dictionaries'
         init_verbs
         init_objs
       end
@@ -42,60 +42,63 @@ module Gloo
       def init_objs
         $log.debug "initializing #{@obj_references.count} objects"
         @obj_references.each do |o|
-          $log.debug  o
+          $log.debug o
           @objs[ o.typename ] = o
           @objs[ o.short_typename ] = o
         end
       end
-      
+
       # Is the given word an object type?
-      def is_obj? word
+      def obj?( word )
         return false unless word
+
         return @objs.key?( word.downcase )
       end
-      
+
       # Find the object type by name.
-      def find_obj word
+      def find_obj( word )
         return nil unless word
-        return nil unless is_obj?( word )
+        return nil unless obj?( word )
+
         return @objs[ word.downcase ]
       end
 
-      
       # Init the list of verbs.
       def init_verbs
         $log.debug "initializing #{@verb_references.count} verbs"
         @verb_references.each do |v|
-          $log.debug  v
+          $log.debug v
           @verbs[ v.keyword ] = v
           @verbs[ v.keyword_shortcut ] = v
           # v.send( :new ).run
         end
       end
-      
+
       # Is the given word a verb?
-      def is_verb? word
+      def verb?( word )
         return false unless word
+
         return @verbs.key?( word.downcase )
       end
-      
+
       # Find the verb by name.
-      def find_verb verb
+      def find_verb( verb )
         return nil unless verb
-        return nil unless is_verb?( verb )
+        return nil unless verb?( verb )
+
         return @verbs[ verb.downcase ]
       end
-      
+
       # Get the list of verbs, sorted.
       def get_obj_types
-        return @obj_references.sort{ |a,b| a.typename <=> b.typename }
+        return @obj_references.sort { |a, b| a.typename <=> b.typename }
       end
-      
+
       # Get the list of verbs, sorted.
       def get_verbs
-        return @verb_references.sort{ |a,b| a.keyword <=> b.keyword }
+        return @verb_references.sort { |a, b| a.keyword <=> b.keyword }
       end
-      
+
     end
   end
 end

data/lib/gloo/core/error.rb

@@ -0,0 +1,50 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2020 Eric Crane.  All rights reserved.
+#
+# If the last command to run generated an error it will be here.
+#
+
+module Gloo
+  module Core
+    class Error
+
+      attr_accessor :value
+
+      # Set up the error object.
+      def initialize
+        @value = nil
+        @error_count = 0
+      end
+
+      # Set the value of error.
+      def set_to( new_value )
+        @error_count += 1
+        @value = new_value
+      end
+
+      # Clear out the error message.
+      def clear
+        @error_count = 0
+        @value = nil
+      end
+
+      # Start counting errors.
+      # We're looking to see if we get any new ones during
+      # a script or an immediate command.
+      def start_tracking
+        @error_count = 0
+      end
+
+      # Clear out error if we didn't add any new ones.
+      def clear_if_no_errors
+        self.clear if @error_count.zero?
+      end
+
+      # Get the string representation of the error.
+      def to_s
+        return @value.to_s
+      end
+
+    end
+  end
+end