gloo 0.6.1 → 0.7.0

data/lib/gloo/app/info.rb

@@ -8,10 +8,12 @@ module Gloo
   module App
     class Info
 
-      VERSION = '0.6.1'.freeze
+      VERSION = '0.7.0'.freeze
       APP_NAME = 'Gloo'.freeze
 
+      #
       # Get the application display title.
+      #
       def self.display_title
         return "#{APP_NAME}, version #{VERSION}"
       end

data/lib/gloo/app/log.rb

@@ -13,6 +13,11 @@ module Gloo
 
       attr_reader :logger, :quiet
 
+      #
+      # Set up a logger.
+      # If quiet is true, then message are written to the log
+      # but not to the console.
+      #
       def initialize( quiet )
         f = File.join( $settings.log_path, 'gloo.log' )
         @logger = Logger.new( f )
@@ -20,25 +25,43 @@ module Gloo
         @quiet = quiet
       end
 
+      #
       # Show a message unless we're in quite mode.
+      #
       def show( msg )
         puts msg unless @quiet
       end
 
+      #
+      # Write a debug message to the log.
+      #
       def debug( msg )
         @logger.debug msg
       end
 
+      #
+      # Write an information message to the log.
+      # Also write to the console unless quiet.
+      #
       def info( msg )
         @logger.info msg
         puts msg.blue unless @quiet
       end
 
+      #
+      # Write a warning message to the log.
+      # Also write to the console unless quiet.
+      #
       def warn( msg )
         @logger.warn msg
         puts msg.yellow unless @quiet
       end
 
+      #
+      # Write an error message to the log and set the error
+      # in the engine's data heap.
+      # Also write to the console unless quiet.
+      #
       def error( msg, ex = nil, engine = nil )
         engine&.heap&.error&.set_to msg
         @logger.error msg

data/lib/gloo/app/mode.rb

@@ -15,7 +15,9 @@ module Gloo
       HELP = :help        # Show the help screen
       TEST = :test        # Running in Unit Test mode.
 
+      #
       # Get the default mode.
+      #
       def self.default_mode
         return EMBED
       end

data/lib/gloo/app/settings.rb

@@ -18,6 +18,7 @@ module Gloo
 
       #
       # Load setting from the yml file.
+      # The mode parameter is used to determine if we are running in TEST.
       #
       def initialize( mode )
         @mode = mode
@@ -26,20 +27,6 @@ module Gloo
         init_user_settings
       end
 
-      #
-      # Initialize gloo's root path.
-      #
-      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' )
-          @user_root = path
-        else
-          @user_root = File.join( Dir.home, 'gloo' )
-        end
-      end
-
       #
       # Are we in test mode?
       #
@@ -56,6 +43,80 @@ module Gloo
         return settings[ 'gloo' ][ 'project_path' ]
       end
 
+      #
+      # Show the current application settings.
+      # Can be seen in app with 'help settings'
+      #
+      def show
+        puts "\nApplication Settings:".blue
+        puts '  Startup with:  '.yellow + @start_with.white
+        puts '  Indent in Listing:  '.yellow + @list_indent.to_s.white
+        puts '  Screen Lines:  '.yellow + Gloo::App::Settings.lines.to_s.white
+        puts '  Page Size:  '.yellow + Gloo::App::Settings.page_size.to_s.white
+        puts ''
+        self.show_paths
+        puts ''
+      end
+
+      #
+      # Show path settings
+      #
+      def show_paths
+        puts '  User Root Path is here:  '.yellow + @user_root.white
+        puts '  Projects Path:  '.yellow + @project_path.white
+        puts '  Tmp Path:  '.yellow + @tmp_path.white
+        puts '  Debug Path:  '.yellow + @debug_path.white
+      end
+
+      #
+      # Get the number of vertical lines on screen.
+      #
+      def self.lines
+        TTY::Screen.rows
+      end
+
+      #
+      # Get the number of horizontal columns on screen.
+      #
+      def self.cols
+        TTY::Screen.cols
+      end
+
+      #
+      # Get the default page size.
+      # This is the number of lines of text we can show.
+      #
+      def self.page_size
+        Settings.lines - 3
+      end
+
+      #
+      # How many lines should we use for a preview?
+      #
+      def self.preview_lines
+        return 7
+      end
+
+      # ---------------------------------------------------------------------
+      #    Private
+      # ---------------------------------------------------------------------
+
+      private
+
+      #
+      # Initialize gloo's root path.
+      #
+      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' )
+          @user_root = path
+        else
+          @user_root = File.join( Dir.home, 'gloo' )
+        end
+      end
+
       #
       # Get the app's required directories.
       #
