runeblog 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da4cf909e23c3d38745684efef6be5f7b048d5487edc5192fa2041db387f8e6e
-  data.tar.gz: 5aef89b7cff7aab75cb093800ceaaf97f90d669c0a3901829e72fcdc4d1bcb44
+  metadata.gz: bf71088966e7393574d792a3508bb35f8a581e774a250dbe88b61fee08cd7588
+  data.tar.gz: 991d387f3649a4defbdee3500d2a275ab2b5b6b2956ad46188c50a8c3c393513
 SHA512:
-  metadata.gz: d9d6b591026909681b34e1ab24fe61ba274a176c0d22bb335be1c2a07475f1f3b9444fb0c3e419b906853bc1b98f12650393f3a4d409bc83b9b37ee04269e7ce
-  data.tar.gz: 2f22425943ba72ad5587895d4895662fc70e18dd0ae644f1b0f7f6283eb5dc8a188b0e08fa0a08178a9948f9c7b1671c1e98dc6ff704764d289faba2af4d0d17
+  metadata.gz: 57eaf8b41cb76dd92e2a4f5ba45c3461248761e433e2f1fefc4ab6373ac414fcfbe2c4c04016465438b7a68b3ef7d666ad848634afa37f1cbac36c01e7be5385
+  data.tar.gz: 3bd8ed4c9776f71b2787cdb484c981b314b53993b3d31bb125176e576d91f752830813eba24f1cacf84b1cf455a7f4743fc0bc866009217c3afe09a44b67d8c2

data/lib/default.rb

@@ -2,7 +2,6 @@ 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")

data/lib/helpers-blog.rb

@@ -1,89 +1,22 @@
 require 'runeblog_version'
 require 'fileutils'
 
-# Home = Dir.pwd # unless Home
-
-LEXT = ".lt3"
+require 'xlate'
 
 module RuneBlog::Helpers
 
   def copy(src, dst)
     log!(enter: __method__, args: [src, dst])
-    cmd = "cp #{src}  #{dst} 2>/dev/null"
-#   puts "\n--- pwd = #{Dir.pwd}  \n  Trying: #{cmd}"
-#   if src =~ /\*/
-      rc = system(cmd)
-      puts "    FROM #{caller[0]}" unless rc
-exit unless rc
-#   else
-#     FileUtils.cp(src, dst)
-#   end
+    cmd = "cp #{src} #{dst} 2>/dev/null"
+    rc = system(cmd)
+    puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
   end
 
   def copy!(src, dst)
     log!(enter: __method__, args: [src, dst])
-    cmd = "cp -r #{src}  #{dst} 2>/dev/null"
-#   puts "\n--- pwd = #{Dir.pwd}  \n  Trying: #{cmd}"
-#   if src =~ /\*/
-      rc = system(cmd)
-      puts "    FROM #{caller[0]}" unless rc
-exit unless rc
-#   else
-#     FileUtils.cp_r(src, dst)
-#   end
-  end
-
-  def stale?(src, dst, force = false)
-    log!(enter: __method__, args: [src, dst])
-    raise "Source #{src} not found in #{Dir.pwd}" unless File.exist?(src)
-    return true if force
-    return true unless File.exist?(dst)
-    return true if File.mtime(src) > File.mtime(dst)
-    return false
-  end
-
-#  def livetext(src, dst=nil, dir=".")
-#    log!(enter: __method__, args: [src, dst])
-#    src << ".lt3" unless src.end_with?(".lt3")
-#    if dst
-#      dst << ".html" unless dst.end_with?(".html")
-#    else
-#      dst = src.sub(/.lt3$/, "")
-#    end
-##   return unless stale?(src, dst)
-#    Dir.chdir(dir) { system("livetext #{src} >#{dst}") }
-#  end
-#
-#  def livetext!(src, dst=nil, dir=".")
-#    log!(enter: __method__, args: [src, dst])
-#    src << ".lt3" unless src.end_with?(".lt3")
-#    if dst
-#      dst << ".html" unless dst.end_with?(".html")
-#    else
-#      dst = src.sub(/.lt3$/, "")
-#    end
-##   return unless stale?(src, dst)
-#STDERR.puts "-- livetext #{src} >#{dst} \n       in: #{Dir.pwd}\n      from: #{caller[0]}"
-#    Dir.chdir(dir) { system("livetext #{src} >#{dst}") }
-#STDERR.puts "... completed"
-#  end
-
-  def xlate(cwd: Dir.pwd, src:, 
-            dst: (strip = true; src.sub(/.lt3$/,"")), 
-            copy: nil, debug: false, force: false)
-    src += LEXT unless src.end_with?(LEXT)
-    dst += ".html" unless dst.end_with?(".html") || strip
-    Dir.chdir(cwd) do
-      return unless stale?(src, dst, force)
-      if debug
-        STDERR.puts "-- xlate #{src} >#{dst}"
-        STDERR.puts "     in:   #{Dir.pwd}"
-        STDERR.puts "     from: #{caller[0]}"
-        STDERR.puts "     copy: #{copy}" if copy
-      end
-      rc = system("livetext #{src} >#{dst}")
-    end
-    STDERR.puts "...completed (shell returned #{rc})" if debug
+    cmd = "cp -r #{src} #{dst} 2>/dev/null"
+    rc = system(cmd)
+    puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
   end
 
   def get_root
