j1-template 2022.0.14 → 2022.0.18

data/exe/j1

@@ -11,17 +11,37 @@ Mercenary.program(:j1) do |p|
   p.description 'J1 Template is a gem-based Template made for Jekyll'
   p.syntax 'j1 <subcommand> [options]'
 
-  p.command(:generate) do |c|
-    c.description 'Generates a starter site scaffold in PATH'
-    c.syntax 'generate PATH'
-    c.option 'force', '--force',                '    Force a site to be created even the PATH already exists'
-    c.option 'skip-bundle', '--skip-bundle',    '    Skip bundle install'
-    c.option 'skip-patches', '--skip-patches',  '   Skip install any PATCHES buildin with J1'
-    c.option 'system', '--system',              '    Run "bundle install" for the Ruby SYSTEM gem folder'
-    c.action do |args, options|
-      J1::Commands::Generate.process(args, options)
+  # available options for all subcommands
+  #
+  # p.option 'force', '--force'
+  # p.option 'skip-bundle', '--skip-bundle'
+  # p.option 'skip-patches', '--skip-patches'
+  # p.option 'system', '--system'
+
+  # J1::External.require_if_present(J1::External.blessed_gems) do |g, ver_constraint|
+  #   cmd = g.split("-").last
+  #   p.command(cmd.to_sym) do |c|
+  #     c.syntax cmd
+  #     c.action do
+  #       J1.logger.abort_with "You must install the '#{g}' gem" \
+  #         " version #{ver_constraint} to use the 'jekyll #{cmd}' command."
+  #     end
+  #   end
+  # end
+
+  J1::Command.subclasses.each { |c| c.init_with_program(p) }
+
+  p.action do |args, _|
+    if args.empty?
+      J1.logger.error "A subcommand is required."
+      puts p
+      abort
+    else
+      subcommand = args.first
+      unless p.has_command? subcommand
+        J1.logger.abort_with "fatal: 'j1 #{args.first}' failed." \
+          " No subcommand '#{args.first}' available."
+      end
     end
   end
-
-  p.default_command(:generate)
 end

data/lib/j1/commands/generate.rb

@@ -1,36 +1,34 @@
+# frozen_string_literal: true
+
 require 'erb'
-require 'rbconfig'
-require 'fileutils'
 
 module J1
   module Commands
     class Generate < Command
       class << self
 
-        # def init_with_program(prog)
-        #   prog.command(:generate) do |c|
-        #     c.description 'Generates a starter site scaffold in PATH'
-        #     c.syntax 'generate PATH'
-        #     c.option 'force', '--force',                'Force a site to be created even the PATH already exists'
-        #     c.option 'skip-bundle', '--skip-bundle',    'Skip bundle install'
-        #     c.option 'skip-patches', '--skip-patches',  'Skip install any PATCHES buildin with J1'
-        #     c.option 'system', '--system',              'Run "bundle install" for the Ruby SYSTEM gem folder'
-        #     c.action do |args, options|
-        #       J1::Commands::Generate.process(args, options)
-        #     end
-        #   end
-        # end
-
-        def is_windows?
-          RbConfig::CONFIG["host_os"] =~ %r!mswin|mingw|cygwin!i
+        def init_with_program(prog)
+          prog.command(:generate) do |c|
+            c.description 'Generates a J1 project scaffold in PATH'
+            c.syntax 'generate PATH'
+            c.option 'force', '--force',                'Force a site to be created even the PATH already exists'
+            c.option 'skip-bundle', '--skip-bundle',    'Skip bundle install'
+            c.option 'skip-patches', '--skip-patches',  'Skip install any PATCHES build-in with J1'
+            c.option 'system', '--system',              'Run "bundle install" for the Ruby SYSTEM gem folder'
+            c.action do |args, options|
+              J1::Commands::Generate.process(args, options)
+            end
+          end
         end
 
         def process(args, options = {})
