gloo 0.4.0 → 0.5.0

data/lib/gloo/persist/file_loader.rb

@@ -10,6 +10,7 @@ module Gloo
 
       BEGIN_BLOCK = 'BEGIN'.freeze
       END_BLOCK = 'END'.freeze
+      SPACE_CNT = 2
 
       attr_reader :obj
 
@@ -85,10 +86,9 @@ module Gloo
           @tabs = tabs
           @indent = 1
         elsif tabs < @tabs # outdent
-          while tabs < @tabs
-            @tabs -= 1
-            @indent -= 1
-          end
+          diff = @tabs - tabs
+          @tabs -= diff
+          @indent -= diff
         end
         puts "tabs: #{@tabs}, indent: #{@indent}, line: #{line}" if @debug
       end
@@ -116,7 +116,10 @@ module Gloo
       def setup_process_obj_line
         if @exiting_multiline
           @exiting_multiline = false
-        elsif @indent.positive?
+          @indent += 1
+        end
+
+        if @indent.positive?
           @parent = @last
           @parent_stack.push @parent
         elsif @indent.negative?
@@ -139,7 +142,7 @@ module Gloo
         params = { name: name, type: type, value: value, parent: @parent }
         @last = $engine.factory.create( params )
 
-        if @last&.multiline_value?
+        if value.empty? && @last&.multiline_value?
           @multi_indent = 0
           @in_multiline = true
           puts "*** Start multiline. multi_indent: #{@multi_indent}" if @debug
@@ -153,6 +156,14 @@ module Gloo
       #
       def tab_count( line )
         i = 0
+
+        if line[ i ] == ' '
+          i += 1 while line[ i ] == ' '
+          tab_equiv = ( i / SPACE_CNT ).to_i
+          puts "Found #{i} spaces => #{tab_equiv}" if @debug
+          return tab_equiv
+        end
+
         i += 1 while line[ i ] == "\t"
         return i
       end

data/lib/gloo/persist/line_splitter.rb

@@ -35,8 +35,7 @@ module Gloo
       # Detect the object name.
       #
       def detect_name
-        @line = @line[ @tabs..-1 ]
-        @line = @line[ 0..-2 ] if @line[ -1 ] == "\n"
+        @line = @line.strip
         @idx = @line.index( ' ' )
         @name = @line[ 0..@idx - 1 ]
       end
@@ -47,6 +46,12 @@ module Gloo
       def detect_type
         @line = @line[ @idx + 1..-1 ]
         @idx = @line.index( ' ' )
+
+        if @line[ 0 ] == ':'
+          @type = 'untyped'
+          return
+        end
+
         @type = @line[ 0..( @idx ? @idx - 1 : -1 ) ]
         @type = @type[ 1..-1 ] if @type[ 0 ] == '['
         @type = @type[ 0..-2 ] if @type[ -1 ] == ']'

data/lib/gloo/persist/persist_man.rb

@@ -50,26 +50,50 @@ module Gloo
       # Load the object from the file.
       #
       def load( name )
-        pn = get_full_path_name name
-        return unless pn
-
-        $log.debug "Load file at: #{pn}"
-        fs = Gloo::Persist::FileStorage.new( pn )
-        fs.load
-        @maps << fs
-        $engine.event_manager.on_load fs.obj
-        # show_maps
+        pns = get_full_path_names name
+        return unless pns
+
+        pns.each do |pn|
+          $log.debug "Load file(s) at: #{pn}"
+          fs = Gloo::Persist::FileStorage.new( pn )
+          fs.load
+          @maps << fs
+          $engine.event_manager.on_load fs.obj
+        end
       end
 
       #
       # Get the full path and name of the file.
       #
-      def get_full_path_name( name )
+      def get_full_path_names( name )
         return nil if name.strip.empty?
 
