runeblog 0.3.27 → 0.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5338170556c8520e1d03e284f43a1f0b33833dbedf3d6e33991b06086dc655b
-  data.tar.gz: a0e4c476dd214cd0ca3460597e6b1a07415b2223101c2eb1a1eed1966380c41f
+  metadata.gz: f73831245e7f26410b588d25eb8eaf411f199c3b138c07cbbdc1cd6ab17a0c9a
+  data.tar.gz: 985cc0eb1bef7e7f7d782e7f2f15f06c110351acc828de6e188f256f88800808
 SHA512:
-  metadata.gz: 3cd616193a36e21dc6a9ffe56cf2a16c7abc1e3b50bfe339ba0b2b3446c4fd3d7fdcb63c3f569d2a2044d59c0cdbf05a38bc15aa5a1bb70d6482e276a1eb9b91
-  data.tar.gz: aef8ad80e260ecc9805a13ea24b8ca22d9bb9fb8fbf719dd6d7f5fbb9e28032f9313335df8b96ab6993db68a60b16bbab6ccc6cba9261add841aba002dcc1930
+  metadata.gz: 5a3ff11e051b4b35d3016f3494e8f296373cc9463255fcc2803cd30a1429772dcf4e35e2de8c80218b6ba96eb7da4b2884ba9cf478eadb940b4cc16c3bd7b464
+  data.tar.gz: 46adb7c62bedf13f9ccc4a4dcd1526764b0a6d6f3d6638c1e06bad3a49d0957e0858f5d979ca8fb61ca0f08183e8e76d82a07b4a9ec547474ee36e1fa538e1bf

data/bin/blog

@@ -87,7 +87,7 @@ def get_started
 end
 
 def mainloop
-  info = @blog.view || "no view"
+  info = @blog.view.name rescue "No view"
   print fx("[#{info}] ", Red, :bold)
   cmd = STDSCR.gets(history: @cmdhist, tab: @tabcom, capture: [" "])
   case cmd
@@ -107,6 +107,8 @@ def mainloop
     puts "Don't understand '#{cmd.inspect}'\n "
   end
 rescue => err
+  # puts "----- ML_RESCUE err = #{err.inspect}  VIEW = #{@blog.view.inspect}"
+  puts "----- ML_RESCUE err = #{err.inspect} "
   log!(str: err.to_s)
   log!(str: err.backtrace.join("\n")) if err.respond_to?(:backtrace)
   puts "Current dir = #{Dir.pwd}"
@@ -148,7 +150,7 @@ end
 
 def handle_cmdline
   cmd = ARGV[0]
-  @blog = RuneBlog.new
+  @blog = RuneBlog.read    # was .new
   abort "No blog found" if @blog.nil?
 
   case cmd
@@ -193,15 +195,17 @@ def create_new_repo?
   if ! RuneBlog.exist?
     exit unless yesno("No blog repo found. Create new one?")
     RuneBlog.create_new_blog_repo
+    puts "Sleeping..."; sleep 15
     puts fx("  Blog repo successfully created.", :bold)
     new_repo = true
   end
 
-  @blog = RuneBlog.new
+  @blog = RuneBlog.read   # was .new
   get_started if new_repo
 rescue => err
   STDERR.puts "Error - #{err.to_s}"
   STDERR.puts err.backtrace if err.respond_to?(:backtrace)
+  puts "Sleeping..."; sleep 10
 end
 
 def print_intro

data/bin/blog.rb

