j1-template 2022.0.16 → 2022.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6747e12e42b4cbc106beb6bbef14dbc74b7e43c050d88371bcbd814d62bf76e0
-  data.tar.gz: e4d94adc0891fc86bc5f53f702534aeb74caeca9ebf1f51d101271317b244278
+  metadata.gz: 800dc492d73c0a3fa1b6a4a65efad8cd448b1e2cbc304a112e0941be09e6a8ec
+  data.tar.gz: '07801fe24243e2721c57152f94ee02adac6e2f84e82d20ecf32664fc19d64ed3'
 SHA512:
-  metadata.gz: 2743934801254b32fcba41d44183c5f94580f5bcf5460cc816277359fdf81127c1b47e95600b2856e8152e9db0e3c862e9d0cecffa2a7db06b9350467a0db8cc
-  data.tar.gz: 752db1543f50ca13e4b1ce9477796b588bf1bb8447ba0e8fb47f0bf1ffba1daa4f39b40536ababd655d7cc4cf529fd615ebbb89931614bcabc4913c03d74fd2c
+  metadata.gz: 7f3aa7bbbc45b6121e548b7b745c30512c313b2b80b0fd79caf73eac0943ae39f30992f0aa1d0393ca811a543bc2b4e9e7b1717c58cb071106c45f55c1989526
+  data.tar.gz: 3c5e808cea092e42249bb03494a2a8c0366e322e4f3622052ac565b1fe4a400e14402edfb12769afb21c3afd2fc4093931069fc74e48d8d191933d80195aab50

data/lib/j1/commands/generate.rb

@@ -58,10 +58,6 @@ module J1
 
         private
 
-        def is_windows?
-          RbConfig::CONFIG["host_os"] =~ %r!mswin|mingw|cygwin!i
-        end
-
         def create_site(new_blog_path)
           create_sample_files new_blog_path
 
@@ -115,18 +111,16 @@ module J1
               J1.logger.info "GENERATE: Install bundle in Ruby gem SYSTEM folder ..."
             else
               J1.logger.info "GENERATE: 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('BUNDLE:', line.strip) unless line.to_s.empty?
+              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?
+          if J1::Utils::is_windows?
             major, minor = RUBY_VERSION.split('.')
             lib_version = major + '.' + minor
             curr_path = File.expand_path(File.dirname(File.dirname(__FILE__)))
@@ -135,7 +129,7 @@ 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')
             raise SystemExit unless process.success?
 
             result = output.split(';')

data/lib/j1/commands/help.rb

@@ -1,35 +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
+# 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

@@ -19,19 +19,14 @@ module J1
         end
 
         def process(args, options = {})
-          patch_install(options)
           @args = args
+          patch_install(options)
         end
 
         private
 
-        def is_windows?
-          #noinspection RubyResolve
-          RbConfig::CONFIG["host_os"] =~ %r!mswin|mingw|cygwin!i
-        end
-
         def patch_install(options)
-          if is_windows?
+          if J1::Utils::is_windows?
             major, minor = RUBY_VERSION.split('.')
             lib_version = major + '.' + minor
             curr_path = File.expand_path(File.dirname(File.dirname(__FILE__)))
@@ -40,7 +35,7 @@ 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')
             raise SystemExit unless process.success?
 
             result = output.split(';')

data/lib/j1/commands/rebuild.rb

@@ -0,0 +1,41 @@
+# 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."
+              else
+                raise SystemExit
+              end
+            else
+              raise SystemExit
+            end
+          else
+            raise SystemExit
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/j1/commands/reset.rb

@@ -17,14 +17,19 @@ module J1
         end
 
         def process(args, options = {})
-          J1.logger.info "RESET: Reset the project to factory state ..."
-          J1.logger.info "RESET: Be patient, this will take a while ..."
-          process, output = J1::Utils::Exec.run('npm', 'run', 'reset')
-          output.to_s.each_line do |line|
-            J1.logger.info('RESET:', line.strip) unless line.to_s.empty?
-          end
-          if process.success?
-            J1.logger.info "RESET: The project reset finished successfully."
+          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 ..."
+              process = J1::Utils::Exec2.run('RESET','npm', 'run', 'reset')
+              if process.success?
+                J1.logger.info "RESET: The project reset finished successfully."
+              else
+                raise SystemExit
+              end
+            else
+              raise SystemExit
+            end
           else
             raise SystemExit
           end

