runeblog 0.3.05 → 0.3.06

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c6fa9176107c58120ebb4753221228bfe0d031f08f21a20dc2f7f86d6b2c6af
-  data.tar.gz: c3bf5183cbeddb2cc3c9022695fcd9aa9ba50cf0e5364afd4632fac8a837e315
+  metadata.gz: 70bd6e1889a61c19c606616bcb0a4ace993b9f7cb7c993a9e4c2c41e7f47a7f9
+  data.tar.gz: c178b2630acfadbeddbbd51dc050bf41cf636372421fdda3b9003991f31c2b26
 SHA512:
-  metadata.gz: 0bb8f0fb6b1a59ac69eabdcb0c50a20bf20308e4155fb1d305be5a19ab8eece7ffa7aecdbff3d4cfc48000dbbb891c3a2777068608a1e28750d8751b39a39af8
-  data.tar.gz: 113a34a9fba90a9f8b9d9bc47cab433b00359a0c8f159b8fbf807e7609b50056ebf4e0e368d6b369256083a7a6c25316dd2c710297ea4bbccfa7fadd85bbf458
+  metadata.gz: 6c736c15fe20f800cc6393e5ad008983c0cb15eb2e90b1db60ac02361fb3ff65fc526266009d15f9ab1b99324055388bf52c9d487101e2ce6ce3dab1f3b1ba97
+  data.tar.gz: 7eb2bc828f8969fd15524ec4a010de4ecda475e636dc6fd0b8e4cbc0736def5aaf504db801440059644d1080423807f5abc078e79047d9b19cb8c4b79e336e26

data/lib/helpers-blog.rb

@@ -22,16 +22,10 @@ module RuneBlog::Helpers
       dir = @root/:views/self.view/:settings
     end
     file = dir/"features.txt"
-    lines = File.readlines(file)
-    lines.each do |line|
-      line = line.strip
-      line.sub!(/ #.*/, "")   # trailing
-      next if line =~ /^ *#/  # leading
-      next if line.empty?
-      name, status = line.split
-      hash[name] = (status == "1")  # enabled
-    end
-    @features = hash
+    pairs = read_pairs(file)
+    enabled = {}
+    pairs.each {|k,v| enabled[k] = (v == "1") }
+    @features = enabled
   end
 
   def get_repo_config
@@ -72,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/liveblog.rb

@@ -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

@@ -2,7 +2,7 @@
   def _tmp_error(err)
     out = "/tmp/blog#{rand(100)}.txt"
     File.open(out, "w") do |f|
-      f.puts err + "\n--------"
+      f.puts err.to_s + "\n--------"
       f.puts err.backtrace.join("\n")
     end
     puts "Error: See #{out}"
@@ -28,22 +28,40 @@
   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)
+      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"
@@ -74,9 +92,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

data/lib/repl.rb

@@ -8,31 +8,31 @@ make_exception(:EditorProblem, "Could not edit $1")
 
 module RuneBlog::REPL
   def edit_file(file, vim: "")
-    STDSCR.saveback
+#   STDSCR.saveback
     ed = @blog.editor
     params = vim if ed =~ /vim$/
     result = system!("#{@blog.editor} #{file} #{params}")
     raise EditorProblem(file) unless result
-    STDSCR.restback
+#   STDSCR.restback
     cmd_clear
   end
 
   def cmd_quit
     STDSCR.rows.times { puts " "*(STDSCR.cols-1) }
     # FIXME please?
-    sleep 0.1
+    # sleep 0.1
     STDSCR.clear
     sleep 0.1
     RubyText.stop
     sleep 0.1
     system("clear")
-    sleep 0.1
+    # sleep 0.1
     exit
   end
 
   def cmd_clear
     STDSCR.rows.times { puts " "*(STDSCR.cols-1) }
-    sleep 0.1
+    # sleep 0.1
     STDSCR.clear
   end
 
@@ -223,9 +223,9 @@ module RuneBlog::REPL
   def cmd_rebuild
     debug "Starting cmd_rebuild..."
     puts
+    regen_posts
     @blog.generate_view(@blog.view)
     @blog.generate_index(@blog.view)
-    regen_posts
   rescue => err
     _tmp_error(err)
   end
@@ -301,22 +301,8 @@ module RuneBlog::REPL
     tag = "#{'%04d' % id}"
     files = ::Find.find(@blog.root/:drafts).to_a
     files = files.grep(/#{tag}-.*lt3/)
-    files = files.map {|f| File.basename(f) }
-    if files.size > 1
-      msg = "Multiple files: #{files}"
-      puts msg
-      return [false, msg]
-    end
-    if files.empty?
-      msg = "\n  Can't edit post #{id}"
-      puts msg
-      return [false, msg]
-    end
-
-    file = files.first
-    draft = @blog.root/:drafts/file
-    vim_params = '-c G'
-    result = edit_file(draft)
+    draft = exactly_one(files)
+    result = edit_file(draft, vim: '-c$')
     @blog.generate_post(draft)
   rescue => err
     _tmp_error(err)

data/lib/runeblog.rb

@@ -189,11 +189,20 @@ class RuneBlog
     _generate_settings
   end
 
+  # FIXME reconcile with _get_draft data
+
+  def read_metadata
+    meta = read_pairs!("metadata.txt")
+    meta.views = meta.views.split
+    meta.tags  = meta.tags.split
+    meta
+  end
+
   def _deploy_local(dir)
     log!(enter: __method__, args: [dir], level: 1)
     Dir.chdir(dir) do
-      views = _retrieve_metadata(:views)
-      views.each do |v| 
+      meta = read_metadata
+      meta.views.each do |v| 
         next unless _check_view?(v)
         system!("cp *html #@root/views/#{v}/remote", show: true)
       end
@@ -202,33 +211,6 @@ class RuneBlog
     _tmp_error(err)
   end
 
-  # FIXME reconcile with _get_draft data
-
-  def _retrieve_metadata(key)
-    key = key.to_s
-    lines = File.readlines("metadata.txt")
-    lines = lines.grep(/^#{key}: /)
-    case lines.size
-      when 0
-        result = nil  # not found
-      when 1
-        front = "#{key}: "
-        n = front.size
-        str = lines.first.chomp[n..-1]
-        case key
-          when "views", "tags"   # plurals
-            result = str.split
-        else
-          result = str
-        end
-    else 
-      raise "Too many #{key} instances in metadata.txt!"
-    end
-    return result
-  rescue => err
-    _tmp_error(err)
-  end
-
   def process_post(sourcefile)
     log!(enter: __method__, args: [sourcefile], level: 2)
     nslug = sourcefile.sub(/.lt3/, "")
@@ -401,9 +383,8 @@ class RuneBlog
     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(self.view, postdir)
     vp
   rescue => err
@@ -563,34 +544,10 @@ class RuneBlog
     # _tmp_error(err)
   end
 
-  def _get_draft_data(num, sym)
-    tag = prefix(num)
-    front = @blog.root/:drafts/tag
-    files = Dir[front + "*"]
-    raise "No draft #{num} found" if files.empty?
-    raise "Too many files found for #{num}!" if files.size > 1
-    file = files.first
-    lines = File.readlines(file)
-    case sym
-      when :views
-        view_line = lines.grep(/^.views /)
-        raise "More than one .views call in #{draft}" if view_line.size > 1
-        raise "No .views call in #{draft}" if view_line.size < 1
-        view_line = view_line.first
-        views = view_line[7..-1].split
-        return views.uniq 
-    else
-      raise "Unknown symbol #{sym.inspect}"
-    end
-  end
-
   def _get_views(draft)
     log!(enter: __method__, args: [draft], level: 2)
     # FIXME dumb code
-    view_line = File.readlines(draft).grep(/^.views /)
-    raise "More than one .views call in #{draft}" if view_line.size > 1
-    raise "No .views call in #{draft}" if view_line.size < 1
-    view_line = view_line.first
+    view_line = exactly_one(File.readlines(draft).grep(/^.views /))
     views = view_line[7..-1].split
     views.uniq 
   rescue => err
@@ -621,10 +578,11 @@ class RuneBlog
     pnum = nslug[0..3]                 # 0001
     Dir.chdir(pdraft) do 
       excerpt = File.read("teaser.txt")
-      date = _retrieve_metadata(:date)
+      meta = read_metadata
+      date = meta.date
       longdate = ::Date.parse(date).strftime("%B %e, %Y")
-      title = _retrieve_metadata(:title)
-      tags = _retrieve_metadata(:tags)
+      title = meta.title
+      tags = meta.tags
       # FIXME simplify
       vars = <<~LIVE
         .set post.num = #{pnum}

data/lib/runeblog_version.rb

@@ -3,7 +3,7 @@ if !defined?(RuneBlog::Path)
 # if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.3.05"
+  VERSION = "0.3.06"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)
@@ -46,5 +46,4 @@ def prefix(num)
   "#{'%04d' % num.to_i}"
 end
 
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.3.05
+  version: 0.3.06
 platform: ruby
 authors:
 - Hal Fulton