@@ -0,0 +1,237 @@
+#!/usr/bin/env ruby
+
+# $LOAD_PATH << "./lib"
+
+require 'runeblog'
+require 'rubytext'
+
+require 'menus'
+
+require 'repl'
+
+include RuneBlog::REPL
+
+def yesno(question, noskip=false)
+  puts fx("\n  #{question}", :bold)
+  puts unless noskip
+  STDSCR.yesno
+end
+
+def pick_editor
+  choices = %w[vim emacs vi nano]
+  r, c = STDSCR.rc
+  num, name = STDSCR.menu(r: r, c: c+6, title: "Default editor", items: choices)
+  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: ")
+    # Temporarily, for speed:
+    author, site = "Hal Fulton", "somedomain.com"
+    puts "      Author name: #{author}"
+    puts "      Site/domain: #{site}"
+    # Now stash it...
+    str = File.read(univ)
+    str = str.gsub(/AUTHOR/, author)
+    str = str.gsub(/SITE_DOMAIN/, site)
+    File.write(univ, str)
+  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
+  view_name = ask!("      Filename: ")
+  @blog.create_view(view_name)   # call change_view??
+  if yesno("Faster view setup? (no: edit global.lt3)")
+    title     = ask!("      View title: ")
+    subtitle  = ask!("      Subtitle  : ")
+    domain    = ask!("      Domain    : ")
+    modify_view_global(view_name)
+    modify_view_settings(name: view_name, title: title, subtitle: subtitle,
+                         domain: domain)
+  else
+    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)
+    print "      Default editor is "
+    puts  fx(@blog.editor, :bold)
+
+    get_universal
+    # Now create a custom global.lt3
+    @blog._generate_global
+    puts fx("\n  Quick setup complete!", :bold)
+    if yesno("Create your first view now?")
+      get_global
+      puts fx("\n      View #{@blog.view} created!\n ", :bold)
+    end
+  end
+
+  print fx("  For help", :bold);      puts " type h or help."
+  print fx("  Create a view", :bold); puts  " with: new view"
+  print fx("  Create a post", :bold); puts " (within current view): new post"
+end
+
+def mainloop
+  info = @blog.view || "no view"
+  print fx("[#{info}] ", Red, :bold)
+  cmd = STDSCR.gets(history: @cmdhist, tab: @tabcom, capture: [" "]).chomp
+  case cmd
+    when " ", RubyText::Keys::Escape
+      Dir.chdir(@blog.view.dir)
+      show_top_menu
+      puts
+      return
+    when RubyText::Keys::CtlD    # ^D
+      cmd_quit
+    when String
+      return if cmd.empty?  # CR does nothing
+      invoking = RuneBlog::REPL.choose_method(cmd)
+      ret = send(*invoking)
+  else
+    puts "Don't understand '#{cmd.inspect}'\n "
+  end
+rescue => err
+  log!(str: err.to_s)
+  log!(str: err.backtrace.join("\n")) if err.respond_to?(:backtrace)
+  puts "Current dir = #{Dir.pwd}"
+  puts err
+  puts err.backtrace.join("\n")
+  puts "Pausing..."; gets
+end
+
+def cmdline_preview
+  _need_view
+  local = @blog.view.local_index
+  result = system("open #{local}")
+end
+
+def cmdline_publish
+  abort "Not implemented yet"
+  _need_view
+end
+
+def cmdline_browse
+  abort "Not implemented yet"
+  _need_view
+end
+
+def _need_view
+  @view = ARGV[1]
+  abort "Need 'view' parameter" if @view.nil?
+  abort "No such view '#{view}'" unless @blog.view?(@view)
+end
+
+def cmdline_rebuild
+  _need_view
+  print "Generating view... "
+  @blog.generate_view(@view)
+  print "Generating index... "
+  num = @blog.generate_index(@view)
+  puts "#{num} posts\n "
+end
+
+def handle_cmdline
+  cmd = ARGV[0]
+  @blog = RuneBlog.new
+  abort "No blog found" if @blog.nil?
+
+  case cmd
+    when "rebuild"; cmdline_rebuild
+    when "publish"; cmdline_publish
+    when "preview"; cmdline_preview
+    when "browse";  cmdline_browse
+  else
+    puts "Command '#{cmd}' is unknown"
+  end
+  exit
+end
+
+def check_ruby_version
+  major, minor = RUBY_VERSION.split(".").values_at(0,1)
+  ver = major.to_i*10 + minor.to_i
+  unless ver >= 24
+    RubyText.stop
+    sleep 0.2
+    puts "Needs Ruby 2.4 or greater" 
+    exit
+  end
+end
+
+def reopen_stderr
+  errfile = File.new("stderr.out", "w")
+  STDERR.reopen(errfile)
+end
+
+def set_fgbg
+  # read a .rubytext file here?? Call it something else?
+  home = ENV['HOME']
+  @fg, @bg = Blue, White   ##  FIXME!! try_read_config("#{home}/.rubytext", fg: Blue, bg: White)
+  @fg = @fg.downcase.to_sym
+  @bg = @bg.downcase.to_sym
+
+  RubyText.start(:_echo, :keypad, scroll: true, log: "binblog.txt", fg: @fg, bg: @bg)
+end
+
+def create_new_repo?
+  new_repo = false
+  if ! RuneBlog.exist?
+    exit unless yesno("No blog repo found. Create new one?")
+    RuneBlog.create_new_blog_repo
+    puts fx("  Blog repo successfully created.", :bold)
+    new_repo = true
+  end
+
+  @blog = RuneBlog.new
+  get_started if new_repo
+rescue => err
+  STDERR.puts "Error - #{err.to_s}"
+  STDERR.puts err.backtrace if err.respond_to?(:backtrace)
+end
+
+def print_intro
+  print fx("  For help", :bold)
+  puts " type h or help.\n "
+
+  puts fx("\n  RuneBlog", :bold), fx(" v #{RuneBlog::VERSION}\n", Red)
+end
+
+def cmd_history_etc
+  @cmdhist = []
+  @tabcom = RuneBlog::REPL::Patterns.keys.uniq - RuneBlog::REPL::Abbr.keys
+  @tabcom.map! {|x| x.sub(/ [\$\>].*/, "") + " " }
+  @tabcom.sort!
+end
+
+def exit_repl
+  # RubyText.stop
+  sleep 0.2
+  puts
+end
+
+### Main
+
+include RuneBlog::Helpers  # for try_read_config
+
+reopen_stderr
+check_ruby_version
+
+handle_cmdline unless ARGV.empty?
+set_fgbg
+print_intro
+create_new_repo?
+
+cmd_history_etc
+loop { mainloop }
+exit_repl

