runeblog 0.2.47 → 0.2.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4cdb2c0546394c622e9a648273dde7865fc8e4dd6839776c175c406ff34dba1
-  data.tar.gz: b96eb0e7783607b91b3b23d435eff368cea9102caa8a9342901318008d3fd0f1
+  metadata.gz: d4bd7b67f736b85651eb0650c5af974cbcf74fce48be345920e9bac4c9dba9dd
+  data.tar.gz: 5fda0c05a32e16103e7f7f31b7ffe104c307b63c2e14e96216644dfbc6fdefff
 SHA512:
-  metadata.gz: 1945c5f3667d6c25f74e5d7878be2cb22016588551cad9fd66949908640b18d1730cdb0463754df82bcd0ed58a8af4febf5e309fbf3f7afa62ab808f9f0e453d
-  data.tar.gz: 1a646b8c95822f3ed083e3a58b946efe79eda8babc23985d9e6bcd5fca1efbbe500e4b41f9fce3c54aaa41168616cbc1c2789e7984d13ff0048f2ccc2afc96eb
+  metadata.gz: 55b9141f9b2d0d7a06cb5134d1e1da871cd78c2dffa7502310d0ae0caedec7c27eabfa28dc7957754f611122283abc2bc833512e58f9414a541b87d8cf4e146f
+  data.tar.gz: 60b1546750066d75a623a3ca7866b5f5307b31e14a806a85f726fe87507ab1c3d24c5ce7737742ffdb3e41fb7cbcb0eac244089c9f96efddc6534299e9ab9ef1

data/bin/blog

@@ -23,7 +23,8 @@ TEXT
 end
 
 def mainloop
-  print fx("#{@blog.view}> ", Red, :bold)
+  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.chomp!
@@ -72,7 +73,7 @@ puts fx("\n  RuneBlog", :bold), fx(" v #{RuneBlog::VERSION}\n", Red)
   
 loop { mainloop }
 
-# sleep 0.2
-# system("tput clear")
+system("tput clear")
+sleep 0.2
 puts
 

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

@@ -2,13 +2,14 @@
 . 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>
     <tr>
       <td width=14% valign=top align=right style="margin-top: -1px;">
 <!--        <span class="post-date mt-1 mb-1" style="margin-top: 3px; text-align: right"> -->
-          <font size=-1><b>#{date}</b></font>
+          <font size=-1>#{date}</font>
 <!--        </span> -->
       </td>
       <td> 
@@ -21,3 +22,5 @@
     </tr>
   </table>
 </div>
+
+<font size=-4><br></font>

data/lib/liveblog.rb

@@ -70,7 +70,7 @@ end
 
 def quote
   _passthru "<blockquote>"
-  _passthru _body
+  _passthru _body.join(" ")
   _passthru "</blockquote>"
   _optional_blank_line
 end
@@ -364,8 +364,8 @@ def _load_local(widget)
     code
   end
 rescue => err
-  STDOUT.puts err
-  STDOUT.puts err.backtrace.join("\n")
+  STDERR.puts err.to_s
+  STDERR.puts err.backtrace.join("\n")
   exit
 end
 
@@ -480,10 +480,16 @@ class Livetext::Functions
     ::Livetext::Vars[name] || "[:#{name} is undefined]"
   end
 
-  def link
-    file, cdata = self.class.param.split("||", 2)
-    %[<link type="application/atom+xml" rel="alternate" href="#{_var(:host)}#{file}" title="#{_var(:title)}">]
-  end
+#   def link(param = nil)
+# puts "--- WTF?? param = #{param.inspect}"; gets
+#     file, cdata = param.split("||", 2)
+#     %[<a href="assets/#{file}">#{cdata}</a>]
+#   end
+# 
+#   def link(param = nil)
+#     file, cdata = param.split("||", 2)
+#     %[<link type="application/atom+xml" rel="alternate" href="#{_var(:host)}#{file}" title="#{_var(:title)}">]
+#   end
 end
 
 ###

data/lib/post.rb

@@ -62,8 +62,8 @@ class RuneBlog::Post
   end
 
   def self.create(title:, teaser:, body:, pubdate: Time.now.strftime("%Y-%m-%d"),
-                  views:[])
-    log!(enter: __method__, args: [title, teaser, body, pubdate, views])
+                  views:[], file: nil)
+    log!(enter: __method__, args: [title, teaser, body, pubdate, views], stderr: true)
     post = self.new
     # NOTE: This is the ONLY place next_sequence is called!
     num = post.meta.num   = post.blog.next_sequence
