gloo 0.6.1 → 0.7.4

data/lib/gloo/verbs/quit.rb

@@ -35,37 +35,6 @@ module Gloo
         return KEYWORD_SHORT
       end
 
-      # ---------------------------------------------------------------------
-      #    Help
-      # ---------------------------------------------------------------------
-
-      #
-      # Get help for this verb.
-      #
-      def self.help
-        return <<~TEXT
-          QUIT VERB
-            NAME: quit
-            SHORTCUT: q
-
-          DESCRIPTION
-            Stop running the gloo application.
-            Cleanup and shutdown.
-
-          SYNTAX
-            quit
-
-          PARAMETERS
-            None
-
-          RESULT
-            None
-
-          ERRORS
-            None
-        TEXT
-      end
-
     end
   end
 end

data/lib/gloo/verbs/run.rb

@@ -12,11 +12,17 @@ module Gloo
       KEYWORD = 'run'.freeze
       KEYWORD_SHORT = 'r'.freeze
       EVALUATE_RUN = '~>'.freeze
+      MISSING_EXPR_ERR = 'Missing Expression!'.freeze
 
       #
       # Run the verb.
       #
       def run
+        if @tokens.token_count < 2
+          $engine.err MISSING_EXPR_ERR
+          return
+        end
+
         if @tokens.second == EVALUATE_RUN
           run_expression
         else
@@ -24,23 +30,6 @@ module Gloo
         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.
       #
@@ -56,34 +45,29 @@ module Gloo
       end
 
       # ---------------------------------------------------------------------
-      #    Help
+      #    Private functions
       # ---------------------------------------------------------------------
 
+      private
+
       #
-      # Get help for this verb.
+      # Run a script specified by pathname
       #
-      def self.help
-        return <<~TEXT
-          RUN VERB
-            NAME: run
-            SHORTCUT: r
-
-          DESCRIPTION
-            Run a script or other object.
-            This is the same as sending a 'run' message to the object.
-
-          SYNTAX
-            run <path.to.object>
-
-          PARAMETERS
-            path.to.object - Reference to the object which will be run.
+      def run_script
+        Gloo::Exec::Runner.run @tokens.second
+      end
 
-          RESULT
-            The result depends on the object that is run.
+      #
+      # Evaluate an expression and run that.
+      #
+      def run_expression
+        unless @tokens.token_count > 2
+          $engine.err MISSING_EXPR_ERR
+          return
+        end
 
-          ERRORS
-            The errors depend on the object that is run.
-        TEXT
+        expr = Gloo::Expr::Expression.new( @tokens.params[ 1..-1 ] )
+        $engine.parser.run expr.evaluate
       end
 
     end

data/lib/gloo/verbs/save.rb

@@ -34,39 +34,6 @@ module Gloo
         return KEYWORD_SHORT
       end
 
-      # ---------------------------------------------------------------------
-      #    Help
-      # ---------------------------------------------------------------------
-
-      #
-      # Get help for this verb.
-      #
-      def self.help
-        return <<~TEXT
-          SAVE VERB
-            NAME: save
-            SHORTCUT: >
-
-          DESCRIPTION
-            Stop running the gloo application.
-            Cleanup and shutdown.
-
-          SYNTAX
-            save <path.to.object>
-            Save a previously loaded object.  The path will be for the
-            root level object that was loaded earlier.
-
-          PARAMETERS
-            path.to.object - Name of the object file that is to be saved.
-
-          RESULT
-            The file is updated with the latest object state.
-
-          ERRORS
-            None
-        TEXT
-      end
-
     end
   end
 end

data/lib/gloo/verbs/show.rb

@@ -40,6 +40,12 @@ module Gloo
         return KEYWORD_SHORT
       end
 
+      # ---------------------------------------------------------------------
+      #    Private functions
+      # ---------------------------------------------------------------------
+
+      private
+
       #
       # Get the formatted string.
       #
@@ -53,37 +59,6 @@ module Gloo
         return str
       end
 
-      # ---------------------------------------------------------------------
-      #    Help
-      # ---------------------------------------------------------------------
-
-      #
-      # Get help for this verb.
-      #
-      def self.help
-        return <<~TEXT
-          SHOW VERB
-            NAME: show
-            SHORTCUT: =
-
-          DESCRIPTION
-            Show an object's value.
-
-          SYNTAX
-            show <path.to.object>
-
-          PARAMETERS
-            path.to.object - The object that we want to see.
-
-          RESULT
-            The object's value is shown.
-            <it> will contain the object's value.
-
-          ERRORS
-            None
-        TEXT
-      end
-
     end
   end
 end

data/lib/gloo/verbs/tell.rb

@@ -11,21 +11,18 @@ module Gloo
       KEYWORD = 'tell'.freeze
       KEYWORD_SHORT = '->'.freeze
       TO = 'to'.freeze
+      OBJ_NOT_FOUND_ERR = 'Object was not found: '.freeze
+      UNKNOWN_MSG_ERR = 'Missing message!'.freeze
 
       #
       # Run the verb.
       #
       def run
-        name = @tokens.second
-        msg = @tokens.after_token( TO )
-        pn = Gloo::Core::Pn.new name
-        o = pn.resolve
+        setup_msg
+        return unless @msg
 