@@ -131,7 +64,6 @@ exit unless rc
     log!(enter: __method__, args: [file, hash])
     return hash.values unless File.exist?(file)
     vals = read_config(file, *hash.keys)
-# STDERR.puts vals.inspect
     vals
   end
 
@@ -150,30 +82,19 @@ end
   def write_config(obj, file)
     log!(enter: __method__, args: [obj, file])
     hash = obj.to_h
-# Dir.chdir(::Home)
-# puts "--- wc: pwd = #{Dir.pwd}"
-    File.open(file, "w") do |f| 
-      hash.each_pair do |key, val|
-        f.puts "#{key}: #{val}"
-      end
+    File.open(file, "w") do |out|
+      hash.each_pair {|key, val| out.puts "#{key}: #{val}" }
     end
   end
 
   def get_views   # read from filesystem
     log!(enter: __method__)
-#   Dir.chdir(::Home) do
-      verify(@root => "#@root is nil",
-             Dir.exist?(@root) => "#@root doesn't exist",
-             Dir.exist?("#@root/views") => "#@root/views doesn't exist")
-      dirs = subdirs("#@root/views/").sort
-      dirs.map {|name| RuneBlog::View.new(name) }
-#   end
+    dirs = subdirs("#@root/views/").sort
+    dirs.map {|name| RuneBlog::View.new(name) }
   end
 
   def new_dotfile(root: ".blogs", current_view: "test_view", editor: "vi")
     log!(enter: __method__, args: [root, current_view, editor])
-#   raise BlogAlreadyExists if Dir.exist?(".blogs")
-#   Dir.mkdir(".blogs")
     root = Dir.pwd + "/" + root
     x = OpenStruct.new
     x.root, x.current_view, x.editor = root, current_view, editor
@@ -189,7 +110,6 @@ end
 
   def subdirs(dir)
     log!(enter: __method__, args: [dir])
-    verify(Dir.exist?(dir) => "Directory #{dir} not found")
     dirs = Dir.entries(dir) - %w[. ..]
     dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
     dirs
@@ -197,9 +117,6 @@ end
 
   def find_draft_slugs
     log!(enter: __method__)
-    verify(@root => "#@root is nil",
-           Dir.exist?(@root) => "#@root doesn't exist",
-           Dir.exist?("#@root/drafts") => "#@root/drafts doesn't exist")
     files = Dir["#@root/drafts/**"].grep /\d{4}.*.lt3$/
     flagfile = "#@root/drafts/last_rebuild"
     last = File.exist?(flagfile) ? File.mtime(flagfile) : (Time.now - 86_400)

data/lib/helpers-repl.rb

@@ -161,7 +161,6 @@ module RuneBlog::REPL
     n.times { @out << "\n" }
   end
 
-
   def check_empty(arg)
     raise InternalError(caller[0], arg.inspect)  unless arg.nil?
   end
@@ -209,8 +208,6 @@ module RuneBlog::REPL
   end
 
   def ask_publishing_info   # returns Publishing object
-    verify(@blog => "@blog is nil", 
-           @blog.view => "@blog.view is nil")
     # user, server, root, path, protocol = "http"
     puts "Please enter publishing data for view #{@blog.view}..."
     user = ask("User: ")
@@ -241,28 +238,4 @@ module RuneBlog::REPL
     all.sort + ["NEW TAG"]
   end
 
-  ### find_asset
-
-  # FIXME is this per-post?
-
-  def find_asset(asset_name)    # , views)
-    search_path = proc do |path| 
-      full_path = path + asset_name
-      return full_path if File.exist?(full_path)
-    end 
-    check_meta(@meta, "find_asset")
-    views = @meta.views
-    views.each do |view| search_path.call("#{view.dir}/#{@meta.slug}/assets/") end
-    views.each do |view| search_path.call(view.dir + "/assets/") end
-    search_path.call(@root + "/assets/", asset_name)
-    # If all fail... return nil
-    return nil
-  end
-
-  ### find_all_assets
-
-  def find_all_assets(list, views)
-    list ||= []
-    list.each {|asset| puts "#{asset} => #{find_asset(asset, views)}" }
-  end
 end

data/lib/liveblog.rb

@@ -2,11 +2,15 @@ require 'ostruct'
 require 'pp'
 require 'date'
 
-require 'livetext'
+# require 'livetext'
 require 'runeblog'
 
-errfile = File.new("/tmp/liveblog.out", "w")
-STDERR.reopen(errfile)
+require 'pathmagic'
+
+require 'xlate'
+
+# errfile = File.new("/tmp/liveblog.out", "w")
+# STDERR.reopen(errfile)
 
 def init_liveblog    # FIXME - a lot of this logic sucks
   here = Dir.pwd
@@ -24,21 +28,17 @@ end
 
 # FIXME - stale? and livetext are duplicated from helpers-blog
 
-  def stale?(src, dst)
-    return true unless File.exist?(dst)
-    return true if File.mtime(src) > File.mtime(dst)
-    return false
-  end
-
-  def livetext(src, dst=nil)
-    src += ".lt3" unless src.end_with?(".lt3")
-    if dst
-      dst += ".html" unless dst.end_with?(".html")
-    else
-      dst = src.sub(/.lt3$/, "")
+  def livetext(src, dst=nil, cwd=Dir.pwd)
+    Dir.chdir(cwd) do 
+      src += ".lt3" unless src.end_with?(".lt3")
+      if dst
+        dst += ".html" unless dst.end_with?(".html")
+      else
+        dst = src.sub(/.lt3$/, "")
+      end
+      return unless stale?(src, dst)
+      system("livetext #{src} >#{dst}")
     end
-    return unless stale?(src, dst)
-    system("livetext #{src} >#{dst}")
   end
 
 def post
@@ -103,7 +103,7 @@ def _html_body(file)
 end
 
 def _write_card(cardfile, mainfile, pairs, card_title, tag, relative: true)
-  # HTML for sidebar card
+  # HTML for card
   log!(str: "Creating #{cardfile}.html", pwd: true)
 # TTY.puts "Creating #{cardfile}.html - pwd = #{Dir.pwd}"
   File.open("#{cardfile}.html", "w") do |f|
@@ -120,7 +120,6 @@ def _write_card(cardfile, mainfile, pairs, card_title, tag, relative: true)
     top = ""
     top = :widgets/tag + "/" unless tag == "news"   # FIXME !!
     pairs.each do |file, title| 
-    # took out #{top}#{file}
       f.puts <<-EOS
         <li class="list-group-item"> <a href="javascript: void(0)" 
         onclick="javascript:open_main('#{top}#{file}')">#{title}</a> </li>
@@ -134,7 +133,6 @@ def _write_card(cardfile, mainfile, pairs, card_title, tag, relative: true)
 end
 
 def _write_main(mainfile, pairs, card_title)
-  # HTML for main area (iframe)
   log!(str: "Creating #{mainfile}.html", pwd: true)
   File.open("#{mainfile}.html", "w") do |f|
     _html_body(f) do
@@ -286,25 +284,18 @@ def teaser
 end
 
 def finalize
-STDERR.puts :cp1
   unless @meta
     puts @live.body
     return
   end
-STDERR.puts :cp4
   if @blog.nil?
     return @meta
   end
 
-STDERR.puts :cp6
   @slug = @blog.make_slug(@meta)
-STDERR.puts :cp7
   slug_dir = @slug
   @postdir = @blog.view.dir/:posts/slug_dir
-  STDERR.puts "--- finalize: pwd = #{Dir.pwd} postdir = #@postdir"
-STDERR.puts :cp8
   write_post
-STDERR.puts :cp9
   @meta
 end
  
@@ -397,10 +388,8 @@ def head  # Does NOT output  tags
       # Later: allow other overrides
       when ""; break
     else
-STDERR.puts "-- got '#{word}'; old value = #{result[word].inspect}"
       if defaults[word]
         result[word] = %[<meta property="#{word}" content="#{remain}">]
-STDERR.puts "-- new value = #{result[word].inspect}"
       else
         puts "Unknown tag '#{word}'"
       end
@@ -408,7 +397,6 @@ STDERR.puts "-- new value = #{result[word].inspect}"
   end
   hash = defaults.dup.update(result)  # FIXME collisions?
 
-# _out "<!-- "; _out hash.inspect; _out "--> "
   hash.each_value {|x| _out "  " + x }
   _out "<body>"
 end
@@ -445,16 +433,34 @@ def recent_posts    # side-effect
 end
 
 def sidebar
+STDERR.puts "---- SIDEBAR pwd = #{Dir.pwd}"
+  _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
+  _body do |token|
+    tag = token.chomp.strip.downcase
+    wtag = :widgets/tag
+    raise "Can't find #{wtag}" unless Dir.exist?(wtag)
+    tcard = "#{tag}-card.html"
+#   livetext tag, tcard, wtag
+    xlate cwd: wtag, src: tag, dst: tcard, debug: true
+    _include_file wtag/tcard
+  end
+  _out %[</div>]
+end
+
+def sidebar!
+# if _args.include? "off"
+#   _body { }  # iterate, do nothing
+#   return 
+# end
   _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
   _args do |token|
     tag = token.chomp.strip.downcase
     wtag = :widgets/tag
     raise "Can't find #{wtag}" unless Dir.exist?(wtag)
-    Dir.chdir(wtag) do
-      tcard = "#{tag}-card.html"
-      livetext tag, tcard
-      _include_file tcard
-    end
+    tcard = "#{tag}-card.html"
+#   livetext tag, tcard, wtag
+    xlate cwd: wtag, src: tag, dst: tcard, debug: true
+    _include_file wtag/tcard
   end
   _out %[</div>]
 end
@@ -475,44 +481,6 @@ def script
   _out %[<script src="#{url}" integrity="#{integ}" crossorigin="#{cross}"></script>]
 end
 
-# def _find_recent_posts
-#   @vdir = _var(:FileDir).match(%r[(^.*/views/.*?)/])[1]
-#   posts = nil
-#   dir_posts = @vdir + "/posts"
-#   entries = Dir.entries(dir_posts)
-#   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[0..19]  # return 20 at most
-# end
-# 
-# def all_teasers
-#   open = <<-HTML
-#       <section class="posts">
-#   HTML
-#   close = <<-HTML
-#       </section>
-#   HTML
-# 
-#   text = <<-HTML
-#     <html>
-#     <head><link rel="stylesheet" href="etc/blog.css"></head>
-#     <body>
-#   HTML
-#   posts = _find_recent_posts
-#   wanted = [5, posts.size].min  # estimate how many we want?
-#   enum = posts.each
-#   wanted.times do
-#     postid = File.basename(enum.next)
-#     postid = postid.to_i
-#     text << _teaser(postid)    # side effect! calls _out
-#   end
-#   text << "</body></html>"
-#   File.write("recent.html", text)
-#   _out %[<iframe id="main" style="width: 100vw; height: 100vh; position: relative;" src='recent.html' width=100% frameborder="0" allowfullscreen></iframe>]
-# end
-
 def _post_lookup(postid)    # side-effect
   # .. = templates, ../.. = views/thisview
   slug = title = date = teaser_text = nil
@@ -533,22 +501,6 @@ def _interpolate(str, context)   # FIXME move this later
   eval(wrapped, context)
 end
 
-# def _teaser(slug)
-#   id = slug.to_i
-#   text = nil
-#   post_entry_name = @theme + "blog/post_entry.lt3"
-#   @_post_entry ||= File.read(post_entry_name)
-#   vp = _post_lookup(id)
-#   nslug, aslug, title, date, teaser_text = 
-#     vp.nslug, vp.aslug, vp.title, vp.date, vp.teaser_text
-#   path = vp.path
-#   url = "#{path}/#{aslug}.html"    # Should be relative to .blogs!! FIXME
-#     date = Date.parse(date)
-#     date = date.strftime("%B %e<br>%Y")
-#     text = _interpolate(@_post_entry, binding)
-#   text
-# end
-
 def _card_generic(card_title:, middle:, extra: "")
   front = <<-HTML
     <div class="card #{extra} mb-3">

data/lib/logging.rb

@@ -31,28 +31,5 @@ unless self.respond_to?("log!")
     $log = File.new("/tmp/runeblog.log","a")
   end
 
-#   def log(str: "", enter: nil, args: [], pwd: false, dir: false)
-#     return unless $logging
-#     time = Time.now.strftime("%H:%M:%S")
-#     meth = ""
-#     meth = "#{enter}" if enter
-#     para = " args: #{args.inspect[1..-2]}"
-#     source = caller[0].sub(/.*\//, " in ").sub(/:/, " line ").sub(/:.*/, "")
-#     source = " in #{source} (probably liveblog.rb)" if source.include? "(eval)"
-#     str = "  ... #{str}" unless str.empty?
-#     indent = " "*12
-#     STDERR.puts "#{time} #{str} #{meth}"
-#     STDERR.puts "#{indent} #{source}"
-#     STDERR.puts "#{indent} pwd = #{Dir.pwd} " if pwd
-#     if dir
-#       files = (Dir.entries('.') - %w[. ..]).join(" ")
-#       STDERR.puts "#{indent} dir/* = #{files}"
-#     end
-#     STDERR.puts "#{indent} #{para} " unless args.empty?
-#   # STDERR.puts "#{indent} livetext params = #{livedata.inpect} " unless livedata.nil?
-#     STDERR.puts
-#     # $log.close
-#     # $log = File.new("/tmp/runeblog.log","a")
-#   end
 end
 

data/lib/post.rb

@@ -1,11 +1,10 @@
-# require 'helpers-blog'
 require 'runeblog'
 require 'global'
+require 'pathmagic'
 
 class RuneBlog::Post
 
   attr_reader :num, :title, :date, :views, :num, :slug
-
   attr_accessor :meta, :blog, :draft
 
   include RuneBlog::Helpers
@@ -22,17 +21,11 @@ class RuneBlog::Post
     raise "Doesn't work right now"
     raise NoBlogAccessor if RuneBlog.blog.nil?
     # "post" is a slug
-    pdir = RuneBlog.blog.view.dir + "/" + post
+    pdir = RuneBlog.blog.view.dir/post
     verify(Dir.exist?(pdir) => "Directory #{pdir} not found")
     meta = nil
     Dir.chdir(pdir) do
-      verify(File.exist?("metadata.txt") => "metadata.txt not found",
-             File.exist?("teaser.txt") => "teaser.txt not found")
-#            File.exist?("body.txt") => "body.txt not found")
       meta = read_config("metadata.txt")
-      verify(meta.date  => "meta.date is nil",
-             meta.views => "meta.views is nil",
-             meta.tags  => "meta.tags is nil")
       meta.date = Date.parse(meta.date)
       meta.views = meta.views.split
       meta.tags = meta.tags.split
@@ -50,8 +43,6 @@ class RuneBlog::Post
     hash = meta.to_h
 
     File.write("teaser.txt", hash[:teaser])
-# STDERR.puts ">>>> #{__method__}: writing #{@live.body.size} bytes to #{Dir.pwd}/body.txt"
-#     File.write("body.txt", hash[:body])
     hash.delete(:teaser)
     hash.delete(:body)
 
@@ -75,7 +66,7 @@ class RuneBlog::Post
                   other_views:[])
     log!(enter: __method__, args: [title, teaser, body, pubdate, other_views])
     post = self.new
-    # ONLY place next_sequence is called!
+    # NOTE: This is the ONLY place next_sequence is called!
     num = post.meta.num   = post.blog.next_sequence
 
     # new_metadata
@@ -91,10 +82,8 @@ class RuneBlog::Post
     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/"
-    verify(Dir.exist?(srcdir) => "#{srcdir} not found",
-           meta.slug.is_a?(String) => "slug #{meta.slug.inspect} is invalid")
+    srcdir = post.blog.root/:drafts + "/"
+    vpdir = post.blog.root/:drafts + "/"
     fname  = meta.slug + ".lt3"
     post.draft = srcdir + fname
     dump(text, post.draft)
@@ -134,7 +123,7 @@ class RuneBlog::ViewPost
     fname = "#{postdir}/teaser.txt"
     @teaser_text = File.read(fname).chomp
     # FIXME dumb hacks...
-    mdfile = "#{postdir}/metadata.txt"
+    mdfile = postdir/"metadata.txt"
     lines = File.readlines(mdfile)
     @title = lines.grep(/title:/).first[7..-1].chomp
     @date  = lines.grep(/pubdate:/).first[9..-1].chomp
@@ -144,12 +133,12 @@ class RuneBlog::ViewPost
     log!(enter: __method__, args: [view, postdir])
     fname = File.basename(draft)
     noext = fname.sub(/.lt3$/, "")
-    vdir = "#@root/views/#{view}"
-    dir = "#{vdir}/posts/#{noext}/"
+    vdir = @root/:views/view
+    dir = vdir/:posts/noext + "/"
     Dir.mkdir(dir) unless Dir.exist?(dir)
     system("cp #{draft} #{dir}")
     viewdir, slugdir, aslug = vdir, dir, noext[5..-1]
-    theme = viewdir + "/themes/standard"
+    theme = viewdir/:themes/:standard
     [noext, viewdir, slugdir, aslug, theme]
   end
 

data/lib/publish.rb

@@ -1,6 +1,5 @@
-# require 'helpers-blog'
-# require 'runeblog'
 require 'global'
+require 'pathmagic'
 
 class RuneBlog::Publishing
   attr_reader :user, :server, :docroot, :path
@@ -42,15 +41,14 @@ class RuneBlog::Publishing
 
   def publish(files, assets=[])
     log!(enter: __method__, args: [files, assets])
-    dir = "#@docroot/#@path"
+    dir = @docroot/@path
     view_name = @blog.view.name
-    viewpath = "#{dir}/#{view_name}"
+    viewpath = dir/view_name
     result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}") 
     result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}/assets") 
     files.each do |file|
-      dest = "#@user@#@server:#{dir}/#{view_name}"
+      dest = "#@user@#@server:" + dir/view_name
       file.gsub!(/\/\//, "/")  # weird... :-/
-      dest.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}")
@@ -74,8 +72,8 @@ class RuneBlog::Publishing
 
   def remote_permissions?
     log!(enter: __method__)
-    dir = "#@docroot/#@path"
-    temp = "#@path/__only_testing" 
+    dir = @docroot/@path
+    temp = @path/"__only_testing" 
     try1 = system("ssh -o BatchMode=yes -o ConnectTimeout=1 #@user@#@server -x mkdir -p #{temp} >/dev/null 2>&1")
     return nil unless try1
     try2 = system("ssh -o BatchMode=yes -o ConnectTimeout=1 #@user@#@server -x rmdir #{temp} >/dev/null 2>&1")
@@ -84,4 +82,3 @@ class RuneBlog::Publishing
   end
 end
 
-

data/lib/repl.rb

@@ -10,7 +10,6 @@ module RuneBlog::REPL
 
   def edit_file(file)
     result = system("#{@blog.editor} #{file}")
-STDERR.puts "editor = #{@blog.editor} FILE = #{file}"
     raise EditorProblem(file) unless result
     sleep 0.1
     STDSCR.clear
@@ -222,7 +221,6 @@ STDERR.puts "editor = #{@blog.editor} FILE = #{file}"
     id = get_integer(arg)
     result = @blog.remove_post(id)
     output! "Post #{id} not found" if result.nil?
-#   puts "Post #{id} not found" if result.nil?
     @out
   end
 

data/lib/runeblog.rb

@@ -114,7 +114,7 @@ class RuneBlog
     nslug = sourcefile.sub(/.lt3/, "")
     dir = @root/:posts/nslug
     create_dir(dir)
-    xlate cwd: dir, src: sourcefile, debug: true
+    xlate cwd: dir, src: sourcefile  # , debug: true
     _deploy_local(dir)
   end
 
@@ -323,12 +323,6 @@ class RuneBlog
     end
     text << "</body></html>"
     File.write(@vdir/:remote/file, text)
-#    iframe_text = <<-HTML
-#      <iframe name="main" style="width: 100vw;height: 100vh;position: relative;" 
-#              src='recent.html' width=100% frameborder="0" allowfullscreen>
-#      </iframe>
-#    HTML
-    # FIXME  ^ serves no purpose??
   end
 
   def create_new_post(title, testing = false, teaser: nil, body: nil, other_views: [])
@@ -380,7 +374,7 @@ class RuneBlog
     self.view = view   # error checking?
   end
 
-  def generate_index(view) # FIXME  delete?
+  def generate_index(view)
     log!(enter: __method__, args: [view], pwd: true, dir: true)
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     @vdir = @root/:views/view
@@ -423,7 +417,6 @@ class RuneBlog
     log!(enter: __method__, args: [draft, pdraft])
     title_line = File.readlines(draft).grep(/^.title /).first
     title = title_line.split(" ", 2)[1]
-#   pdir = "
     Dir.chdir(pdraft) do 
       excerpt = File.read("teaser.txt")
       vars = %[.set title="#{title.chomp}"\n] + 
@@ -442,13 +435,15 @@ class RuneBlog
       dir = File.basename(w)
       rem = w.sub(/themes.standard/, "remote")
       create_dirs(rem)
-      next unless Dir[w/"*"].any? {|x| x =~ /html$/ }
+      files = Dir[w/"*"]
+      next unless files.any? {|x| x =~ /html$/ }
       system("cp #{w}/*html #{rem}")
     end
   end
 
   def _handle_post(draft, view)
     log!(enter: __method__, args: [draft, view])
+    # break into separate methods?
 
     fname = File.basename(draft)       # 0001-this-is-a-post.lt3
     nslug = fname.sub(/.lt3$/, "")     # 0001-this-is-a-post
@@ -469,9 +464,9 @@ class RuneBlog
     copy(pdraft/"vars.lt3",  @theme/:post) 
     # Step 4...
     xlate cwd: @theme/:post, src: "generate.lt3", 
-          dst: remote/ahtml, copy: @theme/:post
+          dst: remote/ahtml, copy: @theme/:post  # , debug: true
     xlate cwd: @theme/:post, src: "permalink.lt3", 
-          dst: remote/:permalink/ahtml
+          dst: remote/:permalink/ahtml  # , debug: true
     copy_widget_html(view)
   end
 
@@ -480,11 +475,11 @@ class RuneBlog
     views = _get_views(draft)
     views.each do |view| 
       _handle_post(draft, view)
-      generate_view(view)
+      generate_view(view)  # FIXME leads to inefficiency?
     end
   end
 
-  def relink
+  def relink   # FIXME no longer used?
     log!(enter: __method__)
     self.views.each {|view| generate_index(view) }
   end

data/lib/runeblog_version.rb

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

data/lib/view.rb

@@ -1,6 +1,5 @@
-# require 'helpers-blog'
-# require 'runeblog'
 require 'global'
+require 'logging'
 
 class RuneBlog::View
   attr_reader :name, :state
@@ -22,7 +21,7 @@ class RuneBlog::View
   end
 
   def dir
-#   log!(enter: __method__)
+    log!(enter: __method__)
     @blog.root + "/views/#@name/"
   end
 

data/lib/xlate.rb

@@ -0,0 +1,31 @@
+
+LEXT = ".lt3"
+
+  def stale?(src, dst, force = false)
+    log!(enter: __method__, args: [src, dst])
+    raise "Source #{src} not found in #{Dir.pwd}" unless File.exist?(src)
+    return true if force
+    return true unless File.exist?(dst)
+    return true if File.mtime(src) > File.mtime(dst)
+    return false
+  end
+
+  def xlate(cwd: Dir.pwd, src:, 
+            dst: (strip = true; src.sub(/.lt3$/,"")), 
+            copy: nil, debug: false, force: false)
+    src += LEXT unless src.end_with?(LEXT)
+    dst += ".html" unless dst.end_with?(".html") || strip
+    STDERR.puts "-- xlate: pwd = #{cwd}"
+    Dir.chdir(cwd) do
+      return unless stale?(src, dst, force)
+      if debug
+        STDERR.puts "-- xlate #{src} >#{dst}"
+        STDERR.puts "     in:   #{Dir.pwd}"
+        STDERR.puts "     from: #{caller[0]}"
+        STDERR.puts "     copy: #{copy}" if copy
+      end
+      rc = system("livetext #{src} >#{dst}")
+      STDERR.puts "...completed (shell returned #{rc})" if debug
+    end
+  end
+

data/test/make_blog.rb

@@ -15,14 +15,18 @@ def getch
 end
 
 def debug(str)
-# STDERR.puts str
+  STDERR.puts ">>> #{str} #{Time.now}"
 end
 
 def make_post(x, title, teaser, body, views=[])
-# STDERR.puts "\n========= make_post '#{title}'"
-  print "."
+  debug "     make_post '#{title}'"
+# print "."
   x.create_new_post(title, true, teaser: teaser, body: body, other_views: views)
-  views.each {|view| x.generate_index(view) }  # recent.html
+  views.each do |view| 
+    debug "      generate_index #{view}"
+    x.generate_index(view) 
+  end  # recent.html
+  STDERR.puts
 end
 
 def show_lines(text)
@@ -40,6 +44,7 @@ system("rm -rf .blogs")
 RuneBlog.create_new_blog_repo(".blogs")
 x = RuneBlog.new(".blogs")
 
+debug("create_view 'around_austin'")
 x.create_view("around_austin")   # FIXME remember view title!
 
 # Hack:
@@ -47,8 +52,10 @@ if File.exist?("publish")
   system("cp publish .blogs/views/around_austin/publish")
 end
 
+debug("create_view 'computing'")
 x.create_view("computing")
 
+debug("create_view 'music'")
 x.create_view("music")
 
 x.change_view("around_austin")    # 1 2 7 8 9 
@@ -126,6 +133,7 @@ But I first heard of them
 in 2005.
 BODY
 
+debug("GENERATE_view 'around_austin'")
 x.generate_view("around_austin")
 
 x.change_view("around_austin")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - Hal Fulton
@@ -76,6 +76,7 @@ files:
 - lib/runeblog.rb
 - lib/runeblog_version.rb
 - lib/view.rb
+- lib/xlate.rb
 - test/config
 - test/fakeimage.jpg
 - test/general_test.rb