Merge pull request #13 from jsdnhk/blog-enhance

intergrated auto scripts + fixes

Author: jsdnhk

.ruby-version

@@ -0,0 +1 @@
+2.5.3

Gemfile

@@ -5,8 +5,8 @@ gem 'github-pages', group: :jekyll_plugins
 
 group :development, :test do
   gem 'html-proofer'
-  gem 'parallel'
   gem 'rake'
+  gem 'parallel'
   gem 'rubocop'
   gem 'typhoeus'
 end

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 jsdnhk.github.io
+Copyright (c) 2020 David N
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Rakefile

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require 'html-proofer'
 require "rubygems"
+require "html-proofer"
 require 'rake'
+
 require 'yaml'
 require 'time'
 
@@ -11,45 +12,40 @@ COLLECTIONS = "collections"
 DIRS = {
     'layouts' => File.join(SOURCE, "_layouts"),
     'scripts' => File.join(SOURCE, "scripts"),
-    'sites' => File.join(SOURCE, "_sites"),
+    'pages' => File.join(SOURCE, "pages"),
+    'site' => File.join(SOURCE, "_site"),
     'drafts' => File.join(SOURCE, COLLECTIONS, "_drafts"),
     'posts' => File.join(SOURCE, COLLECTIONS, "_posts"),
     'post_ext' => "md",
+    'page_ext' => "md"
 }
 
-# Path configuration helper
-module JB
-  class Path
-    SOURCE = "."
-    Paths = {
-        :layouts => "_layouts",
-        :posts => "_posts"
-    }
-
-    def self.base
-      SOURCE
-    end
-
-    # build a path relative to configured path settings.
-    def self.build(path, opts = {})
-      opts[:root] ||= SOURCE
-      path = "#{opts[:root]}/#{Paths[path.to_sym]}/#{opts[:node]}".split("/")
-      path.compact!
-      File.__send__ :join, path
-    end
-
-  end #Path
-end #JB
-
-# Usage: rake post title="A Title" [date="2012-02-09"] [tags=[tag1,tag2]] [category="category"]
+def ask(message, valid_options)
+  if valid_options
+    answer = get_stdin("#{message}-->#{valid_options.to_s.gsub(/"/, '').gsub(/, /,'/')} ") while !valid_options.include?(answer)
+  else
+    answer = get_stdin(message)
+  end
+  answer
+end
+
+def get_stdin(message)
+  print message
+  STDIN.gets.chomp
+end
+
+IS_COMMENT_ENABLE = true
+IS_DISPLAY_ENABLE = true
+# Usage: rake post [title="${title}"] [date="YYYY-MM-DD"] [tags=[${tag1},${tag2}...]] [category="${category}"]
 desc "Begin a new post in #{DIRS['posts']}"
 task :post do
   abort("rake aborted: '#{DIRS['posts']}' directory not found.") unless FileTest.directory?(DIRS['posts'])
   title = ENV["title"] || "new-post"
   tags = ENV["tags"] || "[]"
   category = ENV["category"] || ""
   category = "\"#{category.gsub(/-/,' ')}\"" if !category.empty?
-  slug = title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
+  # slug = title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
+  slug = "post"
   begin
     date = (ENV['date'] ? Time.parse(ENV['date']) : Time.now).strftime('%Y-%m-%d')
   rescue => e
@@ -58,44 +54,46 @@ task :post do
   end
   filename = File.join(DIRS['posts'], "#{date}-#{slug}.#{DIRS['post_ext']}")
   if File.exist?(filename)
-    abort("rake aborted!") if ask("#{filename} already exists. Do you want to overwrite?", ['y', 'n']) == 'n'
+    abort("rake aborted!") unless ask("#{filename} already exists. Do you want to overwrite?", %w(y n)) == 'y'
   end
 
   puts "Creating new post: #{filename}"
   open(filename, 'w') do |post|
     post.puts "---"
-    post.puts "layout: post"
-    post.puts "title: \"#{title.gsub(/-/,' ')}\""
-    post.puts 'description: ""'
-    post.puts "category: #{category}"
+    # post.puts "layout: post"
+    post.puts "title: \"#{title.strip}\""
     post.puts "tags: #{tags}"
+    post.puts "category: \"#{category}\""
+    # post.puts "display: #{IS_DISPLAY_ENABLE.to_s}"
+    post.puts "comment: #{IS_COMMENT_ENABLE.to_s}"
     post.puts "---"
-    post.puts "{% include JB/setup %}"
   end
 end # task :post
 
