runeblog 0.2.39 → 0.2.44

data/lib/logging.rb

@@ -2,8 +2,17 @@ unless self.respond_to?("log!")
   $logging = true
   $log = File.new("/tmp/runeblog.log","w")
 
-  def log!(str: "", enter: nil, args: [], pwd: false, dir: false)
+  def outlog(str = "", stderr: false)
+    $log.puts str
+    STDERR.puts str if stderr
+  end
+
+  def log!(str: "", enter: nil, args: [], pwd: false, dir: false, level: 0, stderr: false)
     return unless $logging
+    @err_level ||= ENV['RUNEBLOG_ERROR_LEVEL']
+    @err_level ||= 0
+    return if level < @err_level 
+
     time = Time.now.strftime("%H:%M:%S")
 
     meth = ""
@@ -17,16 +26,16 @@ unless self.respond_to?("log!")
     str = "  ... #{str}" unless str.empty?
     indent = " "*12
 
-    $log.puts "#{time} #{meth}#{para}"
-    $log.puts "#{indent} #{str} " unless str.empty?
-    $log.puts "#{indent} #{source}"
-    $log.puts "#{indent} pwd = #{Dir.pwd} " if pwd
+    outlog "#{time} #{meth}#{para}"
+    outlog "#{indent} #{str} " unless str.empty?
+    outlog "#{indent} #{source}"
+    outlog "#{indent} pwd = #{Dir.pwd} " if pwd
     if dir
       files = (Dir.entries('.') - %w[. ..]).join(" ")
-      $log.puts "#{indent} dir/* = #{files}"
+      outlog "#{indent} dir/* = #{files}"
     end
-#   $log.puts "#{indent} livetext params = #{livedata.inpect} " unless livedata.nil?
-    $log.puts
+#   outlog "#{indent} livetext params = #{livedata.inpect} " unless livedata.nil?
+    outlog 
     $log.close
     $log = File.new("/tmp/runeblog.log","a")
   end

data/lib/post.rb

@@ -10,14 +10,14 @@ class RuneBlog::Post
   include RuneBlog::Helpers
 
   def self.files(num, root)
-    log!(enter: __method__, args: [num, root])
+    log!(enter: __method__, args: [num, root], level: 3)
     files = Find.find(root).to_a
     result = files.grep(/#{prefix(num)}-/)
     result
   end
   
   def self.load(post)
-    log!(enter: __method__, args: [post])
+    log!(enter: __method__, args: [post], level: 3)
     raise "Doesn't work right now"
     raise NoBlogAccessor if RuneBlog.blog.nil?
     # "post" is a slug
@@ -36,7 +36,7 @@ class RuneBlog::Post
   end
 
   def write_metadata(meta)   # FIXME ???
-    log!(enter: __method__, args: [meta])
+    log!(enter: __method__, args: [meta], level: 3)
     debug "=== write_metadata:"
     debug "-----\n#{meta.inspect}\n-----"
     fname2 = "metadata.txt"
@@ -57,7 +57,7 @@ class RuneBlog::Post
   end
 
   def initialize
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     @blog = RuneBlog.blog || raise(NoBlogAccessor)
     @meta = OpenStruct.new
   end
@@ -115,7 +115,7 @@ class RuneBlog::ViewPost
               :teaser_text
               
   def initialize(view, postdir)
-    log!(enter: __method__, args: [view, postdir])
+    log!(enter: __method__, args: [view, postdir], level: 3)
     # Assumes already parsed/processed
     @blog = RuneBlog.blog || raise(NoBlogAccessor)
     @path = postdir.dup
@@ -131,7 +131,7 @@ class RuneBlog::ViewPost
   end
 
   def get_dirs
-    log!(enter: __method__, args: [view, postdir])
+    log!(enter: __method__, args: [view, postdir], level: 3)
     fname = File.basename(draft)
     noext = fname.sub(/.lt3$/, "")
     vdir = @root/:views/view

data/lib/publish.rb

@@ -21,25 +21,25 @@ class RuneBlog::Publishing
   end
 
   def to_h
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     {user: @user, server: @server, docroot: @docroot,
      path: @path, proto: @proto}
   end
 
   def url
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     vname = @blog.view.name # .gsub(/_/, "\\_")
     url = "#@proto://#@server/#@path"  # /#{vname}"
   end
 
   def system!(str)
-    log!(enter: __method__, args: [str])
+    log!(enter: __method__, args: [str], level: 1)
     rc = system(str)
     rc
   end
 
   def publish(files, assets=[])
-    log!(enter: __method__, args: [files, assets])
+    log!(enter: __method__, args: [files, assets], level: 1)
     dir = @docroot/@path
     view_name = @blog.view.name
     viewpath = dir # /view_name

data/lib/runeblog.rb

@@ -53,7 +53,7 @@ class RuneBlog
   end
 
   def self.create(root = ".blogs")
-    log!(enter: __method__, args: [root])
+    log!(enter: __method__, args: [root], level: 1)
     # Crude - FIXME later -  # What views are there? Publishing, etc.
     self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     root = Dir.pwd/root
@@ -101,7 +101,7 @@ class RuneBlog
   end
 
   def _deploy_local(dir)
-    log!(enter: __method__, args: [dir])
+    log!(enter: __method__, args: [dir], level: 1)
     Dir.chdir(dir) do
       views = _retrieve_metadata(:views)
       views.each {|v| system!("cp *html #@root/views/#{v}/remote") }
@@ -132,7 +132,7 @@ class RuneBlog
   end
 
   def process_post(sourcefile)
-    log!(enter: __method__, args: [dir])
+    log!(enter: __method__, args: [dir], level: 2)
     nslug = sourcefile.sub(/.lt3/, "")
     dir = @root/:posts/nslug
     create_dir(dir)
@@ -141,7 +141,7 @@ class RuneBlog
   end
 
   def inspect
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     str = "blog: "
     ivars = ["@root", "@sequence"]   # self.instance_variables
     ivars.each do |iv| 
@@ -152,30 +152,30 @@ class RuneBlog
   end
 
   def view?(name)
-    log!(enter: __method__, args: [name])
+    log!(enter: __method__, args: [name], level: 3)
     raise ArgumentError unless name.is_a?(String) && ! name.empty?
     views.any? {|x| x.name == name }
   end
 
   def view(name = nil)
-    log!(enter: __method__, args: [name])
+    log!(enter: __method__, args: [name], level: 3)
     raise ArgumentError unless name.nil? || (name.is_a?(String) && ! name.empty?)
     name.nil? ? @view : str2view(name)
   end
 
   def str2view(str)
-    log!(enter: __method__, args: [str])
+    log!(enter: __method__, args: [str], level: 3)
     raise ArgumentError unless str.is_a?(String) && ! str.empty?
     @views.find {|x| x.name == str }
   end
 
   def _set_publisher
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     @view.publisher = RuneBlog::Publishing.new(@view.to_s)  # FIXME refactor
   end
 
   def view=(arg)
-    log!(enter: __method__, args: [arg])
+    log!(enter: __method__, args: [arg], level: 2)
     case arg
       when RuneBlog::View
         @view = arg
@@ -191,19 +191,19 @@ class RuneBlog
   end
 
   def get_sequence
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     File.read(@root/:sequence).to_i
   end
 
   def next_sequence
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     @sequence += 1
     dump(@sequence, @root/:sequence)
     @sequence
   end
 
   def viewdir(v = nil)   # delete?
-    log!(enter: __method__, args: [v])
+    log!(enter: __method__, args: [v], level: 3)
     v = str2view(v) if v.is_a?(String)
     raise ArgumentError unless v.nil? || v.is_a?(RuneBlog::View)
     v ||= @view
@@ -211,17 +211,17 @@ class RuneBlog
   end
 
   def self.exist?
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     Dir.exist?(DotDir) && File.exist?(DotDir/ConfigFile)
   end
 
   def mark_last_published(str)
-    log!(enter: __method__, args: [str])
+    log!(enter: __method__, args: [str], level: 2)
     dump(str, "#{self.view.dir}/last_published")
   end
 
   def add_view(view_name)
-    log!(enter: __method__, args: [view_name])
+    log!(enter: __method__, args: [view_name], level: 2)
     view = RuneBlog::View.new(view_name)
     @view = view    # current view
     @views << view  # all views
@@ -229,7 +229,7 @@ class RuneBlog
   end
 
   def make_empty_view_tree(view_name)
-    log!(enter: __method__, args: [view_name])
+    log!(enter: __method__, args: [view_name], level: 2)
     Dir.chdir(@root) do
       cmd = "cp -r #{RuneBlog::Path}/../empty_view views/#{view_name}"
       system!(cmd)
@@ -237,7 +237,7 @@ class RuneBlog
   end
 
   def check_valid_new_view(view_name)
-    log!(enter: __method__, args: [view_name])
+    log!(enter: __method__, args: [view_name], level: 3)
     raise ArgumentError unless view_name.is_a?(String)
     raise ArgumentError if view_name.empty?
     names = self.views.map(&:to_s)
@@ -249,9 +249,11 @@ class RuneBlog
   end
 
   def create_view(view_name)
-    log!(enter: __method__, args: [view_name])
+    log!(enter: __method__, args: [view_name], level: 2)
     check_valid_new_view(view_name)
     make_empty_view_tree(view_name)
+# STDERR.puts "Made empty tree!"
+# system("bash")
     add_view(view_name)
     mark_last_published("Initial creation")
   end
@@ -267,7 +269,7 @@ class RuneBlog
   end
 
   def view_files
-    log!(enter: __method__)
+    log!(enter: __method__, level: 2)
     vdir = self.view.dir
     files = [vdir/"index.html"]
     files += posts.map {|x| vdir/x }
@@ -275,7 +277,7 @@ class RuneBlog
   end
 
   def post_lookup(postid)    # side-effect?
-    log!(enter: __method__, args: [postid])
+    log!(enter: __method__, args: [postid], level: 2)
     slug = title = date = teaser_text = nil
 
     dir_posts = @vdir/:posts
@@ -289,8 +291,8 @@ class RuneBlog
     vp
   end
 
-  def teaser(slug)
-    log!(enter: __method__, args: [slug])
+  def index_entry(slug)
+    log!(enter: __method__, args: [slug], level: 2)
     id = slug.to_i
     text = nil
     @theme = @view.dir/"themes/standard"
@@ -303,13 +305,13 @@ class RuneBlog
     path = vp.path
     url = aslug + ".html"
     date = ::Date.parse(date)
-    date = date.strftime("%B %e<br>%Y")
+    date = date.strftime("%B %e<br><div style='float: right'>%Y</div>")
     text = interpolate(@_post_entry, binding)
     text
   end
 
   def collect_recent_posts(file)
-    log!(enter: __method__, args: [file])
+    log!(enter: __method__, args: [file], level: 3)
     posts = nil
     dir_posts = @vdir/:posts
     entries = Dir.entries(dir_posts)
@@ -328,14 +330,14 @@ class RuneBlog
     wanted.times do
       postid = File.basename(enum.next)
       postid = postid.to_i
-      text << teaser(postid)    # side effect! calls _out
+      text << index_entry(postid)    # side effect! calls _out
     end
     text << "</body></html>"
     File.write(@vdir/:remote/file, text)
   end
 
   def create_new_post(title, testing = false, teaser: nil, body: nil, views: [])
-    log!(enter: __method__, args: [title, testing, teaser, body, views])
+    log!(enter: __method__, args: [title, testing, teaser, body, views], level: 1)
     meta = nil
     views = views + [self.view.to_s]
     Dir.chdir(@root/:posts) do
@@ -351,7 +353,7 @@ class RuneBlog
   end
 
   def edit_initial_post(file, testing = false)
-    log!(enter: __method__, args: [file, testing])
+    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
@@ -363,20 +365,20 @@ class RuneBlog
   end
 
   def posts
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     dir = self.view.dir/:posts
     posts = Dir.entries(dir).grep(/^\d{4}/)
     posts
   end
 
   def drafts
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     dir = @root/:drafts
     drafts = Dir.entries(dir).grep(/^\d{4}.*/)
   end
 
   def change_view(view)
-    log!(enter: __method__, args: [view])
+    log!(enter: __method__, args: [view], level: 3)
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     x = OpenStruct.new
     x.root, x.current_view, x.editor = @root, view.to_s, @editor   # dumb - FIXME later
@@ -393,13 +395,15 @@ class RuneBlog
 
   def generate_view(view)  # huh?
     log!(enter: __method__, args: [view])
-    generate_index(view)   # recent posts (recent.html)
+#   generate_index(view)   # recent posts (recent.html)
     vdir = @root/:views/view
     @theme = @root/:views/view/:themes/:standard
     xlate cwd: vdir/"themes/standard/etc",
           src: "blog.css.lt3", copy: vdir/"remote/etc/blog.css" # , debug: true
     xlate cwd: vdir/"themes/standard",
           src: "blog/generate.lt3", dst: vdir/:remote/"index.html"
+#   generate_index(view)   # recent posts (recent.html)
+#   ^ HERE
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
   rescue => err
     puts err
@@ -409,7 +413,7 @@ class RuneBlog
   end
 
   def _get_views(draft)
-    log!(enter: __method__, args: [draft])
+    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
@@ -420,7 +424,7 @@ class RuneBlog
   end
 
   def _copy_get_dirs(draft, view)
-    log!(enter: __method__, args: [draft, view])
+    log!(enter: __method__, args: [draft, view], level: 2)
     fname = File.basename(draft)
     noext = fname.sub(/.lt3$/, "")
     vdir = @root/:views/view
@@ -433,18 +437,42 @@ class RuneBlog
   end
 
   def _post_metadata(draft, pdraft)
-    log!(enter: __method__, args: [draft, pdraft])
+    log!(enter: __method__, args: [draft, pdraft], level: 2)
+    # FIXME store this somewhere
+    fname = File.basename(draft)       # 0001-this-is-a-post.lt3
+    nslug = fname.sub(/.lt3$/, "")     # 0001-this-is-a-post
+    aslug = nslug.sub(/\d\d\d\d-/, "") # this-is-a-post
+    pnum = nslug[0..3]                 # 0001
     Dir.chdir(pdraft) do 
       excerpt = File.read("teaser.txt")
+      date = _retrieve_metadata(:date)
+      longdate = ::Date.parse(date).strftime("%B %e, %Y")
       title = _retrieve_metadata(:title)
-      vars = %[.heredoc title\n#{title.chomp}\n.end\n] + 
-             %[.heredoc teaser\n#{excerpt.chomp}\n.end\n]
+      tags = _retrieve_metadata(:tags)
+      vars = <<~LIVE
+        .set post.num = #{pnum}
+        .heredoc post.aslug
+        #{aslug}
+        .end
+        .heredoc title
+        #{title.chomp}
+        .end
+        .heredoc post.tags
+        #{tags.join(" ")}
+        .end
+        .heredoc teaser
+        #{excerpt.chomp}
+        .end
+        .heredoc longdate
+        #{longdate}
+        .end
+      LIVE
       File.open(pdraft/"vars.lt3", "w") {|f| f.puts vars }
     end
   end
 
   def copy_widget_html(view)
-    log!(enter: __method__)
+    log!(enter: __method__, level: 2)
     vdir = @root/:views/view
     remote = vdir/:remote
     wdir = vdir/:themes/:standard/:widgets
@@ -454,13 +482,16 @@ class RuneBlog
       rem = w.sub(/themes.standard/, "remote")
       create_dirs(rem)
       files = Dir[w/"*"]
-      next unless files.any? {|x| x =~ /html$/ }
-      system!("cp #{w}/*html #{rem}")
+      files = files.select {|x| x =~ /(html|css)$/ }
+# files.each {|f| STDERR.puts "    #{f.inspect}" }
+      tag = File.basename(w)
+# STDERR.puts "--- tag: #{tag.inspect}"
+      files.each {|file| system!("cp #{file} #{rem}", show: (tag == "zzz")) }
     end
   end
 
   def _handle_post(draft, view)
-    log!(enter: __method__, args: [draft, view])
+    log!(enter: __method__, args: [draft, view], level: 2)
     # break into separate methods?
 
     fname = File.basename(draft)       # 0001-this-is-a-post.lt3
@@ -489,15 +520,16 @@ class RuneBlog
   end
 
   def generate_post(draft)
-    log!(enter: __method__, args: [draft])
+    log!(enter: __method__, args: [draft], level: 1)
     views = _get_views(draft)
     views.each do |view| 
       _handle_post(draft, view)
-      generate_view(view)  # FIXME leads to inefficiency?
+#     generate_view(view)  # FIXME leads to inefficiency?
+#     ^ HERE
     end
   end
 
-  def index_entry(view, meta)
+  def OLD_index_entry(view, meta)
     log!(enter: __method__, args: [view, meta])
     debug "=== index_entry #{view.to_s.inspect}  #{meta.num} #{meta.title.inspect}"
     check_meta(meta, "index_entry1")
@@ -534,7 +566,7 @@ class RuneBlog
   end
 
   def remove_post(num)
-    log!(enter: __method__, args: [num])
+    log!(enter: __method__, args: [num], level: 1)
     raise ArgumentError unless num.is_a?(Integer)
     # FIXME update original draft .views
     tag = prefix(num)
@@ -551,7 +583,7 @@ class RuneBlog
   end
 
   def undelete_post(num)
-    log!(enter: __method__, args: [num])
+    log!(enter: __method__, args: [num], level: 1)
     raise ArgumentError unless num.is_a?(Integer)
     files = Find.find(@root/:views).to_a
     tag = prefix(num)
@@ -567,14 +599,14 @@ class RuneBlog
   end
 
   def delete_draft(num)
-    log!(enter: __method__, args: [num])
+    log!(enter: __method__, args: [num], level: 1)
     raise ArgumentError unless num.is_a?(Integer)
     tag = prefix(num)
     system!("rm -rf #@root/drafts/#{tag}-*")
   end
 
   def make_slug(meta)
-    log!(enter: __method__, args: [meta])
+    log!(enter: __method__, args: [meta], level: 3)
     raise ArgumentError unless meta.title.is_a?(String)
     label = '%04d' % meta.num   # FIXME can do better
     slug0 = meta.title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')