@@ -78,14 +78,18 @@ class RuneBlog::Post
     # create_draft
     viewhome = post.blog.view.publisher.url
     meta = post.meta
-    text = RuneBlog.post_template(num: meta.num, title: meta.title, date: meta.pubdate, 
-               view: meta.view, teaser: meta.teaser, body: meta.body,
-               views: meta.views, tags: meta.tags, home: viewhome)
-    srcdir = post.blog.root/:drafts + "/"
-    vpdir = post.blog.root/:drafts + "/"
-    fname  = meta.slug + ".lt3"
-    post.draft = srcdir + fname
-    dump(text, post.draft)
+    if file.nil?
+      text = RuneBlog.post_template(num: meta.num, title: meta.title, date: meta.pubdate, 
+                 view: meta.view, teaser: meta.teaser, body: meta.body,
+                 views: meta.views, tags: meta.tags, home: viewhome)
+      srcdir = post.blog.root/:drafts + "/"
+      vpdir = post.blog.root/:drafts + "/"
+      fname  = meta.slug + ".lt3"
+      post.draft = srcdir + fname
+      dump(text, post.draft)
+    else
+      dump(File.read(file), post.draft)
+    end
     return post
   end
 
@@ -125,6 +129,9 @@ class RuneBlog::ViewPost
     lines = File.readlines(mdfile)
     @title = lines.grep(/title:/).first[7..-1].chomp
     @date  = lines.grep(/pubdate:/).first[9..-1].chomp
+# print "-- date = #{@date.inspect} "; gets
+  rescue => err
+    STDERR.puts "--- #{err}\n #{err.backtrace.join("\n  ")}"
   end
 
   def get_dirs

data/lib/repl.rb

@@ -11,13 +11,15 @@ module RuneBlog::REPL
     result = system!("#{@blog.editor} #{file}")
     raise EditorProblem(file) unless result
     sleep 0.1
-    STDSCR.clear
+    cmd_clear(nil)
   end
 
   def cmd_quit(arg, testing = false)
     check_empty(arg)
     RubyText.stop
-    system!("tput clear")
+    sleep 0.1
+    cmd_clear(nil)
+    sleep 0.1
     exit
   end
 
@@ -98,6 +100,13 @@ module RuneBlog::REPL
     result = system!("open #{local}")
     raise CantOpen(local) unless result
     @out
+  rescue => err
+    out = "/tmp/blog#{rand(100)}.txt"
+    File.open(out, "w") do |f|
+      f.puts err
+      f.puts err.backtrace.join("\n")
+    end
+    puts "Error: See #{out}"
   end
 
   def cmd_publish(arg, testing = false)
@@ -135,6 +144,13 @@ module RuneBlog::REPL
       output! "...finished.\n"
     end
     return @out
+  rescue => err
+    out = "/tmp/blog#{rand(100)}.txt"
+    File.open(out, "w") do |f|
+      f.puts err
+      f.puts err.backtrace.join("\n")
+    end
+    puts "Error: See #{out}"
   end
 
   def cmd_rebuild(arg, testing = false)
@@ -145,6 +161,13 @@ module RuneBlog::REPL
     @blog.generate_view(@blog.view)
     @blog.generate_index(@blog.view)
     @out
+  rescue => err
+    out = "/tmp/blog#{rand(100)}.txt"
+    File.open(out, "w") do |f|
+      f.puts err
+      f.puts err.backtrace.join("\n")
+    end
+    puts "Error: See #{out}"
   end
 
   def cmd_change_view(arg, testing = false)
@@ -178,18 +201,30 @@ module RuneBlog::REPL
     @out
   rescue ViewAlreadyExists
     puts 'Blog already exists'
+  rescue => err
+    out = "/tmp/blog#{rand(100)}.txt"
+    File.open(out, "w") do |f|
+      f.puts err
+      f.puts err.backtrace.join("\n")
+    end
+    puts "Error: See #{out}"
   end
 
   def cmd_new_post(arg, testing = false)
     reset_output
     check_empty(arg)
     title = ask("\nTitle: ")
+    puts
     @blog.create_new_post(title)
 #   STDSCR.clear
     @out
   rescue => err
-    puts err
-    puts err.backtrace.join("\n")
+    out = "/tmp/blog#{rand(100)}.txt"
+    File.open(out, "w") do |f|
+      f.puts err
+      f.puts err.backtrace.join("\n")
+    end
+    puts "Error: See #{out}"
   end
 
   def _remove_post(arg, testing=false)