-# Usage: rake page name="resume.html"
-# You can also specify a sub-directory path.
-# If you don't specify a file extention we create an index.html at the path specified
-desc "Create a new page."
+IS_TITLE_DISPLAY = true
+# Usage: rake page title="${pagename}"
+desc "Create a new page folder with index page"
 task :page do
-  name = ENV["name"] || "new-page.md"
-  filename = File.join(SOURCE, "#{name}")
-  filename = File.join(filename, "index.html") if File.extname(filename) == ""
-  title = File.basename(filename, File.extname(filename)).gsub(/[\W\_]/, " ").gsub(/\b\w/){$&.upcase}
+  abort("rake aborted: the page title must be given.") unless ENV["title"] && !ENV["title"].empty?
+  title = ENV["title"].strip
+  dirname = title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
+  filename = File.join(DIRS['pages'], [dirname, "index.#{DIRS['page_ext']}"])
+  # title = File.basename(filename, File.extname(filename)).gsub(/[\W\_]/, " ").gsub(/\b\w/){$&.upcase}
   if File.exist?(filename)
-    abort("rake aborted!") if ask("#{filename} already exists. Do you want to overwrite?", ['y', 'n']) == 'n'
+    abort("rake aborted!") unless ask("#{filename} already exists. Do you want to overwrite?", %w(y n)) == 'y'
   end
 
   mkdir_p File.dirname(filename)
-  puts "Creating new page: #{filename}"
+  puts "Creating new page folder: #{filename}"
   open(filename, 'w') do |post|
     post.puts "---"
     post.puts "layout: page"
     post.puts "title: \"#{title}\""
-    post.puts 'description: ""'
+    post.puts "title_image: \"\""
+    post.puts "title_display: #{IS_TITLE_DISPLAY.to_s}"
+    post.puts "footer_quote: \"\\\"quote\\\"---person\""
+    post.puts "permalink: \"/#{dirname}/\""
     post.puts "---"
-    post.puts "{% include JB/setup %}"
   end
 end # task :page
 
@@ -106,24 +104,39 @@ task :reset do
 end
 
 desc "Outputs any deprecation or configuration issues"
-task :reset do
-  system 'jekyll doctor' 
+task :doctor do
+  system 'bundle exec jekyll doctor'
+end
+
+desc "Perform Ruby programming syntax check"
+task :syncheck do
+  system 'bundle exec rubocop -D -S'
 end
 
 desc "Test the webpage in local"
 task :test do
   system 'bundle exec jekyll build'
-  HTMLProofer.check_directory(DIRS['sites'], check_html: true).run
-end
-
-desc "Update the site data"
-task :update do
-  system "get-pages-latest-date.rb", chdir: DIRS['scripts']
+  HTMLProofer.check_directory(DIRS['site'], check_html: true).run
 end
 
 desc "Launch preview environment"
 task :preview do
-  host_ip=`hostname -I | awk '{print $1;}'`
-  system "jekyll serve -w -l --host #{host_ip} --port 4000"
+  system "bundle exec jekyll serve -w -l --port 4000"
+end
+
+desc "Reload the site info"
+task :reload do
+  system "./get-pages-latest-date.rb", chdir: DIRS['scripts']
+end
+
+desc "Push the current code to the master branch"
+task :cmpush => :reload do
+  abort("rake aborted!") unless ask("Sure to commit all the change to remote?", %w(y n)) == 'y'
+  system "./git-commit-push.sh", chdir: DIRS['scripts']
 end
 
+desc "Push the current code to the master branch"
+task :verpush => :reload do
+  abort("rake aborted!") unless ask("Sure to push the new version to remote?", %w(y n)) == 'y'
+  system "./git-version-push.sh", chdir: DIRS['scripts']
+end

_config.yml

@@ -76,6 +76,8 @@ defaults:
       type: "posts"
     values:
       layout: post
+      tags: []
+      category: ""
       display: true
       comment: false
   - scope:

_data/links.yaml

@@ -28,7 +28,7 @@
     - https://opensource.microsoft.com
     - https://opensource.com
     - https://redhatofficial.github.io
-    - http://apache.org
+    - https://apache.org
 
 - type: "Search For Answer"
   icon: "categories/system-help.png"

_data/pages_latest.yaml

@@ -1,11 +1,11 @@
 ---
 - name: blog
-  mtime: '20200202'
+  mtime: '20200224'
 - name: debug
   mtime: '20200202'
 - name: links
-  mtime: '20200219'
+  mtime: '20200225'
 - name: quotes
-  mtime: '20200220'
+  mtime: '20200221'
 - name: resume
   mtime: '20200202'

_data/quotes/einstein.yaml

@@ -2,8 +2,8 @@
 - group: Religion
   quotes:
     - God is subtle but he is not malicious.
-    - God always takes the simplest way.
     - Coincidence is God’s way of remaining anonymous.
+    - God always takes the simplest way.
     - When the solution is simple, God is answering.
     - Before God we are all equally wise – and equally foolish.
     - What really interests me is whether God had any choice in the creation of the world.

assets/js/sidebar/logo.js

@@ -9,8 +9,14 @@ const title_weather = 'Current Weather: ';
 const index_selected_json = Number(new Date().getMonth()) % saints_json.length;
 const filepath_selected_json = `${saints_folder}/${saints_json[index_selected_json]}`;
 
+let obj_selected_json = null;
+
 function showAlertLogo() {
-    getQuoteMessage();
+    if (!obj_selected_json) {
+        doAjaxGet(filepath_selected_json).then((json) => {getQuoteMessage(json);});
+    } else {
+        getQuoteMessage();
+    }
 }
 
 function showLogoMessage(quote_message) {
@@ -22,19 +28,16 @@ function showLogoMessage(quote_message) {
     alert(show_message);
 }
 
-function getQuoteMessage(){
+function getQuoteMessage(json){
     var quote_message = '';
-    doAjaxGet(filepath_selected_json).then((json) => {
-        // random index fetch
-        var index_select_quote = getRandomQuoteIndex(json.count);
-        // text handling
-        if (index_select_quote != null) {
-            var text_select_quote = json.results[index_select_quote].quoteText.toString().trim();
-            var author_select_quote = json.results[index_select_quote].quoteAuthor.toString().trim();
-            quote_message = text_select_quote + '\n\n' + author_select_quote;
-        }
-        showLogoMessage(quote_message);
-    });
+    if (json) { obj_selected_json = json; }
+    var index_select_quote = getRandomQuoteIndex(obj_selected_json.count);
+    if (index_select_quote != null) {
+        var text_select_quote = obj_selected_json.results[index_select_quote].quoteText.toString().trim();
+        var author_select_quote = obj_selected_json.results[index_select_quote].quoteAuthor.toString().trim();
+        quote_message = text_select_quote + '\n\n' + author_select_quote;
+    }
+    showLogoMessage(quote_message);
 }
 
 var count_quotes_total = 0;
@@ -60,7 +63,11 @@ function getRandomQuoteIndex(count_total){
 function getPrintedQuoteMessage(quote_message){
     let str_printed = '';
     if(quote_message) {
-        str_printed = `(${count_quotes_total - count_quotes_read}) ${title_quote}`;
+        if (count_quotes_total - count_quotes_read > 0) {
+            str_printed = `(${count_quotes_total - count_quotes_read}) ${title_quote}`;
+        } else {
+            str_printed = `${title_quote}`;
+        }
         str_printed += '\n\n' + quote_message;
     } else {
         str_printed = title_quote_complete;
@@ -89,4 +96,4 @@ async function doAjaxGet(ajaxurl) {
         return data;
     }
     throw new Error(response.status);
-}
+}

assets/saints/confucius.json

@@ -9,10 +9,6 @@
       "quoteAuthor": "Confucius",
       "quoteText": "The more you know yourself, the more you forgive yourself."
     },
-    {
-      "quoteText": "Silence is a true friend who never betrays.",
-      "quoteAuthor": "Confucius"
-    },
     {
       "quoteAuthor": "Confucius",
       "quoteText": "Wherever you go, go with all your heart."
@@ -85,10 +81,6 @@
       "quoteText": "I want you to be everything that's you, deep at the center of your being.",
       "quoteAuthor": "Confucius"
     },
-    {
-      "quoteText": "To be wronged is nothing unless you continue to remember it.",
-      "quoteAuthor": "Confucius"
-    },
     {
       "quoteText": "Silence is the true friend that never betrays.",
       "quoteAuthor": "Confucius"
@@ -99,7 +91,7 @@
     },
     {
       "quoteAuthor": "Confucius",
-      "quoteText": "The Superior Man is aware of Righteousness, the inferior man is aware of advantage."
+      "quoteText": "The superior man is aware of righteousness, the inferior man is aware of advantage."
     },
     {
       "quoteText": "Everything has beauty, but not everyone sees it.",
@@ -129,10 +121,6 @@
       "quoteText": "If you look into your own heart, and you find nothing wrong there, what is there to worry about? What is there to fear?",
       "quoteAuthor": "Confucius"
     },
-    {
-      "quoteAuthor": "Confucius",
-      "quoteText": "Learning without reflection is a waste, reflection without learning is dangerous."
-    },
     {
       "quoteText": "To give ones self earnestly to the duties due to men, and, while respecting spiritual beings, to keep aloof from them, may be called wisdom.",
       "quoteAuthor": "Confucius"