RubyGems - runeblog - Versions diffs - 0.2.89 → 0.2.94 - Mend

runeblog 0.2.89 → 0.2.94

Files changed (27) hide show

checksums.yaml +4 -4
data/bin/blog +9 -6
data/empty_view/themes/standard/{blog → banner}/banner.lt3 +0 -0
data/empty_view/themes/standard/banner/{about.lt3 → navbar/about.lt3} +0 -0
data/empty_view/themes/standard/banner/{contact.lt3 → navbar/contact.lt3} +0 -0
data/empty_view/themes/standard/banner/navbar/faq.lt3 +1 -0
data/empty_view/themes/standard/banner/{list.data → navbar/list.data} +0 -0
data/empty_view/themes/standard/blog/generate.lt3 +1 -1
data/empty_view/themes/standard/global.lt3 +1 -1
data/empty_view/themes/standard/post/index.lt3 +8 -8
data/empty_view/themes/standard/widgets/links/links.rb +1 -1
data/empty_view/themes/standard/widgets/news/news.rb +1 -1
data/empty_view/themes/standard/widgets/pages/pages.rb +2 -2
data/empty_view/themes/standard/widgets/pinned/pinned.rb +1 -1
data/lib/helpers-blog.rb +20 -56
data/lib/helpers-repl.rb +3 -13
data/lib/liveblog.rb +17 -37
data/lib/lowlevel.rb +73 -0
data/lib/publish.rb +6 -22
data/lib/repl.rb +5 -15
data/lib/runeblog.rb +43 -9
data/lib/runeblog_version.rb +1 -16
data/test/austin.rb +0 -1
metadata +8 -9
data/empty_view/remote/banner/austin-pano.jpg +0 -0
data/empty_view/themes/standard/banner/faq.lt3 +0 -1
data/lib/default.rb +0 -31

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69a5bfa546e814106599e4bd829ddf169bc07053b592db267bce813675f57119
-  data.tar.gz: 05dfce46838cf7002e57dc1f279e8da776463a06734f3a445ca2d710d82b4e2a
+  metadata.gz: 7ed9580d074b2ce228aff385bbe22e907a9ae0c330f625aa2d42ee58464a1d3b
+  data.tar.gz: 0ce0642e8b2f0026cca4133916ff0dd3f992bb1ae8cb89e3304d90221d8195a8
 SHA512:
-  metadata.gz: 170e5b90aff508ad77410a0b774bf30b79282e0928f863147d6da681879448e78a8e0d8053bf3c50a97a465b22a88d36409aaca16efe1c1fb20b59f1a365260b
-  data.tar.gz: 37135518327009fd0300cc082914b29992934ecead7a62fe3c3f3bcbb72c6f290f0e7911a6ee94ed26f2b554d77cfd4da84f56cbfa6f95f5b15cac576639aa2a
+  metadata.gz: 84d30bada582bd3393e075a1cba653ec11e719941c675d1a9753d6dbf921643137e6096205b5120c91f385e6d9cb4a1e823440607b1db5ee23232c87885128bc
+  data.tar.gz: 0b0207066da6493400d66e9473c00659bef4b4169fb26cdbe554d220a59778579bd06207643516a409df39247fa8b263ae77229c16344912e81a8befb0237c6b

data/bin/blog CHANGED

@@ -25,8 +25,8 @@ 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)
@@ -41,8 +41,8 @@ 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  : ")
+    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)
@@ -50,7 +50,7 @@ def get_global
     text = text.gsub(/VIEW_SUBTITLE/, subtitle)
     File.write(gname, text)
   else
-    view_name = ask("\nFilename: ")
+    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)
@@ -146,7 +146,10 @@ end
 major, minor = RUBY_VERSION.split(".").values_at(0,1)
 ver = major.to_i*10 + minor.to_i
-abort "Need Ruby 2.4 or greater" unless ver >= 24
+unless ver >= 24
+  RubyText.stop
+  abort "Need Ruby 2.4 or greater"
+end
 include RuneBlog::Helpers  # for try_read_config

data/empty_view/themes/standard/{blog → banner}/banner.lt3 RENAMED

File without changes

data/empty_view/themes/standard/banner/{about.lt3 → navbar/about.lt3} RENAMED

File without changes

data/empty_view/themes/standard/banner/{contact.lt3 → navbar/contact.lt3} RENAMED