@@ -235,6 +270,13 @@ module RuneBlog::REPL
     draft = "#{@blog.root}/drafts/#{file}"
     result = edit_file(draft)
     @blog.generate_post(draft)
+  rescue => err
+    out = "/tmp/blog#{rand(100)}.txt"
+    File.open(out, "w") do |f|
+      f.puts err
+      f.puts err.backtrace.join("\n")
+    end
+    puts "Error: See #{out}"
   end
 
   def cmd_list_views(arg, testing = false)
@@ -318,7 +360,10 @@ module RuneBlog::REPL
 
   def cmd_ssh(arg, testing = false)
     pub = @blog.view.publisher
-    system!("ssh #{pub.user}@#{pub.server}")
+    puts
+    system!("tputs clear; ssh #{pub.user}@#{pub.server}")
+    sleep 0.1
+    cmd_clear(nil)
   end
 
   def cmd_INVALID(arg, testing = false)

data/lib/runeblog.rb

@@ -43,6 +43,15 @@ class RuneBlog
 
   include Helpers
 
+  def _tmp_error(err)   # FIXME move to helpers
+    out = "/tmp/blog#{rand(100)}.txt"
+    File.open(out, "w") do |f|
+      f.puts err
+      f.puts err.backtrace.join("\n")
+    end
+    puts "Error: See #{out}"
+  end
+
   def self.create_new_blog_repo(dir = ".blogs")
     log!(enter: __method__, args: [dir])
     raise ArgumentError unless dir.is_a?(String) && ! dir.empty?
@@ -68,8 +77,9 @@ class RuneBlog
     x.root, x.current_view, x.editor = root, "test_view", "/usr/bin/vim "   # dumb - FIXME later
     write_config(x, root/ConfigFile)
     @blog = self.new(root)
-    @blog.create_view("test_view")
     @blog
+  rescue => err
+    _tmp_error(err)
   end
 
   def self.open(root = ".blogs")
@@ -78,6 +88,8 @@ class RuneBlog
     self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     root = Dir.pwd/root
     blog = self.new(root)
+  rescue => err
+    _tmp_error(err)
   end
 
   def initialize(root_dir = ".blogs")   # always assumes existing blog
@@ -106,6 +118,8 @@ class RuneBlog
       views = _retrieve_metadata(:views)
       views.each {|v| system!("cp *html #@root/views/#{v}/remote") }
     end
+  rescue => err
+    _tmp_error(err)
   end
 
   def _retrieve_metadata(key)
@@ -129,6 +143,8 @@ class RuneBlog
       raise "Too many #{key} instances in metadata.txt!"
     end
     return result
+  rescue => err
+    _tmp_error(err)
   end
 
   def process_post(sourcefile)
@@ -138,6 +154,8 @@ class RuneBlog
     create_dir(dir)
     xlate cwd: dir, src: sourcefile  # , debug: true
     _deploy_local(dir)
+  rescue => err
+    _tmp_error(err)
   end
 
   def inspect
@@ -172,6 +190,8 @@ class RuneBlog
   def _set_publisher
     log!(enter: __method__, level: 3)
     @view.publisher = RuneBlog::Publishing.new(@view.to_s)  # FIXME refactor
+  rescue => err
+    _tmp_error(err)
   end
 
   def view=(arg)
@@ -188,6 +208,8 @@ class RuneBlog
       else 
         raise CantAssignView(arg.class.to_s)
     end
+  rescue => err
+    _tmp_error(err)
   end
 
   def get_sequence
@@ -234,6 +256,8 @@ class RuneBlog
       cmd = "cp -r #{RuneBlog::Path}/../empty_view views/#{view_name}"
       system!(cmd)
     end
+  rescue => err
+    _tmp_error(err)
   end
 
   def check_valid_new_view(view_name)
@@ -254,6 +278,8 @@ class RuneBlog
     make_empty_view_tree(view_name)
     add_view(view_name)
     mark_last_published("Initial creation")
+  rescue => err
+    _tmp_error(err)
   end
 
   def delete_view(name, force = false)
@@ -287,6 +313,8 @@ class RuneBlog
     postdir = post.first
     vp = RuneBlog::ViewPost.new(self.view, postdir)
     vp
+  rescue => err
+    _tmp_error(err)
   end
 
   def index_entry(slug)