-        path = $settings.project_path
-        full_name = "#{name}#{file_ext}"
-        return File.join( path, full_name )
+        if name.strip[ -1 ] == '*'
+          pns = []
+          dir = File.join( $settings.project_path, name[ 0..-2 ] )
+          Dir.glob( "#{dir}*.gloo" ).each do |f|
+            pns << f
+          end
+          return pns
+        else
+          ext_path = File.expand_path( name )
+          return [ ext_path ] if self.gloo_file?( ext_path )
+
+          full_name = "#{name}#{file_ext}"
+          return [ File.join( $settings.project_path, full_name ) ]
+        end
+      end
+
+      #
+      # Check to see if a given path name refers to a gloo object file.
+      #
+      def gloo_file?( name )
+        return false unless name
+        return false unless File.exist?( name )
+        return false unless File.file?( name )
+        return false unless name.end_with?( self.file_ext )
+
+        return true
       end
 
       # Get the default file extention.

data/lib/gloo/verbs/cls.rb

@@ -0,0 +1,67 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2020 Eric Crane.  All rights reserved.
+#
+# Clear the screen.
+#
+
+module Gloo
+  module Verbs
+    class Cls < Gloo::Core::Verb
+
+      KEYWORD = 'cls'.freeze
+      KEYWORD_SHORT = 'cls'.freeze
+
+      #
+      # Run the verb.
+      #
+      def run
+        $engine&.clear_screen
+      end
+
+      #
+      # Get the Verb's keyword.
+      #
+      def self.keyword
+        return KEYWORD
+      end
+
+      #
+      # Get the Verb's keyword shortcut.
+      #
+      def self.keyword_shortcut
+        return KEYWORD_SHORT
+      end
+
+      # ---------------------------------------------------------------------
+      #    Help
+      # ---------------------------------------------------------------------
+
+      #
+      # Get help for this verb.
+      #
+      def self.help
+        return <<~TEXT
+          CLS VERB
+            NAME: cls
+            SHORTCUT: cls
+
+          DESCRIPTION
+            Clear the console screen.
+
+          SYNTAX
+            cls
+
+          PARAMETERS
+            None
+
+          RESULT
+            The screen is cleared and cursor set to the top.
+
+          ERRORS
+            None
+        TEXT
+      end
+
+    end
+  end
+end

data/lib/gloo/verbs/help.rb

@@ -12,6 +12,7 @@ module Gloo
       KEYWORD_SHORT = '?'.freeze
 
       DISPATCH = {
+        settings: 'show_settings',
         verb: 'show_verbs',
         verbs: 'show_verbs',
         v: 'show_verbs',
@@ -113,6 +114,13 @@ module Gloo
         $engine.run_help( true )
       end
 
+      #
+      # Show application settings.
+      #
+      def show_settings
+        $settings.show
+      end
+
       #
       # List the verbs
       #
@@ -199,6 +207,7 @@ module Gloo
           PARAMETERS
             about - Optional parameter.
                     If no parameter is given, shows the default help screen
+                    settings - Show application settings
                     verbs - List available verbs
                     objects - List available objects
                     <verb> - Look up detail about a verb

data/lib/gloo/verbs/if.rb

@@ -27,6 +27,7 @@ module Gloo
           expr = Gloo::Expr::Expression.new( value )
           result = expr.evaluate
           evals_true = true if result == true
+          evals_true = true if result.is_a?( Numeric ) && result != 0
         end
         return unless evals_true
 

data/lib/gloo/verbs/load.rb

@@ -49,8 +49,9 @@ module Gloo
 
           DESCRIPTION
             Load an object file.
-            The file's path should be provided from the gloo project folder
-            as the root directory.
+            There are two ways to specify the file.  Give either the full path and file name or use a relative path from the gloo project folder.  For the latter, the extension is not needed.  For the former, the
+            file extension is necessary.
+            Using * instead of a file name will load all gloo files in the folder.
 
           SYNTAX
             load <file_name>

data/lib/gloo/verbs/move.rb

@@ -0,0 +1,128 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2020 Eric Crane.  All rights reserved.
+#
+# Move an object to a new parent.
+#
+
+module Gloo
+  module Verbs
+    class Move < Gloo::Core::Verb
+
+      KEYWORD = 'move'.freeze
+      KEYWORD_SHORT = 'mv'.freeze
+      TO = 'to'.freeze
+
+      #
+      # Run the verb.
+      #
+      def run
+        dst = lookup_dst
+        return if dst.nil?
+
+        o = lookup_obj
+        return unless o
+
+        o.parent.remove_child o
+        dst.add_child o
+      end
+
+      #
+      # Get the Verb's keyword.
+      #
+      def self.keyword
+        return KEYWORD
+      end
+
+      #
+      # Get the Verb's keyword shortcut.
+      #
+      def self.keyword_shortcut
+        return KEYWORD_SHORT
+      end
+
+      # ---------------------------------------------------------------------
+      #    Helper functions
+      # ---------------------------------------------------------------------
+
+      #
+      # Lookup the object that we're moving.
+      #
+      def lookup_obj
+        arr = @tokens.before_token( TO )
+        if arr.count == 1
+          msg = 'object to move was not specified'
+          $log.error msg, nil, $engine
+        end
+
+        name = arr[ 1 ]
+        pn = Gloo::Core::Pn.new name
+        o = pn.resolve
+
+        unless o
+          msg = "could not find object to move: #{name}"
+          $log.error msg, nil, $engine
+        end
+
+        return o
+      end
+
+      #
+      # Lookup destination, the new parent object.
+      #
+      def lookup_dst
+        dst = @tokens.after_token( TO )
+        unless dst
+          msg = "'move' must include 'to' parent object"
+          $log.error msg, nil, $engine
+          return nil
+        end
+
+        pn = Gloo::Core::Pn.new dst
+        o = pn.resolve
+        unless o
+          msg = "could not resolve '#{dst}'"
+          $log.error msg, nil, $engine
+          return nil
+        end
+
+        return o
+      end
+
+      # ---------------------------------------------------------------------
+      #    Help
+      # ---------------------------------------------------------------------
+
+      #
+      # Get help for this verb.
+      #
+      def self.help
+        return <<~TEXT
+          MOVE VERB
+            NAME: move
+            SHORTCUT: mv
+
+          DESCRIPTION
+            Move an object to a new parent.
+
+          SYNTAX
+            move <path.to.object> to <new.parent>
+
+          PARAMETERS
+            path.to.object - The object that we want to move.
+            new.parent - The new location for the object.
+
+          RESULT
+            The object will now be in the new location.
+
+          ERRORS
+            The <path.to.object> is not specified.
+            The <path.to.object> cannot be resolved.
+            The <new.parent> is not specified.
+            The <new.parent> cannot be resolved.
+            The 'to' keyword is missing.
+        TEXT
+      end
+
+    end
+  end
+end

data/lib/gloo/verbs/run.rb

@@ -11,22 +11,36 @@ module Gloo
 
       KEYWORD = 'run'.freeze
       KEYWORD_SHORT = 'r'.freeze
+      EVALUATE_RUN = '~>'.freeze
 
       #
       # Run the verb.
       #
       def run
-        name = @tokens.second
-        pn = Gloo::Core::Pn.new name
-        o = pn.resolve
-
-        if o
-          o.send_message 'run'
+        if @tokens.second == EVALUATE_RUN
+          run_expression
         else
-          $log.error "Could not send message to object.  Bad path: #{name}"
+          run_script
         end
       end
 
+      #
+      # Run a script specified by pathname
+      #
+      def run_script
+        Gloo::Exec::Runner.run @tokens.second
+      end
+
+      #
+      # Evaluate an expression and run that.
+      #
+      def run_expression
+        return unless @tokens.token_count > 2
+
+        expr = Gloo::Expr::Expression.new( @tokens.params[ 1..-1 ] )
+        $engine.parser.run expr.evaluate
+      end
+
       #
       # Get the Verb's keyword.
       #

data/lib/gloo/verbs/tell.rb

@@ -22,7 +22,7 @@ module Gloo
         o = pn.resolve
 
         if o
-          o.send_message( msg, @params )
+          Gloo::Exec::Dispatch.message msg, o, @params
         else
           $log.error "Could not send message to object.  Bad path: #{name}"
         end

data/lib/gloo/verbs/unless.rb

@@ -27,6 +27,7 @@ module Gloo
           expr = Gloo::Expr::Expression.new( value )
           result = expr.evaluate
           evals_false = true if result == false
+          evals_false = true if result.is_a?( Numeric ) && result.zero?
         end
         return unless evals_false