data/data/global.lt3

@@ -15,6 +15,6 @@ charset     utf-8
 url         http://SITE
 locale      en_US
 
-font.family       verdana
+font.family verdana
 .end
 

data/lib/helpers-blog.rb

@@ -24,7 +24,6 @@ module RuneBlog::Helpers
       dir = root/:views/view/:settings
     end
     file = dir/"features.txt"
-# puts "-- in #{Dir.pwd} trying to read #{file}"
     pairs = read_pairs(file)
     enabled = {}
     pairs.each {|k,v| enabled[k] = (v == "1") }
@@ -108,12 +107,6 @@ module RuneBlog::Helpers
     stop_RubyText rescue nil
   end
 
-  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: nil, editor: "/usr/local/bin/vim")
     view ||= File.read("#{root}/data/VIEW").chomp rescue "[no view]"
     File.write(root + "/data/ROOT",   root + "\n")

data/lib/liveblog.rb

@@ -49,20 +49,20 @@ end
 def dropcap
   log!(enter: __method__)
   # Bad form: adds another HEAD
-  text = _data
-  _out " "
+  text = api.data
+  api.out " "
   letter = text[0]
   remain = text[1..-1]
-  _out %[<div class='mydrop'>#{letter}</div>]
-  _out %[<div style="padding-top: 1px">#{remain}]
+  api.out %[<div class='mydrop'>#{letter}</div>]
+  api.out %[<div style="padding-top: 1px">#{remain}]
 end
 
 def post
   log!(enter: __method__)
   @meta = OpenStruct.new
-  @meta.num = _args[0]
+  @meta.num = api.args[0]
   setvar("post.num", @meta.num.to_i)
-  _out "  <!-- Post number #{@meta.num} -->\n "
+  api.out "  <!-- Post number #{@meta.num} -->\n "
 end
 
   def _got_python?
@@ -91,7 +91,7 @@ def post_toolbar
   log!(enter: __method__)
   back_icon = %[<img src="assets/back-icon.png" width=24 height=24 alt="Go back"></img>]
   back = %[<a style="text-decoration: none" href="javascript:history.go(-1)">#{back_icon}</a>]
-  _out <<~HTML
+  api.out <<~HTML
     <div align='right'>#{back} #@reddit_comments</div>
   HTML
 end
@@ -138,7 +138,7 @@ log! str:  "  -- dir = #{dir}"
   # damned syntax highlighting </>
   end
 # STDERR.print "Pausing... "; getch
-  _out <<~HTML
+  api.out <<~HTML
   #{reddit_txt}
   <hr>
   <table width=100%><tr>
@@ -151,27 +151,27 @@ end
 def faq
   log!(enter: __method__)
   @faq_count ||= 0
-  _out "<br>" if @faq_count == 0
+  api.out "<br>" if @faq_count == 0
   @faq_count += 1
-  ques = _data.chomp
-  ans  = _body.join("\n")
+  ques = api.data.chomp
+  ans  = api.body.join("\n")
   id = "faq#@faq_count"
-  _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
-  _optional_blank_line
+  api.out %[&nbsp;<a data-toggle="collapse" href="##{id}" role="button" aria-expanded="false" aria-controls="collapseExample"><font size=+3>&#8964;</font></a>]
+  api.out %[&nbsp;<b>#{ques}</b>]
+  api.out %[<div class="collapse" id="#{id}"><br><font size=+1>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#{ans}</font></div>\n]
+  api.out "<br>" # unless @faq_count == 1
+  api.optional_blank_line
 end
 
 def backlink
   log!(enter: __method__)
-  _out %[<br><a href="javascript:history.go(-1)">[Back]</a>]
+  api.out %[<br><a href="javascript:history.go(-1)">[Back]</a>]
 end
 
 def code
   log!(enter: __method__)
-  lines = _body # _text
-  _out "<font size=+1><pre>\n#{lines}\n</pre></font>"
+  lines = api.body # _text
+  api.out "<font size=+1><pre>\n#{lines}\n</pre></font>"
 end
 
 def _read_navbar_data
@@ -191,7 +191,7 @@ def banner
   str2 = ""
   navbar = nil
   vdir = @blog.root/:views/@blog.view
-  lines = _body.to_a
+  lines = api.body.to_a
 
   lines.each do |line|
     count += 1
@@ -234,14 +234,14 @@ def banner
       str2 << "        '#{tag}' isn't known" + "\n"
     end
   end
-  _out <<~HTML
+  api.out <<~HTML
     <table width=100% bgcolor=#{bg}>
       <tr>
         #{str2}
       </tr>
     </table>
   HTML
-  _out navbar if navbar
+  api.out navbar if navbar
 rescue => err
   STDERR.puts "err = #{err}"
   STDERR.puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
@@ -306,7 +306,7 @@ end
 def quote
   log!(enter: __method__)
   _passthru "<blockquote>"
-  _passthru _body.join(" ")
+  _passthru api.body.join(" ")
   _passthru "</blockquote>"
   _optional_blank_line
 end
@@ -317,7 +317,7 @@ end
 
 def style
   log!(enter: __method__)
-  fname = _args[0]
+  fname = api.args[0]
   _passthru %[<link rel="stylesheet" href="???/etc/#{fname}')">]
 end
 
@@ -333,43 +333,43 @@ def h6; _passthru "<h6>#{@_data}</h6>"; end
 def hr; _passthru "<hr>"; end
 
 def nlist
-  log!(enter: __method__)
-  _out "<ol>"
-  _body {|line| _out "<li>#{line}</li>" }
-  _out "</ol>"
-  _optional_blank_line
+  log!(enter: api._method__)
+  api.out "<ol>"
+  api.body {|line| api.out "<li>#{line}</li>" }
+  api.out "</ol>"
+  api.optional_blank_line
 end
 
 def list
   log!(enter: __method__)
-  _out "<ul>"
-  _body {|line| _out "<li>#{line}</li>" }
-  _out "</ul>"
-  _optional_blank_line
+  api.out "<ul>"
+  api.body {|line| api.out "<li>#{line}</li>" }
+  api.out "</ul>"
+  api.optional_blank_line
 end
 
 def list!
   log!(enter: __method__)
-  _out "<ul>"
-  lines = _body.each 
+  api.out "<ul>"
+  lines = api.body.each 
   loop do 
     line = lines.next
-    line = _format(line)
+    line = api.format(line)
     if line[0] == " "
-      _out line
+      api.out line
     else
-      _out "<li>#{line}</li>"
+      api.out "<li>#{line}</li>"
     end
   end
-  _out "</ul>"
-  _optional_blank_line
+  api.out "</ul>"
+  api.optional_blank_line
 end
 
 ### inset
 
 def inset
   log!(enter: __method__)
-  lines = _body
+  lines = api.body
   box = ""
   output = []
   lines.each do |line| 
@@ -387,16 +387,16 @@ def inset
       output << line 
     end
   end
-  lr = _args.first
-  wide = _args[1] || "25"
+  lr = api.args.first
+  wide = api.args[1] || "25"
   stuff = "<div style='float:#{lr}; width: #{wide}%; padding:8px; padding-right:12px'>"
   stuff << '<b><i>' + box + '</i></b></div>'
-  _out "</p>"   #  kludge!! nopara
+  api.out "</p>"   #  kludge!! nopara
   0.upto(2) {|i| _passthru output[i] }
   _passthru stuff
   3.upto(output.length-1) {|i| _passthru output[i] }
-  _out "<p>"  #  kludge!! para
-  _optional_blank_line
+  api.out "<p>"  #  kludge!! para
+  api.optional_blank_line
 end
 
 def title
@@ -406,42 +406,42 @@ def title
   @meta.title = title
   setvar :title, title
   # FIXME refactor -- just output variables for a template
-  _optional_blank_line
+  api.optional_blank_line
 end
 
 def pubdate
   log!(enter: __method__)
   raise NoPostCall unless @meta
-  _debug "data = #@_data"
+  api.debug "data = #@_data"
   # Check for discrepancy?
   match = /(\d{4}).(\d{2}).(\d{2})/.match @_data
   junk, y, m, d = match.to_a
   y, m, d = y.to_i, m.to_i, d.to_i
   @meta.date = ::Date.new(y, m, d)
   @meta.pubdate = "%04d-%02d-%02d" % [y, m, d]
-  _optional_blank_line
+  api.optional_blank_line
 end
 
 def tags
   log!(enter: __method__)
   raise NoPostCall unless @meta
-  _debug "args = #{_args}"
-  @meta.tags = _args.dup || []
-  _optional_blank_line
+  api.debug "args = #{_args}"
+  @meta.tags = api.args.dup || []
+  api.optional_blank_line
 end
 
 def views
   log!(enter: __method__)
   raise NoPostCall unless @meta
-  _debug "data = #{_args}"
-  @meta.views = _args.dup
-  _optional_blank_line
+  api.debug "data = #{_args}"
+  @meta.views = api.args.dup
+  api.optional_blank_line
 end
 
 def pin
   log!(enter: __method__)
   raise NoPostCall unless @meta
-  _debug "data = #{_args}"  # verify only valid views?
+  api.debug "data = #{_args}"  # verify only valid views?
   pinned = @_args
   @meta.pinned = pinned
   pinned.each do |pinview|
@@ -452,7 +452,7 @@ def pin
     pins.uniq!
     File.open(datafile, "w") {|out| pins.each {|pin| out.puts pin } }
   end
-  _optional_blank_line
+  api.optional_blank_line
 rescue => err
   STDERR.puts "err = #{err}"
   STDERR.puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
@@ -472,15 +472,15 @@ end
 def teaser
   log!(enter: __method__)
   raise NoPostCall unless @meta
-  text = _body.join("\n")
+  text = api.body.join("\n")
   @meta.teaser = text
   setvar :teaser, @meta.teaser
-  if _args[0] == "dropcap"   # FIXME doesn't work yet!
+  if api.args[0] == "dropcap"   # FIXME doesn't work yet!
     letter, remain = text[0], text[1..-1]
-    _out %[<div class='mydrop'>#{letter}</div>]
-    _out %[<div style="padding-top: 1px">#{remain}] + "\n"
+    api.out %[<div class='mydrop'>#{letter}</div>]
+    api.out %[<div style="padding-top: 1px">#{remain}] + "\n"
   else
-    _out @meta.teaser + "\n"
+    api.out @meta.teaser + "\n"
   end
 end
 
@@ -498,10 +498,10 @@ end
  
 def head  # Does NOT output <head> tags
   log!(enter: __method__)
-  args = _args
+  args = api.args
   args.each do |inc|
     self.data = inc
-    _include
+    dot_include
   end
   # Depends on vars: title, desc, host
   defaults = {}
@@ -522,7 +522,7 @@ def head  # Does NOT output <head> tags
                "favicon"        => %[<link rel="shortcut icon" type="image/x-icon" href="etc/favicon.ico">\n <link rel="apple-touch-icon" href="etc/favicon.ico">]
              }
   result = {}
-  lines = _body
+  lines = api.body
   lines.each do |line|
     line.chomp
     word, remain = line.split(" ", 2)
@@ -547,14 +547,14 @@ def head  # Does NOT output <head> tags
   end
   hash = defaults.dup.update(result)  # FIXME collisions?
 
-  hash.each_value {|x| _out "  " + x }
+  hash.each_value {|x| api.out "  " + x }
 end
 
 ########## newer stuff...
 
 def meta
   log!(enter: __method__)
-  args = _args
+  args = api.args
   enum = args.each
   str = "<meta"
   arg = enum.next
@@ -569,12 +569,12 @@ def meta
     arg = enum.next
   end
   str << ">"
-  _out str
+  api.out str
 end
 
 def recent_posts    # side-effect
   log!(enter: __method__)
-  _out <<-HTML
+  api.out <<-HTML
     <div class="col-lg-9 col-md-9 col-sm-9 col-xs-12">
       <iframe id="main" style="width: 70vw; height: 100vh; position: relative;" 
        src='recent.html' width=100% frameborder="0" allowfullscreen>
@@ -623,17 +623,18 @@ end
 
 def sidebar
   log!(enter: __method__)
-  _debug "--- handling sidebar\r"
-  if _args.include? "off"
-    _body { }  # iterate, do nothing
+  api.debug "--- handling sidebar\r"
+  if api.args.include? "off"
+    api.body { }  # iterate, do nothing
     return 
   end
 
-  _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
+  api.out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
 
   standard = %w[pinned pages links news]
 
-  _body do |token|
+  lines = api.body.to_a
+  lines.each do |token|
     tag = token.chomp.strip.downcase
     wtag = "../../widgets"/tag
     raise CantFindWidgetDir(wtag) unless Dir.exist?(wtag)
@@ -645,9 +646,9 @@ def sidebar
         raise "Nonstandard widget?"
     end
 
-    _include_file wtag/tcard
+    api.include_file wtag/tcard
   end
-  _out %[</div>]
+  api.out %[</div>]
 rescue => err
   puts "err = #{err}"
   puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
@@ -657,20 +658,20 @@ end
 
 def stylesheet
   log!(enter: __method__)
-  lines = _body
+  lines = api.body
   url = lines[0]
   integ = lines[1]
   cross = lines[2] || "anonymous"
-  _out %[<link rel="stylesheet" href="#{url}" integrity="#{integ}" crossorigin="#{cross}"></link>]
+  api.out %[<link rel="stylesheet" href="#{url}" integrity="#{integ}" crossorigin="#{cross}"></link>]
 end
 
 def script
   log!(enter: __method__)
-  lines = _body
+  lines = api.body
   url = lines[0]
   integ = lines[1]
   cross = lines[2] || "anonymous"
-  _out %[<script src="#{url}" integrity="#{integ}" crossorigin="#{cross}"></script>]
+  api.out %[<script src="#{url}" integrity="#{integ}" crossorigin="#{cross}"></script>]
 end
 
 $Dot = self   # Clunky! for dot commands called from Functions class
@@ -716,7 +717,7 @@ end
 
 def tag_cloud
   log!(enter: __method__)
-  title = _data
+  title = api.data
   title = "Tag Cloud" if title.empty?
   open = <<-HTML
         <div class="card mb-3">
@@ -727,15 +728,15 @@ def tag_cloud
             </h5>
             <div class="collapse" id="tag-cloud">
   HTML
-  _out open
-  _body do |line|
+  api.out open
+  api.body do |line|
     line.chomp!
     url, classname, cdata = line.split(",", 3)
     main = _main(url)
-    _out %[<a #{main} class="#{classname}">#{cdata}</a>]
+    api.out %[<a #{main} class="#{classname}">#{cdata}</a>]
   end
   close = %[       </div>\n    </div>\n  </div>]
-  _out close
+  api.out close
 end
 
 def vnavbar
@@ -785,7 +786,7 @@ def _make_navbar(orient = :horiz)
   output = File.new(html_file, "w")
   output.puts start
   lines = _read_navbar_data
-  lines = ["index  Home"] + lines  unless _args.include?("nohome")
+  lines = ["index  Home"] + lines  unless api.args.include?("nohome")
   lines.each do |line|
     basename, cdata = line.chomp.strip.split(" ", 2)
     full = :banner/:navbar/basename+".html"
@@ -831,16 +832,16 @@ def _passthru(line)
   log!(enter: __method__)
   return if line.nil?
   line = _format(line)
-  _out line + "\n"
-  _out "<p>" if line.empty? && ! @_nopara
+  api.out line + "\n"
+  api.out "<p>" if line.empty? && ! @_nopara
 end
 
 def _passthru_noline(line)
   log!(enter: __method__)
   return if line.nil?
   line = _format(line)
-  _out line
-  _out "<p>" if line.empty? && ! @_nopara
+  api.out line
+  api.out "<p>" if line.empty? && ! @_nopara
 end
 
 def _write_metadata
@@ -891,7 +892,7 @@ def _card_generic(card_title:, middle:, extra: "")
     </div>
   HTML
   text = front + middle + tail
-  _out text + "\n "
+  api.out text + "\n "
 end
 
 def _var(name)  # FIXME scope issue!

data/lib/lowlevel.rb

@@ -12,7 +12,7 @@
       f.puts err.backtrace.join("\n")
     end
     puts "Error: See #{out}"
-    # sleep 3
+    puts "Sleeping..."; sleep 10
   end
 
   def dump(obj, name)
@@ -23,13 +23,14 @@
     File.open(file, "a") {|f| f.puts "#{Time.now} #{line}" }
   end
 
-  def system!(str, show: false)
-    log!(enter: __method__, args: [str], level: 2)
-    STDERR.puts str if show
-    rc = system(str)
+  def system!(os_cmd, show: false)
+    log!(enter: __method__, args: [os_cmd], level: 2)
+caller.each {|x| print ":::  "; p x }
+    STDERR.puts os_cmd if show
+    rc = system(os_cmd)
     STDERR.puts "  rc = #{rc.inspect}" if show
     return rc if rc
-    STDERR.puts "FAILED: #{str.inspect}"
+    STDERR.puts "FAILED: #{os_cmd.inspect}"
     STDERR.puts "\ncaller = \n#{caller.join("\n  ")}\n"
     if defined?(RubyText)
       sleep 6

data/lib/menus.rb

@@ -105,7 +105,7 @@ Menu.top_config = {
     "Generator for a post"                => proc { edit_post_generate },
     "   HEAD info for post"               => proc { edit_post_head },
     "   Content for post"                 => proc { edit_post_index },
-    "Variables (general)"                 => proc { edit_view_global },
+    "Variables (general!)"                 => proc { edit_view_global },
     "   View-specific"                    => proc { edit_settings_view },
     "   Recent posts"                     => proc { edit_settings_recent },
     "   Publishing"                       => proc { edit_settings_publish },

data/lib/processing.rb

@@ -77,11 +77,14 @@ rescue => err
 end
 
 def get_live_vars(src)
+  dir, base = File.dirname(src), File.basename(src)
   live = Livetext.customize(call: [".nopara"])
-# puts "glv: src = #{src.inspect}"
-# STDERR.puts "glv: src = #{src.inspect}"
-  live.xform_file(src)
+  Dir.chdir(dir) { live.xform_file(base) }
   live
+rescue => e
+  puts e
+  puts $!
+  gets
 end
 
 end

data/lib/repl.rb

@@ -11,8 +11,10 @@ Signal.trap("INT") { puts "Don't  :)" }
 module RuneBlog::REPL
   def edit_file(file, vim: "")
     ed = @blog.editor
+STDERR.puts ">>> edit_file: ed = #{ed.inspect}"
     params = vim if ed =~ /vim$/
     result = system!("#{@blog.editor} #{file} #{params}")
+STDERR.puts ">>> edit_file: after system call"
     raise EditorProblem(file) unless result
     cmd_clear
   end
@@ -38,8 +40,8 @@ module RuneBlog::REPL
   end
 
   def cmd_config
-    hash = {"Variables (general)"                 => "global.lt3",
-            "   View-specific"                    => "../../settings/view.txt",
+    hash = {"Variables (General)"                 => "global.lt3",
+            "   View-specific"                    => "../settings/view.txt",
             "   Recent posts"                     => "../../settings/recent.txt",
             "   Publishing"                       => "../../settings/publish.txt",
             "Configuration: enable/disable"       => "../../settings/features.txt",
@@ -60,6 +62,7 @@ module RuneBlog::REPL
            }
 
     dir = @blog.view.dir/"themes/standard/"
+STDERR.puts ">>> cmd_config: dir = #{dir.inspect}"
     num, target = STDSCR.menu(title: "Edit file:", items: hash)
     edit_file(dir/target)
   end
@@ -253,7 +256,6 @@ log! str:  "===   ...finished!"
       name = @blog.view.name
       k, name = STDSCR.menu(title: "Views", items: viewnames, curr: n, wrap: true)
       return if name.nil?
-log! str:  "cv Setting to #{name.inspect}"
       @blog.view = name
 #     puts "\n  ", fx(name, :bold), "\n"
       return
@@ -371,7 +373,8 @@ log! str:  "cv Setting to #{name.inspect}"
 
   def cmd_list_views
     puts
-    @blog.views.each do |v| 
+    list = @blog.views
+    list.each do |v| 
       v = v.to_s
       title = view2title(v)
       v = fx(v, :bold) if v == @blog.view.name
@@ -412,22 +415,16 @@ log! str:  "cv Setting to #{name.inspect}"
     if curr_drafts.empty?
       puts "\n  No drafts\n "
       return
-    else
-      puts
-      curr_drafts.each do |draft| 
-        base = draft.sub(/.lt3$/, "")
-        dir = @blog.root/:posts/base
-        meta = nil 
-        Dir.chdir(dir) { meta = @blog.read_metadata }
-        num, title = meta.num, meta.title
-        num = '%4d' % num.to_s
-        puts "  ", fx(num, Red), "  ", fx(title, Black)
-        other = @blog._get_views(@blog.root/:drafts/draft) - [@blog.view.to_s]
-        unless other.empty?
-          print fx(" "*9 + "also in: ", :bold) 
-          puts other.join(", ") 
-        end
-      end
+    end
+    puts
+    curr_drafts.each do |draft| 
+      base = draft.sub(/.lt3$/, "")
+      dir = @blog.root/:posts/base
+      meta = nil 
+      Dir.chdir(dir) { meta = @blog.read_metadata }
+      num, title = meta.num, meta.title
+      num = '%4d' % num.to_s
+      puts "  ", fx(num, Red), "  ", fx(title, Black)
     end
     puts
   end
@@ -438,12 +435,11 @@ log! str:  "cv Setting to #{name.inspect}"
     if assets.empty?
       puts "  No assets"
       return
-    else
-      puts
-      assets.each do |name| 
-        asset = File.basename(name)
-        puts "  ", fx(asset, Blue)
-      end
+    end
+    puts
+    assets.each do |name| 
+      asset = File.basename(name)
+      puts "  ", fx(asset, Blue)
     end
     puts
   end

data/lib/runeblog.rb

@@ -58,9 +58,9 @@ class RuneBlog
     include ErrorChecks
   end
 
-  attr_reader :views, :sequence
-  attr_accessor :root, :editor, :features
-  attr_accessor :view  # overridden
+  attr_reader   :views, :sequence
+  attr_accessor :root,  :editor, :features
+  attr_accessor :view   # overridden
   attr_accessor :post
 
   attr_accessor :post_views, :post_tags, :dirty_views
@@ -74,7 +74,7 @@ class RuneBlog
                                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(" ")
+      viewlist = (views + [view.to_s]).join(" ").uniq
       taglist = ".tags " + tags.join(" ")
 
       <<~TEXT
@@ -96,9 +96,9 @@ class RuneBlog
 
   def self.create_new_blog_repo(root_rel = ".blogs")
     log!(enter: __method__, args: [root_rel])
+    check_error(BlogRepoAlreadyExists) { Dir.exist?(root_rel) }
     check_nonempty_string(root_rel)
     repo_root = Dir.pwd/root_rel
-    check_error(BlogRepoAlreadyExists) { Dir.exist?(repo_root) }
 
     create_dirs(repo_root)
     Dir.chdir(repo_root) do
@@ -110,7 +110,6 @@ class RuneBlog
     unless File.exist?(repo_root/"data/VIEW")
       copy_data(repo_root/:data)   
     end
-#   copy_data(:extra,  repo_root/:config)
     write_repo_config(root: repo_root)
     # Weird. Like a singleton - dumbass circular dependency?
     self.blog = blog = self.new
@@ -128,32 +127,58 @@ class RuneBlog
     _tmp_error(err)
   end
 
-  def initialize(root_rel = ".blogs")   # always assumes existing blog
-    log!(enter: "initialize", args: [root_rel])
-    # Weird. Like a singleton - dumbass circular dependency?
-    self.class.blog = self   
+################
 
-    @root = Dir.pwd/root_rel
-    # write_repo_config(root: @root)   # ?? FIXME
-    get_repo_config
-    read_features   # top level
-    @views = retrieve_views
-    self.view = File.read(@root/"data/VIEW").chomp
-    md = Dir.pwd.match(%r[.*/views/(.*?)/])
-    if md
-      @view_name = md[1]
-      @view = str2view(@view_name)
-    end
-    @sequence = get_sequence
-    @post_views = []
-    @post_tags = []
+  def self.read(root_rel = ".blogs")   # always assumes existing blog
+    log!(enter: "RuneBlog.read", args: [root_rel])
+    RuneBlog.new(root_rel)
   rescue => err
-    puts "Error - see stdout.txt"
-    STDERR.puts err.inspect
-    STDERR.puts err&.backtrace
+    puts "ERROR - #{err.inspect}"
+    # puts "Error - see stderr.out"
+    puts err.inspect + "\n" + err&.backtrace
     sleep 3
   end
 
+#   def self.read(root_rel = ".blogs")   # always assumes existing blog
+#     log!(enter: "RuneBlog.read", args: [root_rel])
+#     instance = RuneBlog.allocate
+#     instance.instance_eval do
+#       # @blog = instance    # Duhhh
+#       @root = Dir.pwd/root_rel
+#       # _init_get_view    ##########??????
+#       # self.class.blog = self   # Weird, like singleton. Dumbass circular dependency?
+#       RuneBlog.blog = instance
+#       dirs = subdirs("#@root/views/").sort
+#       @views = dirs.map {|name| RuneBlog::View.new(name) }
+#       @curr = str2view(File.read(@root/"data/VIEW").chomp)
+#       @view = @curr
+#       # ...was init_get_view
+#       @sequence, @post_views, @post_tags = get_sequence, [], []
+#     end
+#     return instance
+#   rescue => err
+#     puts "ERROR - #{err.inspect}"
+#     # puts "Error - see stderr.out"
+#     puts err.inspect + "\n" + err&.backtrace
+#     sleep 3
+#   end
+
+  def initialize(root_rel)    ##### FIXME ??
+    # @blog = instance    # Duhhh
+    @root = Dir.pwd/root_rel
+    # _init_get_view    ##########??????
+    # self.class.blog = self   # Weird, like singleton. Dumbass circular dependency?
+    RuneBlog.blog = self
+    dirs = subdirs("#@root/views/").sort
+    @views = dirs.map {|name| RuneBlog::View.new(name) }
+    @curr = str2view(File.read(@root/"data/VIEW").chomp)
+    @view = @curr
+    # ...was init_get_view
+    @sequence, @post_views, @post_tags = get_sequence, [], []
+    get_repo_config
+    read_features
+  end
+
   def complete_file(name, vars, hash)
     debugging = vars.nil?
     return if hash.empty?
@@ -270,14 +295,6 @@ class RuneBlog
     views.any? {|x| x.name == name }
   end
 
-# def view(name = nil)
-#   log!(enter: __method__, args: [name], level: 3)
-#   return @view if name.nil?
-# 
-#   check_nonempty_string(name)
-#   return str2view(name)
-# end
-
   def str2view(str)
     log!(enter: __method__, args: [str], level: 3)
     check_nonempty_string(str)  # redundant?
@@ -297,15 +314,12 @@ class RuneBlog
       @view = nil
       return
     end
-# STDERR.puts "view=  #{arg.inspect}"
-
     case arg
       when RuneBlog::View
         @view = arg
         @view.get_globals(true)
       when String
         new_view = str2view(arg)
-# STDERR.puts "view=  new view #{new_view.inspect}"
         check_error(NoSuchView, arg) { new_view.nil? }
         @view = new_view
       else 
@@ -541,11 +555,10 @@ class RuneBlog
       next unless Dir.exist?(postdir)
       meta = nil
       Dir.chdir(postdir) { meta = read_metadata }
-# puts [draft, meta.views].inspect
       list << draft if meta.views.include?(self.view.to_s)
     end
-    # list.sort
-    curr_drafts
+    # curr_drafts
+    list.sort
   end
 
   def all_drafts
@@ -739,8 +752,7 @@ args = {cwd: pdraft, src: draft, debug: true, dst: "guts.html",
 
   def remove_post(num)
     log!(enter: __method__, args: [num], level: 1)
-    check_integer(num)
-    # FIXME update original draft .views
+    check_integer(num)   # FIXME update original draft .views
     tag = prefix(num)
     files = Find.find(self.view.dir).to_a
     list = files.select {|x| File.directory?(x) and x =~ /#{tag}/ }

data/lib/runeblog_version.rb

@@ -1,7 +1,7 @@
 if !defined?(RuneBlog::Path)
 
 class RuneBlog
-  VERSION = "0.3.27"
+  VERSION = "0.3.29"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/runeblog.gemspec

@@ -21,7 +21,7 @@ spec = Gem::Specification.new do |s|
   s.authors     = ["Hal Fulton"]
   s.email       = 'rubyhacker@gmail.com'
   s.executables << "blog"
-  s.add_runtime_dependency 'livetext', '~> 0.9',  '>= 0.9.10'
+  s.add_runtime_dependency 'livetext', '~> 0.9',  '>= 0.9.33'
   s.add_runtime_dependency 'rubytext', '~> 0.1',  '>= 0.1.23'
   s.add_runtime_dependency 'rouge',    '~> 3.25', '>= 3.25.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.3.27
+  version: 0.3.29
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2024-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -19,7 +19,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.9.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.9.33
 - !ruby/object:Gem::Dependency
   name: rubytext
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +101,7 @@ files:
 - "./README.md"
 - "./runeblog.gemspec"
 - bin/blog
+- bin/blog.rb
 - bin/mkwidget
 - data/EDITOR
 - data/ROOT
@@ -256,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A command-line blogging system