runeblog 0.3.02 → 0.3.07

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af242702c47c1cad260040a42b4fe58f5fb84e83934bfa80e0f12fd3e7083c9c
-  data.tar.gz: 90b1d17454ce166e5c89b1c8ed6cc43f129a708a14200b94a1bb5c2a5a721a7b
+  metadata.gz: c9c40711649cc90ed5892d256311a01c9841655a1945cc2dcfcc9bd8dd0e77e5
+  data.tar.gz: ff3b53cdf4d0f6d7136e31cef2aca74a4843d836d45518909baa082f134ec089
 SHA512:
-  metadata.gz: a70f36f01ebdfc94db5b6794b8975b876b0255b154d8393d87e7728f19010c478daaa93462cbb21aa0bee539c4d4a922640d8c92f7f3707538974d5cbe60f65d
-  data.tar.gz: 50d5b646a4fa6e050f0aedb2789371c61fd5115ce35d03051b3ce690f113b47182782951ac8a6e7742bbf1316e7791fcccfd653d2d67911bf75b4bf3e62ae4a6
+  metadata.gz: 667ae25acb4c5230f9674fc067bbfca36b18562f8bf9f740f066e39621ae3eff9a952309eb28b3ed754c8f4c4acc0cc7a25054db1f7999844c8f49ac6621cb9c
+  data.tar.gz: cda360ef27a9733285d4aa0c50f402cd00c385f30f49f40d0fd1d61fc1046aec84dc2b0d8f6bb9e4db018c8f4266eb7381c1e9171ff5096166a7054fda98e8ea

data/bin/blog

@@ -25,14 +25,13 @@ end
 def get_universal
   univ = "#{@blog.root}/data/universal.lt3"
   if yesno("Faster initial setup? (no: edit universal.lt3)")
-    author = ask!("    Author name: ")
-    site   = ask!("    Site/domain: ")
+    author = ask!("      Author name: ")
+    site   = ask!("      Site/domain: ")
     # Now stash it...
     str = File.read(univ)
     str = str.gsub(/AUTHOR/, author)
     str = str.gsub(/SITE_DOMAIN/, site)
     File.write(univ, str)
-# STDERR.puts "------ universal ------\n#{`cat #{univ}`}\n------------------------"
   else
     vim_params = '-c ":set hlsearch" -c ":hi Search ctermfg=2 ctermbg=6" +/"\(AUTHOR.*\|SITE.*\)"'
     edit_file(univ, vim: vim_params)
@@ -41,11 +40,11 @@ end
 
 def get_global
   if yesno("Faster view setup? (no: edit global.lt3)")
-    view_name = ask!("\n    Filename: ")
+    view_name = ask!("      Filename: ")
     @blog.create_view(view_name)   # call change_view??
-    title     = ask!("    View title: ")
-    subtitle  = ask!("    Subtitle  : ")
-    domain    = ask!("    Domain    : ")
+    title     = ask!("      View title: ")
+    subtitle  = ask!("      Subtitle  : ")
+    domain    = ask!("      Domain    : ")
 
     vfile = "#{@blog.root}/views/#{view_name}/settings/view.txt"
     hash = {/VIEW_NAME/     => view_name,
@@ -54,7 +53,7 @@ def get_global
             /VIEW_DOMAIN/   => domain}
     @blog.complete_file(vfile, nil, hash)
   else
-    view_name = ask!("\n    Filename: ")
+    view_name = ask!("      Filename: ")
     @blog.create_view(view_name)   # call change_view??
     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)
@@ -66,6 +65,8 @@ def get_started
     puts "      First choose your editor."
     @blog.editor = pick_editor
     File.write("#{@blog.root}/data/EDITOR", @blog.editor)
+    print "      Default editor is "
+    puts  fx(@blog.editor, :bold)
 
     get_universal
     # Now create a custom global.lt3
@@ -73,11 +74,10 @@ def get_started
     puts fx("\n  Quick setup complete!", :bold)
     if yesno("Create your first view now?")
       get_global
-      puts "\n  View #{@blog.view} created!\n "
+      puts fx("\n      View #{@blog.view} created!\n ", :bold)
     end
   end
 
-  puts
   print fx("  For help", :bold)
   puts " type h or help."
   print fx("  Create a view", :bold)
@@ -90,11 +90,11 @@ def mainloop
   info = @blog.view || "no view"
   print fx("[#{info}] ", Red, :bold)
   cmd = STDSCR.gets(history: @cmdhist, tab: @tabcom)
-  cmd_quit(nil) if cmd.nil?   # ^D
+  cmd_quit if cmd.nil?   # ^D
   cmd.chomp!
   return if cmd.empty?   # CR does nothing
