gloo-lang 1.0.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaf0cc0e5ed992c2a11536a38506170a840099823bacd260b0e2bf6e4384dd14
-  data.tar.gz: c07498a7140679627f936db05d0d71b69c2853e4e87fe504cf7182ac47eb38f2
+  metadata.gz: 57974f040c6be178fe85ea7aae937a4dcbda5c587e8562337eb3ca0d1350812f
+  data.tar.gz: ded8003925e5cabece8f655d14724d00c42aedcc2f8f11177af9eb81936a0426
 SHA512:
-  metadata.gz: 5667685e248cd7fba038d9913c766ab3bfe899a7333d07977b517168eacf6d6b5843cb7a8d4e750dd02e94f7faf2c5921775cce2920ad6ac59913ba89bc9b9ee
-  data.tar.gz: 425a61000ca83a501a656e01c241e927a7de3d909058d1760266a5d026128e103ea69d412443d2a1a78a5247412799bbf68a6ee0ddbe55bfc5eddbc9595220e0
+  metadata.gz: 5755e06bd81077928a1070904583ce58cb82ea1fcbf19986045c177596cc55df2653d41d35e656bcc12011c553f12d1bf4b105f4c6215271d5dee526c8bc2efb
+  data.tar.gz: 201d226fa6b5d74de4f1f08848481c7d8f75148a84e068db106d300a3282e8475db648dfec7c64710b94aed3cffdc4e873aa616b6f2610ff16bf82dc01e380bd

data/.gitignore

@@ -10,3 +10,4 @@
 *.log
 test/gloo/debug/*
 .DS_Store
+Gemfile.lock

data/.ruby-gemset

@@ -0,0 +1 @@
+gloo-gem

data/.ruby-version

@@ -0,0 +1 @@
+ruby-3.0.2

data/lib/VERSION

@@ -1 +1 @@
-1.0.2
+1.2.1

data/lib/gloo_lang/app/engine.rb

@@ -15,7 +15,7 @@ module GlooLang
       attr_reader :args, :mode, :running, :platform,
                   :dictionary, :parser, :heap, :factory
       attr_accessor :last_cmd, :persist_man, :event_manager,
-                    :exec_env, :help, :converter
+                    :exec_env, :converter
 
       #
       # Set up the engine with basic elements.
@@ -52,7 +52,6 @@ module GlooLang
         @event_manager = GlooLang::Core::EventManager.new( self )
 
         @exec_env = GlooLang::Exec::ExecEnv.new( self )
-        @help = GlooLang::App::Help.new( self )
         @converter = GlooLang::Convert::Converter.new( self )
 
         @log.debug 'the engine has started'
@@ -107,8 +106,6 @@ module GlooLang
 
         if @mode == Mode::VERSION
           run_version
-        elsif @mode == Mode::HELP
-          show_help_and_quit
         elsif @mode == Mode::SCRIPT
           run_files
         elsif @mode == Mode::EMBED
@@ -217,14 +214,6 @@ module GlooLang
         quit
       end
 
-      #
-      # Show the help information and then quit.
-      #
-      def show_help_and_quit
-        @help.show_app_help
-        quit
-      end
-
       # ---------------------------------------------------------------------
       #    Error Handling
       # ---------------------------------------------------------------------

data/lib/gloo_lang/app/platform.rb

@@ -70,6 +70,14 @@ module GlooLang
       def cols
         return 80
       end
+
+      # 
+      # Get the file mechanism for this platform.
+      # 
+      def getFileMech( engine )
+        return GlooLang::Persist::DiscMech.new( engine )
+      end
+
     end
   end
 end

data/lib/gloo_lang/core/dictionary.rb

@@ -138,6 +138,26 @@ module GlooLang
         end
       end
 
+      # ---------------------------------------------------------------------
+      #    Register after start up
+      # ---------------------------------------------------------------------
+
+      #
+      # Register a verb after start up.
+      #
+      def register_verb_post_start( subclass )
+        # @verb_references << subclass
+        add_verb subclass
+      end
+
+      #
+      # Register an object type after start up.
+      #
+      def register_obj_post_start( subclass )
+        # @obj_references << subclass
+        add_object subclass
+      end
+
       # ---------------------------------------------------------------------
       #    Private
       # ---------------------------------------------------------------------
@@ -163,11 +183,7 @@ module GlooLang
       def init_objs
         # @engine.log.debug "initializing #{@obj_references.count} objects"
         @obj_references.each do |o|
-          # @engine.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
+          add_object o
         end
       end
 
@@ -177,15 +193,33 @@ module GlooLang
       def init_verbs
         # @engine.log.debug "initializing #{@verb_references.count} verbs"
         @verb_references.each do |v|
-          # @engine.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
+          add_verb v
         end
       end
 
+      # 
+      # Add an object to the dictionary
+      # 
+      def add_object o
+        # @engine.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
+
+      # 
+      # Add a verb to the dictionary
+      # 
+      def add_verb v
+        # @engine.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

data/lib/gloo_lang/persist/disc_mech.rb

@@ -0,0 +1,87 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2022 Eric Crane.  All rights reserved.
+#
+# Disc based mechanism for files.
+# Provides interaction between the persistance classes and the OS 
+# file and folder system.
+# This class might be overiden elsewhere to provide other mechanism.
+# For example, in gloo-web, there will be a db based mechanism.
+#
+
+module GlooLang
+  module Persist
+    class DiscMech
+
+      #
+      # Set up a disc based file mechanism.
+      #
+      def initialize( engine )
+        @engine = engine
+      end
+
+      #
+      # Get the default file extention.
+      #
+      def file_ext
+        return '.gloo'
+      end
+
+      #
+      # Get all the gloo files in the folder (partial path).
+      #
+      def get_all_files_in( folder )
+        pns = []
+        dir = File.join( @engine.settings.project_path, folder )
+        Dir.glob( "#{dir}*.gloo" ).each do |f|
+          pns << f
+        end
+        return pns
+      end
+
+      # 
+      # Check if a file exists.
+      # 
+      def exist?( file )
+        File.exist?( file )
+      end
+
+      # 
+      # Check to see if the file is valid.
+      # 
+      def valid?( file )
+        return false unless file
+        return false unless File.exist?( file )
+        return false unless File.file?( file )
+        return false unless file.end_with?( self.file_ext )
+
+        return true
+      end
+
+      # 
+      # Expand a single file path.
+      # 
+      def expand( name )
+        ext_path = File.expand_path( name )
+        return [ ext_path ] if self.valid?( ext_path )
+
+        full_name = "#{name}#{file_ext}"
+        return [ File.join( @engine.settings.project_path, full_name ) ]
+      end
+
+      # 
+      # Read in the contents of a single file.
+      # 
+      def read( file )
+        return File.read( file )
+      end
+
+      # 
+      # Write data to the file.
+      # 
+      def write( pn, data )
+        File.write( pn, data )
+      end
+
+    end
+  end
+end

data/lib/gloo_lang/persist/file_loader.rb

@@ -19,6 +19,7 @@ module GlooLang
       #
       def initialize( engine, pn )
         @engine = engine
+        @mech = @engine.platform.getFileMech( @engine )
         @pn = pn
         @tabs = 0
         @obj = nil
@@ -33,7 +34,7 @@ module GlooLang
       # Load the objects from the file.
       #
       def load
-        unless File.exist?( @pn )
+        unless @mech.exist?( @pn )
           @engine.log.error "File '#{@pn}' does not exist."
           return
         end
@@ -43,7 +44,7 @@ module GlooLang
         @parent_stack = []
         @parent = @engine.heap.root
         @parent_stack.push @parent
-        f = File.open( @pn, 'r' )
+        f = @mech.read( @pn )
         f.each_line do |line|
           next if skip_line? line
 

data/lib/gloo_lang/persist/file_saver.rb

@@ -13,6 +13,7 @@ module GlooLang
       #
       def initialize( engine, pn, obj )
         @engine = engine
+        @mech = @engine.platform.getFileMech( @engine )
         @pn = pn
         @obj = obj
       end
@@ -22,7 +23,7 @@ module GlooLang
       #
       def save
         data = get_obj( @obj )
-        File.write( @pn, data )
+        @mech.write( @pn, data )
       end
 
       #

data/lib/gloo_lang/persist/persist_man.rb

@@ -10,7 +10,7 @@ module GlooLang
   module Persist
     class PersistMan
 
-      attr_reader :maps
+      attr_reader :maps, :mech
 
       #
       # Contructor for the persistence manager.
@@ -18,6 +18,7 @@ module GlooLang
       def initialize( engine )
         @engine = engine
         @maps = []
+        @mech = @engine.platform.getFileMech( @engine )
       end
 
       #
@@ -72,18 +73,9 @@ module GlooLang
         return nil if name.strip.empty?
 
         if name.strip[ -1 ] == '*'
-          pns = []
-          dir = File.join( @engine.settings.project_path, name[ 0..-2 ] )
-          Dir.glob( "#{dir}*.gloo" ).each do |f|
-            pns << f
-          end
-          return pns
+          return @mech.get_all_files_in( name[ 0..-2 ] )
         else
-          ext_path = File.expand_path( name )
-          return [ ext_path ] if self.gloo_file?( ext_path )
-
-          full_name = "#{name}#{file_ext}"
-          return [ File.join( @engine.settings.project_path, full_name ) ]
+          return @mech.expand( name )
         end
       end
 
@@ -91,19 +83,14 @@ module GlooLang
       # 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
+        return @mech.valid?( name )
       end
 
       #
       # Get the default file extention.
       #
       def file_ext
-        return '.gloo'
+        return @mech.file_ext
       end
 
       #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloo-lang
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,9 +192,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -207,7 +208,6 @@ files:
 - lib/gloo_lang/app/args.rb
 - lib/gloo_lang/app/engine.rb
 - lib/gloo_lang/app/engine_context.rb
-- lib/gloo_lang/app/help.rb
 - lib/gloo_lang/app/info.rb
 - lib/gloo_lang/app/log.rb
 - lib/gloo_lang/app/mode.rb
@@ -249,81 +249,6 @@ files:
 - lib/gloo_lang/expr/op_minus.rb
 - lib/gloo_lang/expr/op_mult.rb
 - lib/gloo_lang/expr/op_plus.rb
-- lib/gloo_lang/help/app/application.txt
-- lib/gloo_lang/help/app/configuration.txt
-- lib/gloo_lang/help/app/default_help.txt
-- lib/gloo_lang/help/app/logging.txt
-- lib/gloo_lang/help/core/color.txt
-- lib/gloo_lang/help/core/error.txt
-- lib/gloo_lang/help/core/events.txt
-- lib/gloo_lang/help/core/gloo_system.txt
-- lib/gloo_lang/help/core/here.txt
-- lib/gloo_lang/help/core/it.txt
-- lib/gloo_lang/help/core/ops.txt
-- lib/gloo_lang/help/core/pathname.txt
-- lib/gloo_lang/help/objs/basic/alias.txt
-- lib/gloo_lang/help/objs/basic/boolean.txt
-- lib/gloo_lang/help/objs/basic/container.txt
-- lib/gloo_lang/help/objs/basic/decimal.txt
-- lib/gloo_lang/help/objs/basic/integer.txt
-- lib/gloo_lang/help/objs/basic/script.txt
-- lib/gloo_lang/help/objs/basic/string.txt
-- lib/gloo_lang/help/objs/basic/text.txt
-- lib/gloo_lang/help/objs/basic/untyped.txt
-- lib/gloo_lang/help/objs/cli/banner.txt
-- lib/gloo_lang/help/objs/cli/bar.txt
-- lib/gloo_lang/help/objs/cli/colorize.txt
-- lib/gloo_lang/help/objs/cli/confirm.txt
-- lib/gloo_lang/help/objs/cli/menu.txt
-- lib/gloo_lang/help/objs/cli/menu_item.txt
-- lib/gloo_lang/help/objs/cli/pastel.txt
-- lib/gloo_lang/help/objs/cli/prompt.txt
-- lib/gloo_lang/help/objs/cli/select.txt
-- lib/gloo_lang/help/objs/ctrl/each.txt
-- lib/gloo_lang/help/objs/ctrl/repeat.txt
-- lib/gloo_lang/help/objs/data/markdown.txt
-- lib/gloo_lang/help/objs/data/mysql.txt
-- lib/gloo_lang/help/objs/data/query.txt
-- lib/gloo_lang/help/objs/data/sqlite.txt
-- lib/gloo_lang/help/objs/data/table.txt
-- lib/gloo_lang/help/objs/dev/git_repo.txt
-- lib/gloo_lang/help/objs/dev/stats.txt
-- lib/gloo_lang/help/objs/dt/date.txt
-- lib/gloo_lang/help/objs/dt/datetime.txt
-- lib/gloo_lang/help/objs/dt/time.txt
-- lib/gloo_lang/help/objs/ror/erb.txt
-- lib/gloo_lang/help/objs/ror/eval.txt
-- lib/gloo_lang/help/objs/snd/play.txt
-- lib/gloo_lang/help/objs/snd/say.txt
-- lib/gloo_lang/help/objs/system/file.txt
-- lib/gloo_lang/help/objs/system/ssh_exec.txt
-- lib/gloo_lang/help/objs/system/system.txt
-- lib/gloo_lang/help/objs/web/http_get.txt
-- lib/gloo_lang/help/objs/web/http_post.txt
-- lib/gloo_lang/help/objs/web/json.txt
-- lib/gloo_lang/help/objs/web/slack.txt
-- lib/gloo_lang/help/objs/web/teams.txt
-- lib/gloo_lang/help/objs/web/uri.txt
-- lib/gloo_lang/help/verbs/alert.txt
-- lib/gloo_lang/help/verbs/beep.txt
-- lib/gloo_lang/help/verbs/cls.txt
-- lib/gloo_lang/help/verbs/context.txt
-- lib/gloo_lang/help/verbs/create.txt
-- lib/gloo_lang/help/verbs/execute.txt
-- lib/gloo_lang/help/verbs/help.txt
-- lib/gloo_lang/help/verbs/if.txt
-- lib/gloo_lang/help/verbs/list.txt
-- lib/gloo_lang/help/verbs/load.txt
-- lib/gloo_lang/help/verbs/move.txt
-- lib/gloo_lang/help/verbs/put.txt
-- lib/gloo_lang/help/verbs/quit.txt
-- lib/gloo_lang/help/verbs/run.txt
-- lib/gloo_lang/help/verbs/save.txt
-- lib/gloo_lang/help/verbs/show.txt
-- lib/gloo_lang/help/verbs/tell.txt
-- lib/gloo_lang/help/verbs/unless.txt
-- lib/gloo_lang/help/verbs/version.txt
-- lib/gloo_lang/help/verbs/wait.txt
 - lib/gloo_lang/objs/basic/alias.rb
 - lib/gloo_lang/objs/basic/boolean.rb
 - lib/gloo_lang/objs/basic/container.rb
@@ -349,6 +274,7 @@ files:
 - lib/gloo_lang/objs/web/slack.rb
 - lib/gloo_lang/objs/web/teams.rb
 - lib/gloo_lang/objs/web/uri.rb
+- lib/gloo_lang/persist/disc_mech.rb
 - lib/gloo_lang/persist/file_loader.rb
 - lib/gloo_lang/persist/file_saver.rb
 - lib/gloo_lang/persist/file_storage.rb
@@ -360,7 +286,6 @@ files:
 - lib/gloo_lang/verbs/context.rb
 - lib/gloo_lang/verbs/create.rb
 - lib/gloo_lang/verbs/execute.rb
-- lib/gloo_lang/verbs/help.rb
 - lib/gloo_lang/verbs/if.rb
 - lib/gloo_lang/verbs/list.rb
 - lib/gloo_lang/verbs/load.rb
@@ -372,7 +297,6 @@ files:
 - lib/gloo_lang/verbs/show.rb
 - lib/gloo_lang/verbs/tell.rb
 - lib/gloo_lang/verbs/unless.rb
-- lib/gloo_lang/verbs/version.rb
 - lib/gloo_lang/verbs/wait.rb
 homepage: http://github.com/ecrane/gloo_lang
 licenses:

data/Gemfile.lock

@@ -1,68 +0,0 @@
-PATH
-  remote: .
-  specs:
-    gloo-lang (1.0.1)
-      activesupport (~> 6.1, >= 6.1.4.6)
-      chronic (~> 0.10, >= 0.10.2)
-      json (~> 2.1, >= 2.1.0)
-      net-ssh (~> 6.1, >= 6.1.0)
-      openssl (~> 2.1, >= 2.1.0)
-      tty-platform (~> 0.3, >= 0.3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (6.1.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    ast (2.4.2)
-    chronic (0.10.2)
-    concurrent-ruby (1.1.10)
-    i18n (1.10.0)
-      concurrent-ruby (~> 1.0)
-    ipaddr (1.2.4)
-    json (2.6.1)
-    minitest (5.15.0)
-    net-ssh (6.1.0)
-    openssl (2.2.1)
-      ipaddr
-    parallel (1.21.0)
-    parser (3.1.1.0)
-      ast (~> 2.4.1)
-    rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.2.1)
-    rexml (3.2.5)
-    rubocop (1.25.1)
-      parallel (~> 1.10)
-      parser (>= 3.1.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    tty-platform (0.3.0)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
-    zeitwerk (2.5.4)
-
-PLATFORMS
-  x86_64-darwin-21
-
-DEPENDENCIES
-  bundler (~> 2.2.22)
-  gloo-lang!
-  minitest (~> 5.1, >= 5.14.2)
-  rake (~> 13.0, >= 13.0.1)
-  rubocop
-
-BUNDLED WITH
-   2.2.22

data/lib/gloo_lang/app/help.rb

@@ -1,118 +0,0 @@
-# Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 2019 Eric Crane.  All rights reserved.
-#
-# Help system.
-#
-
-module GlooLang
-  module App
-    class Help
-
-      APPLICATION = 'application'.freeze
-
-      attr_accessor :topics
-
-      #
-      # Set up the help system.
-      # We won't load help topics until we know we need them.
-      #
-      def initialize( engine )
-        @engine = engine
-        @topics = nil
-      end
-
-      #
-      # Show application help.
-      # This is the what is shown when help is run from the CLI.
-      #
-      def show_app_help
-        puts Info.display_title unless @engine.args.quiet?
-        self.show_topic APPLICATION
-      end
-
-      #
-      # Check to see if there is a topic by the given name.
-      #
-      def topic?( name )
-        lazy_load_index
-
-        return @topics.key?( name )
-      end
-
-      #
-      # Is the current topic Markdown?
-      #
-      def topic_is_md?( name )
-        lazy_load_index
-
-        topic_file = @topics[ name ]
-        return topic_file.end_with? '.md'
-      end
-
-      #
-      # Show a help topic, optionally paginaged.
-      # If the content of the help page fits on a single
-      # screen, it won't paginate.
-      #
-      def page_topic( topic )
-        return if @engine.args.quiet?
-
-        data = self.get_topic_data( topic )
-        page = data.lines.count > Settings.page_size( @engine )
-        @engine.platform.show( data, topic_is_md?( topic ), page )
-      end
-
-      #
-      # Show a help topic.
-      #
-      def show_topic( topic )
-        return if @engine.args.quiet?
-
-        data = self.get_topic_data( topic )
-        @engine.platform.show( data, topic_is_md?( topic ), false )
-      end
-
-      #
-      # Get topic data.
-      #
-      def get_topic_data( topic )
-        lazy_load_index
-
-        topic_file = @topics[ topic ]
-        return nil unless topic_file
-
-        File.read topic_file
-      end
-
-      #
-      # Lazy load topic index.
-      # We'll only load the index the first time a help topic
-      # is requested.  After that we'll use the cached index.
-      #
-      def lazy_load_index
-        return if @topics
-
-        @topics = {}
-        @engine.log.debug 'loading help file index...'
-
-        pn = File.dirname( File.absolute_path( __FILE__ ) )
-        pn = File.dirname( pn )
-
-        root = File.join( pn, 'help', '**/*.txt' )
-        Dir.glob( root ).each do |txt_file|
-          key = File.basename( txt_file, '.txt' )
-          @topics[ key ] = txt_file
-        end
-
-        root = File.join( pn, 'help', '**/*.md' )
-        Dir.glob( root ).each do |md_file|
-          key = File.basename( md_file, '.md' )
-          @topics[ key ] = md_file
-        end
-
-        @engine.log.debug "Found #{@topics.count} help files"
-      end
-
-    end
-  end
-end