File without changes

data/empty_view/themes/standard/banner/navbar/faq.lt3 ADDED

	@@ -0,0 +1 @@
1	+ .include ../../widgets/pages/faq.lt3

data/empty_view/themes/standard/banner/{list.data → navbar/list.data} RENAMED

File without changes

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

@@ -11,7 +11,7 @@
   $.seek global.lt3
   $.include blog/head.lt3
   <body>
-    $.include blog/banner.lt3
+    $.include banner/banner.lt3
     <div class="content container-fluid mt-4">
       <div class="row">
         $.include blog/index.lt3

data/empty_view/themes/standard/global.lt3 CHANGED

@@ -29,7 +29,7 @@ post.date.size    15px
 publish.user      root
 publish.server    rubyhacker.com
 publish.docroot   /var/www/
-publish.path      around_austin
+publish.path      stuff
 publish.proto     http
 .end

data/empty_view/themes/standard/post/index.lt3 CHANGED

@@ -6,19 +6,19 @@
 . likely be the place.
 . --------------------------------------------------
-.mixin liveblog
-. ^ get rid of this later
 .post 0
-.title The new amphitheatre is overrated
+.title This is my title
 .pubdate 2019-07-09
-.views around_austin
+.views stuff
 .tags
 .teaser
-It used to be that all major concerts played the Erwin Center.
+This is only a short excerpt from the top of the blog post.
 .end
-Now, depending on what you consider "major," blah blah blah...
+And now we continue the post.
+Do we have anything to say?
+Apparently not much.

data/empty_view/themes/standard/widgets/links/links.rb CHANGED

@@ -9,7 +9,7 @@ class ::RuneBlog::Widget
     def initialize(repo)
       @blog = repo
       @datafile = input = "list.data"
-      @lines = File.readlines(input)
+      @lines = _get_data(@datafile)
     end
     def build

data/empty_view/themes/standard/widgets/news/news.rb CHANGED

@@ -7,7 +7,7 @@ class ::RuneBlog::Widget
     def initialize(repo)
       @blog = repo
       @datafile = "list.data"
-      lines = File.readlines(@datafile)
+      lines = _get_data(@datafile)
       @data = lines.map {|line| line.chomp.split(/, */) }
     end

data/empty_view/themes/standard/widgets/pages/pages.rb CHANGED

@@ -4,12 +4,12 @@
 class ::RuneBlog::Widget
   class Pages
-    Type, Title = "pages", "Pages"
+    Type, Title = "pages", "My Pages"
     def initialize(repo)
       @blog = repo
       @datafile = "list.data"
-      @lines = File.readlines(@datafile)
+      @lines = _get_data(@datafile)
       @data = @lines.map {|x| x.chomp.split(/, */, 2) }
     end

data/empty_view/themes/standard/widgets/pinned/pinned.rb CHANGED

@@ -7,7 +7,7 @@ class ::RuneBlog::Widget
     def initialize(repo)
       @blog = repo
       @datafile = "list.data"
-      @lines = File.exist?(@datafile) ? File.readlines(@datafile) : []
+      @lines = _get_data?(@datafile)
     end
     def _html_body(file, css = nil)    # FIXME

data/lib/helpers-blog.rb CHANGED

@@ -3,20 +3,15 @@ require 'fileutils'
 require 'processing'
-module RuneBlog::Helpers
+require 'lowlevel'
-  def copy(src, dst)
-    log!(enter: __method__, args: [src, dst], level: 2)
-    cmd = "cp #{src} #{dst} 2>/dev/null"
-    rc = system!(cmd)
-    puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
-  end
+module RuneBlog::Helpers
-  def copy!(src, dst)
-    log!(enter: __method__, args: [src, dst], level: 2)
-    cmd = "cp -r #{src} #{dst} 2>/dev/null"
-    rc = system!(cmd)
-    puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
+  def quit_RubyText
+    return unless defined? RubyText
+    sleep 6
+    RubyText.stop
+    exit
   end
   def get_repo_config
@@ -54,7 +49,7 @@ module RuneBlog::Helpers
     puts "Can't read vars file '#{file}': #{err}"
     puts err.backtrace.join("\n")
     puts "dir = #{Dir.pwd}"
-    exit
+    stop_RubyText
   end
   def read_config(file, *syms)
