gloo-lang 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 402d31f29ed04334fc22758dd7aaa7cc230f66ccf341e3cc5b1cedc42fdf998d
-  data.tar.gz: 10d69c788bf1975b3beb2eb79eff6d18a919f2956678be2d6649b407b6b1ad9e
+  metadata.gz: 38f13cdfcec13390f7b1332f97c2d2296ba72bfa67008eaf677d04409b3f0f8a
+  data.tar.gz: 042cb5edc85629209f62ff2b778d29d082128eefb6ae0037d501906ebe776df3
 SHA512:
-  metadata.gz: 5887c6675f3ca5c7df494f351b7e25c06a118dcc73c84fe0e94242b59d1dcb3ce130216c4e164761a6e0a49855ce49ac88ede67f0a3434594069c8ac693fe937
-  data.tar.gz: 7849d0fc9c9dabcdb70238b0b1d5b5108fc7c3ed6e41c9d3608ada059ed1d0c514fdcdb8ddb1cb24d8a616beef3933e84e5c6faac2d81bc6a8019bdb00bcf5e6
+  metadata.gz: bb96a66f19398aa1bfd0ca5251adbcf9740fbe8395a0e24592510a52beceb961cba107e9f7b251d266af8c691f71a9dcf17107fad85398bb0d7d7768cc7e2d49
+  data.tar.gz: 94b7b46fae7e2f31ae499defffddbc3e09e0fbde3004900f5ded87c6b9e841f86587414c8786f2d53bd2afc57403da1bd38fd47a9270212f245de01e5934230d

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    gloo-lang (0.9.7)
+    gloo-lang (0.9.10)
+      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)
@@ -11,8 +12,17 @@ PATH
 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)
@@ -39,7 +49,10 @@ GEM
       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

data/gloo-lang.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency "rake", '~> 13.0', '>= 13.0.1'
 
-  # spec.add_dependency "activesupport", '~> 6.1', ">= 6.1.4.6"
+  spec.add_dependency "activesupport", '~> 6.1', ">= 6.1.4.6"
   spec.add_dependency 'chronic', '~> 0.10', '>= 0.10.2'
   spec.add_dependency 'json', '~> 2.1', '>= 2.1.0'
   spec.add_dependency 'openssl', '~> 2.1', '>= 2.1.0'

data/lib/VERSION

@@ -1 +1 @@
-0.9.9
+0.9.10

data/lib/gloo_lang/app/engine.rb

@@ -20,12 +20,12 @@ module GlooLang
       #
       # Set up the engine with basic elements.
       #
-      def initialize( params = [], platform=Platform, log=Log )
-        @args = Args.new( self, params )
-        @settings = Settings.new( self, ENV[ 'GLOO_ENV' ] )
+      def initialize( context )
+        @args = Args.new( self, context.params )
+        @settings = Settings.new( self, context.user_root )
 
         @log = Log.new( self, @args.quiet? )
-        @platform = platform.new
+        @platform = context.platform
 
         @log.debug 'engine intialized...'
       end

data/lib/gloo_lang/app/engine_context.rb

@@ -0,0 +1,25 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2022 Eric Crane.  All rights reserved.
+#
+# The context (parameters) for the Gloo Script Engine.
+#
+
+module GlooLang
+  module App
+    class EngineContext
+
+      attr_accessor :params, :platform, :log, :user_root
+
+      #
+      # Create the context, supplying defaults where relevant.
+      #
+      def initialize( params = [], platform=nil, log=nil, user_root=nil )
+        @params = params
+        @platform = Platform.new if platform.nil?
+        @log = Log if log.nil?
+        @user_root = user_root
+      end
+
+    end
+  end
+end

data/lib/gloo_lang/app/settings.rb

@@ -10,38 +10,24 @@ module GlooLang
   module App
     class Settings
 
-      attr_reader :user_root, :log_path, :config_path, :project_path,
-                  :start_with, :list_indent, :tmp_path,
-                  :debug_path, :debug
+      attr_reader :user_root, :log_path,
+        :config_path, :project_path,
+        :start_with, :list_indent, :tmp_path,
+        :debug_path, :debug
 
       #
       # Load setting from the yml file.
       # The mode parameter is used to determine if we are running in TEST.
       #
-      def initialize( engine, mode )
+      def initialize( engine, root=nil )
         @engine = engine
-        @mode = mode
-        init_root
+        # @mode = mode
+        init_root( root )
+
         init_path_settings
         init_user_settings
       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
-
       #
       # Show the current application settings.
       # Can be seen in app with 'help settings'
@@ -130,12 +116,14 @@ module GlooLang
       #
       # 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
+      def init_root root
+        if root
+          @user_root = 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
@@ -167,7 +155,11 @@ module GlooLang
       def init_user_settings
         settings = get_settings
 
-        @project_path = project_path_for_mode settings
+        @project_path = settings[ 'gloo' ][ 'project_path' ]
+        if @project_path.blank?
+          @project_path = File.join( @user_root, 'projects' )
+        end
+
         @start_with = settings[ 'gloo' ][ 'start_with' ]
         @list_indent = settings[ 'gloo' ][ 'list_indent' ]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloo-lang
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 13.0.1
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.4.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.4.6
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +200,7 @@ files:
 - lib/gloo-lang.rb
 - 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