j1-template 2022.0.17 → 2022.0.18

data/lib/j1/commands/generate.rb

@@ -22,12 +22,13 @@ module J1
         end
 
         def process(args, options = {})
-          raise ArgumentError, 'GENERATE: You must specify a path.' if args.empty?
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          raise ArgumentError, "#{timestamp} - GENERATE: You must specify a path." if args.empty?
 
           new_blog_path = File.expand_path(args.join(' '), Dir.pwd)
           FileUtils.mkdir_p new_blog_path
           if preserve_source_location?(new_blog_path, options)
-            J1.logger.abort_with 'GENERATE: Conflict:', "#{new_blog_path} exists and is not empty."
+            J1.logger.abort_with "#{timestamp} - GENERATE: Conflict:", "#{new_blog_path} exists and is not empty."
           end
 
           if options['blank']
@@ -37,6 +38,8 @@ module J1
           end
 
           after_install(new_blog_path, options)
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          J1.logger.info "#{timestamp} - GENERATE: To setup the site, change to the project folder #{new_blog_path} and run: j1 setup"
         end
 
         def create_blank_site(path)
@@ -87,30 +90,33 @@ module J1
         # then automatically execute bundle install from within the generate blog dir
         # unless the user opts to generate a blank blog or skip 'bundle install'.
         def after_install(path, options = {})
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
           unless options['skip-bundle']
             bundle_install(path, options)
             if options['skip-patches']
-              J1.logger.info "GENERATE: Install build-in patches skipped ..."
+              J1.logger.info "#{timestamp} - GENERATE: Install build-in patches skipped ..."
             else
               patch_install(options)
             end
           end
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
           if options['force']
-            J1.logger.info "GENERATE: Generated Jekyll site force installed in folder #{path}"
+            J1.logger.info "#{timestamp} - GENERATE: Generated Jekyll site force installed in folder #{path}"
           else
-            J1.logger.info "GENERATE: Generated Jekyll site installed in folder #{path}"
+            J1.logger.info "#{timestamp} - GENERATE: Generated Jekyll site installed in folder #{path}"
           end
-          J1.logger.info 'GENERATE: Installation (bundle) of RubyGems skipped' if options['skip-bundle']
+          J1.logger.info "#{timestamp} - GENERATE: Installation (bundle) of RubyGems skipped" if options['skip-bundle']
         end
 
         def bundle_install(path, options)
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
           J1::External.require_with_graceful_fail 'bundler'
-          J1.logger.info "GENERATE: Running bundle install in #{path} ..."
+          J1.logger.info "#{timestamp} - GENERATE: Running bundle install in #{path} ..."
           Dir.chdir(path) do
             if options['system']
-              J1.logger.info "GENERATE: Install bundle in Ruby gem SYSTEM folder ..."
+              J1.logger.info "#{timestamp} - GENERATE: Install bundle in Ruby gem SYSTEM folder ..."
             else
-              J1.logger.info "GENERATE: Install bundle in USER gem folder ~/.gem ..."
+              J1.logger.info "#{timestamp} - GENERATE: Install bundle in USER gem folder ~/.gem ..."
               process = J1::Utils::Exec2.run('GENERATE','bundle', 'config', 'set', '--local', 'path', '~/.gem')
               raise SystemExit unless process.success?
             end
@@ -120,6 +126,7 @@ module J1
         end
 
         def patch_install(options)
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
           if J1::Utils::is_windows?
             major, minor = RUBY_VERSION.split('.')
             lib_version = major + '.' + minor
@@ -130,19 +137,23 @@ module J1
             patch_execjs_source_path = curr_path + '/patches/rubygems' + '/' + patch_gem_execjs + '/lib/execjs/external_runtime.rb'
 
             process, output = J1::Utils::Exec1.run('gem', 'env', 'gempath')
+            output.to_s.each_line do |line|
+              J1.logger.info("#{timestamp} - GENERATE: ", line.strip) unless line.to_s.empty?
+            end
             raise SystemExit unless process.success?
 
             result = output.split(';')
             user_path = result[0]
             system_path = result[1]