@@ -120,60 +181,6 @@ module Gloo
         return str
       end
 
-      #
-      # Show the current application settings.
-      # Can be seen in app with 'help settings'
-      #
-      def show
-        puts "\nApplication Settings:".blue
-        puts '  Startup with:  '.yellow + @start_with.white
-        puts '  Indent in Listing:  '.yellow + @list_indent.to_s.white
-        puts '  Screen Lines:  '.yellow + Gloo::App::Settings.lines.to_s.white
-        puts '  Page Size:  '.yellow + Gloo::App::Settings.page_size.to_s.white
-        puts ''
-        self.show_paths
-        puts ''
-      end
-
-      #
-      # Show path settings
-      #
-      def show_paths
-        puts '  User Root Path is here:  '.yellow + @user_root.white
-        puts '  Projects Path:  '.yellow + @project_path.white
-        puts '  Tmp Path:  '.yellow + @tmp_path.white
-        puts '  Debug Path:  '.yellow + @debug_path.white
-      end
-
-      #
-      # Get the number of vertical lines on screen.
-      #
-      def self.lines
-        TTY::Screen.rows
-      end
-
-      #
-      # Get the number of horizontal columns on screen.
-      #
-      def self.cols
-        TTY::Screen.cols
-      end
-
-      #
-      # Get the default page size.
-      # This is the number of lines of text we can show.
-      #
-      def self.page_size
-        Settings.lines - 3
-      end
-
-      #
-      # How many lines should we use for a preview?
-      #
-      def self.preview_lines
-        return 7
-      end
-
     end
   end
 end

data/lib/gloo/convert/converter.rb

@@ -0,0 +1,35 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2020 Eric Crane.  All rights reserved.
+#
+# Data conversion manager.
+#
+
+module Gloo
+  module Convert
+    class Converter
+
+      # ---------------------------------------------------------------------
+      #    Convert
+      # ---------------------------------------------------------------------
+
+      #
+      # Convert the given value to the specified type,
+      # or if no conversion is available, revert to default.
+      #
+      def convert( value, to_type, default = nil )
+        begin
+          name = "Gloo::Convert::#{value.class}To#{to_type}"
+          clazz = name.split( '::' ).inject( Object ) { |o, c| o.const_get c }
+          o = clazz.new
+          return o.convert( value )
+        rescue => e
+          $log.error e.message
+          $engine.heap.error.set_to e.message
+        end
+
+        return default
+      end
+
+    end
+  end
+end

data/lib/gloo/convert/string_to_datetime.rb

@@ -1,5 +1,5 @@
 # Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 202 Eric Crane.  All rights reserved.
+# Copyright:: Copyright (c) 2020 Eric Crane.  All rights reserved.
 #
 # Conversion tool:  String to Date Time.
 #

data/lib/gloo/convert/string_to_decimal.rb

@@ -1,5 +1,5 @@
 # Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 202 Eric Crane.  All rights reserved.
+# Copyright:: Copyright (c) 2020 Eric Crane.  All rights reserved.
 #
 # Conversion tool:  String to Decimal.
 #

data/lib/gloo/convert/string_to_integer.rb

@@ -1,5 +1,5 @@
 # Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 202 Eric Crane.  All rights reserved.
+# Copyright:: Copyright (c) 2020 Eric Crane.  All rights reserved.
 #
 # Conversion tool:  String to Integer.
 #

data/lib/gloo/core/dictionary.rb

@@ -11,51 +11,54 @@ module Gloo
 
       include Singleton
 
-      attr_reader :verbs, :objs
+      attr_reader :verbs, :objs, :keywords
 
+      #
       # Set up the object dictionary.
+      #
       def initialize
         @verbs = {}
         @objs = {}
         @verb_references = []
         @obj_references = []
+        @keywords = []
       end
 
+      #
       # Register a verb.
+      #
       def register_verb( subclass )
         @verb_references << subclass
       end
 
+      #
       # Register an object type.
+      #
       def register_obj( subclass )
         @obj_references << subclass
       end
 
+      #
       # Initialize verbs and objects in the dictionary.
+      #
       def init
         $log.debug 'initializing dictionaries'
         init_verbs
         init_objs
       end
 
-      # Init the list of verbs.
-      def init_objs
-        $log.debug "initializing #{@obj_references.count} objects"
-        @obj_references.each do |o|
-          $log.debug o
-          @objs[ o.typename ] = o
-          @objs[ o.short_typename ] = o
-        end
-      end
-
+      #
       # Is the given word an object type?
+      #
       def obj?( word )
         return false unless word
 
         return @objs.key?( word.downcase )
       end
 
+      #
       # Find the object type by name.
+      #
       def find_obj( word )
         return nil unless word
         return nil unless obj?( word )
@@ -63,25 +66,18 @@ module Gloo
         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
-          @verbs[ v.keyword ] = v
-          @verbs[ v.keyword_shortcut ] = v
-          # v.send( :new ).run
-        end
-      end
-
+      #
       # Is the given word a verb?
+      #
       def verb?( word )
         return false unless word
 
         return @verbs.key?( word.downcase )
       end
 
+      #
       # Find the verb by name.
+      #
       def find_verb( verb )
         return nil unless verb
         return nil unless verb?( verb )
@@ -89,16 +85,97 @@ module Gloo
         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 }
       end
 
+      #
       # Get the list of verbs, sorted.
+      #
       def get_verbs
         return @verb_references.sort { |a, b| a.keyword <=> b.keyword }
       end
 
+      #
+      # Lookup the keyword by name or shortcut.
+      # Return the keyword (name) or nil if it is not found.
+      #
+      def lookup_keyword( key )
+        v = find_verb key
+        return v.keyword if v
+
+        o = find_obj key
+        return o.typename if o
+
+        return nil
+      end
+
+      #
+      # Show a list of all keywords.
+      # This includes verbs and objects, names and shortcuts.
+      #
+      def show_keywords
+        str = ''
+        @keywords.sort.each_with_index do |k, i|
+          str << k.ljust( 20, ' ' )
+          if ( ( i + 1 ) % 6 ).zero?
+            puts str
+            str = ''
+          end
+        end
+      end
+
+      # ---------------------------------------------------------------------
+      #    Private
+      # ---------------------------------------------------------------------
+
+      private
+
+      #
+      # Add a keyword to the keyword list.
+      # Report an error if the keyword is already in the list.
+      #
+      def add_key( keyword )
+        if @keywords.include?( keyword )
+          $log.error "duplicate keyword '#{keyword}'"
+          return
+        end
+
+        @keywords << keyword
+      end
+
+      #
+      # Init the list of objects.
+      #
+      def init_objs
+        $log.debug "initializing #{@obj_references.count} objects"
+        @obj_references.each do |o|
+          $log.debug o
+          @objs[ o.typename ] = o
+          @objs[ o.short_typename ] = o
+          add_key o.typename
+          add_key o.short_typename if o.typename != o.short_typename
+        end
+      end
+
+      #
+      # Init the list of verbs.
+      #
+      def init_verbs
+        $log.debug "initializing #{@verb_references.count} verbs"
+        @verb_references.each do |v|
+          $log.debug v
+          @verbs[ v.keyword ] = v
+          @verbs[ v.keyword_shortcut ] = v
+          # v.send( :new ).run
+          add_key v.keyword
+          add_key v.keyword_shortcut if v.keyword != v.keyword_shortcut
+        end
+      end
+
     end
   end
 end