-          raise ArgumentError, '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 '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']
@@ -40,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)
@@ -90,42 +90,44 @@ 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)
-            unless options['skip-patches']
-              patch_install(options)
+            if options['skip-patches']
+              J1.logger.info "#{timestamp} - GENERATE: Install build-in patches skipped ..."
             else
-              J1.logger.info "Install build-in patches skipped ..."
+              patch_install(options)
             end
           end
-          unless options['force']
-            J1.logger.info "Generated Jekyll site installed in folder #{path}"
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          if options['force']
+            J1.logger.info "#{timestamp} - GENERATE: Generated Jekyll site force installed in folder #{path}"
           else
-            J1.logger.info "Generated Jekyll site force installed in folder #{path}"
+            J1.logger.info "#{timestamp} - GENERATE: Generated Jekyll site installed in folder #{path}"
           end
-          J1.logger.info '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 "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 "Install bundle in Ruby gem SYSTEM folder ..."
+              J1.logger.info "#{timestamp} - GENERATE: Install bundle in Ruby gem SYSTEM folder ..."
             else
-              J1.logger.info "Install bundle in USER gem folder ~/.gem ..."
-              process, output = J1::Utils::Exec.run('bundle', 'config', 'set', '--local', 'path', '~/.gem')
-            end
-            process, output = J1::Utils::Exec.run('bundle', 'install')
-            output.to_s.each_line do |line|
-              J1.logger.info('Bundler:', line.strip) unless line.to_s.empty?
+              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
+            process = J1::Utils::Exec2.run( 'GENERATE', 'bundle', 'install')
             raise SystemExit unless process.success?
           end
         end
 
         def patch_install(options)
-          if is_windows?
+          timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          if J1::Utils::is_windows?
             major, minor = RUBY_VERSION.split('.')
             lib_version = major + '.' + minor
             curr_path = File.expand_path(File.dirname(File.dirname(__FILE__)))
@@ -134,20 +136,24 @@ module J1
             patch_eventmachine_source_path = curr_path + '/patches/rubygems' + '/' + patch_gem_eventmachine + '/lib/' + lib_version
             patch_execjs_source_path = curr_path + '/patches/rubygems' + '/' + patch_gem_execjs + '/lib/execjs/external_runtime.rb'
 
-            process, output = J1::Utils::Exec.run('gem', 'env', 'gempath')
+            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 "Install patches in SYSTEM folder ..."
-              J1.logger.info "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 "Install patches in USER gem folder ~/.gem ..."
-              J1.logger.info "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
@@ -163,7 +169,7 @@ module J1
               if Dir.exist?(dest)
                 FileUtils.cp(src, dest)
               else
-                J1.logger.info "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/help.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module J1
+  module Commands
+    class Help < Command
+      class << self
+
+        def init_with_program(prog)
+          prog.command(:help) do |c|
+            c.syntax "help [subcommand]"
+            c.description "Show the help message, optionally for a given subcommand"
+
+            c.action do |args, _|
+              cmd = (args.first || "").to_sym
+              if args.empty?
+                J1.logger.info prog.to_s
+              elsif prog.has_command? cmd
+                J1.logger.info prog.commands[cmd].to_s
+              else
+                invalid_command(prog, cmd)
+                abort
+              end
+            end
+          end
+        end
+
+        def invalid_command(prog, cmd)
+          J1.logger.error "Error:",
+                              "Hmm... we don't know what the '#{cmd}' command is."
+          J1.logger.info  "Valid commands:", prog.commands.keys.join(", ")
+        end
+      end
+    end
+  end
+end