-  meth, params = RuneBlog::REPL.choose_method(cmd)
-  ret, str = send(meth, params)
+  invoking = RuneBlog::REPL.choose_method(cmd)
+  ret = send(*invoking)
 rescue => err
   puts err
 end
@@ -106,7 +106,7 @@ def cmdline_preview
 end
 
 def cmdline_publish
-  abort "Nor implemented yet"
+  abort "Not implemented yet"
   _need_view
 end
 
@@ -152,7 +152,8 @@ major, minor = RUBY_VERSION.split(".").values_at(0,1)
 ver = major.to_i*10 + minor.to_i
 unless ver >= 24
   RubyText.stop
-  abort "Need Ruby 2.4 or greater" 
+  sleep 0.2
+  abort "Needs Ruby 2.4 or greater" 
 end
 
 include RuneBlog::Helpers  # for try_read_config
@@ -194,7 +195,7 @@ puts fx("\n  RuneBlog", :bold), fx(" v #{RuneBlog::VERSION}\n", Red)
   
 loop { mainloop }
 
-system("tput clear")
+# system("tput clear")
 sleep 0.2
 puts
 

data/data/features.txt

@@ -2,7 +2,7 @@
 # 1 = enabled (implies installed)
 # x = excluded (not installed; does it even exist?)
 
-reddit     1   # autopost, embed thread after blog post
+reddit     0   # autopost, embed thread after blog post
 facebook   0   # reader-like, reader post, autopost?
 twitter    0   # reader-tweet, reader-follow, autotweet?
 

data/empty_view/settings/features.txt

@@ -2,7 +2,7 @@
 # 1 = enabled (implies installed)
 # x = excluded (not installed; does it even exist?)
 
-reddit     1   # autopost, embed thread after blog post
+reddit     0   # autopost, embed thread after blog post
 facebook   0   # reader-like, reader post, autopost?
 twitter    0   # reader-tweet, reader-follow, autotweet?
 

data/empty_view/settings/recent.txt

@@ -1,6 +1,11 @@
 title.color  #010101
 title.size   28px
+
 text.color   #0101a1
 text.size    22px
+
 date.color   #9a9a9a
 date.size    15px
+
+bgcolor      #ffffff   # white
+count        10        # max number of recent entries

data/lib/helpers-blog.rb

@@ -14,16 +14,18 @@ module RuneBlog::Helpers
     exit
   end
 
-  def read_features
+  def read_features(view = nil)
     hash = {}
-    file = @root/self.view/"settings/features.txt"
-    lines = File.readlines(file)
-    lines.each do |line|
-      char, line = line[0], line[1..-1].chomp
-      name = line.strip
-      hash[name] = (char != "-")
+    if view.nil?  # toplevel default
+      dir = @root/"data"
+    else
+      dir = @root/:views/self.view/:settings
     end
-    @features = hash
+    file = dir/"features.txt"
+    pairs = read_pairs(file)
+    enabled = {}
+    pairs.each {|k,v| enabled[k] = (v == "1") }
+    @features = enabled
   end
 
   def get_repo_config
@@ -39,15 +41,9 @@ module RuneBlog::Helpers
 
   def copy_data(tag, dest)
     data  = RuneBlog::Path + "/../data"    # files kept inside gem
-    extra = RuneBlog::Path + "/../config"  # files kept inside gem
-    # FIXME names are confusing
-    case tag
-      when :config 
-        files = %w[ROOT VIEW EDITOR universal.lt3 global.lt3]
-        files.each {|file| copy(data + "/" + file, dest) }
-      when :extra  # FIXME remove later
-#        copy!(extra, dest)
-    end
+    # FIXME tag no longer used
+    files = %w[ROOT VIEW EDITOR universal.lt3 global.lt3 features.txt]
+    files.each {|file| copy(data + "/" + file, dest) unless File.exist?(dest/file) }
   end
 
   def read_vars(file)
@@ -70,47 +66,6 @@ module RuneBlog::Helpers
     stop_RubyText rescue nil
   end
 
-  def read_config(file, *syms)
-    log!(enter: __method__, args: [file, *syms], level: 3)
-    lines = File.readlines(file).map(&:chomp)
-    obj = ::OpenStruct.new
-    skip = ["\n", "#", "."]
-    lines.each do |line|
-      next if skip.include?(line[0])
-      key, val = line.split(/: +/, 2)
-      obj.send(key+"=", val)
-    end
-    return obj if syms.empty?
-
-    vals = []
-    if syms.empty?
-      vals = obj.to_hash.values
-    else
-      syms.each {|sym| vals << obj.send(sym) }
-    end
-    return vals
-  rescue => err
-    puts "Can't read config file '#{file}': #{err}"
-    puts err.backtrace.join("\n")
-    puts "dir = #{Dir.pwd}"
-    stop_RubyText
-  end
-
-  def try_read_config(file, hash)
-    log!(enter: __method__, args: [file, hash], level: 3)
-    return hash.values unless File.exist?(file)
-    vals = read_config(file, *hash.keys)
-    vals
-  end
-
-  def write_config(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}" }
-    end
-  end
-
   def retrieve_views   # read from filesystem
     log!(enter: __method__, level: 3)
     dirs = subdirs("#@root/views/").sort

