runeblog 0.2.43 → 0.2.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16662b0b5b8ec9310e57c63c336fe13bdde1612a4b1dc0a8ffdaab0a2982db1f
-  data.tar.gz: 93aeb315ce95b26a4aee96350fb20abf081b95af69873e57ed1e1310f8a4416b
+  metadata.gz: b0b81363110b0cb0392e016c289ee76b841d05a2d4ed2167ce26b9f08bb2e1ae
+  data.tar.gz: c57eedabc749e9bee009dd3dc68c9f5ad8f430ae858ff6e307b027cd90fbf147
 SHA512:
-  metadata.gz: 0fb2ef08e58378caa049c6b5a274f3cb6928f9e09dc9a54d5cf5fdd613fed0c473d249dbb2d43b99baf76ae209a343ab70cb89db75e26f082284db1737c967a8
-  data.tar.gz: a35443b76f177cc48457acebdea57fcc9909edd49af992c7eb3ce8d15a7308855c08992385b9dbae0ae9b429646e052210576733e76d835e3717e4214f61e123
+  metadata.gz: 20a947a5d88018aa3a9942b559cba915f15c733120ffbdd46433e50ea018bd9997184a194220a530882c9bcfab818a364c141b3ba62a4d36411b4241617521b4
+  data.tar.gz: '019e9d9fbff78f670ea225014e3ec9208aa9fb0fd31fbc4241262d9f4ed39c365f5be14c6d3439e9bb996a9cea568ef81ddd1b1a41ad369b14279339160f91a8'

data/empty_view/themes/standard/etc/blog.css.lt3

@@ -40,3 +40,9 @@
   text-align: top;
 }
 
+. not used?
+\.thumbnail img {
+    max-height: 100%;
+    max-width: 100%;
+}
+

data/empty_view/themes/standard/navbar/faq.lt3

@@ -0,0 +1 @@
+.include ../widgets/pages/faq.lt3

data/empty_view/themes/standard/navbar/navbar.lt3

@@ -12,5 +12,6 @@
   index   Home
   about   About
   contact Contact
+  faq     FAQ
 .end
 

data/empty_view/themes/standard/widgets/ad/ad.lt3

@@ -1,15 +1,22 @@
 . In real life, ads won't work this way...
 
+.include vars.lt3
+
 .set classname="btn btn-light float-right"
 .set card.title="Advertisement"
 .set card.text="Build your amazing website with blabla.com."
-.set extra="bg-dark text-white"
+. set extra="bg-dark text-white"
+
+<!-- "$ad.image" -->
 
 <div class="card $extra mb-3">
   <div class="card-body">
+<!--
     <h5 class="card-title">$card.title</h5>
     <p class="card-text">$card.text</p>
     <a href="javascript: void(0)" onclick="javascript:open_main('widgets/ad/ad.html')" class="$classname">Visit page</a>
+-->
+    <img style="max-height: 100%; max-width: 100%" src="$ad.image"></img>
   </div>
 </div>
 

data/empty_view/themes/standard/widgets/pages/pages.rb

@@ -5,11 +5,14 @@
 class ::RuneBlog::Widget
   class Pages
     def self.build
+      # build child pages
       children = Dir["*.lt3"] - ["pages.lt3"]
       children.each do |child|
         dest = child.sub(/.lt3$/, ".html")
         xlate src: child, dst: dest  # , debug: true
       end
+      # build mainfile
+      # build cardfile
     end
 
     def self.edit_menu

data/lib/default.rb

@@ -5,7 +5,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])
+  log!(enter: __method__, args: [num, title, date, view, teaser, body, tags, views, back, home], level: 3)
   viewlist = (views + [view.to_s]).join(" ")
   taglist = ".tags " + tags.join(" ")
 <<-TEXT

data/lib/global.rb

@@ -20,7 +20,7 @@ end
 # Refactor, move stuff elsewhere?
 
 def make_exception(sym, str)
-  log!(enter: __method__, args: [sym, str])
+  log!(enter: __method__, args: [sym, str], level: 3)
   return if Object.constants.include?(sym)
   Object.const_set(sym, StandardError.dup)
   define_method(sym) do |*args|
@@ -30,8 +30,9 @@ def make_exception(sym, str)
   end
 end
 
-  def system!(str)
-    log!(enter: __method__, args: [str])
+  def system!(str, show: false)
+    log!(enter: __method__, args: [str], level: 2)
+    STDERR.puts str if show
     rc = system(str)
     if rc
       return rc
@@ -44,12 +45,12 @@ end
   end
 
 def prefix(num)
-  log!(enter: __method__, args: [num])
+  log!(enter: __method__, args: [num], level: 3)
   "#{'%04d' % num.to_i}"
 end
 
 def check_meta(meta, where = "")
-  log!(enter: __method__, args: [meta, where])
+  log!(enter: __method__, args: [meta, where], level: 3)
   str =  "--- #{where}\n"
   str << "\ncheck_meta: \n" + caller.join("\n") + "\n  meta = #{meta.inspect}\n"
   str << "  title missing!\n" unless meta.title
@@ -62,14 +63,14 @@ def check_meta(meta, where = "")
 end
 
 def verify(hash)
-  log!(enter: __method__, args: [hash])
+  log!(enter: __method__, args: [hash], level: 3)
   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])
+  log!(enter: __method__, args: [hash], level: 3)
   hash.each_pair do |expr, msg|
     puts "<< #{msg}" unless expr
   end

data/lib/helpers-blog.rb

@@ -6,14 +6,14 @@ require 'xlate'
 module RuneBlog::Helpers
 
   def copy(src, dst)
-    log!(enter: __method__, args: [src, dst])
+    log!(enter: __method__, args: [src, dst], level: 2)
     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])
+    log!(enter: __method__, args: [src, dst], level: 2)
     cmd = "cp -r #{src} #{dst} 2>/dev/null"
     rc = system!(cmd)
     puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
@@ -36,7 +36,7 @@ module RuneBlog::Helpers
 #  end
 
   def read_config(file, *syms)
-    log!(enter: __method__, args: [file, *syms])
+    log!(enter: __method__, args: [file, *syms], level: 3)
     lines = File.readlines(file).map(&:chomp)
     obj = ::OpenStruct.new
     lines.each do |line|
@@ -61,7 +61,7 @@ module RuneBlog::Helpers
   end
 
   def try_read_config(file, hash)
-    log!(enter: __method__, args: [file, hash])
+    log!(enter: __method__, args: [file, hash], level: 3)
     return hash.values unless File.exist?(file)
     vals = read_config(file, *hash.keys)
     vals
@@ -80,7 +80,7 @@ module RuneBlog::Helpers
 # end 
 
   def write_config(obj, file)
-    log!(enter: __method__, args: [obj, file])
+    log!(enter: __method__, args: [obj, file], level: 2)
     hash = obj.to_h
     File.open(file, "w") do |out|
       hash.each_pair {|key, val| out.puts "#{key}: #{val}" }
@@ -88,13 +88,13 @@ module RuneBlog::Helpers
   end
 
   def get_views   # read from filesystem
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     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])
+    log!(enter: __method__, args: [root, current_view, editor], level: 3)
     root = Dir.pwd/root
     x = OpenStruct.new
     x.root, x.current_view, x.editor = root, current_view, editor
@@ -102,21 +102,21 @@ module RuneBlog::Helpers
   end
 
   def new_sequence
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     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])
+    log!(enter: __method__, args: [dir], level: 3)
     dirs = Dir.entries(dir) - %w[. ..]
     dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
     dirs
   end
 
   def find_draft_slugs
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     files = Dir["#@root/drafts/**"].grep /\d{4}.*.lt3$/
     flagfile = "#@root/drafts/last_rebuild"
     last = File.exist?(flagfile) ? File.mtime(flagfile) : (Time.now - 86_400)
@@ -128,7 +128,7 @@ module RuneBlog::Helpers
   end
 
   def create_dirs(*dirs)
-    log!(enter: __method__, args: [*dirs])
+    log!(enter: __method__, args: [*dirs], level: 3)
     dirs.each do |dir|
       dir = dir.to_s  # symbols allowed
       next if Dir.exist?(dir)
@@ -139,27 +139,27 @@ module RuneBlog::Helpers
   end
 
   def interpolate(str, bind)
-    log!(enter: __method__, args: [str, bind])
+    log!(enter: __method__, args: [str, bind], level: 3)
     wrap = "<<-EOS\n#{str}\nEOS"
     eval wrap, bind
   end
 
   def error(err)  # Hmm, this is duplicated
-    log!(str: "duplicated method", enter: __method__, args: [err])
+    log!(str: "duplicated method", enter: __method__, args: [err], level: 2)
     str = "\n  Error: #{err}"
     puts str
     puts err.backtrace.join("\n")
   end
 
   def dump(obj, name)
-    log!(enter: __method__, args: [obj, name])
+    log!(enter: __method__, args: [obj, name], level: 3)
     File.write(name, obj)
   end
 
 end
 
 def dump(obj, name)      # FIXME scope
-  log!(str: "scope problem", enter: __method__, args: [obj, name])
+  log!(str: "scope problem", enter: __method__, args: [obj, name], level: 3)
   File.write(name, obj)
 end
 

data/lib/liveblog.rb

@@ -128,17 +128,17 @@ end
 
 
 def make_main_links
-  log!(enter: __method__)
+  log!(enter: __method__, level: 1)
   # FIXME remember strings may not be safe
   line = _data.chomp
   tag, card_title = *line.split(" ", 2)
   cardfile, mainfile = "#{tag}-card", "#{tag}-main"
   input = "list.data"
-  log!(str: "Reading #{input}", pwd: true)
+  log!(str: "Reading #{input}", pwd: true, level: 3)
   pairs = File.readlines(input).map {|line| line.chomp.split(/, */, 2) }
   _write_main(mainfile, pairs, card_title, tag)
   _write_card(cardfile, mainfile, pairs, card_title, tag)
-  log!(str: "...returning from method", pwd: true)
+  log!(str: "...returning from method", pwd: true, level: 3)
 end
 
 ### inset
@@ -375,16 +375,22 @@ def sidebar
     tcard = "#{tag}-card.html"
 
     code = _load_local(tag)
-    code && Dir.chdir(wtag) { code.build }
-
-#    if File.exist?(wtag/"SUBFILES")
-#      children = Dir[wtag/"*.lt3"] - [wtag/tag+".lt3"]
-#      children.each do |child|
-#        dest = child.sub(/.lt3$/, ".html")
-#        xlate src: child, dst: dest  # , debug: true
-#      end
-#    end
-    xlate cwd: wtag, src: tag, dst: tcard  # , debug: true
+    if code && tag == "pages"
+      Dir.chdir(wtag) { code.build }
+    else
+    end
+
+    if tag == "ad"
+      num = rand(1..4)
+      img = "widgets/ad/ad#{num}.png"
+      src, dst = img, @root/:views/@view_name/"remote/widgets/ad/"
+      system!("cp #{src} #{dst}")   # , show: true)
+      File.open(wtag/"vars.lt3", "w") do |f| 
+        f.puts ".set ad.image = #{img}"
+      end
+    end
+
+    xlate cwd: wtag, src: tag, dst: tcard # , debug: (tag == "ad")
     _include_file wtag/tcard
   end
   _out %[</div>]
@@ -593,7 +599,7 @@ def _html_body(file, css = nil)
 end
 
 def _write_card(cardfile, mainfile, pairs, card_title, tag)
-  log!(str: "Creating #{cardfile}.html", pwd: true)
+  log!(str: "Creating #{cardfile}.html", pwd: true, level: 2)
   url = mainfile
   url = :widgets/tag/mainfile + ".html"
   File.open("#{cardfile}.html", "w") do |f|
@@ -608,7 +614,7 @@ def _write_card(cardfile, mainfile, pairs, card_title, tag)
           </h5>
           <div class="collapse" id="#{tag}">
     EOS
-    log!(str: "Writing data pairs to #{cardfile}.html", pwd: true)
+    log!(str: "Writing data pairs to #{cardfile}.html", pwd: true, level: 2)
     local = _local_tag?(tag)
     pairs.each do |file, title| 
       url = file
@@ -681,7 +687,7 @@ def _write_main_pages(mainfile, pairs, card_title, tag)
 end
 
 def _write_main(mainfile, pairs, card_title, tag)
-  log!(str: "Creating #{mainfile}.html", pwd: true)
+  log!(str: "Creating #{mainfile}.html", pwd: true, level: 2)
 
   if tag == "pages"   # temporary experiment
     _write_main_pages(mainfile, pairs, card_title, tag)

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
@@ -290,7 +292,7 @@ class RuneBlog
   end
 
   def index_entry(slug)
-    log!(enter: __method__, args: [slug])
+    log!(enter: __method__, args: [slug], level: 2)
     id = slug.to_i
     text = nil
     @theme = @view.dir/"themes/standard"
@@ -309,7 +311,7 @@ class RuneBlog
   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)
@@ -335,7 +337,7 @@ class RuneBlog
   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
@@ -400,7 +402,7 @@ class RuneBlog
           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)
+#   generate_index(view)   # recent posts (recent.html)
 #   ^ HERE
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
   rescue => err
@@ -411,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
@@ -422,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
@@ -435,12 +437,12 @@ 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
+    pnum = nslug[0..3]                 # 0001
     Dir.chdir(pdraft) do 
       excerpt = File.read("teaser.txt")
       date = _retrieve_metadata(:date)
@@ -470,7 +472,7 @@ class RuneBlog
   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
@@ -481,12 +483,15 @@ class RuneBlog
       create_dirs(rem)
       files = Dir[w/"*"]
       files = files.select {|x| x =~ /(html|css)$/ }
-      files.each {|file| system!("cp #{file} #{rem}") }
+# 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
@@ -515,7 +520,7 @@ 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)
@@ -561,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)
@@ -578,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)
@@ -594,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-]/, '')

data/lib/runeblog_version.rb

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

data/lib/view.rb

@@ -8,7 +8,7 @@ class RuneBlog::View
   include RuneBlog::Helpers
 
   def initialize(name)
-    log!(enter: __method__, args: [name])
+    log!(enter: __method__, args: [name], level: 3)
     raise NoBlogAccessor if RuneBlog.blog.nil?
     @blog = RuneBlog.blog
     @name = name
@@ -17,27 +17,23 @@ class RuneBlog::View
   end
 
   def dir
-    log!(enter: __method__)
     @blog.root + "/views/#@name/"
   end
 
   def local_index
-    log!(enter: __method__)
     dir + "/remote/index.html"
   end
 
   def index
-    log!(enter: __method__)
     dir + "index.html"
   end
 
   def to_s
-    log!(enter: __method__)
     @name
   end
 
   def publishable_files
-    log!(enter: __method__)
+    log!(enter: __method__, level: 2)
     vdir = dir()
     remote = local_index()
     files = [remote]
@@ -55,12 +51,10 @@ class RuneBlog::View
   end
 
   def can_publish?
-    log!(enter: __method__)
     @can_publish
   end
 
   def recent?(file)
-    log!(enter: __method__, args: [file])
     File.mtime(file) > File.mtime("#{self.dir()}/last_published")
   rescue
     true

data/lib/xlate.rb

@@ -2,7 +2,7 @@
 LEXT = ".lt3"
 
   def stale?(src, dst, force = false)
-    log!(enter: __method__, args: [src, dst])
+    log!(enter: __method__, args: [src, dst], level: 3)
     raise "Source #{src} not found in #{Dir.pwd}" unless File.exist?(src)
     return true if force
     return true unless File.exist?(dst)
@@ -29,7 +29,7 @@ LEXT = ".lt3"
         STDERR.puts "#{indent} -- ^ Already up to date!" if debug
         return
       end
-      rc = system!("livetext #{src} >#{dst}")
+      rc = system("livetext #{src} >#{dst}")
       STDERR.puts "...completed (shell returned #{rc})" if debug
       system!("cp #{dst} #{copy}") if copy
     end

data/test/austin.rb

@@ -30,11 +30,6 @@ end
 def make_post(x, title, teaser, body, views=[])
   debug "      make_post #{bold(title)}"
   x.create_new_post(title, true, teaser: teaser, body: body, views: views)
-  views.each do |view| 
-    debug
-    debug "** generate_index #{bold(view)}"
-    x.generate_index(view) 
-  end  # recent.html
 end
 
 def show_lines(text)
@@ -70,6 +65,9 @@ File.open(".blogs/views/around_austin/themes/standard/global.lt3", "a") do |f|
 end
 ####
 
+debug("** generate_view: #{bold('around_austin')}")
+x.generate_view("around_austin")
+
 debug("-- change_view: #{bold('around_austin')}")
 x.change_view("around_austin")    # 1 2 7 8 9 
 
@@ -136,8 +134,10 @@ in 2005.
 BODY
 
 debug
-debug("** generate_view: #{bold('around_austin')}")
-x.generate_view("around_austin")
+debug "** generate_index #{bold("around_austin")}"
+x.generate_index("around_austin") 
+
+debug
 x.change_view("around_austin")
 debug
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.43
+  version: 0.2.44
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -67,9 +67,6 @@ files:
 - empty_view/remote/etc/GIT_IS_DUMB
 - empty_view/remote/navbar/GIT_IS_DUMB
 - empty_view/remote/permalink/GIT_IS_DUMB
-- empty_view/remote/widgets/links/list.data
-- empty_view/remote/widgets/news/list.data
-- empty_view/remote/widgets/pages/list.data
 - empty_view/themes/standard/README
 - empty_view/themes/standard/blog/generate.lt3
 - empty_view/themes/standard/blog/head.lt3
@@ -82,6 +79,7 @@ files:
 - empty_view/themes/standard/global.lt3
 - empty_view/themes/standard/navbar/about.lt3
 - empty_view/themes/standard/navbar/contact.lt3
+- empty_view/themes/standard/navbar/faq.lt3
 - empty_view/themes/standard/navbar/navbar.lt3
 - empty_view/themes/standard/post/generate.lt3
 - empty_view/themes/standard/post/head.lt3
@@ -89,6 +87,10 @@ files:
 - empty_view/themes/standard/post/permalink.lt3
 - empty_view/themes/standard/widgets/README
 - empty_view/themes/standard/widgets/ad/ad.lt3
+- empty_view/themes/standard/widgets/ad/ad1.png
+- empty_view/themes/standard/widgets/ad/ad2.png
+- empty_view/themes/standard/widgets/ad/ad3.png
+- empty_view/themes/standard/widgets/ad/ad4.png
 - empty_view/themes/standard/widgets/bydates/README
 - empty_view/themes/standard/widgets/bydates/bydates.lt3
 - empty_view/themes/standard/widgets/bydates/bydates.rb

data/empty_view/remote/widgets/links/list.data

@@ -1,3 +0,0 @@
-https://www.mensa.org, no, Mensa International
-http://space.com, yes, Space.com: NASA, Space Exploration and Astronomy News
-https://arstechnica.com, no, Ars Technica

data/empty_view/remote/widgets/news/list.data

@@ -1,4 +0,0 @@
-https://techcrunch.com/2019/09/16/fossa-scores-8-5-million-series-a-to-help-enterprise-manage-open-source-licenses/, yes, FOSSA scores \$8.5 million Series A to help enterprise manage open-source licenses
-https://techcrunch.com/2019/09/17/spacexs-orbital-starship-prototype-construction-progress-detailed-in-new-photos/, yes, SpaceX’s orbital Starship prototype construction progress detailed in new photos
-https://developers.googleblog.com/2019/05/Flutter-io19.html, yes, Flutter: a Portable UI Framework for Mobile, Web, Embedded, and Desktop
-https://jaycarlson.net/microcontrollers/, no, The Amazing \$1 Microcontroller (2017)

data/empty_view/remote/widgets/pages/list.data

@@ -1,4 +0,0 @@
-faq.html,Frequently Asked Questions
-like-dislike.html,Likes and Dislikes
-disclaim.html,Disclaimer
-lifestory.html,My Life Story