@@ -302,10 +330,13 @@ class RuneBlog
       vp.nslug, vp.aslug, vp.title, vp.date, vp.teaser_text
     path = vp.path
     url = aslug + ".html"
+# puts "--- vp = #{[vp.nslug, vp.aslug, vp.title, vp.date, vp.teaser_text].inspect}"; gets
     date = ::Date.parse(date)
     date = date.strftime("%B %e<br><div style='float: right'>%Y</div>")
     text = interpolate(@_post_entry, binding)
     text
+  rescue => err
+    _tmp_error(err)
   end
 
   def collect_recent_posts(file)
@@ -316,14 +347,20 @@ class RuneBlog
     posts = entries.grep(/^\d\d\d\d/).map {|x| dir_posts/x }
     posts.select! {|x| File.directory?(x) }
     # directories that start with four digits
-    posts = posts.sort {|a, b| b.to_i <=> a.to_i }  # sort descending
+    posts = posts.sort do |a, b| 
+      ai = a.index(/\d\d\d\d-/)
+      bi = b.index(/\d\d\d\d-/)
+      na = a[ai..(ai+3)].to_i
+      nb = b[bi..(bi+3)].to_i
+      nb <=> na
+    end  # sort descending
     posts = posts[0..19]  # return 20 at most
     text = <<-HTML
       <html>
       <head><link rel="stylesheet" href="etc/blog.css"></head>
       <body>
     HTML
-    wanted = [5, posts.size].min  # estimate how many we want?
+    wanted = [8, posts.size].min  # estimate how many we want?
     enum = posts.each
     wanted.times do
       postid = File.basename(enum.next)
@@ -332,13 +369,16 @@ class RuneBlog
     end
     text << "</body></html>"
     File.write(@vdir/:remote/file, text)
+  rescue => err
+    _tmp_error(err)
   end
 
   def create_new_post(title, testing = false, teaser: nil, body: nil, 
                       pubdate: Time.now.strftime("%Y-%m-%d"), views: [])
-    log!(enter: __method__, args: [title, testing, teaser, body, views], level: 1)
+    log!(enter: __method__, args: [title, testing, teaser, body, views], level: 1, stderr: true)
     meta = nil
     views = views + [self.view.to_s]
+    views.uniq!
     Dir.chdir(@root/:posts) do
       post = Post.create(title: title, teaser: teaser, body: body, pubdate: pubdate, views: views)
       post.edit unless testing
@@ -347,14 +387,12 @@ class RuneBlog
     end
     return meta.num
   rescue => err
-    puts err
-    puts err.backtrace.join("\n")
+    _tmp_error(err)
   end
 
   def edit_initial_post(file, testing = false)
     log!(enter: __method__, args: [file, testing], level: 3)
     debug "=== edit_initial_post #{file.inspect}  => #{sourcefile}"
-    sourcefile = @root/:drafts/file
     result = system!("#@editor #{sourcefile} +8") unless testing
     raise EditorProblem(sourcefile) unless result
     process_post(sourcefile)
@@ -390,6 +428,8 @@ class RuneBlog
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     @vdir = @root/:views/view
     collect_recent_posts("recent.html")
+  rescue => err
+    _tmp_error(err)
   end
 
   def generate_view(view)  # huh?
@@ -402,10 +442,7 @@ class RuneBlog
           src: "blog/generate.lt3", dst: vdir/:remote/"index.html"
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
   rescue => err
-    puts err
-    puts err.backtrace.join("\n")
-    print "Pause... "
-    gets
+    _tmp_error(err)
   end
 
   def _get_views(draft)
@@ -416,7 +453,9 @@ class RuneBlog
     raise "No .views call!" if view_line.size < 1
     view_line = view_line.first
     views = view_line[7..-1].split
-    views 
+    views.uniq 
+  rescue => err
+    _tmp_error(err)
   end
 
   def _copy_get_dirs(draft, view)
@@ -430,6 +469,8 @@ class RuneBlog
     viewdir, slugdir, aslug = vdir, dir, noext[5..-1]
     theme = viewdir/:themes/:standard
     [noext, viewdir, slugdir, aslug, theme]
+  rescue => err
+    _tmp_error(err)
   end
 
   def _post_metadata(draft, pdraft)
@@ -466,6 +507,8 @@ class RuneBlog
       LIVE
       File.open(pdraft/"vars.lt3", "w") {|f| f.puts vars }
     end
+  rescue => err
+    _tmp_error(err)
   end
 
   def copy_widget_html(view)