data/lib/helpers-repl.rb

@@ -109,7 +109,9 @@ module RuneBlog::REPL
     end
     meth = found || :cmd_INVALID
     params = cmd if meth == :cmd_INVALID
-    [meth, params]
+    result = [meth]
+    result << params unless params.nil?
+    result
   end
 
   def ask(prompt, meth = :to_s)
@@ -121,42 +123,6 @@ module RuneBlog::REPL
     ask(fx(prompt, :bold), meth)
   end
 
-  def reset_output(initial = "")
-    @out ||= ""
-    @out.replace initial
-  end
-
-  def flush_output(initial = "")
-    CantOpen
-    @out ||= ""
-    puts @out
-    reset_output
-  end
-
-  def output(str)  # \n and indent
-    @out ||= ""
-    @out << "  " + str.to_s
-  end
-
-  def outstr(str)  # indent
-    @out ||= ""
-    @out << str
-  end
-
-  def output!(str)  # \n and indent
-    @out ||= ""
-    @out << "  " + str
-  end
-
-  def output_newline(n = 1)
-    @out ||= ""
-    n.times { @out << "\n" }
-  end
-
-  def check_empty(arg)
-    raise InternalError(caller[0], arg.inspect)  unless arg.nil?
-  end
-
   def get_integer(arg)
     Integer(arg) 
   rescue 
@@ -176,10 +142,6 @@ module RuneBlog::REPL
     end
   end
 
-  def colored_slug(slug)
-    slug[0..3] + slug[4..-1]
-  end
-
   def tags_for_view(vname = @blog.view)
     Dir.chdir(vname) do
       fname = "tagpool"

data/lib/liveblog.rb

@@ -72,7 +72,7 @@ def post_trailer
   tags = _var("post.tags")
   taglist = tags.empty? ? "" : "Tags: #{tags}"
 
-  reddit_enabled = @blog.features["reddit"] rescue nil
+  reddit_enabled = @blog.features["reddit"]
   reddit_txt = ""
   if reddit_enabled
     vdir  = @blog.root/:views/@blog.view