@@ -80,7 +75,7 @@ module RuneBlog::Helpers
     puts "Can't read config file '#{file}': #{err}"
     puts err.backtrace.join("\n")
     puts "dir = #{Dir.pwd}"
-    exit
+    stop_RubyText
   end
   def try_read_config(file, hash)
@@ -98,26 +93,27 @@ module RuneBlog::Helpers
     end
   end
-  def get_views   # read from filesystem
+  def retrieve_views   # read from filesystem
     log!(enter: __method__, level: 3)
     dirs = subdirs("#@root/views/").sort
     dirs.map {|name| RuneBlog::View.new(name) }
   end
-  def write_repo_config(root: "#{Dir.pwd}/.blogs", view: "#{root}/data/VIEW", editor: "/usr/local/bin/vim")
+  def write_repo_config(root: "#{Dir.pwd}/.blogs", view: nil, editor: "/usr/local/bin/vim")
+    view ||= File.read("#{root}/data/VIEW").chomp rescue "[no view]"
     File.write(root + "/data/ROOT",   root + "\n")
     File.write(root + "/data/VIEW",   view.to_s + "\n")
     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_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)
@@ -145,38 +141,6 @@ module RuneBlog::Helpers
     files
   end
-  def create_dirs(*dirs)
-    log!(enter: __method__, args: [*dirs], level: 3)
-    dirs.each do |dir|
-      dir = dir.to_s  # symbols allowed
-      next if Dir.exist?(dir)
-      cmd = "mkdir -p #{dir} >/dev/null"
-      result = system!(cmd)
-      raise CantCreateDir(dir) unless result
-    end
-  end
-  def interpolate(str, bind)
-    log!(enter: __method__, args: [str, bind], level: 3)
-    wrap = "<<-EOS\n#{str}\nEOS"
-    eval wrap, bind
-  end
-  def error(err)  # Hmm, this is duplicated
-    log!(str: "duplicated method", enter: __method__, args: [err], level: 2)
-    str = "\n  Error: #{err}"
-    puts str
-    puts err.backtrace.join("\n")
-  end
-  def dump(obj, name)
-    log!(enter: __method__, args: [obj, name], level: 3)
-    File.write(name, obj)
-  end
 end
-def dump(obj, name)      # FIXME scope
-  log!(str: "scope problem", enter: __method__, args: [obj, name], level: 3)
-  File.write(name, obj)
-end

data/lib/helpers-repl.rb CHANGED

@@ -109,26 +109,16 @@ module RuneBlog::REPL
     end
     meth = found || :cmd_INVALID
     params = cmd if meth == :cmd_INVALID
-# puts "choose: #{[meth, params].inspect}"
     [meth, params]
   end
-  def error(err)  # Hmm, this is duplicated
-    str = "\n  Error: #{err}"
-    puts str
-    puts err.backtrace.join("\n")
-  end
   def ask(prompt, meth = :to_s)
     print prompt
-    str = gets
-    str.chomp!
-    str.send(meth)
+    gets.chomp.send(meth)
   end
-  def yesno(prompt, meth = :to_s)
-    print prompt
-    gets.chomp.upcase[0] == "Y"
+  def ask!(prompt, meth = :to_s)
+    ask(fx(prompt, :bold), meth)
   end
   def reset_output(initial = "")

data/lib/liveblog.rb CHANGED

@@ -7,6 +7,9 @@ require 'runeblog'
 require 'pathmagic'
 require 'processing'
+# top = Livetext::Path + "/../plugin/liveblog/"
+# eval(File.read("#{top}/testing.rb"))
 def init_liveblog    # FIXME - a lot of this logic sucks
   dir = Dir.pwd.sub(/\.blogs.*/, "")
@@ -44,7 +47,7 @@ end
 def post_trailer
   perma = _var("publish.proto") + "://" + _var("publish.server") +
-          "/" + _var("publish.path") + "/permalink/" + _var("post.aslug") +
+          "/" + _var("publish.path") + "/" + _var("post.aslug") +
           ".html"
   tags = _var("post.tags")
   if tags.empty?
@@ -85,9 +88,10 @@ def code
 end
 def _read_navbar_data
-  dir = @blog.root/:views/@blog.view/"themes/standard/banner/"
+  vdir = @blog.root/:views/@blog.view
+  dir = vdir/"themes/standard/banner/navbar/"
   datafile = dir/"list.data"