data/lib/j1/commands/patch.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module J1
+  module Commands
+    class Patch < Command
+      #noinspection MissingYardParamTag
+      class << self
+
+        def init_with_program(prog)
+          prog.command(:patch) do |c|
+            c.description 'Install patches available for J1 projects'
+            c.syntax 'patch'
+            c.option 'force', '--force',                'Force to install patches even already exists'
+            c.option 'system', '--system',              'Install patches on the Ruby SYSTEM gem folder'
+            c.action do |args, options|
+              J1::Commands::Patch.process(args, options)
+            end
+          end
+        end
+
+        def process(args, options = {})
+          @args = args
+          patch_install(options)
+        end
+
+        private
+
+        def patch_install(options)
+          if J1::Utils::is_windows?
+            major, minor = RUBY_VERSION.split('.')
+            lib_version = major + '.' + minor
+            curr_path = File.expand_path(File.dirname(File.dirname(__FILE__)))
+            patch_gem_eventmachine = 'eventmachine-1.2.7-x64-mingw32'
+            patch_gem_execjs = 'execjs-2.7.0'
+            patch_eventmachine_source_path = curr_path + '/patches/rubygems' + '/' + patch_gem_eventmachine + '/lib/' + lib_version
+            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')
+            raise SystemExit unless process.success?
+
+            result = output.split(';')
+            user_path = result[0]
+            system_path = result[1]
+
+            if options['system']
+              J1.logger.info "PATCH: Install patches in SYSTEM folder ..."
+              J1.logger.info "PATCH: Install patches on path #{system_path} ..."
+              dest = system_path + '/gems/' + patch_gem_eventmachine + '/lib'
+            else
+              J1.logger.info "PATCH: Install patches in USER gem folder ~/.gem ..."
+              J1.logger.info "PATCH: Install patches on path #{user_path} ..."
+              dest = user_path + '/gems/' + patch_gem_eventmachine + '/lib'
+            end
+            src = patch_eventmachine_source_path
+            FileUtils.cp_r(src, dest)
+
+            if lib_version === '2.7'
+              if options['system']
+                dest = system_path + '/gems/' + patch_gem_execjs + '/lib/execjs'
+              else
+                dest = user_path + '/gems/' + patch_gem_execjs + '/lib/execjs'
+              end
+              src = patch_execjs_source_path
+              if Dir.exist?(dest)
+                FileUtils.cp(src, dest)
+              else
+                J1.logger.info "PATCH: Skipped install patches for execjs-2.7.0 ..."
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/j1/commands/rebuild.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module J1
+  module Commands
+    class Rebuild < Command
+      #noinspection MissingYardParamTag
+      class << self
+
+        def init_with_program(prog)
+          prog.command(:rebuild) do |c|
+            c.description 'Rebuild the J1 projects website'
+            c.syntax 'rebuild'
+            c.action do |args, options|
+              J1::Commands::Rebuild.process(args, options)
+            end
+          end
+        end
+
+        def process(args, options = {})
+          if J1::Utils::is_project?
+            if J1::Utils::is_project_setup?
+              J1.logger.info "REBUILD: Rebuild the projects website ..."
+              J1.logger.info "REBUILD: Be patient, this will take a while ..."
+              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
+            else
+              raise SystemExit
+            end
+          else
+            raise SystemExit
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/j1/commands/reset.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module J1
+  module Commands
+    class Reset < Command
+      #noinspection MissingYardParamTag
+      class << self
+
+        def init_with_program(prog)
+          prog.command(:reset) do |c|
+            c.description 'Reset a J1 project to factory state'
+            c.syntax 'reset'
+            c.action do |args, options|
+              J1::Commands::Reset.process(args, options)
+            end
+          end
+        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 "#{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?
+                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
+            else
+              raise SystemExit
+            end
+          else
+            raise SystemExit
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/j1/commands/setup.rb