@@ -110,7 +110,7 @@ def faq
   _out %[&nbsp;<a data-toggle="collapse" href="##{id}" role="button" aria-expanded="false" aria-controls="collapseExample"><font size=+3>&#8964;</font></a>]
   _out %[&nbsp;<b>#{ques}</b>]
   _out %[<div class="collapse" id="#{id}"><br><font size=+1>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#{ans}</font></div>\n]
-  _out "<br>" unless @faq_count == 1
+  _out "<br>" # unless @faq_count == 1
   _optional_blank_line
 end
 
@@ -775,9 +775,9 @@ end
 def _write_metadata
   File.write("teaser.txt", @meta.teaser)
   fields = [:num, :title, :date, :pubdate, :views, :tags, :pinned]
-  fname2 = "metadata.txt"
-  f2 = File.open(fname2, "w") do |f2| 
-    fields.each {|fld| f2.puts "#{fld}: #{@meta.send(fld)}" }
+  fname = "metadata.txt"
+  File.open(fname, "w") do |f| 
+    fields.each {|fld| f.puts "#{'%8s' % fld}  #{@meta.send(fld)}" }
   end
 end
 
@@ -789,9 +789,8 @@ def _post_lookup(postid)    # side-effect
   posts = Dir.entries(dir_posts).grep(/^\d\d\d\d/).map {|x| dir_posts/x }
   posts.select! {|x| File.directory?(x) }
 
-  post = posts.select {|x| File.basename(x).to_i == postid }
-  raise "Error: More than one post #{postid}" if post.size > 1
-  postdir = post.first
+  posts = posts.select {|x| File.basename(x).to_i == postid }
+  postdir = exactly_one(posts)
   vp = RuneBlog::ViewPost.new(@blog.view, postdir)
   vp
 end

data/lib/lowlevel.rb

@@ -1,4 +1,13 @@
 
+  def _tmp_error(err)
+    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}"
+  end
+
   def dump(obj, name)
     File.write(name, obj)
   end
@@ -19,22 +28,41 @@
   end
 
   def _get_data?(file)   # File need not exist
-    if File.exist?(file)
-      _get_data(file)
-    else
-      []
-    end
+    File.exist?(file) ? _get_data(file) : []
   end
 
   def _get_data(file)
     lines = File.readlines(file)
-    lines.reject! {|line| line[0] == "-" }  # allow rejection of lines
     lines = lines.map do |line|
-      line.sub(/ *# .*$/, "")               # allow trailing comments
+      line = line.chomp.strip
+      line.sub(/ *# .*$/, "")    # allow leading/trailing comments
     end
+    lines.reject! {|x| x.empty? }
     lines
   end
 
+  def read_pairs(file)       # returns a hash
+    lines = _get_data(file)
+    hash = {}
+    lines.each do |line|
+      key, val = line.split(" ", 2)
+      val ||= ""
+      hash[key] = val
+    end
+    hash
+  end
+
+  def read_pairs!(file)       # returns an openstruct
+    lines = _get_data(file)
+    obj = OpenStruct.new
+    lines.each do |line|
+      key, val = line.split(" ", 2)
+      val ||= ""
+      obj.send("#{key}=", val)
+    end
+    obj
+  end
+
   def copy(src, dst)
     log!(enter: __method__, args: [src, dst], level: 2)
     cmd = "cp #{src} #{dst} 2>/dev/null"
@@ -65,9 +93,15 @@
   end
 
   def error(err)
-    log!(str: err, enter: __method__, args: [err], level: 2)
+    # log!(str: err, enter: __method__, args: [err], level: 2)
     str = "\n  Error: #{err}"
     puts str
     puts err.backtrace.join("\n")
   end
 
+  def exactly_one(list)
+    raise "List: Zero instances" if list.empty?
+    raise "List: More than one instance" if list.size > 1
+    list.first
+  end
+

data/lib/post.rb

@@ -13,41 +13,20 @@ class RuneBlog::Post
     log!(enter: __method__, args: [post], level: 3)
     raise "Doesn't work right now"
     raise NoBlogAccessor if RuneBlog.blog.nil?
-    # "post" is a slug
+    # "post" is a slug?
     pdir = RuneBlog.blog.root/:drafts/post
     meta = nil
     Dir.chdir(pdir) do
-      meta = read_config("metadata.txt")
-      meta.date = Date.parse(meta.date)
-      meta.views = meta.views.split
-      meta.tags = meta.tags.split
-      meta.teaser = File.read("teaser.txt")
+#     meta = read_config("metadata.txt")
+#     meta.date = Date.parse(meta.date)
+#     meta.views = meta.views.split
+#     meta.tags = meta.tags.split
+#     meta.teaser = File.read("teaser.txt")
 #     meta.body = File.read("body.txt")
     end
     meta
   end
 
-  def write_metadata(meta)   # FIXME ???
-    log!(enter: __method__, args: [meta], level: 3)
-    debug "=== write_metadata:"
-    debug "-----\n#{meta.inspect}\n-----"
-    fname2 = "metadata.txt"
-    hash = meta.to_h
-
-    File.write("teaser.txt", hash[:teaser])
-    hash.delete(:teaser)
-    hash.delete(:body)
-
-    hash[:views] = hash[:views].join(" ")
-    hash[:tags]  = hash[:tags].join(" ")
-
-    fields = [:num, :title, :date, :pubdate, :views, :tags]
-
-    f2 = File.new(fname2, "w")
-    fields.each {|fld| f2.puts "#{fld}: #{hash[fld]}" }
-    f2.close
-  end
-
   def initialize
     log!(enter: __method__, level: 3)
     @blog = RuneBlog.blog || raise(NoBlogAccessor)
@@ -87,10 +66,9 @@ class RuneBlog::Post
   end
 
   def edit
-    log!(enter: __method__)
-    result = system!("vi #@draft +8")  # TODO improve this
-    raise EditorProblem(draft) unless result
-    nil
+    # log!(enter: __method__)
+    edit_file(@draft, vim: "+8")
+    build
   rescue => err
     error(err)
   end 
@@ -99,8 +77,8 @@ class RuneBlog::Post
     log!(enter: __method__)
     post = self
     views = post.meta.views
-    text = File.read(@draft)
     @blog.generate_post(@draft)
+    @blog.generate_index(@blog.view)
   end
 end
 
@@ -184,12 +162,12 @@ class RuneBlog::ViewPost
     @aslug = @nslug[5..-1]
     fname = "#{postdir}/teaser.txt"            # ???
     @teaser_text = File.read(fname).chomp
-    # FIXME dumb hacks...
-    mdfile = postdir/"metadata.txt"
-    lines = File.readlines(mdfile)
-    @title = lines.grep(/title:/).first[7..-1].chomp
-    @date  = lines.grep(/pubdate:/).first[9..-1].chomp
-# print "-- date = #{@date.inspect} "; gets
+    
+    Dir.chdir(postdir) do 
+      meta = @blog.read_metadata
+      @title = meta.title
+      @date  = meta.pubdate
+    end
   rescue => err
     STDERR.puts "--- #{err}\n #{err.backtrace.join("\n  ")}"
   end