-  File.readlines(datafile)
+  _get_data(datafile)
 end
 def banner
@@ -97,6 +101,7 @@ def banner
   high = 250
   str2 = ""
   navbar = nil
+  vdir = @blog.root/:views/@blog.view
   lines = _body.to_a
   lines.each do |line|
@@ -130,15 +135,9 @@ def banner
         end
         str2 << "<td>" + File.read(file) + "</td>" + "\n"
       when "navbar"
-        dir = @blog.root/:views/@blog.view/"themes/standard/banner/" + "\n"
-        _make_navbar  # horiz is default
-        file = "banner/navbar.html"
-        navbar = File.read(file)
+        navbar = _make_navbar  # horiz is default
       when "vnavbar"
-        dir = @blog.root/:views/@blog.view/"themes/standard/banner/"
-        _make_navbar(:vert)
-        file = "banner/vnavbar.html"
-        navbar = File.read(file)
+        navbar = _make_navbar(:vert)
       when "break"
          str2 << "  </tr>\n  <tr>"  + "\n"
     else
@@ -347,7 +346,7 @@ def pin
   pinned.each do |pinview|
     dir = @blog.root/:views/pinview/"themes/standard/widgets/pinned/"
     datafile = dir/"list.data"
-    pins = File.exist?(datafile) ? File.readlines(datafile) : []
+    pins = _get_data?(datafile)
     pins << "#{@meta.num} #{@meta.title}\n"
     pins.uniq!
     File.open(datafile, "w") {|out| pins.each {|pin| out.puts pin } }
@@ -498,25 +497,10 @@ def _load_local(widget)
 rescue => err
   STDERR.puts err.to_s
   STDERR.puts err.backtrace.join("\n")
+  sleep 6; RubyText.stop
   exit
 end
-# def pinned_rebuild
-#   view = @blog.view
-#   view = _args[0] unless _args.empty?
-#   Dir.chdir(@blog.root/:views/view/"themes/standard/") do
-#     wtag = "widgets/pinned"
-#     code = _load_local("pinned")
-#     if code
-#       Dir.chdir(wtag) do
-#         widget = code.new(@blog)
-#         widget.build
-#       end
-#       # _include_file wtag/"pinned-card.html"
-#     end
-#   end
-# end
 def _handle_standard_widget(tag)
   wtag = :widgets/tag
   code = _load_local(tag)
@@ -564,6 +548,7 @@ def sidebar
 rescue => err
   puts "err = #{err}"
   puts err.backtrace.join("\n")
+  sleep 6; RubyText.stop
   exit
 end
@@ -686,20 +671,20 @@ def _make_navbar(orient = :horiz)
     </td></tr></table>
   HTML
-  html_file = @blog.root/:views/@blog.view/"themes/standard/banner"/name
+  html_file = @blog.root/:views/@blog.view/"themes/standard/banner/navbar"/name
   output = File.new(html_file, "w")
   output.puts start
   lines = _read_navbar_data
   lines = ["index  Home"] + lines  unless _args.include?("nohome")
   lines.each do |line|
     basename, cdata = line.chomp.strip.split(" ", 2)
-    full = :banner/basename+".html"
+    full = :banner/:navbar/basename+".html"
     href_main = _main(full)
     if basename == "index"  # special case
       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"
-      dest = vdir/"remote/banner"/basename+".html"
+      dir = @blog.root/:views/@blog.view/"themes/standard/banner/navbar"
+      dest = vdir/"remote/banner/navbar"/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
@@ -768,11 +753,6 @@ def _post_lookup(postid)    # side-effect
   vp
 end
-def _interpolate(str, context)   # FIXME move this later
-  wrapped = "%[" + str.dup + "]"  # could fail...
-  eval(wrapped, context)
-end
 def _card_generic(card_title:, middle:, extra: "")
   front = <<-HTML
     <div class="card #{extra} mb-3">

data/lib/lowlevel.rb ADDED