+            timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
 
             if options['system']
-              J1.logger.info "GENERATE: Install patches in SYSTEM folder ..."
-              J1.logger.info "GENERATE: Install patches on path #{system_path} ..."
+              J1.logger.info "#{timestamp} - GENERATE: Install patches in SYSTEM folder ..."
+              J1.logger.info "#{timestamp} - GENERATE: Install patches on path #{system_path} ..."
               dest = system_path + '/gems/' + patch_gem_eventmachine + '/lib'
             else
-              J1.logger.info "GENERATE: Install patches in USER gem folder ~/.gem ..."
-              J1.logger.info "GENERATE: Install patches on path #{user_path} ..."
+              J1.logger.info "#{timestamp} - GENERATE: Install patches in USER gem folder ~/.gem ..."
+              J1.logger.info "#{timestamp} - GENERATE: Install patches on path #{user_path} ..."
               dest = user_path + '/gems/' + patch_gem_eventmachine + '/lib'
             end
             src = patch_eventmachine_source_path
@@ -158,7 +169,7 @@ module J1
               if Dir.exist?(dest)
                 FileUtils.cp(src, dest)
               else
-                J1.logger.info "GENERATE: Skipped install patches for execjs-2.7.0 ..."
+                J1.logger.info "#{timestamp} - GENERATE: Skipped install patches for execjs-2.7.0 ..."
               end
             end
 

data/lib/j1/commands/rebuild.rb

@@ -24,6 +24,7 @@ module J1
               process = J1::Utils::Exec2.run('REBUILD','npm', 'run', 'rebuild')
               if process.success?
                 J1.logger.info "REBUILD: The projects website has been rebuild successfully."
+                J1.logger.info "REBUILD: To open the site, run: j1 site"
               else
                 raise SystemExit
               end

data/lib/j1/commands/reset.rb

@@ -17,13 +17,16 @@ module J1
         end
 
         def process(args, options = {})
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
           if J1::Utils::is_project?
             if J1::Utils::is_project_setup?
-              J1.logger.info "RESET: Reset the project to factory state ..."
-              J1.logger.info "RESET: Be patient, this will take a while ..."
+              J1.logger.info "#{timestamp} - RESET: Reset the project to factory state ..."
+              J1.logger.info "#{timestamp} - RESET: Be patient, this will take a while ..."
               process = J1::Utils::Exec2.run('RESET','npm', 'run', 'reset')
               if process.success?
-                J1.logger.info "RESET: The project reset finished successfully."
+                timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+                J1.logger.info "#{timestamp} - RESET: The project reset finished successfully."
+                J1.logger.info "#{timestamp} - RESET: To setup the project, run: j1 setup"
               else
                 raise SystemExit
               end

data/lib/j1/commands/setup.rb

@@ -27,20 +27,23 @@ module J1
           if J1::Utils::is_project?
             bundle_install(path, options)
             if options['skip-patches']
-              J1.logger.info "SETUP: Install build-in patches skipped ..."
+              J1.logger.info "#{timestamp} - SETUP: Install build-in patches skipped ..."
             else
               patch_install(options)
             end
-            J1.logger.info "SETUP: Initialize the project ..."
-            J1.logger.info "SETUP: Be patient, this will take a while ..."
+
+            timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+            J1.logger.info "#{timestamp} - SETUP: Initialize the project ..."
+            J1.logger.info "#{timestamp} - SETUP: Be patient, this will take a while ..."
             # process, output = J1::Utils::Exec.run('npm', 'run', 'setup')
             # output.to_s.each_line do |line|
             #   J1.logger.info('SETUP:', line.strip) unless line.to_s.empty?
             # end
             process = J1::Utils::Exec2.run('SETUP','npm', 'run', 'setup')
             if process.success?
-              J1.logger.info "SETUP: Initializing the project finished successfully."
-              J1.logger.info "SETUP: To open your site, run: j1 site"
+              timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+              J1.logger.info "#{timestamp} - SETUP: Initializing the project finished successfully."
+              J1.logger.info "#{timestamp} - SETUP: To open your site, run: j1 site"
             else
               raise SystemExit
               end
@@ -52,13 +55,14 @@ module J1
         private
 
         def bundle_install(path, options)
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
           J1::External.require_with_graceful_fail 'bundler'
-          J1.logger.info "SETUP: Running bundle install in #{path} ..."
+          J1.logger.info "#{timestamp} - SETUP: Running bundle install in #{path} ..."
           Dir.chdir(path) do
             if options['system']
-              J1.logger.info "SETUP: Install bundle in Ruby gem SYSTEM folder ..."
+              J1.logger.info "#{timestamp} - SETUP: Install bundle in Ruby gem SYSTEM folder ..."
             else
-              J1.logger.info "SETUP: Install bundle in USER gem folder ~/.gem ..."
+              J1.logger.info "#{timestamp} - SETUP: Install bundle in USER gem folder ~/.gem ..."
               process = J1::Utils::Exec2.run('SETUP','bundle', 'config', 'set', '--local', 'path', '~/.gem')
               raise SystemExit unless process.success?
             end
@@ -68,6 +72,7 @@ module J1
         end
 
         def patch_install(options)
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
           if J1::Utils::is_windows?
             major, minor = RUBY_VERSION.split('.')
             lib_version = major + '.' + minor
@@ -85,12 +90,12 @@ module J1
             system_path = result[1]
 
             if options['system']
-              J1.logger.info "SETUP: Install patches in SYSTEM folder ..."
-              J1.logger.info "SETUP: Install patches on path #{system_path} ..."
+              J1.logger.info "#{timestamp} - SETUP: Install patches in SYSTEM folder ..."
+              J1.logger.info "#{timestamp} - SETUP: Install patches on path #{system_path} ..."
               dest = system_path + '/gems/' + patch_gem_eventmachine + '/lib'
             else
-              J1.logger.info "SETUP: Install patches in USER gem folder ~/.gem ..."
-              J1.logger.info "SETUP: Install patches on path #{user_path} ..."
+              J1.logger.info "#{timestamp} - SETUP: Install patches in USER gem folder ~/.gem ..."
+              J1.logger.info "#{timestamp} - SETUP: Install patches on path #{user_path} ..."
               dest = user_path + '/gems/' + patch_gem_eventmachine + '/lib'
             end
             src = patch_eventmachine_source_path
@@ -106,7 +111,7 @@ module J1
               if Dir.exist?(dest)
                 FileUtils.cp(src, dest)
               else
-                J1.logger.info "SETUP: Skipped install patches for execjs-2.7.0 ..."
+                J1.logger.info "#{timestamp} - SETUP: Skipped install patches for execjs-2.7.0 ..."
               end
             end
 

data/lib/j1/commands/site.rb

@@ -17,9 +17,10 @@ module J1
         end
 
         def process(args, options = {})
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
           if J1::Utils::is_project?
             if J1::Utils::is_project_setup?
-              J1.logger.info "SITE: Starting up your site ..."
+              J1.logger.info "#{timestamp} - SITE: Starting up your site ..."
               process = J1::Utils::Exec2.run('SITE','npm', 'run', 'j1-site')
             else
               raise SystemExit

data/lib/j1/utils/exec2.rb

@@ -5,23 +5,49 @@ module J1
     module Exec2
       extend self
 
-      # Runs a program in a sub-shell.
+      # Runs a program in a sub-shell and return a Process::Status on exit
       #
+      # title - prepend a title on all messages
       # *args - a list of strings containing the program name and arguments
       #
-      # Returns a Process::Status and a String of output in an array in
-      # that order.
       def run(title, *args)
-        # title = 'TITLE'
         Open3.popen3(*args) do |stdin, stdout, stderr, status|
+
+          # manage software interrupt on Ctrl-C
           trap('INT') {
-            puts "#{title}: Received Ctrl-C to stop"
+            timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+            puts "#{timestamp} - #{title}: Received Ctrl-C to stop"
+            [stdin, stdout, stderr].each(&:close)
             raise SystemExit
           }
-          stdout.each_line do |line|
-            puts "#{title}: #{line}"
+
+          # manage messages on stdout
+          stdout_thr = Thread.new do
+            # exit the tread silently
+            Thread.current.report_on_exception = false
+            stdout.each_line do |line|
+              timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+              puts "#{timestamp} - #{title}: #{line}"
+            end
+          end
+
+          # manage messages on stdout
+          stderr_thr = Thread.new do
+            # exit the tread silently
+            Thread.current.report_on_exception = false
+            stderr.each_line do |line|
+              timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+              puts "#{timestamp} - " + "\e[31m" + "#{title}: #{line}" + "\e[0m"
+            end
           end
+
+          # combine channels stdout, stderr for output
+          [stdout_thr, stderr_thr].each(&:join)
+
+          # close channels explicitly to exit gracefully
           [stdin, stdout, stderr].each(&:close)
+
+          # exit and return Process::Status
           status.value
         end
       end

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
-module J1
-  VERSION = '2022.0.17'
-end
+module J1
+  VERSION = '2022.0.18'
+end

data/lib/starter_web/Gemfile

@@ -53,7 +53,7 @@ gem 'jekyll', '~> 4.2'
 
 # Theme Rubies, default: J1 Template (NOT used for the development system)
 #
-gem 'j1-template', '~> 2022.0.17'
+gem 'j1-template', '~> 2022.0.18'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            development
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2022.0.17
+version:                                2022.0.18
 
 # version
 # ------------------------------------------------------------------------------

data/lib/starter_web/_data/apps/carousel.yml

@@ -47,148 +47,146 @@ settings:
   enabled:                              true
 
   # ----------------------------------------------------------------------------
-  # CAROUSEL configurations
+  # CAROUSEL options
   # ----------------------------------------------------------------------------
-
-    # ----------------------------------------------------------------------------
-    # CAROUSEL options
-    # ----------------------------------------------------------------------------
-    #
-    # enabled
-    # ----------------------------------------------------------------------------
-    #   Enables|Disables the use of the OwlCarousel
-    #
-    #   values:                           boolean (true|false)
-    #   default:                          false
-    #
-    # carousel
-    # ----------------------------------------------------------------------------
-    #  All shows are configured as elements of the carousel
-    #  array
-    #
-    #   enabled:
-    # ----------------------------------------------------------------------------
-    #   If enabled, show data (JSON) is generated
-    #
-    #       values:                       boolean (false|true)
-    #       default:                      no default
-    #
-    #   lightbox:
-    #   ---------------------------------------------------
-    #   If set to true, J1 Lightbox is enabled for all images
-    #   of that carousel|show
-    #
-    #   NOTE:
-    #   To use Lightbox with Owl Carousel, lazyLoad needs to
-    #   be enabled for the show to delay the load of images.
-    #   If lightbox is detected as ENABLED, lazyLoad is
-    #   automatically ENABLED as well.
-    #
-    #       values:                       boolean (false|true)
-    #       default:                      false
-    #
-    #   id
-    #   --------------------------------------------------------------------------
-    #   A unique id used to create and initialize a
-    #   (specific) carousel|show.
-    #
-    #       values:                       string
-    #       default:                      no defaults
-    #
-    #
-    #   item_type
-    #   --------------------------------------------------------------------------
-    #   For a slide show, images or text (HTML code) can be
-    #   used as items.
-    #
-    #       values:                       image|text
-    #       default:                      image
-    #
-    #   images
-    #   --------------------------------------------------------------------------
-    #   The images array specifies all images used by a
-    #   carousel as items. All images are to be configured
-    #   as a comma separated list (of image names with NO path).
-    #
-    #   NOTE:
-    #   Because NO individual path for images can be configured,
-    #   all image files are to be located in the SAME directory.
-    #
-    #       values:                       array|string (image names)
-    #       default:                      no defaults
-    #
-    #   slide_height
-    #   --------------------------------------------------------------------------
-    #   The images are scaled to 100 percent of height per
-    #   default. To reduce the height of the images of a
-    #   show, slide_height reduce the (viewport) height of
-    #   a show down to 10vh (vh, view height).
-    #
-    #   IMPORTANT:
-    #   This option can be used ONLY for SINGLE image shows
-    #   with option "singleItem" set to "true".
-    #
-    #   NOTE:
-    #   The view port units VH and VW are supported for
-    #   browsers supporting CSS3, only. The view port units
-    #   scale the view port of an HTML element (e.g DIV)
-    #   in relation to the current (window) size of the
-    #   browser.
-    #
-    #       values:                       integer [10 .. 100] (vh)
-    #       default:                      100
-    #
-    #   lb_caption
-    #   --------------------------------------------------------------------------
-    #   The lb_caption array specifies all CAPTION TEXT
-    #   used by the LIGHTBOX configured (if a lightbox is
-    #   enabled).
-    #
-    #   Caption text elements are to be configured as a
-    #   comma separated list of the SAME number as IMAGES
-    #   configured for a show.
-    #
-    #       values:                       array|string (caption text)
-    #       default:                      no defaults
-    #
-    #   images_path
-    #   --------------------------------------------------------------------------
-    #   Path to the IMAGES configured with the 'images'
-    #   sequence (array ).
-    #
-    #       values:                       string (path)
-    #       default:                      no defaults
-    #
-    #   text
-    #   --------------------------------------------------------------------------
-    #   If the slide show items are of type TEXT (item_type),
-    #   the text array specifies all text blocks (plain text
-    #   of HTML code) used by a carousel as show items. Text
-    #   items are configured as a comma separated list of
-    #   strings.
-    #
-    #       values:                       array|string (plain text OR HTML code)
-    #       default:                      no defaults
-    #
-    #   links
-    #   --------------------------------------------------------------------------
-    #   On all carousel items, links (URLs) can be specified.
-    #
-    #   NOTE:
-    #   The number of elements of the 'links' array has to be
-    #   the same as the images or text array. The links are
-    #   bound to the items the same order. The first link is
-    #   bound to the first image|text block, the second link
-    #   to the second image|text etc.
-    #
-    #       values:                       array|string (url)
-    #       default:                      no defaults
-    #
-    #
-    # ----------------------------------------------------------------------------
-
+  #
+  # enabled
+  # ----------------------------------------------------------------------------
+  #   Enables|Disables the use of the OwlCarousel
+  #
+  #   values:                           boolean (true|false)
+  #   default:                          false
+  #
+  # carousel
+  # ----------------------------------------------------------------------------
+  #  All shows are configured as elements of the carousel
+  #  array
+  #
+  #   enabled:
+  # ----------------------------------------------------------------------------
+  #   If enabled, show data (JSON) is generated
+  #
+  #       values:                       boolean (false|true)
+  #       default:                      no default
+  #
+  #   lightbox:
+  #   ---------------------------------------------------
+  #   If set to true, J1 Lightbox is enabled for all images
+  #   of that carousel|show
+  #
+  #   NOTE:
+  #   To use Lightbox with Owl Carousel, lazyLoad needs to
+  #   be enabled for the show to delay the load of images.
+  #   If lightbox is detected as ENABLED, lazyLoad is
+  #   automatically ENABLED as well.
+  #
+  #       values:                       boolean (false|true)
+  #       default:                      false
+  #
+  #   id
+  #   --------------------------------------------------------------------------
+  #   A unique id used to create and initialize a
+  #   (specific) carousel|show.
+  #
+  #       values:                       string
+  #       default:                      no defaults
+  #
+  #
+  #   item_type
+  #   --------------------------------------------------------------------------
+  #   For a slide show, images or text (HTML code) can be
+  #   used as items.
+  #
+  #       values:                       image|text
+  #       default:                      image
+  #
+  #   images
+  #   --------------------------------------------------------------------------
+  #   The images array specifies all images used by a
+  #   carousel as items. All images are to be configured
+  #   as a comma separated list (of image names with NO path).
+  #
+  #   NOTE:
+  #   Because NO individual path for images can be configured,
+  #   all image files are to be located in the SAME directory.
+  #
+  #       values:                       array|string (image names)
+  #       default:                      no defaults
+  #
+  #   slide_height
+  #   --------------------------------------------------------------------------
+  #   The images are scaled to 100 percent of height per
+  #   default. To reduce the height of the images of a
+  #   show, slide_height reduce the (viewport) height of
+  #   a show down to 10vh (vh, view height).
+  #
+  #   IMPORTANT:
+  #   This option can be used ONLY for SINGLE image shows
+  #   with option "singleItem" set to "true".
+  #
+  #   NOTE:
+  #   The view port units VH and VW are supported for
+  #   browsers supporting CSS3, only. The view port units
+  #   scale the view port of an HTML element (e.g DIV)
+  #   in relation to the current (window) size of the
+  #   browser.
+  #
+  #       values:                       integer [10 .. 100] (vh)
+  #       default:                      100
+  #
+  #   lb_caption
+  #   --------------------------------------------------------------------------
+  #   The lb_caption array specifies all CAPTION TEXT
+  #   used by the LIGHTBOX configured (if a lightbox is
+  #   enabled).
+  #
+  #   Caption text elements are to be configured as a
+  #   comma separated list of the SAME number as IMAGES
+  #   configured for a show.
+  #
+  #       values:                       array|string (caption text)
+  #       default:                      no defaults
+  #
+  #   images_path
+  #   --------------------------------------------------------------------------
+  #   Path to the IMAGES configured with the 'images'
+  #   sequence (array ).
+  #
+  #       values:                       string (path)
+  #       default:                      no defaults
+  #
+  #   text
+  #   --------------------------------------------------------------------------
+  #   If the slide show items are of type TEXT (item_type),
+  #   the text array specifies all text blocks (plain text
+  #   of HTML code) used by a carousel as show items. Text
+  #   items are configured as a comma separated list of
+  #   strings.
+  #
+  #       values:                       array|string (plain text OR HTML code)
+  #       default:                      no defaults
+  #
+  #   links
+  #   --------------------------------------------------------------------------
+  #   On all carousel items, links (URLs) can be specified.
+  #
+  #   NOTE:
+  #   The number of elements of the 'links' array has to be
+  #   the same as the images or text array. The links are
+  #   bound to the items the same order. The first link is
+  #   bound to the first image|text block, the second link
+  #   to the second image|text etc.
+  #
+  #       values:                       array|string (url)
+  #       default:                      no defaults
+  #
+  #
+  # ----------------------------------------------------------------------------
+  #
   carousel:
-
+    # --------------------------------------------------------------------------
+    # CAROUSEL configurations
+    # --------------------------------------------------------------------------
 
     # --------------------------------------------------------------------------
     # demo_text_carousel

data/lib/starter_web/_data/blocks/banner.yml

@@ -197,17 +197,17 @@ settings:
                     href:               "https://rubygems.org/gems/j1-template"
                     target:             blank
 
-                - name:                 Quickstart
+                - name:                 Rocketstart
                   button:
-                    id:                 quickstart
-                    title:              Quickstart
-                    tagline:            finished in 15 minutes
-                    class:              btn btn-xl btn-primary text-uppercase text-left mr-2 mb-2
+                    id:                 rocketstart
+                    title:              Rocketstart
+                    tagline:            finished in minutes
+                    class:              btn btn-raised btn-xl btn-primary text-uppercase text-left mr-2 mb-2
                     style:              "min-width: 250px"
-                    icon:               briefcase-check-outline
+                    icon:               rocket-launch
                     icon_color:
                     icon_size:          3x
-                    href:               "https://jekyll.one/pages/public/learn/quickstart/"
+                    href:               "https://jekyll.one/pages/public/learn/rocketstart/"
                     target:             blank
 
     # --------------------------------------------------------------------------