@@ -483,10 +526,12 @@ class RuneBlog
       tag = File.basename(w)
       files.each {|file| system!("cp #{file} #{rem}", show: (tag == "zzz")) }
     end
+  rescue => err
+    _tmp_error(err)
   end
 
-  def _handle_post(draft, view)
-    log!(enter: __method__, args: [draft, view], level: 2)
+  def _handle_post(draft, view_name = self.view.to_s)
+    log!(enter: __method__, args: [draft, view_name], level: 2)
     # break into separate methods?
 
     fname = File.basename(draft)       # 0001-this-is-a-post.lt3
@@ -494,30 +539,34 @@ class RuneBlog
     aslug = nslug.sub(/\d\d\d\d-/, "") # this-is-a-post
     ahtml = aslug + ".html"            # this-is-a-post.html
     pdraft = @root/:posts/nslug
-    remote = @root/:views/view/:remote
-    @theme = @root/:views/view/:themes/:standard
+    remote = @root/:views/view_name/:remote
+    @theme = @root/:views/view_name/:themes/:standard
     # Step 1...
     create_dirs(pdraft)
-    xlate cwd: pdraft, src: draft, dst: "guts.html"
+    xlate cwd: pdraft, src: draft, dst: "guts.html", debug: true
     _post_metadata(draft, pdraft)
     # Step 2...
-    vposts = @root/:views/view/:posts
+    vposts = @root/:views/view_name/:posts
     copy!(pdraft, vposts)    # ??
     # Step 3..
     copy(pdraft/"guts.html", @theme/:post) 
     copy(pdraft/"vars.lt3",  @theme/:post) 
     # Step 4...
-    xlate cwd: @theme/:post, src: "generate.lt3", 
-          dst: remote/ahtml, copy: @theme/:post  # , debug: true
+    xlate cwd: @theme/:post, src: "generate.lt3", force: true, 
+          dst: remote/ahtml, copy: @theme/:post, debug: true
     xlate cwd: @theme/:post, src: "permalink.lt3", 
           dst: remote/:permalink/ahtml  # , debug: true
-    copy_widget_html(view)
+    copy_widget_html(view_name)
+  rescue => err
+    _tmp_error(err)
   end
 
   def generate_post(draft)
     log!(enter: __method__, args: [draft], level: 1)
     views = _get_views(draft)
     views.each {|view| _handle_post(draft, view) }
+  rescue => err
+    _tmp_error(err)
   end
 
   def rebuild_post(file)
@@ -531,8 +580,7 @@ class RuneBlog
     @views_dirty.flatten!
     @views_dirty.uniq!
   rescue => err
-    error(err)
-    getch
+    _tmp_error(err)
   end
 
   def remove_post(num)

data/lib/runeblog_version.rb

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

data/lib/xlate.rb

@@ -2,6 +2,7 @@
 LEXT = ".lt3"
 
 def stale?(src, dst, force = false)
+  meh = File.new("/tmp/dammit-#{src.gsub(/\//, "-")}", "w")
   log!(enter: __method__, args: [src, dst], level: 3)
   raise "Source #{src} not found in #{Dir.pwd}" unless File.exist?(src)
   return true if force
@@ -23,15 +24,15 @@ def xlate(cwd: Dir.pwd, src:,
       STDERR.puts "#{indent}      from: #{caller[0]}"
       STDERR.puts "#{indent}      copy: #{copy}" if copy
     end
-    if stale?(src, dst, force)
-      # do nothing
+    stale = stale?(src, dst, force)
+    if stale
+      rc = system("livetext #{src} >#{dst}")
+      STDERR.puts "...completed (shell returned #{rc})" if debug
+      system!("cp #{dst} #{copy}") if copy
     else
       STDERR.puts "#{indent} -- ^ Already up to date!" if debug
       return
     end
-    rc = system("livetext #{src} >#{dst}")
-    STDERR.puts "...completed (shell returned #{rc})" if debug
-    system!("cp #{dst} #{copy}") if copy
   end
 end
 

data/test/austin.rb

@@ -119,6 +119,8 @@ Contact light. Houston, this is Tranquility Base. The Eagle has
 landed. That's one small step for (a) man, one giant leap for 
 mankind.
 
+Here's the PDF of $$link["Ruby for the Old-Time C Programmer"|http://rubyhacker.com/blog2/rubydino.pdf]
+
 Pity this busy monster, manunkind, not. Pity rather... Listen:
 There's a hell of a universe next door; let's go.
 BODY

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.47
+  version: 0.2.48
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2019-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext