runeblog 0.2.2 → 0.2.8

data/lib/default.rb

@@ -6,6 +6,7 @@ class RuneBlog::Default
 def RuneBlog.post_template(num: 0, title: "No title", date: nil, view: "test_view", 
                        teaser: "No teaser", body: "No body", tags: ["untagged"], 
                        views: [], back: "javascript:history.go(-1)", home: "no url")
+  log!(enter: __method__, args: [num, title, date, view, teaser, body, tags, views, back, home])
   viewlist = (views + [view.to_s]).join(" ")
   taglist = ".tags " + tags.join(" ")
 <<-TEXT

data/lib/global.rb

@@ -20,6 +20,7 @@ end
 # Refactor, move stuff elsewhere?
 
 def make_exception(sym, str)
+  log!(enter: __method__, args: [sym, str])
   return if Object.constants.include?(sym)
   Object.const_set(sym, StandardError.dup)
   define_method(sym) do |*args|
@@ -30,10 +31,12 @@ def make_exception(sym, str)
 end
 
 def prefix(num)
+  log!(enter: __method__, args: [num])
   "#{'%04d' % num.to_i}"
 end
 
 def check_meta(meta, where = "")
+  log!(enter: __method__, args: [meta, where])
   str =  "--- #{where}\n"
   str << "\ncheck_meta: \n" + caller.join("\n") + "\n  meta = #{meta.inspect}\n"
   str << "  title missing!\n" unless meta.title
@@ -46,12 +49,14 @@ def check_meta(meta, where = "")
 end
 
 def verify(hash)
+  log!(enter: __method__, args: [hash])
   hash.each_pair do |expr, msg|
     puts "<< #{msg}" unless expr
   end
 end
 
 def assure(hash)  # really the same as verify for now...
+  log!(enter: __method__, args: [hash])
   hash.each_pair do |expr, msg|
     puts "<< #{msg}" unless expr
   end

data/lib/helpers-blog.rb

@@ -6,39 +6,52 @@ require 'fileutils'
 module RuneBlog::Helpers
 
   def copy(src, dst)
-    if src =~ /\*/
-      system("cp #{src}  #{dst}")
-    else
-      FileUtils.cp(src, dst)
-    end
+    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
   end
 
   def copy!(src, dst)
-    if src =~ /\*/
-      system("cp -r #{src}  #{dst}")
-    else
-      FileUtils.cp_r(src, dst)
-    end
+    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)
+    log!(enter: __method__, args: [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)
+    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)
+#   return unless stale?(src, dst)
     system("livetext #{src} >#{dst}")
   end
 
   def get_root
+    log!(enter: __method__)
     if $_blog
       if $_blog.root
         puts "0. Returned: #{$_blog.root}/"
@@ -54,7 +67,7 @@ module RuneBlog::Helpers
   end
 
   def read_config(file, *syms)
-# puts "dir   = #{Dir.pwd}"
+    log!(enter: __method__, args: [file, *syms])
     lines = File.readlines(file).map(&:chomp)
     obj = ::OpenStruct.new
     lines.each do |line|
@@ -79,6 +92,7 @@ module RuneBlog::Helpers
   end
 
   def try_read_config(file, hash)
+    log!(enter: __method__, args: [file, hash])
     return hash.values unless File.exist?(file)
     vals = read_config(file, *hash.keys)
 # STDERR.puts vals.inspect
@@ -86,6 +100,7 @@ module RuneBlog::Helpers
   end
 
 def put_config(root:, view:"test_view", editor: "/usr/local/bin/vim")
+  log!(enter: __method__, args: [root, view, editor])
   Dir.mkdir(root) unless Dir.exist?(root)
   Dir.chdir(root) do 
     File.open("config", "w") do |cfg|
@@ -97,6 +112,7 @@ def put_config(root:, view:"test_view", editor: "/usr/local/bin/vim")
 end 
 
   def write_config(obj, file)
+    log!(enter: __method__, args: [obj, file])
     hash = obj.to_h
 # Dir.chdir(::Home)
 # puts "--- wc: pwd = #{Dir.pwd}"
@@ -108,6 +124,7 @@ 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",
@@ -118,6 +135,7 @@ end
   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
@@ -127,12 +145,14 @@ end
   end
 
   def new_sequence
+    log!(enter: __method__)
     dump(0, "sequence")
     version_info = "#{RuneBlog::VERSION}\nBlog created: #{Time.now.to_s}"
     dump(version_info, "VERSION")
   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}") }
@@ -140,6 +160,7 @@ end
   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")
@@ -154,6 +175,7 @@ end
   end
 
   def create_dirs(*dirs)
+    log!(enter: __method__, args: [*dirs])
     dirs.each do |dir|
       dir = dir.to_s  # symbols allowed
       next if Dir.exist?(dir)
@@ -163,24 +185,28 @@ end
     end
   end
 
-  def interpolate(str, binding)
+  def interpolate(str, bind)
+    log!(enter: __method__, args: [str, bind])
     wrap = "<<-EOS\n#{str}\nEOS"
-    eval wrap, binding
+    eval wrap, bind
   end
 
   def error(err)  # Hmm, this is duplicated
+    log!(str: "duplicated method", enter: __method__, args: [err])
     str = "\n  Error: #{err}"
     puts str
     puts err.backtrace.join("\n")
   end
 
   def dump(obj, name)
+    log!(enter: __method__, args: [obj, name])
     File.write(name, obj)
   end
 
 end
 
 def dump(obj, name)      # FIXME scope
+  log!(str: "scope problem", enter: __method__, args: [obj, name])
   File.write(name, obj)
 end
 

data/lib/liveblog.rb

@@ -410,15 +410,20 @@ def meta
 end
 
 def recent_posts    # side-effect
-  _out %[<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12">]
-  all_teasers
-  _out %[</div>]
+  _out <<-HTML
+    <div class="col-lg-9 col-md-9 col-sm-9 col-xs-12">
+      <iframe id="main" style="width: 100vw; height: 100vh; position: relative;" 
+       src='recent.html' width=100% frameborder="0" allowfullscreen>
+      </iframe>
+    </div>
+  HTML
 end
 
 def sidebar
   _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
   _args do |token|
     tag = token.chomp.strip.downcase
+# Doesn't handle "split personality" widgets yet
     Dir.chdir("widgets/#{tag}") do
       livetext tag, "card-#{tag}.html"
       _include_file "card-#{tag}.html"
@@ -443,59 +448,43 @@ def script
   _out %[<script src="#{url}" integrity="#{integ}" crossorigin="#{cross}"></script>]
 end
 
-
-### How this next bit works:
-### 
-###   all_teasers will call _find_recent_posts
-### 
-###   _find_recent_posts will search higher in the directory structure
-###   for where the posts are (0001, 0002, ...) NOTE: This implies you
-###   must be in some specific place when this code is run.
-###   It returns the 20 most recent posts.
-### 
-###   all_teasers will then pick a small number of posts and call _teaser
-
-###   on each one. (The code in _teaser really belongs in a small template
-###   somewhere.)
-### 
-
-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 _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
@@ -517,21 +506,21 @@ 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 _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

data/lib/logging.rb

@@ -0,0 +1,58 @@
+unless self.respond_to?("log!")
+  $logging = true
+  $log = File.new("/tmp/runeblog.log","w")
+
+  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.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
+
+    $log.puts "#{time} #{meth}#{para}"
+    $log.puts "#{indent} #{str} " unless str.empty?
+    $log.puts "#{indent} #{source}"
+    $log.puts "#{indent} pwd = #{Dir.pwd} " if pwd
+    if dir
+      files = (Dir.entries('.') - %w[. ..]).join(" ")
+      $log.puts "#{indent} dir/* = #{files}"
+    end
+#   $log.puts "#{indent} livetext params = #{livedata.inpect} " unless livedata.nil?
+    $log.puts
+    $log.close
+    $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

@@ -11,12 +11,14 @@ class RuneBlog::Post
   include RuneBlog::Helpers
 
   def self.files(num, root)
+    log!(enter: __method__, args: [num, root])
     files = Find.find(root).to_a
     result = files.grep(/#{prefix(num)}-/)
     result
   end
   
   def self.load(post)
+    log!(enter: __method__, args: [post])
     raise "Doesn't work right now"
     raise NoBlogAccessor if RuneBlog.blog.nil?
     # "post" is a slug
@@ -41,6 +43,7 @@ class RuneBlog::Post
   end
 
   def write_metadata(meta)   # FIXME ???
+    log!(enter: __method__, args: [meta])
     debug "=== write_metadata:"
     debug "-----\n#{meta.inspect}\n-----"
     fname2 = "metadata.txt"
@@ -63,12 +66,14 @@ class RuneBlog::Post
   end
 
   def initialize
+    log!(enter: __method__)
     @blog = RuneBlog.blog || raise(NoBlogAccessor)
     @meta = OpenStruct.new
   end
 
   def self.create(title:, teaser:, body:, pubdate: Time.now.strftime("%Y-%m-%d"),
                   other_views:[])
+    log!(enter: __method__, args: [title, teaser, body, pubdate, other_views])
     post = self.new
     # ONLY place next_sequence is called!
     num = post.meta.num   = post.blog.next_sequence
@@ -97,6 +102,7 @@ class RuneBlog::Post
   end
 
   def edit
+    log!(enter: __method__)
     verify(File.exist?(@draft) => "File #{@draft} not found")
     result = system("vi #@draft +8")  # TODO improve this
     raise EditorProblem(draft) unless result
@@ -106,6 +112,7 @@ class RuneBlog::Post
   end 
 
   def build
+    log!(enter: __method__)
     post = self
     views = post.meta.views
     text = File.read(@draft)
@@ -118,6 +125,7 @@ class RuneBlog::ViewPost
               :teaser_text
               
   def initialize(view, postdir)
+    log!(enter: __method__, args: [view, postdir])
     # Assumes already parsed/processed
     @blog = RuneBlog.blog || raise(NoBlogAccessor)
     @path = postdir.dup
@@ -133,6 +141,7 @@ class RuneBlog::ViewPost
   end
 
   def get_dirs
+    log!(enter: __method__, args: [view, postdir])
     fname = File.basename(draft)
     noext = fname.sub(/.lt3$/, "")
     vdir = "#@root/views/#{view}"