runeblog 0.2.99 → 0.3.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d65eb398cbd787046ff303ec0d045c6f3abac93b31c165bf102e54d4239f23c
-  data.tar.gz: 036b16fbc5c3aeae33dd0483f1e5415f93f1cbc8852c78d43c79c87458b233e8
+  metadata.gz: 4c6fa9176107c58120ebb4753221228bfe0d031f08f21a20dc2f7f86d6b2c6af
+  data.tar.gz: c3bf5183cbeddb2cc3c9022695fcd9aa9ba50cf0e5364afd4632fac8a837e315
 SHA512:
-  metadata.gz: 87c32ca6cb9ed8c7245178726cac650ebd1f2470f09f59cc89b3705496a7dd88503f3dce7fdd78ba26052894861aa69cc3dbf0f8be462699f7bfbe3738f2fc7f
-  data.tar.gz: 968b1a74bac6320060a1ffa4bdc0d3e747c450dcdd032842533f3f4d05815eecfdbada1a71c211e07b81cc1b0be3c8d0dc65d7326bbcfe3a4dcd7c062fae32fb
+  metadata.gz: 0bb8f0fb6b1a59ac69eabdcb0c50a20bf20308e4155fb1d305be5a19ab8eece7ffa7aecdbff3d4cfc48000dbbb891c3a2777068608a1e28750d8751b39a39af8
+  data.tar.gz: 113a34a9fba90a9f8b9d9bc47cab433b00359a0c8f159b8fbf807e7609b50056ebf4e0e368d6b369256083a7a6c25316dd2c710297ea4bbccfa7fadd85bbf458

data/bin/blog

@@ -25,13 +25,14 @@ end
 def get_universal
   univ = "#{@blog.root}/data/universal.lt3"
   if yesno("Faster initial setup? (no: edit universal.lt3)")
-    author = ask!("Author name: ")
-    site   = ask!("Site/domain: ")
+    author = ask!("    Author name: ")
+    site   = ask!("    Site/domain: ")
     # Now stash it...
     str = File.read(univ)
     str = str.gsub(/AUTHOR/, author)
     str = str.gsub(/SITE_DOMAIN/, site)
     File.write(univ, str)
+# STDERR.puts "------ universal ------\n#{`cat #{univ}`}\n------------------------"
   else
     vim_params = '-c ":set hlsearch" -c ":hi Search ctermfg=2 ctermbg=6" +/"\(AUTHOR.*\|SITE.*\)"'
     edit_file(univ, vim: vim_params)
@@ -40,18 +41,20 @@ end
 
 def get_global
   if yesno("Faster view setup? (no: edit global.lt3)")
-    view_name = ask!("\nFilename: ")
+    view_name = ask!("\n    Filename: ")
     @blog.create_view(view_name)   # call change_view??
-    title     = ask!("View title: ")
-    subtitle  = ask!("Subtitle  : ")
-    gname = "#{@blog.root}/views/#{view_name}/themes/standard/global.lt3" 
-    text = File.read(gname)
-    text = text.gsub(/VIEW_NAME/,     view_name)
-    text = text.gsub(/VIEW_TITLE/,    title)
-    text = text.gsub(/VIEW_SUBTITLE/, subtitle)
-    File.write(gname, text)
+    title     = ask!("    View title: ")
+    subtitle  = ask!("    Subtitle  : ")
+    domain    = ask!("    Domain    : ")
+
+    vfile = "#{@blog.root}/views/#{view_name}/settings/view.txt"
+    hash = {/VIEW_NAME/     => view_name,
+            /VIEW_TITLE/    => title,
+            /VIEW_SUBTITLE/ => subtitle,
+            /VIEW_DOMAIN/   => domain}
+    @blog.complete_file(vfile, nil, hash)
   else
-    view_name = ask!("\nFilename: ")
+    view_name = ask!("\n    Filename: ")
     @blog.create_view(view_name)   # call change_view??
     vim_params = '-c ":set hlsearch" -c ":hi Search ctermfg=2 ctermbg=6" +/"\(VIEW_.*\|SITE.*\)"'
     edit_file(@blog.view.dir/"themes/standard/global.lt3", vim: vim_params)
@@ -63,6 +66,8 @@ def get_started
     puts "      First choose your editor."
     @blog.editor = pick_editor
     File.write("#{@blog.root}/data/EDITOR", @blog.editor)
+    print "      Default editor is "
+    puts  fx(@blog.editor, :bold)
 
     get_universal
     # Now create a custom global.lt3
@@ -87,11 +92,11 @@ def mainloop
   info = @blog.view || "no view"
   print fx("[#{info}] ", Red, :bold)
   cmd = STDSCR.gets(history: @cmdhist, tab: @tabcom)
