runeblog 0.3.18 → 0.3.23

data/lib/lowlevel.rb

@@ -1,11 +1,17 @@
 
   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")
+    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 +26,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 +39,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 +55,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 +67,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 +108,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)
+    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)
+    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"),
@@ -32,8 +33,9 @@ Menu.top_config = {
     "   HEAD info"                        => edit("#{std}/blog/head.lt3"),
     "   Layout "                          => edit("#{std}/blog/index.lt3"),
     "   Recent-posts entry"               => edit("#{std}/blog/post_entry.lt3"),
-    "   Banner: Description"              => edit("#{std}/blog/banner.lt3"),
-    "      Text portion"                  => edit("#{std}/banner/top.lt3"),
+    "   Banner: Description"              => edit("#{std}/banner/banner.lt3"),
+    "      Navbar"                        => edit("#{std}/navbar/navbar.lt3"),
+#   "      Text portion"                  => edit("#{std}/banner/top.lt3"),
     "Generator for a post"                => edit("#{std}/post/generate.lt3"),
     "   HEAD info for post"               => edit("#{std}/post/head.lt3"),
     "   Content for post"                 => edit("#{std}/post/index.lt3"),

data/lib/newpost.rb

@@ -0,0 +1,82 @@
+require 'rubytext'
+
+RubyText.start
+  
+#  Idea: A special sub-environment for creating a post
+#  
+#  1. Display: view, post number, date
+#  2. Menu?
+#  3.   - Edit/enter title
+#  4.   - Edit teaser
+#  5.   - Add views
+#  6.   - Add tags
+#  7.   - Import assets
+#  8.   - Save 
+#  9.  - Quit
+# Edit body after save/quit
+
+def ask(prompt)  # elsewhere?
+  print prompt
+  str = gets
+  str.chomp! if str
+  str
+end
+
+def enter_title
+  puts __method__
+  str = ask("Title:    ")
+  puts str.inspect
+end
+
+def edit_teaser
+  puts __method__
+  str = ask("Teaser:   ")
+  puts str.inspect
+end
+
+def add_views
+  puts __method__
+end
+
+def add_tags
+  puts __method__
+end
+
+def import_assets
+  puts __method__
+end
+
+def save_post
+  puts __method__
+end
+
+def quit_post
+  puts __method__
+end
+
+items = {
+  "Enter title"   => proc { enter_title },
+  "Edit teaser"   => proc { edit_teaser },
+  "Add views"     => proc { add_views },
+  "Add tags"      => proc { add_tags },
+  "Import assets" => proc { import_assets },
+  "Save"          => proc { save_post },
+  "Quit"          => proc { quit_post }
+}
+
+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

@@ -11,7 +11,7 @@ class RuneBlog::Post
   
   def self.load(post)
     log!(enter: __method__, args: [post], level: 3)
-    raise "Doesn't work right now"
+    raise NotImplemented
     raise NoBlogAccessor if RuneBlog.blog.nil?
     # "post" is a slug?
     pdir = RuneBlog.blog.root/:drafts/post
@@ -66,7 +66,7 @@ class RuneBlog::Post
   end
 
   def edit
-    # log!(enter: __method__)
+    log!(enter: __method__)
     edit_file(@draft, vim: "+8")
     build
   rescue => err
@@ -87,8 +87,8 @@ class RuneBlog::ViewPost
   attr_accessor :path, :title, :date, :teaser_text
 
   def self.make(blog:, view:, nslug:)
-    raise "No numeric prefix on #{nslug}" unless nslug =~ /^\d{4}-/
-    raise "Not expecting an extension" if nslug.end_with?(".lt3") || nslug.end_with?(".html")
+    raise NoNumericPrefix(nslug) unless nslug =~ /^\d{4}-/
+    raise NoExtensionExpected(nslug) if nslug.end_with?(".lt3") || nslug.end_with?(".html")
     view = view.to_s
     view.define_singleton_method :path do |subdir = ""|
       str = blog.root/:views/view
@@ -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

@@ -12,7 +12,7 @@ end
 def stale?(src, dst, deps, force = false)
   meh = File.new("/tmp/dammit-#{src.gsub(/\//, "-")}", "w")
   log!(enter: __method__, args: [src, dst], level: 3)
-  raise "Source #{src} not found in #{Dir.pwd}" unless File.exist?(src)
+  raise FileNotFound("#{Dir.pwd}/#{src}") unless File.exist?(src)
   return true if force
   return true unless File.exist?(dst)
   return true if newer?(src, dst)
@@ -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,10 @@ def preprocess(cwd: Dir.pwd, src:,
     dst += ".html" unless dst.end_with?(".html")
   end
   sp = " "*12
+# STDERR.puts "=== ls -l #{cwd} = "
+# STDERR.puts `ls -l #{cwd}`
+# STDERR.puts "=== going into #{cwd}"
+
   Dir.chdir(cwd) do
     if debug
       STDERR.puts "#{sp} -- preprocess "
@@ -44,6 +49,20 @@ def preprocess(cwd: Dir.pwd, src:,
     stale = stale?(src, dst, deps, force)
     if stale
       live = Livetext.customize(mix: "liveblog", call: call, vars: vars)
+      STDERR.puts <<~EOF
+        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
+      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
@@ -54,6 +73,8 @@ 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

@@ -2,35 +2,28 @@ require 'runeblog'
 require 'ostruct'
 require 'helpers-repl'  # FIXME structure
 require 'pathmagic'
+require 'exceptions'
 
 require 'menus'
 
-make_exception(:PublishError,  "Error during publishing")
-make_exception(:EditorProblem, "Could not edit $1")
-
 Signal.trap("INT") { puts "Don't  :)" }
 
 module RuneBlog::REPL
   def edit_file(file, vim: "")
-#   STDSCR.saveback
     ed = @blog.editor
     params = vim if ed =~ /vim$/
     result = system!("#{@blog.editor} #{file} #{params}")
     raise EditorProblem(file) unless result
-#   STDSCR.restback
     cmd_clear
   end
 
   def cmd_quit
     STDSCR.rows.times { puts " "*(STDSCR.cols-1) }
-    # FIXME please?
-    # sleep 0.1
     STDSCR.clear
     sleep 0.1
     RubyText.stop
     sleep 0.1
     system("clear")
-    # sleep 0.1
     exit
   end
 
@@ -213,13 +206,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)
 
+log! str:  "=== Calling generate_post(#{orig})"
       @blog.generate_post(orig)    # rebuild post
       Dir.chdir(postdir) do
         meta = @blog.read_metadata
@@ -231,28 +225,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)
@@ -262,17 +262,56 @@ 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    : ")
+    modify_view_global(view_name)
+    modify_view_settings(name: view_name, title: title, subtitle: subtitle,
+                         domain: domain)
+    @blog.change_view(view_name)
+  end 
+
+  def cmd_new_view_ORIG(arg)
     if arg.nil?
       arg = ask(fx("\nFilename: ", :bold))
       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'
@@ -313,22 +352,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 = lines.select {|x| x =~ /^title / && x !~ /VIEW_/ }
-      title = lines.first.split(" ", 2)[1]
       print "  ", ('%15s' % v)
       puts  "  ", fx(title, Black)
     end
@@ -441,7 +484,6 @@ module RuneBlog::REPL
       cmd = "cp #{name} #{@blog.root}/drafts/#@fname"
       result = system!(cmd)
       raise CantCopy(name, "#{@blog.root}/drafts/#@fname") unless result
-      # post = Post.load(@slug)
       draft = "#{@blog.root}/drafts/#@fname"
       @meta = @blog.generate_post(draft)
       puts