lib/j1/commands/generate.rb in j1-template-2024.2.1 vs lib/j1/commands/generate.rb in j1-template-2024.3.12

@@ -21,27 +21,30 @@
           end
         end
 
         def process(args, options = {})
           timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-          raise ArgumentError, "#{timestamp} - GENERATE: You must specify a path." if args.empty?
+          raise ArgumentError, "#{timestamp} - GENERATE: you need to 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 "#{timestamp} - GENERATE: Conflict:", "#{new_blog_path} exists and is not empty."
+            J1.logger.abort_with "#{timestamp} - GENERATE: conflict detected:", "#{new_blog_path} exists and is not empty."
           end
 
           if options['blank']
             create_blank_site new_blog_path
           else
             create_site new_blog_path
           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"
+          J1.logger.info "#{timestamp} - GENERATE: creating site finished."
+          J1.logger.info "#{timestamp} - GENERATE: for setup, change to project folder: #{new_blog_path}"
+          J1.logger.info "#{timestamp} - GENERATE: and run: j1 setup."
+          puts " "
         end
 
         def create_blank_site(path)
           Dir.chdir(path) do
             FileUtils.mkdir(%w(_layouts posts/public/featured/_posts _drafts))
@@ -93,33 +96,33 @@
         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 "#{timestamp} - GENERATE: Install build-in patches skipped ..."
+              J1.logger.info "#{timestamp} - GENERATE: installalling 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 "#{timestamp} - GENERATE: Generated Jekyll site force installed in folder #{path}"
+            J1.logger.info "#{timestamp} - GENERATE: generated site installed forced in folder: #{path}"
           else
-            J1.logger.info "#{timestamp} - GENERATE: Generated Jekyll site installed in folder #{path}"
+            J1.logger.info "#{timestamp} - GENERATE: generated site installed in folder: #{path}"
           end
-          J1.logger.info "#{timestamp} - GENERATE: Installation (bundle) of RubyGems skipped" if options['skip-bundle']
+          J1.logger.info "#{timestamp} - GENERATE: installation of ruby gems (bundle) 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 "#{timestamp} - GENERATE: Running bundle install in #{path} ..."
+          J1.logger.info "#{timestamp} - GENERATE: running bundle install in path: #{path} .."
           Dir.chdir(path) do
             if options['system']
-              J1.logger.info "#{timestamp} - GENERATE: Install bundle in Ruby gem SYSTEM folder ..."
+              J1.logger.info "#{timestamp} - GENERATE: install bundle in ruby gem SYSTEM folder .."
             else
-              J1.logger.info "#{timestamp} - GENERATE: Install bundle in USER gem folder ~/.gem ..."
+              J1.logger.info "#{timestamp} - GENERATE: install bundle in gem USER 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?
@@ -147,30 +150,30 @@
             user_path = result[0]
             system_path = result[1]
             timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
 
             if options['system']
-              J1.logger.info "#{timestamp} - GENERATE: Install patches in SYSTEM folder ..."
-              J1.logger.info "#{timestamp} - GENERATE: Install patches on path #{system_path} ..."
+              J1.logger.info "#{timestamp} - GENERATE: installing patches in SYSTEM folder."
+              J1.logger.info "#{timestamp} - GENERATE: installing patches on path: #{system_path} .."
               dest = system_path + '/gems/' + patch_gem_eventmachine + '/lib'
             else
-              J1.logger.info "#{timestamp} - GENERATE: Install patches in USER gem folder ~/.gem ..."
-              J1.logger.info "#{timestamp} - GENERATE: Install patches on path #{user_path} ..."
+              J1.logger.info "#{timestamp} - GENERATE: installing patches in USER gem folder."
+              J1.logger.info "#{timestamp} - GENERATE: installalling patches on path: #{user_path} .."
               dest = user_path + '/gems/' + patch_gem_eventmachine + '/lib'
             end
 
             src = patch_eventmachine_source_path
 
             # Added to support Ruby V3.x.
             if Dir.exist?(dest)
               #             FileUtils.cp(src, dest)
-              J1.logger.info "#{timestamp} - GENERATE: Patches already installed, skip install."
+              J1.logger.info "#{timestamp} - GENERATE: installing patches: already installed: installation skipped."
             else
               # Create path (eventmachine-1.2.7-x64-mingw32) for Ruby V3
               FileUtils.mkdir_p dest
               FileUtils.cp_r(src, dest)
-              J1.logger.info "#{timestamp} - GENERATE: Install patches successful."
+              J1.logger.info "#{timestamp} - GENERATE: installing patches: successful."
             end
 
             if lib_version === '2.7'
               if options['system']
                 dest = system_path + '/gems/' + patch_gem_execjs + '/lib/execjs'
@@ -179,10 +182,10 @@
               end
               src = patch_execjs_source_path
               if Dir.exist?(dest)
                 FileUtils.cp(src, dest)
               else
-                J1.logger.info "#{timestamp} - GENERATE: Skipped install patches for execjs-2.7.0 ..."
+                J1.logger.info "#{timestamp} - GENERATE: installing patches: skipped patches for execjs v2.7.0."
               end
             end
 
           end
         end