-  cmd_quit(nil) if cmd.nil?   # ^D
+  cmd_quit if cmd.nil?   # ^D
   cmd.chomp!
   return if cmd.empty?   # CR does nothing
-  meth, params = RuneBlog::REPL.choose_method(cmd)
-  ret, str = send(meth, params)
+  invoking = RuneBlog::REPL.choose_method(cmd)
+  ret = send(*invoking)
 rescue => err
   puts err
 end
@@ -103,7 +108,7 @@ def cmdline_preview
 end
 
 def cmdline_publish
-  abort "Nor implemented yet"
+  abort "Not implemented yet"
   _need_view
 end
 
@@ -149,7 +154,8 @@ major, minor = RUBY_VERSION.split(".").values_at(0,1)
 ver = major.to_i*10 + minor.to_i
 unless ver >= 24
   RubyText.stop
-  abort "Need Ruby 2.4 or greater" 
+  sleep 0.2
+  abort "Needs Ruby 2.4 or greater" 
 end
 
 include RuneBlog::Helpers  # for try_read_config
@@ -191,7 +197,7 @@ puts fx("\n  RuneBlog", :bold), fx(" v #{RuneBlog::VERSION}\n", Red)
   
 loop { mainloop }
 
-system("tput clear")
+# system("tput clear")
 sleep 0.2
 puts
 

data/data/features.txt

@@ -0,0 +1,18 @@
+# 0 = disabled (installed but disabled)
+# 1 = enabled (implies installed)
+# x = excluded (not installed; does it even exist?)
+
+reddit     0   # autopost, embed thread after blog post
+facebook   0   # reader-like, reader post, autopost?
+twitter    0   # reader-tweet, reader-follow, autotweet?
+
+links      1   # widget: external links
+news       1   # widget: news (external)
+pages      1   # widget: internal pages
+pinned     1   # widget: pinned posts
+
+ad         x   # widget: embed advertising 
+bydates    x   # widget: browse posts by date
+search     x   # widget: search posts
+sitemap    x   # widget: site map
+tag_cloud  x   # widget: tag cloud (clickable)

data/data/global.lt3

@@ -3,12 +3,13 @@
 .   <variable>  <value>                             
 . --------------------------------------------------
 
-.variables
-author      AUTHOR
-blog        VIEW_TITLE
-blog.desc   VIEW_SUBTITLE
-site        SITE
+.variables view     ../../settings/view.txt
+
+.variables recent   ../../settings/recent.txt
+
+.variables publish  ../../settings/publish.txt
 
+.variables
 host        http://SITE
 charset     utf-8
 url         http://SITE
@@ -17,22 +18,3 @@ locale      en_US
 font.family       verdana
 .end
 
-.variables recent
-title.color  #010101
-title.size   28px
-
-text.color   #0101a1
-text.size    22px
-
-date.color   #9a9a9a
-date.size    15px
-.end
-
-.variables publish
-user      root
-server    SITE
-docroot   /var/www/
-path      VIEW_NAME
-proto     http
-.end
-

data/data/universal.lt3

@@ -8,14 +8,11 @@
 .nopara
 
 .variables
-. Identity
-author        AUTHOR
-site          SITE_DOMAIN
+univ.author        AUTHOR
+univ.site          SITE_DOMAIN
 
-. Style
 font.family   verdana
 
-. Details
 charset       utf-8
 locale        en_US
 .end

data/empty_view/settings/features.txt

@@ -0,0 +1,18 @@
+# 0 = disabled (installed but disabled)
+# 1 = enabled (implies installed)
+# x = excluded (not installed; does it even exist?)
+
+reddit     0   # autopost, embed thread after blog post
+facebook   0   # reader-like, reader post, autopost?
+twitter    0   # reader-tweet, reader-follow, autotweet?
+
+links      1   # widget: external links
+news       1   # widget: news (external)
+pages      1   # widget: internal pages
+pinned     1   # widget: pinned posts
+
+ad         x   # widget: embed advertising 
+bydates    x   # widget: browse posts by date
+search     x   # widget: search posts
+sitemap    x   # widget: site map
+tag_cloud  x   # widget: tag cloud (clickable)

data/empty_view/settings/publish.txt

@@ -0,0 +1,5 @@
+user      root
+server    SITE
+docroot   /var/www/html
+path      VIEW_NAME        # can be different
+proto     https

data/empty_view/settings/recent.txt

@@ -0,0 +1,11 @@
+title.color  #010101
+title.size   28px
+
+text.color   #0101a1
+text.size    22px
+
+date.color   #9a9a9a
+date.size    15px
+
+bgcolor      #ffffff   # white
+count        10        # max number of recent entries

data/empty_view/settings/view.txt