data/lib/j1/commands/setup.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# require "futils"
 
 module J1
   module Commands
@@ -22,7 +23,8 @@ module J1
         def process(args, options = {})
           @args = args
           path = File.expand_path(Dir.getwd)
-          if is_project?
+
+          if J1::Utils::is_project?
             bundle_install(path, options)
             if options['skip-patches']
               J1.logger.info "SETUP: Install build-in patches skipped ..."
@@ -31,52 +33,42 @@ module J1
             end
             J1.logger.info "SETUP: Initialize the project ..."
             J1.logger.info "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, 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"
             else
               raise SystemExit
-            end
+              end
+          else
+            raise SystemExit
           end
         end
 
         private
 
-        def is_project?
-          path = File.expand_path(File.dirname(File.dirname(__FILE__)))
-          J1.logger.info "Check consistency of the project ..."
-          return true
-        end
-
-        def is_windows?
-          #noinspection RubyResolve
-          RbConfig::CONFIG["host_os"] =~ %r!mswin|mingw|cygwin!i
-        end
-
         def bundle_install(path, options)
           J1::External.require_with_graceful_fail 'bundler'
-          J1.logger.info "Running bundle install in #{path} ..."
+          J1.logger.info "SETUP: 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 "SETUP: 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 "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)
-          if is_windows?
+          if J1::Utils::is_windows?
             major, minor = RUBY_VERSION.split('.')
             lib_version = major + '.' + minor
             curr_path = File.expand_path(File.dirname(File.dirname(__FILE__)))
@@ -85,7 +77,7 @@ 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')
             raise SystemExit unless process.success?
 
             result = output.split(';')
@@ -93,12 +85,12 @@ module J1
             system_path = result[1]
 
             if options['system']
-              J1.logger.info "Install patches in SYSTEM folder ..."
-              J1.logger.info "Install patches on path #{system_path} ..."
+              J1.logger.info "SETUP: Install patches in SYSTEM folder ..."
+              J1.logger.info "SETUP: 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 "SETUP: Install patches in USER gem folder ~/.gem ..."
+              J1.logger.info "SETUP: Install patches on path #{user_path} ..."
               dest = user_path + '/gems/' + patch_gem_eventmachine + '/lib'
             end
             src = patch_eventmachine_source_path
@@ -114,7 +106,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 "SETUP: Skipped install patches for execjs-2.7.0 ..."
               end
             end
 

data/lib/j1/commands/site.rb

@@ -17,8 +17,16 @@ module J1
         end
 
         def process(args, options = {})
-          J1.logger.info "SITE: Starting up your site ..."
-          J1::Utils::ExecUntilTrap.run('SITE','npm', 'run', 'j1-site')
+          if J1::Utils::is_project?
+            if J1::Utils::is_project_setup?
+              J1.logger.info "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

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/{exec_until_trap.rb → exec2.rb}

@@ -2,16 +2,18 @@ require "open3"
 
 module J1
   module Utils
-    module ExecUntilTrap
+    module Exec2
       extend self
 
-      # Runs a program in a sub-shell and exits on Ctrl+C.
+      # Runs a program in a sub-shell.
       #
-      # title - Trailing line title for the output on stdout
-      # *args - a list of strings containing the program name and (followed by) arguments
+      # *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)
-        Open3.popen3(*args) do |stdin, stdout, stderr|
+        # title = 'TITLE'
+        Open3.popen3(*args) do |stdin, stdout, stderr, status|
           trap('INT') {
             puts "#{title}: Received Ctrl-C to stop"
             raise SystemExit
@@ -19,10 +21,11 @@ module J1
           stdout.each_line do |line|
             puts "#{title}: #{line}"
           end
+          [stdin, stdout, stderr].each(&:close)
+          status.value
         end
-        [stdin, stdout, stderr].each(&:close)
       end
 
     end
   end
-end
+end

data/lib/j1/utils.rb

@@ -4,8 +4,8 @@ module J1
   module Utils
     extend self
     autoload :Ansi, "j1/utils/ansi"
-    autoload :Exec, "j1/utils/exec"
-    autoload :ExecUntilTrap, "j1/utils/exec_until_trap"
+    autoload :Exec1, "j1/utils/exec1"
+    autoload :Exec2, "j1/utils/exec2"
     autoload :Platforms, "j1/utils/platforms"
     autoload :WinTZ, "j1/utils/win_tz"
 
@@ -32,11 +32,8 @@ module J1
           exit
         end
       end
-
     end
 
-
-
     # Constants for use in #slugify
     SLUGIFY_MODES = %w(raw default pretty ascii).freeze
     SLUGIFY_RAW_REGEXP = Regexp.new('\\s+').freeze
@@ -44,6 +41,32 @@ module J1
     SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze
     SLUGIFY_ASCII_REGEXP = Regexp.new("[^[A-Za-z0-9]]+").freeze
 
+    def is_project?
+      path = File.expand_path(Dir.pwd)
+      puts "Check consistency of the J1 project ..."
+      if File.exist?(path + '/package.json') && File.exist?(path + '/_config.yml')
+        return true
+      else
+        puts "\e[31m" + "FATAL: Path #{path} seems not a J1 project folder" + "\e[0m"
+      end
+    end
+
+    def is_project_setup?
+      path = File.expand_path(Dir.pwd)
+      puts "Check setup state of the J1 project ..."
+      if File.exist?(path + '/package-lock.json') && File.exist?(path + '/Gemfile.lock')
+        return true
+      else
+        puts "\e[31m" + "FATAL: Project in path #{path} seems not initialized" + "\e[0m"
+        puts "INFO: Consider to run 'j1 setup' in order to prepare the project for first use"
+      end
+    end
+
+    def is_windows?
+      #noinspection RubyResolve
+      RbConfig::CONFIG["host_os"] =~ %r!mswin|mingw|cygwin!i
+    end
+
     # Takes an indented string and removes the preceding spaces on each line
 
     def strip_heredoc(str)

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
-module J1
-  VERSION = '2022.0.16'
-end
+module J1
+  VERSION = '2022.0.17'
+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.16'
+gem 'j1-template', '~> 2022.0.17'
 
 # ------------------------------------------------------------------------------
 # 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.16
+version:                                2022.0.17
 
 # version
 # ------------------------------------------------------------------------------

data/lib/starter_web/_includes/attributes.asciidoc

@@ -437,7 +437,7 @@ end::tables[]
 // -----------------------------------------------------------------------------
 tag::products[]
 :j1--license:                                     MIT License
-:j1--version:                                     2022.0.16
+:j1--version:                                     2022.0.17
 :j1--site-name:                                   Jekyll One
 end::products[]
 

data/lib/starter_web/_plugins/lunr_index.rb

@@ -364,6 +364,6 @@ end
 
 module Jekyll
   module J1LunrSearch
-    VERSION = '2022.0.16'
+    VERSION = '2022.0.17'
   end
 end

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1_starter",
-  "version": "2022.0.16",
+  "version": "2022.0.17",
   "description": "J1 Template Starter Web",
   "homepage": "https://your.site",
   "author": {

data/lib/starter_web/utilsrv/_defaults/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2022.0.16",
+  "version": "2022.0.17",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

data/lib/starter_web/utilsrv/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2022.0.16",
+  "version": "2022.0.17",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j1-template
 version: !ruby/object:Gem::Version
-  version: 2022.0.16
+  version: 2022.0.17
 platform: ruby
 authors:
 - juergen_jekyll_one
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-09 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -1457,6 +1457,7 @@ files:
 - lib/j1/commands/generate.rb
 - lib/j1/commands/help.rb
 - lib/j1/commands/patch.rb
+- lib/j1/commands/rebuild.rb
 - lib/j1/commands/reset.rb
 - lib/j1/commands/setup.rb
 - lib/j1/commands/site.rb
@@ -1470,8 +1471,8 @@ files:
 - lib/j1/patches/rubygems/execjs-2.7.0/lib/execjs/external_runtime.rb
 - lib/j1/utils.rb
 - lib/j1/utils/ansi.rb
-- lib/j1/utils/exec.rb
-- lib/j1/utils/exec_until_trap.rb
+- lib/j1/utils/exec1.rb
+- lib/j1/utils/exec2.rb
 - lib/j1/utils/platforms.rb
 - lib/j1/utils/win_tz.rb
 - lib/j1/version.rb