gloo 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ae55fc93967be4c9270574fe8d2e92929448e6ad9afde0698fd9091b4ed63a2
-  data.tar.gz: a011fc02bb53601d58ae004c3b40f396301ffc0f2506ececc345c191d7e91f7b
+  metadata.gz: 20774ab083e3f97894367f2e5ab0ede6ae65edeb72e8153af73df130da3a728c
+  data.tar.gz: 9225ba79729353ed2a21966dfdf380ad1d6b081615895d6bef1eec83720d428b
 SHA512:
-  metadata.gz: 9460d46f95ce30a5e6ab027cf0dd8edfce9287db01c85e6b07753c082932716738c7e3b8283cd46e755729e3f1e23d2b4a148c434ad97c5a4ef3435716cd2c5c
-  data.tar.gz: 6d6eb3d0ce29f7d6af52819f978eaab6269f50c48d6fb689719c265d5edd05516f4fbaa2874c9b39a97887bcfe82c92ebcb10fbd3bcd8750783f50a56aef3dad
+  metadata.gz: 1c4d53f40b31c60a0d32f45bf5ab8a3a6489325f34fb4f488333a3fdc5c67b876b13bd7cf9ad7daa388124386ba866033b5c96357d6621239f9b02e466db13c4
+  data.tar.gz: c3326a3b85ca3996cf5a0ecee1dbf4d49ada7f8ae37815bdfa053ba9c593bf1a01e508870ebff7b263e159d48472a37c874baddba78d2dfce52ba1aabe9dee99

data/lib/VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0

data/lib/gloo/objs/cli/banner.rb

@@ -96,10 +96,20 @@ module Gloo
       # Show the banner bar
       #
       def msg_show
-        font = TTY::Font.new self.style_value
-        t = font.write( self.text_value )
+        Banner.show_banner( self.text_value, self.style_value, self.color_value )
+      end
+
+      # 
+      # Show the banner bar.
+      # text - the text of the banner
+      # style - the style of the banner
+      # color - the color of the banner
+      # 
+      def self.show_banner( text, style, color )
+        font = TTY::Font.new style
+        t = font.write( text )
         pastel = ::Pastel.new
-        c = self.color_value.split( ' ' ).map( &:to_sym )
+        c = color.split( ' ' ).map( &:to_sym )
         puts pastel.decorate( t, *c )
       end
 

data/lib/gloo/objs/cli/colorize.rb

@@ -64,7 +64,7 @@ module Gloo
         children.each do |o|
           msg += ColorizedString[ o.value_display ].colorize( o.name.to_sym )
         end
-        $log.show msg
+        @engine.log.show msg
         @engine.heap.it.set_to msg.to_s
       end
 

data/lib/gloo/objs/cli/menu.rb

@@ -18,6 +18,10 @@ module Gloo
       HIDE_ITEMS = 'hide_items'.freeze
       BEFORE_MENU = 'before_menu'.freeze
       DEFAULT = 'default'.freeze
+      TITLE = 'title'.freeze
+      TITLE_STYLE = 'straight'.freeze
+      TITLE_COLOR = 'bright_cyan'.freeze
+      QUIT_ITEM_NAME = 'q'.freeze
 
       #
       # The name of the object type.
@@ -55,6 +59,53 @@ module Gloo
         return o.value
       end
 
+      # 
+      # If there is no loop child, add it.
+      # 
+      def add_loop_child
+        o = find_child LOOP
+        return if o
+
+        fac = @engine.factory
+        fac.create_bool LOOP, true, self
+      end
+
+      # 
+      # Add a Quit menu item
+      # 
+      def add_quit_item
+        items = find_child ITEMS
+        q = items.find_child QUIT_ITEM_NAME
+        return if q
+
+        fac = @engine.factory
+        fac.create_bool LOOP, true, self
+
+        params = { :name => QUIT_ITEM_NAME,
+          :type => 'mitem',
+          :value => 'Quit',
+          :parent => items }
+        mitem = fac.create params
+        script = "put false into #{self.pn}.loop"
+        fac.create_script 'do', script, mitem
+      end
+
+      # 
+      # Add any required children not specified in the source.
+      # 
+      def lazy_add_children
+        add_loop_child
+        add_quit_item
+      end
+
+      #
+      # Does the menu have a title?
+      #
+      def title?
+        o = find_child TITLE
+        return o ? true : false
+      end
+
       # ---------------------------------------------------------------------
       #    Children
       # ---------------------------------------------------------------------
@@ -96,6 +147,7 @@ module Gloo
       # Show the menu options, and prompt for user input.
       #
       def msg_run
+        lazy_add_children
         run_default
         loop do
           begin_menu
@@ -103,7 +155,7 @@ module Gloo
             dt = DateTime.now
             d = dt.strftime( '%Y.%m.%d' )
             t = dt.strftime( '%I:%M:%S' )
-            cmd = @engine.platform.prompt.ask( "#{d.yellow} #{t.white} >" )
+            cmd = @engine.platform.prompt.ask( "\n#{d.yellow} #{t.white} >" )
           else
             cmd = @engine.platform.prompt.ask( prompt_value )
           end
@@ -174,10 +226,22 @@ module Gloo
       #
       def run_default
         obj = find_child DEFAULT
-        return unless obj
+        if obj
+          s = Gloo::Exec::Script.new( @engine, obj )
+          s.run
+        elsif title?
+          run_default_title
+        end
+      end
 
-        s = Gloo::Exec::Script.new( @engine, obj )
-        s.run
+      # 
+      # There is a title, so show it.
+      # 
+      def run_default_title
+        obj = find_child TITLE
+        title = obj.value
+        @engine.platform&.clear_screen
+        Banner.show_banner( title, TITLE_STYLE, TITLE_COLOR )
       end
 
       #

data/lib/gloo/objs/dev/git.rb

@@ -63,9 +63,9 @@ module Gloo
       # Review pending changes.
       #
       def msg_review
-        $log.debug 'Reviewing pending changes'
+        @engine.log.debug 'Reviewing pending changes'
         cmd = "cd #{path_value}; git diff"
-        $log.debug cmd
+        @engine.log.debug cmd
         system cmd
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloo
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler