runeblog 0.2.80 → 0.2.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 191d3a95d939a6d6aaa195feedc1277822b5a0b25d2b853a4a69d954eb675c65
-  data.tar.gz: 9246a5ac4bddff5c4ce2a35eb5610fb6e64d2fb5cad8af21b68178d5ecb71a52
+  metadata.gz: d15f5bd6b7e8b87c3de63a77516dee2c6f57134a2a3c5b51db502aad0aaa3181
+  data.tar.gz: ff84de0a2c007a9f75f38295ea6bbcd7dcdcb3b3963294b7c74c2dd79cfbb8c4
 SHA512:
-  metadata.gz: 65741de79f64c2f1c3411b19a54537f2123b372cdd8176fba23f1d98f5f6c05f45a6c3671bef848addcdd2f51e4d8fdeaade11d27b8faadc544c77a35d2c1523
-  data.tar.gz: 831f44314a5ce756e2218903c272db96a6317bf06ba33bca8b91ebb3fa5babfed2becf4ff8eb8b4b126da53c7cae7e12671e08da686c71f0fad04bf0e7e7becc
+  metadata.gz: ef4cfbb271c5711f0a55f771bed52e9d59327ffdccdc4eadda5eab8b9438c043224aeac21a766aa63dd0638887cfc3d16fd9eac0bf647a698b091cd282b330ca
+  data.tar.gz: 4de4e96e9f22e523c48d512267a0bd51fbdb3ed6aecf61b8724aa98cab92e7988fc151d5e9ca8cf27fe1ca926758e7e4236c57f4e288bde334abfe9de5c61915

data/bin/blog

@@ -37,6 +37,7 @@ def get_started
       edit_file(fname)
     end
     # Now create a custom global.lt3
+    @blog._generate_global
     sleep 1
     noview = true
     puts fx("\n  Quick setup complete!", :bold)
@@ -46,6 +47,7 @@ def get_started
       sleep 1
       puts "\n  View #{@blog.view} created!\n "
     end
+    system("cp #@root/data/global.lt3 #@root/views/#{@blog.view}/themes/standard/")
   end
 
   sleep 0.5
@@ -140,7 +142,9 @@ home = ENV['HOME']
 
 RubyText.start(:_echo, :keypad, scroll: true, log: "binblog.txt", fg: @fg, bg: @bg)
 
-if ! RuneBlog.exist?
+if RuneBlog.exist?
+  @blog = RuneBlog.new
+else
   if yesno("No blog repo found. Create new one?")
     RuneBlog.create_new_blog_repo
     @blog = RuneBlog.new

data/data/global.lt3

@@ -0,0 +1,35 @@
+. --------------------------------------------------
+. Global settings are stored here in the form       
+.   <variable>  <value>                             
+. --------------------------------------------------
+
+.variables
+author      AUTHOR
+blog        VIEW_TITLE
+blog.desc   VIEW_SUBTITLE
+site        SITE
+
+host        http://SITE
+charset     CHARSET
+url         http://SITE
+locale      LOCALE
+
+font.family       FONT
+
+post.title.color  #010101
+post.title.size   28px
+
+post.text.color   #0101a1
+post.text.size    22px
+
+post.date.color   #9a9a9a
+post.date.size    15px
+
+
+publish.user      root
+publish.server    SITE
+publish.docroot   /var/www/
+publish.path      VIEW_NAME
+publish.proto     http
+.end
+

data/data/universal.lt3

@@ -7,6 +7,7 @@
 . --------------------------------------------------
 .nopara
 
+.variables
 . Identity
 author      Your name here
 site        rubyhacker.com
@@ -17,3 +18,5 @@ font.family       verdana
 . Details
 charset     utf-8
 locale      en_US
+
+.end

data/lib/helpers-blog.rb

@@ -33,17 +33,37 @@ module RuneBlog::Helpers
   def copy_data(tag, dest)
     data = RuneBlog::Path + "/../data"  # files kept inside gem
     case tag
-      when :config; files = %w[ROOT VIEW EDITOR universal.lt3]
+      when :config; files = %w[ROOT VIEW EDITOR universal.lt3 global.lt3]
     end
     files.each {|file| copy(data + "/" + file, dest) }
   end
 
+  def read_vars(file)
+    log!(enter: __method__, args: [file], level: 3)
+    lines = File.readlines(file).map(&:chomp)
+    hash = {}
+    skip = ["\n", "#", "."]
+    lines.each do |line|
+      line = line.strip
+      next if skip.include?(line[0])
+      key, val = line.split(" ", 2)
+      hash[key] = val
+    end
+    hash
+  rescue => err
+    puts "Can't read vars file '#{file}': #{err}"
+    puts err.backtrace.join("\n")
+    puts "dir = #{Dir.pwd}"
+    exit
+  end
+
   def read_config(file, *syms)
     log!(enter: __method__, args: [file, *syms], level: 3)
     lines = File.readlines(file).map(&:chomp)
     obj = ::OpenStruct.new
+    skip = ["\n", "#", "."]
     lines.each do |line|
-      next if line == "\n" || line[0] == "#"
+      next if skip.include?(line[0])
       key, val = line.split(/: +/, 2)
       obj.send(key+"=", val)
     end

data/lib/runeblog.rb

@@ -101,6 +101,18 @@ class RuneBlog
     @post_tags = []
   end
 
+  def _generate_global
+    vars = read_vars("#@root/data/universal.lt3")
+    global = File.read("#@root/data/global.lt3")
+    global.gsub!(/AUTHOR/,  vars["author"])
+    global.gsub!(/SITE/,    vars["site"])
+    global.gsub!(/FONT/,    vars["font.family"])
+    global.gsub!(/CHARSET/, vars["charset"])
+    global.gsub!(/LOCALE/,  vars["locale"])
+    File.write("#@root/data/global.lt3", global)
+STDERR.puts "Remember: fix global.lt3"
+  end
+
   def _deploy_local(dir)
     log!(enter: __method__, args: [dir], level: 1)
     Dir.chdir(dir) do

data/lib/runeblog_version.rb

@@ -2,7 +2,7 @@
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.80"
+  VERSION = "0.2.81"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.80
+  version: 0.2.81
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -85,6 +85,7 @@ files:
 - data/EDITOR
 - data/ROOT
 - data/VIEW
+- data/global.lt3
 - data/universal.lt3
 - empty_view/assets/austin-pano.jpg
 - empty_view/assets/sky2.jpg