runeblog 0.2.84 → 0.2.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0a0162c325b884d416802f6502ca34273cc388d7af3e58347e886c1b1e4c4d1
-  data.tar.gz: 450abb053bea34e25e392e6421fbd38cd6ded80d9bc93379b3a0f288f9dd60e3
+  metadata.gz: 69a5bfa546e814106599e4bd829ddf169bc07053b592db267bce813675f57119
+  data.tar.gz: 05dfce46838cf7002e57dc1f279e8da776463a06734f3a445ca2d710d82b4e2a
 SHA512:
-  metadata.gz: 886ae461d1898a79c2b674b728418975b3d28bd48a43c7d1cd2706133495c4497fbda6d1af3d365015929e7e53d6fab76047f4b7b17697cfed88f4dbacda153d
-  data.tar.gz: 100ef7fd298aff83c714070fc7beda5cedf03d063bf1b8dc5a9a150a16e56bada728842e23acbcb61b827eacea22404e5f743a74de905daf614629265b8e1f10
+  metadata.gz: 170e5b90aff508ad77410a0b774bf30b79282e0928f863147d6da681879448e78a8e0d8053bf3c50a97a465b22a88d36409aaca16efe1c1fb20b59f1a365260b
+  data.tar.gz: 37135518327009fd0300cc082914b29992934ecead7a62fe3c3f3bcbb72c6f290f0e7911a6ee94ed26f2b554d77cfd4da84f56cbfa6f95f5b15cac576639aa2a

data/bin/blog

@@ -12,9 +12,7 @@ include RuneBlog::REPL
 def yesno(question, noskip=false)
   puts fx("\n  #{question}", :bold)
   puts unless noskip
-  r, c = STDSCR.rc
-  num, str = STDSCR.menu(r: r, c: c+6, items: ["yes", "no"])
-  num == 0
+  STDSCR.yesno
 end
 
 def pick_editor
@@ -24,29 +22,57 @@ def pick_editor
   file = `which #{name}`.chomp
 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: ")
+    # Now stash it...
+    str = File.read(univ)
+    str = str.gsub(/AUTHOR/, author)
+    str = str.gsub(/SITE_DOMAIN/, site)
+  else
+    vim_params = '-c ":set hlsearch" -c ":hi Search ctermfg=2 ctermbg=6" +/"\(AUTHOR.*\|SITE.*\)"'
+    edit_file(univ, vim: vim_params)
+  end
+end
+
+def get_global
+  if yesno("Faster view setup? (no: edit global.lt3)")
+    view_name = ask("\nFilename: ")
+    @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)
+  else
+    view_name = ask("\nFilename: ")
+    @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)
+  end
+end
+
 def get_started
   if yesno("Do you want to qo a quick setup?")
     puts "      First choose your editor."
     @blog.editor = pick_editor
     File.write("#{@blog.root}/data/EDITOR", @blog.editor)
 
-    if yesno("Edit settings now?")
-      fname = "#{@blog.root}/data/universal.lt3"
-      vim_params = '-c ":set hlsearch" -c ":hi Search ctermfg=2 ctermbg=6" +/"\(AUTHOR.*\|SITE.*\)"'
-      edit_file(fname, vim: vim_params)
-    end
+    get_universal
     # Now create a custom global.lt3
     @blog._generate_global
-    noview = true
     puts fx("\n  Quick setup complete!", :bold)
     if yesno("Create your first view now?")
-      cmd_new_view(nil)
-      noview = false
+      get_global
       puts "\n  View #{@blog.view} created!\n "
     end
   end
 
-
   puts
   print fx("  For help", :bold)
   puts " type h or help."

data/empty_view/posts/GIT_IS_DUMB

@@ -0,0 +1 @@
+meh

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

@@ -1,5 +1,6 @@
-.nopara
-<svg width="98%" height="100"
+.seek global.lt3    # FIXME this is a hack!
+
+<svg width="98%" height="120"
      viewBox="0 0 98% 100">
   <defs>
     <linearGradient id="grad1" x1="100%" y1="100%" x2="0%" y2="100%">
@@ -8,12 +9,12 @@
     </linearGradient>
   </defs>
   <style>
-    .small { font: 20px sans-serif; fill: #98baff }
-    .heavy { font: bold 55px sans-serif; fill: #76a9ff }
+    .small { font: 18px sans-serif; fill: #98baff }
+    .heavy { font: bold 52px sans-serif; fill: #76a9ff }
   </style>
 
 <rect x="20" y="20" rx="15" ry="15" width="98%" height="100" fill="url(#grad1)"/>
 
-<text x="25" y="60" class=heavy>$blog</text>
-<text x="25" y="90" class=small>$blog.desc</text>
+<text x="45" y="70" class=heavy>$blog</text>
+<text x="45" y="98" class=small>$blog.desc</text>
 </svg>

data/empty_view/themes/standard/blog/generate.lt3

@@ -4,8 +4,6 @@
 . The user will more often edit blog/index.lt3 in   
 . the process of blog setup.                        
 . --------------------------------------------------
-.nopara
-.mixin liveblog
 
 <html>
   <!-- Generated from $File on $$date.  

data/empty_view/themes/standard/blog/post_entry.lt3

@@ -2,7 +2,6 @@
 . This HTML fragment gives the format of a post's   
 . "index" entry (recent posts on blog front page).  
 . --------------------------------------------------
-.nopara
 
 <div class="post">
   <table width=100% cellpadding=7>

data/empty_view/themes/standard/etc/blog.css.lt3

@@ -2,7 +2,6 @@
 . This file is processed to create blog.css         
 . Most of the global CSS goes here                  
 . --------------------------------------------------
-.nopara
 
 .seek themes/standard/global.lt3
 

data/lib/default.rb

@@ -8,10 +8,11 @@ def RuneBlog.post_template(num: 0, title: "No title", date: nil, view: "test_vie
   log!(enter: __method__, args: [num, title, date, view, teaser, body, tags, views, back, home], level: 3)
   viewlist = (views + [view.to_s]).join(" ")
   taglist = ".tags " + tags.join(" ")
-<<-TEXT
-.mixin liveblog
-. ^ get rid of this later
 
+# .mixin liveblog
+# . ^ get rid of this later
+
+<<-TEXT
 .post #{num}
  
 .title #{title}

data/lib/liveblog.rb

@@ -18,6 +18,8 @@ def init_liveblog    # FIXME - a lot of this logic sucks
   @vdir = @blog.view.dir rescue "NONAME"
   @version = RuneBlog::VERSION
   @theme = @vdir/:themes/:standard
+rescue
+  raise "Only works inside a blog repo"
 end
 
 ##################
@@ -90,7 +92,6 @@ end
 
 def banner
   count = 0
-  span = 1
   bg = "white"  # outside loop
   wide = nil
   high = 250
@@ -111,23 +112,23 @@ def banner
         image = "banner"/image
         wide = data[0]
         width = wide ? "width=#{wide}" : "" 
-        str2 << "      <td colspan=#{span}><img src=#{image} #{width} height=#{high}></img></td>" + "\n"
+        str2 << "      <td><img src=#{image} #{width} height=#{high}></img></td>" + "\n"
       when "svg_title"
         stuff, hash = _svg_title(*data)
         wide = hash["width"]
-        str2 << "      <td colspan=#{span} width=#{wide}>#{stuff}</td>" + "\n"
+        str2 << "      <td width=#{wide}>#{stuff}</td>" + "\n"
       when "text"
         data[0] ||= "top.html"
         file = "banner"/data[0]
         if ! File.exist?(file) 
           src = file.sub(/html$/, "lt3")
           if File.exist?(src)
-            preprocess src: src, dst: file, vars: Livetext::Vars
+            preprocess src: src, dst: file, call: ".nopara" # , vars: @blog.view.globals
           else
             raise "Neither #{file} nor #{src} found"
           end
         end
-        str2 << "<td colspan=#{span}>" + File.read(file) + "</td>" + "\n"
+        str2 << "<td>" + File.read(file) + "</td>" + "\n"
       when "navbar"
         dir = @blog.root/:views/@blog.view/"themes/standard/banner/" + "\n"
         _make_navbar  # horiz is default
@@ -139,7 +140,6 @@ def banner
         file = "banner/vnavbar.html"
         navbar = File.read(file)
       when "break"
-#        span = count - 1
          str2 << "  </tr>\n  <tr>"  + "\n"
     else
       str2 << "        '#{tag}' isn't known" + "\n"
@@ -159,28 +159,6 @@ rescue => err
   gets
 end
 
-def _parse_colon_args(args, hash)  # really belongs in livetext
-  h2 = hash.dup
-  e = args.each
-  loop do
-    arg = e.next.chop.to_sym
-    raise "_parse_args: #{arg} is unknown" unless hash.keys.include?(arg)
-    h2[arg] = e.next
-  end
-  h2 = h2.reject {|k,v| v.nil? }
-  h2.each_pair {|k, v| raise "#{k} has no value" if v.empty? }
-  h2
-end
-
-def _get_arg(name, args)  # really belongs in livetext
-  raise "(#{name}) Expected an array" unless args.is_a? Array
-  raise "(#{name}) Expected an arg" if args.empty?
-  raise "(#{name}) Too many args: #{args.inspect}" if args.size > 1
-  val = args[0]
-  raise "Expected an argument '#{name}'" if val.nil?
-  val
-end
-
 def _svg_title(*args)
   width    = "95%"
   height   = 90
@@ -574,11 +552,10 @@ def sidebar
         num = rand(1..4)
         img = "widgets/ad/ad#{num}.png"
         src, dst = img, @root/:views/@view_name/"remote/widgets/ad/"
-        system!("cp #{src} #{dst}")   # , show: true)
-        File.open(wtag/"vars.lt3", "w") do |f| 
-          f.puts ".set ad.image = #{img}"
-        end
-        preprocess cwd: wtag, src: tag, dst: tcard, force: true # , debug: true # , deps: depend 
+        system!("cp #{src} #{dst}")
+        File.open(wtag/"vars.lt3", "w") {|f| f.puts ".set ad.image = #{img}" }
+        preprocess cwd: wtag, src: tag, dst: tcard, call: ".nopara", 
+                   force: true # , debug: true # , deps: depend 
     end
 
     _include_file wtag/tcard
@@ -722,7 +699,8 @@ def _make_navbar(orient = :horiz)
       output.puts %[#{li1} <a class="nav-link" href="index.html">#{cdata}<span class="sr-only">(current)</span></a> #{li2}]
     else
       dir = @blog.root/:views/@blog.view/"themes/standard/banner"
-      preprocess cwd: dir, src: basename, dst: vdir/"remote/banner"/basename+".html" # , debug: true
+      dest = vdir/"remote/banner"/basename+".html"
+      preprocess cwd: dir, src: basename, dst: dest, call: ".nopara" # , debug: true
       output.puts %[#{li1} <a class="nav-link" #{href_main}>#{cdata}</a> #{li2}]
     end
   end

data/lib/post.rb

@@ -1,5 +1,4 @@
 require 'runeblog'
-require 'global'
 require 'pathmagic'
 
 class RuneBlog::Post
@@ -9,12 +8,6 @@ class RuneBlog::Post
 
   include RuneBlog::Helpers
 
-# def self.files(num, root)
-#   log!(enter: __method__, args: [num, root], level: 3)
-#   files = ::Find.find(root).to_a
-#   result = files.grep(/#{prefix(num)}-/)
-#   result
-# end
   
   def self.load(post)
     log!(enter: __method__, args: [post], level: 3)
@@ -22,7 +15,6 @@ class RuneBlog::Post
     raise NoBlogAccessor if RuneBlog.blog.nil?
     # "post" is a slug
     pdir = RuneBlog.blog.root/:drafts/post
-puts "-- load: opening #{pdir}"
     meta = nil
     Dir.chdir(pdir) do
       meta = read_config("metadata.txt")

data/lib/processing.rb

@@ -22,7 +22,8 @@ end
 
 def preprocess(cwd: Dir.pwd, src:, 
           dst: (strip = true; File.basename(src).sub(/.lt3$/,"")), 
-          deps: [], copy: nil, debug: false, force: false, vars: nil)
+          deps: [], copy: nil, debug: false, force: false, 
+          mix: [], call: [], vars: {})
   src += LEXT unless src.end_with?(LEXT)
   dst += ".html" unless (dst.end_with?(".html") || strip)
   sp = " "*12
@@ -37,8 +38,8 @@ def preprocess(cwd: Dir.pwd, src:,
     end
     stale = stale?(src, dst, deps, force)
     if stale
-      live = Livetext.new
-      out = live.xform_file(src, vars: vars)
+      live = Livetext.customize(mix: "liveblog", call: call, vars: vars)
+      out = live.xform_file(src)
       File.write(dst, out)
       system!("cp #{dst} #{copy}") if copy
     end

data/lib/publish.rb

@@ -2,7 +2,6 @@ if ! defined?(Already_publish)
 
   Already_publish = nil
 
-require 'global'
 require 'pathmagic'
 
 class RuneBlog::Publishing
@@ -17,6 +16,7 @@ class RuneBlog::Publishing
     @blog = RuneBlog.blog
     gfile = @blog.root/:views/view/"themes/standard/global.lt3"
     data = File.readlines(gfile)
+    # Please refactor the Hal out of this
     grab = ->(var) { data.grep(/^#{var} /).first.chomp.split(" ", 2)[1] }
     @user    = grab.call("publish.user")
     @server  = grab.call("publish.server")

data/lib/repl.rb

@@ -1,5 +1,4 @@
 require 'runeblog'
-require 'global'
 require 'ostruct'
 require 'helpers-repl'  # FIXME structure
 
@@ -39,27 +38,22 @@ module RuneBlog::REPL
   end
 
   def cmd_config(arg, testing = false)
-    list = ["global.lt3           Global configuration",
-            "blog/generate.lt3    Generator for view (usu not edited)",
-            ".... head.lt3        HEAD info for view",
-            ".... banner.lt3      banner description",
-            ".... index.lt3       User-edited detail for view",
-            ".... post_entry.lt3  Generator for post entry in recent-posts",
-            "etc/blog.css.lt3     Global CSS",
-            "... externals.lt3    External JS/CSS (Bootstrap, etc.)",
-            "post/generate.lt3    Generator for a post",
-            ".... head.lt3        HEAD info for post",
-            ".... index.lt3       Content for post",
-            ".... permalink.lt3   Generator for permalink"]
-
-    name = ["global.lt3", "blog/generate.lt3", "blog/head.lt3", "blog/banner.lt3", 
-            "blog/index.lt3", "blog/post_entry.lt3", "etc/blog.css.lt3", 
-            "blog/externals.lt3", "post/generate.lt3", "post/head.lt3", 
-            "post/index.lt3", "post/permalink.lt3"]
+    hash = {"global.lt3           Global configuration"                     => "global.lt3",
+            "blog/generate.lt3    Generator for view (usu not edited)"      => "blog/generate.lt3",
+            ".... head.lt3        HEAD info for view"                       => "blog/head.lt3",
+            ".... banner.lt3      banner description"                       => "blog/banner.lt3",
+            ".... index.lt3       User-edited detail for view"              => "blog/index.lt3",
+            ".... post_entry.lt3  Generator for post entry in recent-posts" => "blog/post_entry.lt3",
+            "etc/blog.css.lt3     Global CSS"                               => "etc/blog.css.lt3",
+            "... externals.lt3    External JS/CSS (Bootstrap, etc.)"        => "/etc/externals.lt3",
+            "post/generate.lt3    Generator for a post"                     => "post/generate.lt3",
+            ".... head.lt3        HEAD info for post"                       => "post/head.lt3",
+            ".... index.lt3       Content for post"                         => "post/index.lt3",
+            ".... permalink.lt3   Generator for permalink"                  => "post/permalink.lt3",
+           }
 
     dir = @blog.view.dir/"themes/standard/"
-    num, str = STDSCR.menu(title: "Edit file:", items: list)
-    target = name[num]
+    num, target = STDSCR.menu(title: "Edit file:", items: hash)
     edit_file(dir/target)
   end
 
@@ -192,7 +186,7 @@ module RuneBlog::REPL
     puts unless testing
     reset_output
     unless @blog.view.can_publish?
-      msg = "Can't publish... see globals.lt3"
+      msg = "Can't publish... see global.lt3"
       puts msg unless testing
       output! msg
       return @out
@@ -253,6 +247,7 @@ module RuneBlog::REPL
       viewnames = @blog.views.map {|x| x.name }
       n = viewnames.find_index(@blog.view.name)
       name = @blog.view.name
+      # TODO: Add view description 
       k, name = STDSCR.menu(title: "Views", items: viewnames, curr: n) unless testing
       return if name.nil?
       @blog.view = name

data/lib/runeblog.rb

@@ -9,7 +9,6 @@ require 'ostruct'
 require 'logging'
 
 require 'runeblog_version'
-require 'global'
 require 'helpers-blog'
 require 'default'
 require 'view'
@@ -107,13 +106,14 @@ class RuneBlog
 
   def _generate_global
     vars = read_vars("#@root/data/universal.lt3")
-    global = File.read("#@root/data/global.lt3")
+    gfile = "#@root/data/global.lt3"
+    global = File.read(gfile)
     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)
+    File.write(gfile, global)
   end
 
   def _deploy_local(dir)
@@ -163,7 +163,8 @@ class RuneBlog
     dir = @root/:posts/nslug
     create_dirs(dir)
     # FIXME dependencies?
-    preprocess cwd: dir, src: @root/:drafts/sourcefile   # , debug: true
+    preprocess cwd: dir, src: @root/:drafts/sourcefile, 
+               mix: "liveblog"  # , debug: true
     _deploy_local(dir)
   rescue => err
     _tmp_error(err)
@@ -336,8 +337,10 @@ class RuneBlog
     @theme = @view.dir/"themes/standard"
     post_entry_name = @theme/"blog/post_entry.lt3"
     depend = [post_entry_name]
-    preprocess src: post_entry_name, dst: "/tmp/post_entry.html" # , deps: depend  # , debug: true
-    @_post_entry ||= File.read("/tmp/post_entry.html")
+    html = "/tmp/post_entry.html"
+    preprocess src: post_entry_name, dst: html,
+               call: ".nopara"  # , deps: depend  # , debug: true
+    @_post_entry ||= File.read(html)
     vp = post_lookup(id)
     nslug, aslug, title, date, teaser_text = 
       vp.nslug, vp.aslug, vp.title, vp.date, vp.teaser_text
@@ -389,13 +392,11 @@ class RuneBlog
       end
     else
       text << <<-HTML
-        <svg width="95%" height="95%" viewBox="0 0 95% 95%">
-          <style> .huge { font:  italic 100px sans-serif; fill: white } </style>
+        <svg width="95%" height="75%" viewBox="0 0 95% 95%">
+          <style> .huge { font:  italic 90px sans-serif; fill: white } </style>
           <rect x="0" y="0" rx="50" ry="50" width="95%" height="95%" fill="lightblue"/>
-          <text x="250" y="120" class=huge>No</text>
-          <text x="250" y="230" class=huge>posts</text>
-          <text x="250" y="340" class=huge>here</text>
-          <text x="250" y="450" class=huge>yet</text>
+          <text x="120" y="250" class=huge>No posts</text>
+          <text x="120" y="350" class=huge>here yet</text>
         </svg>
       HTML
     end
@@ -466,9 +467,11 @@ class RuneBlog
              # @theme/"navbar/navbar.lt3",
              @theme/"blog/index.lt3"]   # FIXME what about assets?
     preprocess cwd: vdir/"themes/standard/etc", # deps: depend, debug: true,
-               src: "blog.css.lt3", copy: vdir/"remote/etc/" # , dst: "blog.css"
+               src: "blog.css.lt3", copy: vdir/"remote/etc/", 
+               call: ".nopara" # , dst: "blog.css"
     preprocess cwd: vdir/"themes/standard", deps: depend, force: true,
-               src: "blog/generate.lt3", dst: vdir/:remote/"index.html"
+               src: "blog/generate.lt3", dst: vdir/:remote/"index.html", 
+               call: ".nopara"
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
     copy_widget_html(view)
   rescue => err
@@ -576,7 +579,8 @@ class RuneBlog
     # Step 1...
     create_dirs(pdraft)
     # FIXME dependencies?
-    preprocess cwd: pdraft, src: draft, dst: "guts.html"  # , debug: true
+    preprocess cwd: pdraft, src: draft, dst: "guts.html",
+               mix: "liveblog"  # , debug: true
     _post_metadata(draft, pdraft)
     # Step 2...
     vposts = @root/:views/view_name/:posts
@@ -587,10 +591,12 @@ class RuneBlog
     # Step 4...
     # FIXME dependencies?
     preprocess cwd: @theme/:post, src: "generate.lt3", force: true, 
-               dst: remote/ahtml, copy: @theme/:post    # , debug: true
+               dst: remote/ahtml, copy: @theme/:post,
+               call: ".nopara"    # , debug: true
     # FIXME dependencies?
     preprocess cwd: @theme/:post, src: "permalink.lt3", 
-               dst: remote/:permalink/ahtml  # , debug: true
+               dst: remote/:permalink/ahtml,
+               mix: "liveblog"  # , debug: true
     copy_widget_html(view_name)
   rescue => err
     _tmp_error(err)

data/lib/runeblog_version.rb

@@ -1,11 +1,65 @@
+if !defined?(RuneBlog::Path)
 
-if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
+# if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.84"
+  VERSION = "0.2.89"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)
 end
 
+# skeleton
+
+class RuneBlog
+  module Helpers
+  end
+
+  class Default
+  end
+
+  class View
+  end
+
+  class Publishing
+  end
+
+  class Post
+  end
+end
+
+# Refactor, move stuff elsewhere?
+
+def make_exception(sym, str)
+  log!(enter: __method__, args: [sym, str], level: 3)
+  return if Object.constants.include?(sym)
+  Object.const_set(sym, StandardError.dup)
+  define_method(sym) do |*args|
+    msg = str
+    args.each.with_index {|arg, i| msg.sub!("$#{i+1}", arg) }
+    Object.class_eval(sym.to_s).new(msg)
+  end
+end
+
+def system!(str, show: false)
+  log!(enter: __method__, args: [str], level: 2)
+  STDERR.puts str if show
+  rc = system(str)
+  if rc
+    return rc
+  else
+    STDERR.puts "FAILED: #{str.inspect}"
+    STDERR.puts "\ncaller = \n#{caller.join("\n  ")}\n"
+exit
+    return rc
+  end
+  rc
+end
+
+def prefix(num)
+  log!(enter: __method__, args: [num], level: 3)
+  "#{'%04d' % num.to_i}"
+end
+
+
 end

data/lib/view.rb

@@ -1,8 +1,7 @@
-require 'global'
 require 'logging'
 
 class RuneBlog::View
-  attr_reader :name, :state
+  attr_reader :name, :state, :globals
   attr_accessor :publisher
 
   include RuneBlog::Helpers
@@ -15,6 +14,10 @@ class RuneBlog::View
     @publisher = RuneBlog::Publishing.new(name)
     @can_publish = true  # FIXME
     @blog.view = self
+    gfile = @blog.root/"views/#{name}/themes/standard/global.lt3"
+    live = Livetext.customize(call: ".nopara")
+    live.xform_file(gfile)
+    @globals = live.vars
   end
 
   def dir

data/runeblog.gemspec

@@ -20,8 +20,8 @@ spec = Gem::Specification.new do |s|
   s.authors     = ["Hal Fulton"]
   s.email       = 'rubyhacker@gmail.com'
   s.executables << "blog"
-  s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.96'
-  s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.18'
+  s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.99'
+  s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.20'
 
   s.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.84
+  version: 0.2.89
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -19,7 +19,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.96
+        version: 0.8.99
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.96
+        version: 0.8.99
 - !ruby/object:Gem::Dependency
   name: rubytext
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.20
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +89,7 @@ files:
 - data/universal.lt3
 - empty_view/assets/austin-pano.jpg
 - empty_view/assets/sky2.jpg
+- empty_view/posts/GIT_IS_DUMB
 - empty_view/remote/assets/GIT_IS_DUMB
 - empty_view/remote/banner/austin-pano.jpg
 - empty_view/remote/etc/GIT_IS_DUMB
@@ -183,7 +184,6 @@ files:
 - lib/exper/gen_svg.rb
 - lib/exper/s2.html
 - lib/exper/varmint.rb
-- lib/global.rb
 - lib/helpers-blog.rb
 - lib/helpers-repl.rb
 - lib/liveblog.rb

data/lib/global.rb

@@ -1,52 +0,0 @@
-# skeleton
-
-class RuneBlog
-  module Helpers
-  end
-
-  class Default
-  end
-
-  class View
-  end
-
-  class Publishing
-  end
-
-  class Post
-  end
-end
-
-# Refactor, move stuff elsewhere?
-
-def make_exception(sym, str)
-  log!(enter: __method__, args: [sym, str], level: 3)
-  return if Object.constants.include?(sym)
-  Object.const_set(sym, StandardError.dup)
-  define_method(sym) do |*args|
-    msg = str
-    args.each.with_index {|arg, i| msg.sub!("$#{i+1}", arg) }
-    Object.class_eval(sym.to_s).new(msg)
-  end
-end
-
-def system!(str, show: false)
-  log!(enter: __method__, args: [str], level: 2)
-  STDERR.puts str if show
-  rc = system(str)
-  if rc
-    return rc
-  else
-    STDERR.puts "FAILED: #{str.inspect}"
-    STDERR.puts "\ncaller = \n#{caller.join("\n  ")}\n"
-exit
-    return rc
-  end
-  rc
-end
-
-def prefix(num)
-  log!(enter: __method__, args: [num], level: 3)
-  "#{'%04d' % num.to_i}"
-end
-