-        if o
-          Gloo::Exec::Dispatch.message msg, o, @params
-        else
-          $log.error "Could not send message to object.  Bad path: #{name}"
-        end
+        setup_target
+        dispatch_msg
       end
 
       #
@@ -43,35 +40,38 @@ module Gloo
       end
 
       # ---------------------------------------------------------------------
-      #    Help
+      #    Private functions
       # ---------------------------------------------------------------------
 
+      private
+
       #
-      # Get help for this verb.
+      # Lookup the message to send.
       #
-      def self.help
-        return <<~TEXT
-          TELL VERB
-            NAME: tell
-            SHORTCUT: ->
-
-          DESCRIPTION
-            Send a message to an object.
-            Ask the object to perform an action.
+      def setup_msg
+        @msg = @tokens.after_token( TO )
 
-          SYNTAX
-            tell <path.to.object> to <message>
-
-          PARAMETERS
-            path.to.object - The object that we want to see.
-            message - The message to send.
+        $engine.err( UNKNOWN_MSG_ERR ) unless @msg
+      end
 
-          RESULT
-            The result depends on the message that is sent.
+      #
+      # Setup the target of the message.
+      #
+      def setup_target
+        @obj_name = @tokens.second
+        pn = Gloo::Core::Pn.new @obj_name
+        @target_obj = pn.resolve
+      end
 
-          ERRORS
-            Errors depend on the message that is sent.
-        TEXT
+      #
+      # Dispatch the message to the target object.
+      #
+      def dispatch_msg
+        if @target_obj
+          Gloo::Exec::Dispatch.message @msg, @target_obj, @params
+        else
+          $engine.err "#{OBJ_NOT_FOUND_ERR} #{@obj_name}"
+        end
       end
 
     end

data/lib/gloo/verbs/unless.rb

@@ -10,32 +10,19 @@ module Gloo
 
       KEYWORD = 'unless'.freeze
       KEYWORD_SHORT = 'if!'.freeze
-      THEN = 'do'.freeze
+      DO = 'do'.freeze
+      MISSING_EXPR_ERR = 'Missing Expression!'.freeze
 
       #
       # Run the verb.
       #
       def run
-        value = @tokens.before_token( THEN )
-        if value.count > 1
-          # The first token is the verb, so we drop it.
-          value = value[ 1..-1 ]
-        end
+        value = value_tokens
+        return if value.nil?
 
-        evals_false = false
-        if value.count.positive?
-          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
+        return unless evals_false( value )
 
-        cmd = @tokens.expr_after( THEN )
-        i = $engine.parser.parse_immediate cmd
-        return unless i
-
-        i.run
+        run_do
       end
 
       #
@@ -53,37 +40,51 @@ module Gloo
       end
 
       # ---------------------------------------------------------------------
-      #    Help
+      #    Private functions
       # ---------------------------------------------------------------------
 
+      private
+
       #
-      # Get help for this verb.
+      # Get the list of tokens that represent the parameters
+      # of the unless command.
       #
-      def self.help
-        return <<~TEXT
-          UNLESS VERB
-            NAME: unless
-            SHORTCUT: if!
-
-          DESCRIPTION
-            Unless an expression is true, do something.
-            This is the opposite of the if verb.
-
-          SYNTAX
-            unless <true> do <do>
-
-          PARAMETERS
-            true - Does the expression evaluate to true?
-            do - Execute command if the expression is not true.
-
-          RESULT
-            Unchanged if the expression is true.
-            If not true, then the result will be based on the command
-            specified after the 'do' keyword.
-
-          ERRORS
-            The errors depend on the object that is run.
-        TEXT
+      def value_tokens
+        value = @tokens.before_token( DO )
+        if value && value.count > 1
+          # The first token is the verb, so we drop it.
+          value = value[ 1..-1 ]
+        else
+          $engine.err MISSING_EXPR_ERR
+        end
+
+        return value
+      end
+
+      #
+      # Does the given value evalute to true?
+      #
+      def evals_false( value )
+        eval_result = false
+        if value.count.positive?
+          expr = Gloo::Expr::Expression.new( value )
+          result = expr.evaluate
+          eval_result = true if result == false
+          eval_result = true if result.is_a?( Numeric ) && result.zero?
+        end
+
+        return eval_result
+      end
+
+      #
+      # Run the 'do' command.
+      #
+      def run_do
+        cmd = @tokens.expr_after( DO )
+        i = $engine.parser.parse_immediate cmd
+        return unless i
+
+        i.run
       end
 
     end

data/lib/gloo/verbs/version.rb

@@ -32,36 +32,6 @@ module Gloo
         return KEYWORD_SHORT
       end
 
-      # ---------------------------------------------------------------------
-      #    Help
-      # ---------------------------------------------------------------------
-
-      #
-      # Get help for this verb.
-      #
-      def self.help
-        return <<~TEXT
-          VERSION VERB
-            NAME: version
-            SHORTCUT: v
-
-          DESCRIPTION
-            Show the application version information.
-
-          SYNTAX
-            version
-
-          PARAMETERS
-            None
-
-          RESULT
-            None
-
-          ERRORS
-            None
-        TEXT
-      end
-
     end
   end
 end