@@ -0,0 +1,4 @@
+author      VIEW_AUTHOR
+title       VIEW_TITLE
+subtitle    VIEW_SUBTITLE
+site        VIEW_SITE

data/empty_view/themes/standard/banner/top.lt3

@@ -15,6 +15,6 @@
 
 <rect x="20" y="20" rx="15" ry="15" width="98%" height="100" fill="url(#grad1)"/>
 
-<text x="45" y="70" class=heavy>$blog</text>
-<text x="45" y="98" class=small>$blog.desc</text>
+<text x="45" y="70" class=heavy>$view.title</text>
+<text x="45" y="98" class=small>$view.subtitle</text>
 </svg>

data/lib/helpers-blog.rb

@@ -14,6 +14,26 @@ module RuneBlog::Helpers
     exit
   end
 
+  def read_features(view = nil)
+    hash = {}
+    if view.nil?  # toplevel default
+      dir = @root/"data"
+    else
+      dir = @root/:views/self.view/:settings
+    end
+    file = dir/"features.txt"
+    lines = File.readlines(file)
+    lines.each do |line|
+      line = line.strip
+      line.sub!(/ #.*/, "")   # trailing
+      next if line =~ /^ *#/  # leading
+      next if line.empty?
+      name, status = line.split
+      hash[name] = (status == "1")  # enabled
+    end
+    @features = hash
+  end
+
   def get_repo_config
     log!(enter: __method__, level: 3)
     @editor = File.read(".blogs/data/EDITOR").chomp
@@ -27,15 +47,9 @@ module RuneBlog::Helpers
 
   def copy_data(tag, dest)
     data  = RuneBlog::Path + "/../data"    # files kept inside gem
-    extra = RuneBlog::Path + "/../config"  # files kept inside gem
-    # FIXME names are confusing
-    case tag
-      when :config 
-        files = %w[ROOT VIEW EDITOR universal.lt3 global.lt3]
-        files.each {|file| copy(data + "/" + file, dest) }
-      when :extra  # FIXME remove later
-#        copy!(extra, dest)
-    end
+    # FIXME tag no longer used
+    files = %w[ROOT VIEW EDITOR universal.lt3 global.lt3 features.txt]
+    files.each {|file| copy(data + "/" + file, dest) unless File.exist?(dest/file) }
   end
 
   def read_vars(file)
@@ -47,14 +61,15 @@ module RuneBlog::Helpers
       line = line.strip
       next if skip.include?(line[0])
       key, val = line.split(" ", 2)
-      hash[key] = val
+      next if key.nil?
+      hash[key] = hash[key.to_sym] = val
     end
     hash
   rescue => err
     puts "Can't read vars file '#{file}': #{err}"
     puts err.backtrace.join("\n")
     puts "dir = #{Dir.pwd}"
-    stop_RubyText
+    stop_RubyText rescue nil
   end
 
   def read_config(file, *syms)
@@ -111,15 +126,6 @@ module RuneBlog::Helpers
     File.write(root + "/data/EDITOR", editor + "\n")
   end
 
-  # def new_dotfile(root: ".blogs", current_view: "test_view", editor: "vi")
-  #   log!(enter: __method__, args: [root, current_view, editor], level: 3)
-  #   root = Dir.pwd + "/" + root
-  #   x = OpenStruct.new
-  #   x.root, x.current_view, x.editor = root, current_view, editor
-  #   write_config(x, root + "/" + RuneBlog::ConfigFile)
-  #   write_repo_config
-  # end
-
   def new_sequence
     log!(enter: __method__, level: 3)
     dump(0, "data/sequence")

data/lib/helpers-repl.rb

@@ -109,7 +109,9 @@ module RuneBlog::REPL
     end
     meth = found || :cmd_INVALID
     params = cmd if meth == :cmd_INVALID
-    [meth, params]
+    result = [meth]
+    result << params unless params.nil?
+    result
   end
 
   def ask(prompt, meth = :to_s)
@@ -121,42 +123,6 @@ module RuneBlog::REPL
     ask(fx(prompt, :bold), meth)
   end
 
-  def reset_output(initial = "")
-    @out ||= ""
-    @out.replace initial
-  end
-
-  def flush_output(initial = "")
-    CantOpen
-    @out ||= ""
-    puts @out
-    reset_output
-  end
-
-  def output(str)  # \n and indent
-    @out ||= ""
-    @out << "  " + str.to_s
-  end
-
-  def outstr(str)  # indent
-    @out ||= ""
-    @out << str
-  end
-
-  def output!(str)  # \n and indent
-    @out ||= ""
-    @out << "  " + str
-  end
-
-  def output_newline(n = 1)
-    @out ||= ""
-    n.times { @out << "\n" }
-  end
-
-  def check_empty(arg)
-    raise InternalError(caller[0], arg.inspect)  unless arg.nil?
-  end
-
   def get_integer(arg)
     Integer(arg) 
   rescue 
@@ -176,10 +142,6 @@ module RuneBlog::REPL
     end
   end
 
-  def colored_slug(slug)
-    slug[0..3] + slug[4..-1]
-  end
-
   def tags_for_view(vname = @blog.view)
     Dir.chdir(vname) do
       fname = "tagpool"

data/lib/liveblog.rb

@@ -72,7 +72,7 @@ def post_trailer
   tags = _var("post.tags")
   taglist = tags.empty? ? "" : "Tags: #{tags}"
 
-  reddit_enabled = false   # FIXME
+  reddit_enabled = @blog.features["reddit"]
   reddit_txt = ""
   if reddit_enabled
     vdir  = @blog.root/:views/@blog.view
@@ -110,7 +110,7 @@ def faq
   _out %[&nbsp;<a data-toggle="collapse" href="##{id}" role="button" aria-expanded="false" aria-controls="collapseExample"><font size=+3>&#8964;</font></a>]
   _out %[&nbsp;<b>#{ques}</b>]
   _out %[<div class="collapse" id="#{id}"><br><font size=+1>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#{ans}</font></div>\n]
-  _out "<br>" unless @faq_count == 1
+  _out "<br>" # unless @faq_count == 1
   _optional_blank_line
 end
 
@@ -241,8 +241,8 @@ def _svg_title(*args)
         .subtitle { font: #{style2} #{size2} #{font2}; fill: #{color2} }
       </style>
       <rect x="10" y="10" rx="10" ry="10" width="#{width}" height="#{height}" fill="url(#grad1)"/>
-      <text text-anchor="#{align}"  x="#{x}" y="#{y}" class="title">#{Livetext::Vars[:blog]} </text>
-      <text text-anchor="#{align2}" x="#{x2}" y="#{y2}" class="subtitle">#{Livetext::Vars["blog.desc"]} </text>
+      <text text-anchor="#{align}"  x="#{x}" y="#{y}" class="title">#{Livetext::Vars["view.title"]} </text>
+      <text text-anchor="#{align2}" x="#{x2}" y="#{y2}" class="subtitle">#{Livetext::Vars["view.subtitle"]} </text>
     </svg> 
     <!-- ^ how does syntax highlighting get messed up? </svg> -->
   HTML
@@ -446,18 +446,18 @@ def head  # Does NOT output  tags
   defaults = {}
   defaults = { "charset"        => %[<meta charset="utf-8">],
                "http-equiv"     => %[<meta http-equiv="X-UA-Compatible" content="IE=edge">],
-               "title"          => %[<title>\n  #{_var(:blog)} | #{_var("blog.desc")}\n  </title>],
+               "title"          => %[<title>\n  #{_var("view.title")} | #{_var("view.subtitle")}\n  </title>],
                "generator"      => %[<meta name="generator" content="Runeblog v #@version">],
-               "og:title"       => %[<meta property="og:title" content="#{_var(:blog)}">],
+               "og:title"       => %[<meta property="og:title" content="#{_var("view.title")}">],
                "og:locale"      => %[<meta property="og:locale" content="#{_var(:locale)}">],
-               "description"    => %[<meta name="description" content="#{_var("blog.desc")}">],
-               "og:description" => %[<meta property="og:description" content="#{_var("blog.desc")}">],
+               "description"    => %[<meta name="description" content="#{_var("view.subtitle")}">],
+               "og:description" => %[<meta property="og:description" content="#{_var("view.subtitle")}">],
                "linkc"          => %[<link rel="canonical" href="#{_var(:host)}">],
                "og:url"         => %[<meta property="og:url" content="#{_var(:host)}">],
-               "og:site_name"   => %[<meta property="og:site_name" content="#{_var(:blog)}">],
+               "og:site_name"   => %[<meta property="og:site_name" content="#{_var("view.title")}">],
 #              "style"          => %[<link rel="stylesheet" href="etc/blog.css">],
 # ^ FIXME
-               "feed"           => %[<link type="application/atom+xml" rel="alternate" href="#{_var(:host)}/feed.xml" title="#{_var(:blog)}">],
+               "feed"           => %[<link type="application/atom+xml" rel="alternate" href="#{_var(:host)}/feed.xml" title="#{_var("view.title")}">],
                "favicon"        => %[<link rel="shortcut icon" type="image/x-icon" href="etc/favicon.ico">\n <link rel="apple-touch-icon" href="etc/favicon.ico">]
              }
   result = {}
@@ -689,7 +689,7 @@ end
 
 def _make_navbar(orient = :horiz)
   vdir = @root/:views/@blog.view
-  title = _var(:blog)
+  title = _var("view.title")
 
   if orient == :horiz
     name = "navbar.html"