@@ -0,0 +1,73 @@
+  def dump(obj, name)
+    File.write(name, obj)
+  end
+  def system!(str, show: false)
+    log!(enter: __method__, args: [str], level: 2)
+    STDERR.puts str if show
+    rc = system(str)
+    return rc if rc
+    STDERR.puts "FAILED: #{str.inspect}"
+    STDERR.puts "\ncaller = \n#{caller.join("\n  ")}\n"
+    if defined?(RubyText)
+      sleep 6
+      RubyText.stop
+      exit
+    end
+    return rc
+  end
+  def _get_data?(file)   # File need not exist
+    if File.exist?(file)
+      _get_data(file)
+    else
+      []
+    end
+  end
+  def _get_data(file)
+    lines = File.readlines(file)
+    lines.reject! {|line| line[0] == "-" }  # allow rejection of lines
+    lines = lines.map do |line|
+      line.sub(/ *# .*$/, "")               # allow trailing comments
+    end
+    lines
+  end
+  def copy(src, dst)
+    log!(enter: __method__, args: [src, dst], level: 2)
+    cmd = "cp #{src} #{dst} 2>/dev/null"
+    system!(cmd)
+  end
+  def copy!(src, dst)
+    log!(enter: __method__, args: [src, dst], level: 2)
+    cmd = "cp -r #{src} #{dst} 2>/dev/null"
+    system!(cmd)
+  end
+  def create_dirs(*dirs)
+    log!(enter: __method__, args: [*dirs], level: 3)
+    dirs.each do |dir|
+      dir = dir.to_s  # symbols allowed
+      next if Dir.exist?(dir)
+      cmd = "mkdir -p #{dir} >/dev/null"
+      result = system!(cmd)
+      raise CantCreateDir(dir) unless result
+    end
+  end
+  def interpolate(str, bind)
+    log!(enter: __method__, args: [str, bind], level: 3)
+    wrap = "<<-EOS\n#{str}\nEOS"
+    eval wrap, bind
+  end
+  def error(err)
+    log!(str: err, enter: __method__, args: [err], level: 2)
+    str = "\n  Error: #{err}"
+    puts str
+    puts err.backtrace.join("\n")
+  end

data/lib/publish.rb CHANGED

@@ -37,31 +37,15 @@ class RuneBlog::Publishing
     url = "#@proto://#@server/#@path"  # /#{vname}"
   end
-  def system!(str)
-    log!(enter: __method__, args: [str], level: 1)
-    rc = system(str)
-    rc
-  end
-  def publish(files, assets=[])
-    log!(enter: __method__, args: [files, assets], level: 1)
+  def publish
+    log!(enter: __method__, level: 1)
     dir = @docroot/@path
     view_name = @blog.view.name
     viewpath = dir # /view_name
-    result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}/assets")
-    files.each do |file|
-      dest = "#@user@#@server:" + dir  # /view_name
-      file.gsub!(/\/\//, "/")  # weird... :-/
-      cmd = "scp -r #{file} #{dest} >/dev/null 2>/tmp/wtf"
-      debug "cmd = #{cmd.inspect}  - see /tmp/wtf"
-      result = system!(cmd) || puts("\n  Could not copy #{file} to #{dest}")
-    end
-    unless assets.empty?
-      cmd = "scp #{assets.join(' ')} #@user@#@server:#{viewpath}/assets >/dev/null 2>/tmp/wtf2"
-      result = system!(cmd)
-      raise PublishError if !result
-    end
-    dump(files, "#{@blog.view.dir}/last_published")
+    # FIXME rsync doesn't work
+    cmd = "rsync -r -z #{@blog.root}/views/#{@blog.view}/remote/ #@user@#@server:#{viewpath}/"
+    system!(cmd)
+    dump("#{@blog.view} at #{Time.now}", "#{@blog.view.dir}/last_published")
     true
   end

data/lib/repl.rb CHANGED

@@ -39,6 +39,7 @@ module RuneBlog::REPL
   def cmd_config(arg, testing = false)
     hash = {"global.lt3           Global configuration"                     => "global.lt3",
+            "banner/top.lt3       Text portion of banner"                   => "banner/top.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",
@@ -75,10 +76,10 @@ module RuneBlog::REPL
   end
   def _manage_navbar(arg, testing = false)   # cloned from manage_pages
-    dir = @blog.view.dir/"themes/standard/navbar"
+    dir = @blog.view.dir/"themes/standard/banner/navbar"
     files = Dir.entries(dir) - %w[. .. navbar.lt3]
-    new_item = "  [New item]  "
     main_file = "[ navbar.lt3 ]"
+    new_item  = "  [New item]  "
     files = [main_file] + files + [new_item]
     num, fname = STDSCR.menu(title: "Edit navbar:", items: files)
     return if fname.nil?
@@ -113,7 +114,7 @@ module RuneBlog::REPL
     dir = @blog.view.dir/"themes/standard/widgets/pages"
     # Assume child files already generated (and list.data??)
     data = dir/"list.data"
-    lines = File.readlines(data)
+    lines = _get_data?(data)
     hash = {}
     lines.each do |line|
       url, name = line.chomp.split(",")
@@ -192,19 +193,8 @@ module RuneBlog::REPL
       return @out
     end
-    # Need to check dirty/clean status first
-    dirty, all, assets = @blog.view.publishable_files
-    files = dirty
-    if dirty.empty?
-      puts fx("\n  No files are out of date." + " "*20, :bold)
-      print "  Publish anyway? "
-      yn = RubyText.gets.chomp
-      files = all if yn == "y"
-    end
-    return @out if files.empty?
     ret = RubyText.spinner(label: " Publishing... ") do
-      @blog.view.publisher.publish(files, assets)  # FIXME weird?
+      @blog.view.publisher.publish
     end
     return @out unless ret

data/lib/runeblog.rb CHANGED

@@ -10,7 +10,6 @@ require 'logging'
 require 'runeblog_version'
 require 'helpers-blog'
-require 'default'
 require 'view'
 require 'publish'
 require 'post'
@@ -48,6 +47,34 @@ class RuneBlog
   include Helpers
+    class Default
+    # This will all become much more generic later.
+    def RuneBlog.post_template(num: 0, title: "No title", date: nil, view: "test_view",
+                               teaser: "No teaser", body: "No body", tags: ["untagged"],
+                               views: [], back: "javascript:history.go(-1)", home: "no url")
+      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
+      .post #{num}
+      .title #{title}
+      .pubdate #{date}
+      .views #{viewlist}
+      #{taglist}
+      .teaser
+      #{teaser}
+      .end
+      #{body}
+      TEXT
+    end
+  end
   def _tmp_error(err)   # FIXME move to helpers
     out = "/tmp/blog#{rand(100)}.txt"
     File.open(out, "w") do |f|
@@ -68,7 +95,7 @@ class RuneBlog
       create_dirs(:data, :drafts, :views, :posts)
       new_sequence
     end
-    copy_data(:config, repo_root/:data)
+    copy_data(:config, repo_root/:data) unless File.exist?(repo_root/"data/VIEW")
     write_repo_config(root: repo_root)
     @blog = self.new
     @blog
@@ -90,10 +117,11 @@ class RuneBlog
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     @root = Dir.pwd/root_rel
-    copy_data(:config, @root/:data)
+#   copy_data(:config, @root/:data) unless File.exist?(@root/"data/VIEW")
     write_repo_config(root: @root)
     get_repo_config
-    @views = get_views
+    @views = retrieve_views
+    self.view = File.read(@root/"data/VIEW").chomp
     md = Dir.pwd.match(%r[.*/views/(.*?)/])
     if md
       @view_name = md[1]
@@ -209,6 +237,9 @@ class RuneBlog
   def view=(arg)
     log!(enter: __method__, args: [arg], level: 2)
     case arg
+      when "[no view]"
+        # puts "Warning: No current view set"
+        @view = nil
       when RuneBlog::View
         @view = arg
         _set_publisher
@@ -472,7 +503,9 @@ class RuneBlog
     preprocess cwd: vdir/"themes/standard", deps: depend, force: true,
                src: "blog/generate.lt3", dst: vdir/:remote/"index.html",
                call: ".nopara"
+    copy!("#{vdir}/themes/standard/banner/*", "#{vdir}/remote/banner/")  # includes navbar/
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
+# rebuild widgets
     copy_widget_html(view)
   rescue => err
     STDERR.puts err
@@ -484,8 +517,8 @@ class RuneBlog
     log!(enter: __method__, args: [draft], level: 2)
     # FIXME dumb code
     view_line = File.readlines(draft).grep(/^.views /)
-    raise "More than one .views call!" if view_line.size > 1
-    raise "No .views call!" if view_line.size < 1
+    raise "More than one .views call in #{draft}" if view_line.size > 1
+    raise "No .views call in #{draft}" if view_line.size < 1
     view_line = view_line.first
     views = view_line[7..-1].split
     views.uniq
@@ -593,10 +626,11 @@ class RuneBlog
     preprocess cwd: @theme/:post, src: "generate.lt3", force: true,
                dst: remote/ahtml, copy: @theme/:post,
                call: ".nopara"    # , debug: true
+#   copy(remote/ahtml, remote/permalink/ahtml)
     # FIXME dependencies?
-    preprocess cwd: @theme/:post, src: "permalink.lt3",
-               dst: remote/:permalink/ahtml,
-               mix: "liveblog"  # , debug: true
+#   preprocess cwd: @theme/:post, src: "permalink.lt3",
+#              dst: remote/:permalink/ahtml,
+#              mix: "liveblog"  # , debug: true
     copy_widget_html(view_name)
   rescue => err
     _tmp_error(err)

data/lib/runeblog_version.rb CHANGED

@@ -3,7 +3,7 @@ if !defined?(RuneBlog::Path)
 # if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 class RuneBlog
-  VERSION = "0.2.89"
+  VERSION = "0.2.94"
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)
@@ -41,21 +41,6 @@ def make_exception(sym, str)
   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}"

data/test/austin.rb CHANGED

@@ -8,7 +8,6 @@ abort "Need Ruby 2.4 or greater" unless ver >= 24
 require 'date'
-require 'global'
 require 'runeblog'
 require 'repl'

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.89
+  version: 0.2.94
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2019-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -91,7 +91,6 @@ files:
 - 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
 - empty_view/remote/permalink/GIT_IS_DUMB
 - empty_view/remote/widgets/ad/GIT_IS_DUMB
@@ -100,12 +99,12 @@ files:
 - empty_view/remote/widgets/pages/GIT_IS_DUMB
 - empty_view/remote/widgets/pinned/GIT_IS_DUMB
 - empty_view/themes/standard/README
-- empty_view/themes/standard/banner/about.lt3
-- empty_view/themes/standard/banner/contact.lt3
-- empty_view/themes/standard/banner/faq.lt3
-- empty_view/themes/standard/banner/list.data
+- empty_view/themes/standard/banner/banner.lt3
+- empty_view/themes/standard/banner/navbar/about.lt3
+- empty_view/themes/standard/banner/navbar/contact.lt3
+- empty_view/themes/standard/banner/navbar/faq.lt3
+- empty_view/themes/standard/banner/navbar/list.data
 - empty_view/themes/standard/banner/top.lt3
