runeblog 0.3.20 → 0.3.25

data/lib/lowlevel.rb

@@ -1,11 +1,18 @@
 
   def _tmp_error(err)
+    STDERR.puts err
+    STDERR.puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
+    log!(str: "#{err} - see also stderr.out")
+    log!(str: err.backtrace.join("\n")) if err.respond_to?(:backtrace)
+    return
+
     out = "/tmp/blog#{rand(100)}.txt"
     File.open(out, "w") do |f|
       f.puts err.to_s + "\n--------"
       f.puts err.backtrace.join("\n")
     end
     puts "Error: See #{out}"
+    # sleep 3
   end
 
   def dump(obj, name)
@@ -20,6 +27,7 @@
     log!(enter: __method__, args: [str], level: 2)
     STDERR.puts str if show
     rc = system(str)
+    STDERR.puts "  rc = #{rc.inspect}" if show
     return rc if rc
     STDERR.puts "FAILED: #{str.inspect}"
     STDERR.puts "\ncaller = \n#{caller.join("\n  ")}\n"
@@ -32,10 +40,12 @@
   end
 
   def _get_data?(file)   # File need not exist
+    log!(enter: __method__, args: [file], level: 2)
     File.exist?(file) ? _get_data(file) : []
   end
 
   def _get_data(file)
+    log!(enter: __method__, args: [file], level: 2)
     lines = File.readlines(file)
     lines = lines.map do |line|
       line = line.chomp.strip
@@ -46,6 +56,7 @@
   end
 
   def read_pairs(file)       # returns a hash
+    log!(enter: __method__, args: [file], level: 2)
     lines = _get_data(file)
     hash = {}
     lines.each do |line|
@@ -57,6 +68,7 @@
   end
 
   def read_pairs!(file)       # returns an openstruct
+    log!(enter: __method__, args: [file], level: 2)
     lines = _get_data(file)
     obj = OpenStruct.new
     lines.each do |line|
@@ -97,27 +109,32 @@
   end
 
   def error(err)
-    # log!(str: err, enter: __method__, args: [err], level: 2)
-    str = "\n  Error: #{err}"
+    log!(str: err, enter: __method__, args: [err], level: 2)
+    str = "\n  Error... #{err}"
     puts str
     puts err.backtrace.join("\n")
   end
 
-  def find_item(list)
+  def find_item(list, &block)
+    log!(enter: __method__, args: [list], level: 2)
     list2 = list.select(&block)
-    exactly_one(list2)
+    exactly_one(list2, list.join("/"))
   end
 
   def find_item!(list, &block)
+    log!(enter: __method__, args: [list], level: 2)
+    list2 = list.select(&block)
     list2 = list.select(&block)
-    item = exactly_one(list2)
+    item = exactly_one(list2, list.join("/"))
     n = list.index(&block)
     [n, item]
   end
 
-  def exactly_one(list)
-    raise "List: Zero instances" if list.empty?
-    raise "List: More than one instance" if list.size > 1
+  def exactly_one(list, tag = nil, &block)
+    log!(enter: __method__, args: [list], level: 2)
+    list2 = list.select(&block)
+    raise "List: Zero instances #{"- #{tag}" if tag}" if list.empty?
+    raise "List: More than one instance #{"- #{tag}" if tag}" if list.size > 1
     list.first
   end
 

data/lib/menus.rb

@@ -18,9 +18,10 @@ top_help   = proc { RubyText.splash(RuneBlog::REPL::Help.gsub(/[{}]/, " ")) }
 #   dir = @blog.view.dir/"themes/standard/"
 
 std = "themes/standard"
+data = "."    # CHANGED
 
 Menu.top_config = {
-    "Variables (general)"                 => edit("#{std}/global.lt3"),
+    "Variables (general)"                 => edit("#{data}/global.lt3"),
     "   View-specific"                    => edit("settings/view.txt"),
     "   Recent posts"                     => edit("settings/recent.txt"),
     "   Publishing"                       => edit("settings/publish.txt"),

data/lib/newpost.rb

@@ -2,7 +2,7 @@ require 'rubytext'
 
 RubyText.start
   
-#  IdeaL A special sub-environment for creating a post
+#  Idea: A special sub-environment for creating a post
 #  
 #  1. Display: view, post number, date
 #  2. Menu?
@@ -15,44 +15,43 @@ RubyText.start
 #  9.  - Quit
 # Edit body after save/quit
 
+def ask(prompt)  # elsewhere?
+  print prompt
+  str = gets
+  str.chomp! if str
+  str
+end
+
 def enter_title
-  STDSCR.puts __method__
-  r = STDSCR.rows / 2 - 3
-  @win = RubyText.window(1, 30, r: r, c: 30, border: false, bg: White, fg: Black)
-  @win.home
-  str = @win.gets
-  STDSCR.puts str.inspect
-  [__method__, 0]
+  puts __method__
+  str = ask("Title:    ")
+  puts str.inspect
 end
 
 def edit_teaser
-  STDSCR.puts __method__
-  [__method__, 1]
+  puts __method__
+  str = ask("Teaser:   ")
+  puts str.inspect
 end
 
 def add_views
-  STDSCR.puts __method__
-  [__method__, 2]
+  puts __method__
 end
 
 def add_tags
-  STDSCR.puts __method__
-  [__method__, 3]
+  puts __method__
 end
 
 def import_assets
-  STDSCR.puts __method__
-  [__method__, 4]
+  puts __method__
 end
 
 def save_post
-  STDSCR.puts __method__
-  [__method__, 5]
+  puts __method__
 end
 
 def quit_post
-  STDSCR.puts __method__
-  [__method__, 6]
+  puts __method__
 end
 
 items = {
@@ -65,9 +64,19 @@ items = {
   "Quit"          => proc { quit_post }
 }
 
-curr = 0
-loop do
-  str, curr = STDSCR.menu(c: 10, items: items, curr: curr, sticky: true)
-  break if curr.nil?
-  STDSCR.puts "str = #{str}  curr = #{curr}"
-end
+enter_title
+edit_teaser
+add_views
+add_tags
+import_assets
+save_post
+quit_post
+
+# getch
+
+# curr = 0
+# loop do
+#   str, curr = menu(c: 10, items: items, curr: curr, sticky: true)
+#   break if curr.nil?
+#   puts "str = #{str}  curr = #{curr}"
+# end

data/lib/post.rb

@@ -66,7 +66,7 @@ class RuneBlog::Post
   end
 
   def edit
-    # log!(enter: __method__)
+    log!(enter: __method__)
     edit_file(@draft, vim: "+8")
     build
   rescue => err
@@ -169,7 +169,8 @@ class RuneBlog::ViewPost
       @date  = meta.pubdate
     end
   rescue => err
-    STDERR.puts "--- #{err}\n #{err.backtrace.join("\n  ")}"
+    STDERR.puts "--- #{err}"
+    STDERR.puts "    #{err.backtrace.join("\n  ")}" if err.respond_to?(:backtrace)
   end
 
   def get_dirs

data/lib/processing.rb

@@ -23,7 +23,8 @@ end
 def preprocess(cwd: Dir.pwd, src:, 
           dst: nil, strip: false,
           deps: [], copy: nil, debug: false, force: false, 
-          mix: [], call: [], vars: {})
+          mix: [], call: [], 
+          vars: {})
   src += LEXT unless src.end_with?(LEXT)
   if strip
     dst = File.basename(src).sub(/.lt3$/,"")
@@ -31,6 +32,9 @@ def preprocess(cwd: Dir.pwd, src:,
     dst += ".html" unless dst.end_with?(".html")
   end
   sp = " "*12
+
+
+
   Dir.chdir(cwd) do
     if debug
       STDERR.puts "#{sp} -- preprocess "
@@ -40,20 +44,44 @@ def preprocess(cwd: Dir.pwd, src:,
       STDERR.puts "#{sp}      from: #{caller[0]}"
       STDERR.puts "#{sp}      copy: #{copy}" if copy
       STDERR.puts "#{sp}      vars: #{vars.inspect}" unless vars == {}
+      STDERR.flush
     end
     stale = stale?(src, dst, deps, force)
+    STDERR.puts <<~EOF if debug
+      STALE = #{stale}
+      cwd = #{cwd.inspect}
+      src = #{src.inspect}
+      dst = #{dst.inspect}
+      strip = #{strip.inspect}
+      deps = #{deps.inspect}
+      copy = #{copy.inspect}
+      debug = #{debug.inspect}
+      force = #{force.inspect}
+      mix = #{mix.inspect}
+      call = #{call.inspect}
+      vars = #{vars.inspect}
+    EOF
     if stale
       live = Livetext.customize(mix: "liveblog", call: call, vars: vars)
+      log!(str: "Calling xform_file... src = #{src} pwd = #{Dir.pwd}")
       out = live.xform_file(src)
       File.write(dst, out)
       system!("cp #{dst} #{copy}") if copy
     end
     puts "#{sp} -- ^ Already up to date!" if debug && ! stale
   end
+rescue => err
+  msg = err.to_s
+  msg << err.backtrace.join("\n") if err.respond_to?(:backtrace)
+  STDERR.puts msg
+  STDERR.flush
+  log!(str: msg) 
 end
 
 def get_live_vars(src)
   live = Livetext.customize(call: [".nopara"])
+# puts "glv: src = #{src.inspect}"
+# STDERR.puts "glv: src = #{src.inspect}"
   live.xform_file(src)
   live
 end

data/lib/publish.rb

@@ -14,7 +14,9 @@ class RuneBlog::Publishing
   def initialize(view)
     log!(enter: __method__, args: [view.to_s])
     @blog = RuneBlog.blog
-    dir = @blog.root/:views/view/"themes/standard/"
+    dir0 = @blog.root/:views/view/"themes/standard/"
+    # CHANGED
+    dir = @blog.root/:views/view/:data
     gfile = dir/"global.lt3"
     return unless File.exist?(gfile)  # FIXME Hackish as hell
 

data/lib/repl.rb

@@ -176,7 +176,10 @@ module RuneBlog::REPL
     result = system!("open #{local}")
     raise CantOpen(local) unless result
   rescue => err
-    _tmp_error(err)
+    msg = err.to_s
+    msg << "\n" << err.backtrace.join("\n") if err.respond_to?(:backtrace)
+    puts msg
+    log!(str: msg) 
   end
 
   def cmd_publish
@@ -206,14 +209,14 @@ module RuneBlog::REPL
 
   def regen_posts
     drafts = @blog.drafts  # current view
-    puts "  Regenerating posts..." unless drafts.empty?
+log! str:  "===  Regenerating posts..." unless drafts.empty?
     drafts.each do |draft|
       orig = @blog.root/:drafts/draft
       postdir = @blog.root/:posts/draft.sub(/.lt3$/, "")
       content = postdir/"/guts.html"
       next if fresh?(orig, content)
 
-# puts "Calling generate_post(#{orig})"
+log! str:  "=== Calling generate_post(#{orig})"
       @blog.generate_post(orig)    # rebuild post
       Dir.chdir(postdir) do
         meta = @blog.read_metadata
@@ -225,28 +228,34 @@ module RuneBlog::REPL
   end
 
   def cmd_rebuild
-    debug "Starting cmd_rebuild..."
+log! str:  "=== Starting cmd_rebuild..."
     puts
     regen_posts
-    puts "  Generating view..."
+log! str:  "===   Generating view..."
     @blog.generate_view(@blog.view)
-    puts "  Generating index..."
+log! str:  "===   Generating index..."
     @blog.generate_index(@blog.view)
-    puts "  ...finished!"
+log! str:  "===   ...finished!"
   rescue => err
     _tmp_error(err)
   end
 
   def cmd_change_view(arg = nil)
     if arg.nil?
-      viewnames = @blog.views.map {|x| x.name }
-      n = viewnames.find_index(@blog.view.name)
+      viewnames = {}
+      @blog.views.each do |v| 
+        name = v.to_s
+        title = view2title(name)
+        string = "#{'%-25s' % title}  #{name}"
+        viewnames[string] = name
+      end
+      n = viewnames.values.find_index(@blog.view.name)
       name = @blog.view.name
-      # TODO: Add view description 
       k, name = STDSCR.menu(title: "Views", items: viewnames, curr: n)
       return if name.nil?
+log! str:  "cv Setting to #{name.inspect}"
       @blog.view = name
-      puts "\n  ", fx(name, :bold), "\n"
+#     puts "\n  ", fx(name, :bold), "\n"
       return
     else
       if @blog.view?(arg)
@@ -256,19 +265,40 @@ module RuneBlog::REPL
     end
   end
 
+  # move to helpers
+  def modify_view_global(view_name)
+    gfile = "#{@blog.root}/views/#{view_name}/data/global.lt3"
+    lines = File.readlines(gfile).map(&:chomp)
+    vars = <<~EOF
+      .variables
+      View     #{view_name}
+      ViewDir  #{@blog.root}/views/#{view_name}
+      .end
+
+    EOF
+    # lines.insert(5, vars)
+    text = lines.join("\n")
+    File.write(gfile, text)
+  end
+
+  def modify_view_settings(name:, title:, subtitle:, domain:)
+    vfile = "#{@blog.root}/views/#{name}/settings/view.txt"
+    hash = {/VIEW_NAME/     => name,
+            /VIEW_TITLE/    => title,
+            /VIEW_SUBTITLE/ => subtitle,
+            /VIEW_DOMAIN/   => domain}
+    @blog.complete_file(vfile, nil, hash)
+  end
+
   def cmd_new_view(arg)
     view_name = ask!("      Filename: ")
     @blog.create_view(view_name)   # call change_view??
     title     = ask!("      View title: ")
     subtitle  = ask!("      Subtitle  : ")
     domain    = ask!("      Domain    : ")
-
-    vfile = "#{@blog.root}/views/#{view_name}/settings/view.txt"
-    hash = {/VIEW_NAME/     => view_name,
-            /VIEW_TITLE/    => title,
-            /VIEW_SUBTITLE/ => subtitle,
-            /VIEW_DOMAIN/   => domain}
-    @blog.complete_file(vfile, nil, hash)
+    modify_view_global(view_name)
+    modify_view_settings(name: view_name, title: title, subtitle: subtitle,
+                         domain: domain)
     @blog.change_view(view_name)
   end 
 
@@ -278,11 +308,13 @@ module RuneBlog::REPL
       puts
     end
     @blog.create_view(arg)
-    text = File.read("#{@blog.root}/data/global.lt3")
-    File.write("#{@blog.root}/views/#{@blog.view}/themes/standard/global.lt3", 
+    lines = File.read("#{@blog.root}/data/global.lt3")
+    # File.write("#{@blog.root}/views/#{@blog.view}/themes/standard/global.lt3", 
+    File.write("#{@blog.root}/views/#{@blog.view}/data/global.lt3", 
                text.gsub(/VIEW_NAME/, @blog.view.to_s))
     vim_params = '-c ":set hlsearch" -c ":hi Search ctermfg=2 ctermbg=6" +/"\(VIEW_.*\|SITE.*\)"'
-    edit_file(@blog.view.dir/"themes/standard/global.lt3", vim: vim_params)
+    # edit_file(@blog.view.dir/"themes/standard/global.lt3", vim: vim_params)
+    edit_file(@blog.view.dir/"data/global.lt3", vim: vim_params)
     @blog.change_view(arg)
   rescue ViewAlreadyExists
     puts 'Blog already exists'
@@ -323,23 +355,26 @@ module RuneBlog::REPL
     tag = "#{'%04d' % id}"
     files = ::Find.find(@blog.root/:drafts).to_a
     files = files.grep(/#{tag}-.*lt3/)
-    draft = exactly_one(files)
+    draft = exactly_one(files, files.join("/"))
     result = edit_file(draft, vim: '-c$')
     @blog.generate_post(draft)
   rescue => err
     _tmp_error(err)
   end
 
+  def view2title(name)  # FIXME: crufty as hell
+    lines = File.readlines(@blog.root/"views/#{name}/settings/view.txt")
+    lines.map!(&:chomp)
+    lines = lines.select {|x| x =~ /^title / && x !~ /VIEW_/ }
+    title = lines.first.split(" ", 2)[1]
+  end
+
   def cmd_list_views
     puts
     @blog.views.each do |v| 
       v = v.to_s
+      title = view2title(v)
       v = fx(v, :bold) if v == @blog.view.name
-      # FIXME: next 3 lines are crufty as hell
-      lines = File.readlines(@blog.root/"views/#{v}/settings/view.txt")
-      lines.map!(&:chomp)
-      lines = lines.select {|x| x =~ /^title / && x !~ /VIEW_/ }
-      title = lines.first.split(" ", 2)[1]
       print "  ", ('%15s' % v)
       puts  "  ", fx(title, Black)
     end
@@ -383,6 +418,7 @@ module RuneBlog::REPL
         base = draft.sub(/.lt3$/, "")
         dir = @blog.root/:posts/base
         meta = nil 
+puts "Trying chdir into #{dir}..."
         Dir.chdir(dir) { meta = @blog.read_metadata }
         num, title = meta.num, meta.title
         num = '%4d' % num.to_s