@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+# require "futils"
+
+module J1
+  module Commands
+    class Setup < Command
+      #noinspection MissingYardParamTag
+      class << self
+
+        def init_with_program(prog)
+          prog.command(:setup) do |c|
+            c.description 'Initialize a J1 project for first use'
+            c.syntax 'setup'
+            c.option 'force', '--force',                ' Force to install patches even already exists'
+            c.option 'system', '--system',              ' Install patches on the Ruby SYSTEM gem folder'
+            c.option 'skip-patches', '--skip-patches',  'Skip install any PATCHES build-in with J1'
+            c.action do |args, options|
+              J1::Commands::Setup.process(args, options)
+            end
+          end
+        end
+
+        def process(args, options = {})
+          @args = args
+          path = File.expand_path(Dir.getwd)
+
+          if J1::Utils::is_project?
+            bundle_install(path, options)
+            if options['skip-patches']
+              J1.logger.info "#{timestamp} - SETUP: Install build-in patches skipped ..."
+            else
+              patch_install(options)
+            end
+
+            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?
+              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
+          else
+            raise SystemExit
+          end
+        end
+
+        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 "#{timestamp} - SETUP: Running bundle install in #{path} ..."
+          Dir.chdir(path) do
+            if options['system']
+              J1.logger.info "#{timestamp} - SETUP: Install bundle in Ruby gem SYSTEM folder ..."
+            else
+              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
+            process = J1::Utils::Exec2.run('SETUP','bundle', 'install')
+            raise SystemExit unless process.success?
+          end
+        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
+            curr_path = File.expand_path(File.dirname(File.dirname(__FILE__)))
+            patch_gem_eventmachine = 'eventmachine-1.2.7-x64-mingw32'
+            patch_gem_execjs = 'execjs-2.7.0'
+            patch_eventmachine_source_path = curr_path + '/patches/rubygems' + '/' + patch_gem_eventmachine + '/lib/' + lib_version
+            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')
+            raise SystemExit unless process.success?
+
+            result = output.split(';')
+            user_path = result[0]
+            system_path = result[1]
+
+            if options['system']
+              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 "#{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
+            FileUtils.cp_r(src, dest)
+
+            if lib_version === '2.7'
+              if options['system']
+                dest = system_path + '/gems/' + patch_gem_execjs + '/lib/execjs'
+              else
+                dest = user_path + '/gems/' + patch_gem_execjs + '/lib/execjs'
+              end
+              src = patch_execjs_source_path
+              if Dir.exist?(dest)
+                FileUtils.cp(src, dest)
+              else
+                J1.logger.info "#{timestamp} - SETUP: Skipped install patches for execjs-2.7.0 ..."
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/j1/commands/site.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module J1
+  module Commands
+    class Site < Command
+      #noinspection MissingYardParamTag
+      class << self
+
+        def init_with_program(prog)
+          prog.command(:site) do |c|
+            c.description 'Run the website of a J1 project'
+            c.syntax 'site'
+            c.action do |args, options|
+              J1::Commands::Site.process(args, options)
+            end
+          end
+        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 "#{timestamp} - SITE: Starting up your site ..."
+              process = J1::Utils::Exec2.run('SITE','npm', 'run', 'j1-site')
+            else
+              raise SystemExit
+            end
+          else
+            raise SystemExit
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/j1/external.rb

@@ -50,7 +50,7 @@ The full error message from Ruby is: '#{e.message}'
 
 If you run into trouble, you can find helpful resources at https://jekyllrb.com/help/!
             MSG
-            raise Jekyll::Errors::MissingDependencyException, name
+            raise J1::Errors::MissingDependencyException, name
           end
         end
       end

data/lib/j1/utils/{exec.rb → exec1.rb}

@@ -2,7 +2,7 @@ require "open3"
 
 module J1
   module Utils
-    module Exec
+    module Exec1
       extend self
 
       # Runs a program in a sub-shell.

data/lib/j1/utils/exec2.rb

@@ -0,0 +1,57 @@
+require "open3"
+
+module J1
+  module Utils
+    module Exec2
+      extend self
+
+      # 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
+      #
+      def run(title, *args)
+        Open3.popen3(*args) do |stdin, stdout, stderr, status|
+
+          # manage software interrupt on Ctrl-C
+          trap('INT') {
+            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
+          }
+
+          # 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
+
+    end
+  end
+end