-- empty_view/themes/standard/blog/banner.lt3
 - empty_view/themes/standard/blog/generate.lt3
 - empty_view/themes/standard/blog/head.lt3
 - empty_view/themes/standard/blog/index.lt3
@@ -176,7 +175,6 @@ files:
 - empty_view/themes/standard/widgets/tag-cloud/tag-cloud.lt3
 - empty_view/themes/standard/widgets/tag-cloud/tag-cloud.rb
 - lib/Javascript.stuff
-- lib/default.rb
 - lib/exper/2svg.lt3
 - lib/exper/callout.js
 - lib/exper/fbtw-js
@@ -188,6 +186,7 @@ files:
 - lib/helpers-repl.rb
 - lib/liveblog.rb
 - lib/logging.rb
+- lib/lowlevel.rb
 - lib/pathmagic.rb
 - lib/post.rb
 - lib/processing.rb

data/empty_view/remote/banner/austin-pano.jpg DELETED

Binary file

data/empty_view/themes/standard/banner/faq.lt3 DELETED

	@@ -1 +0,0 @@
1	- .include ../widgets/pages/faq.lt3

data/lib/default.rb DELETED

@@ -1,31 +0,0 @@
-class RuneBlog::Default
-# This will all become much more generic later.
-def RuneBlog.post_template(num: 0, title: "No title", date: nil, view: "test_view",
-                       teaser: "No teaser", body: "No body", tags: ["untagged"],
-                       views: [], back: "javascript:history.go(-1)", home: "no url")
-  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(" ")
-# .mixin liveblog
-# . ^ get rid of this later
-<<-TEXT
-.post #{num}
-.title #{title}
-.pubdate #{date}
-.views #{viewlist}
-#{taglist}
-.teaser
-#{teaser}
-.end
-#{body}
-TEXT
-end
-end