runeblog 0.1.79 → 0.1.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6add0a9ef9437be9e4f41ee88ac0a067cc13a9120c73a4403a2a23d471f1034d
-  data.tar.gz: ec7b79a7c68f46b57e367043aff7db3524d88e8fd593ccd9a699ca1071ff83c0
+  metadata.gz: 57d59b2120fa25efd7d1542b31200079497991ae27240e30c936701a3ac1e066
+  data.tar.gz: 3b5c8f7bde8e3ca0c7989406ecca1edb6cc35c6b8ad1b76ea55dd25cddf15f9b
 SHA512:
-  metadata.gz: 2301c17418d3d5f1cb076e36d9b6583b8388f82f6c142ac67b4d2f88110dcd46c3d79f344bf59a0e3dd0858fbbf35d3469f6a7ab0ad11d587b5cd142c61eb124
-  data.tar.gz: e96e4521ecb8f542a58164ac20f2cac17b51113cd3096258a45124b05ad1a79e29f6059eabe154c1ae4576ece2bda8f51f50c5c3368740f5728fd137a0a50e03
+  metadata.gz: e1dc62eedd0bca2d772c3363fc0a8565499d4b92911fc3f418cb0b5ab1e2d9eecd44b637040fdb52f424375a13ddf94a71118d1244b9410b61b0aaeff1e98c1c
+  data.tar.gz: 271ba003372c3562aa83f2e1bd84021a4ae333ab2d863fc2473df915d1b667f9303d0c3681ff3156da11fe6f22cf4c0e91f7e255a361b201c8e55e0d9d65c6af

data/lib/liveblog.rb

@@ -8,8 +8,6 @@ require 'runeblog'
 errfile = File.new("liveblog.out", "w")
 STDERR.reopen(errfile)
 
-# ::Home = Dir.pwd unless defined?(::Home)
-
 =begin 
 123:def title    # side-effect
 133:def pubdate    # side-effect
@@ -21,11 +19,19 @@ STDERR.reopen(errfile)
 491:def _post_lookup(postid)    # side-effect
 =end
 
+def init_liveblog    # FIXME - a lot of this logic sucks
+  @blog = $_blog = RuneBlog.new(false)
+  @root = @blog.root
+  @view = @blog.view
+  @view_name = @blog.view.name
+  @vdir = @blog.view.dir
+  @version = RuneBlog::VERSION
+  @theme = @vdir + "/themes/standard/"
+end
+
 def post
   @meta = OpenStruct.new
   @meta.num = _args[0]
-# @live = ::Livetext.new
-# STDERR.puts ">>> #{__method__}: @meta = #{@meta.to_h.inspect}"
 end
 
 def _view_from_cwd
@@ -95,31 +101,6 @@ def inset
   _optional_blank_line
 end
 
-### copy_asset
-
-# def copy_asset(asset)
-#   vdir = @blog.view.dir
-#   return if File.exist?(vdir + "/assets/" + asset)
-#   top = vdir + "/../../assets/"
-#   if File.exist?(top + asset)
-#     system("cp #{top}/#{asset} #{vdir}/assets/#{asset}")
-#     return
-#   end
-#   raise "Can't find #{asset.inspect}"
-# end
-
-#############
-
-def init_liveblog    # FIXME - a lot of this logic sucks
-  @blog = $_blog = RuneBlog.new(false)
-  @root = @blog.root
-  @view = @blog.view
-  @view_name = @blog.view.name
-  @vdir = @blog.view.dir
-  @version = RuneBlog::VERSION
-  @theme = @vdir + "/themes/standard/"
-end
-
 def _errout(*args)
   ::STDERR.puts *args
 end
@@ -142,8 +123,6 @@ def title    # side-effect
   raise "'post' was not called" unless @meta
   title = @_data.chomp
   @meta.title = title
-# STDERR.puts ">>> #{__method__}: @meta = #{@meta.to_h.inspect}"
-# @live.setvar :title, title
   setvar :title, title
   _out %[<h1 class="post-title">#{title}</h1><br>]
   _optional_blank_line
@@ -158,7 +137,6 @@ def pubdate    # side-effect
   y, m, d = y.to_i, m.to_i, d.to_i
   @meta.date = ::Date.new(y, m, d)
   @meta.pubdate = "%04d-%02d-%02d" % [y, m, d]
-# STDERR.puts ">>> #{__method__}: @meta = #{@meta.to_h.inspect}"
   _optional_blank_line
 end
 
@@ -174,7 +152,6 @@ def tags    # side-effect
   raise "'post' was not called" unless @meta
   _debug "args = #{_args}"
   @meta.tags = _args.dup || []
-# STDERR.puts ">>> #{__method__}: @meta = #{@meta.to_h.inspect}"
   _optional_blank_line
 end
 
@@ -182,7 +159,6 @@ def views    # side-effect
   raise "'post' was not called" unless @meta
   _debug "data = #{_args}"
   @meta.views = _args.dup # + ["main"]
-# STDERR.puts ">>> #{__method__}: @meta = #{@meta.to_h.inspect}"
   _optional_blank_line
 end
 
@@ -191,13 +167,9 @@ def pin    # side-effect
   _debug "data = #{_args}"
   # verify only already-specified views?
   @meta.pinned = _args.dup
-# STDERR.puts ">>> #{__method__}: @meta = #{@meta.to_h.inspect}"
   _optional_blank_line
 end
 
-# def liveblog_version
-# end
-
 def list
   _out "<ul>"
   _body {|line| _out "<li>#{line}</li>" }
@@ -221,38 +193,14 @@ def list!
   _optional_blank_line
 end
 
-def asset
-  raise "'post' was not called" unless @meta
-  @meta.assets ||= {}
-# STDERR.puts ">>> #{__method__}: @meta = #{@meta.to_h.inspect}"
-  list = _args
-  # For now: copies, doesn't keep record
-  # Later: Add to file and uniq; use in publishing
-  list.each {|asset| copy_asset(asset) }
-  _optional_blank_line
-end
-
-def assets
-  raise "'post' was not called" unless @meta
-  @meta.assets ||= []
-  @meta.assets += _body
-# STDERR.puts ">>> #{__method__}: @meta = #{@meta.to_h.inspect}"
-  _optional_blank_line
-end
-
 def write_post    # side-effect
   raise "'post' was not called" unless @meta
-# return
   save = Dir.pwd
   @postdir.gsub!(/\/\//, "/")  # FIXME unneeded?
   Dir.mkdir(@postdir) unless Dir.exist?(@postdir) # FIXME remember assets!
   Dir.chdir(@postdir)
-STDERR.puts "------ cd into #@postdir"
   @meta.views = @meta.views.join(" ")
   @meta.tags  = @meta.tags.join(" ") rescue ""
-# STDERR.puts ">>>> #{__method__}: writing #{@live.body.size} bytes to #{Dir.pwd}/body.txt"
-#  File.write("body.txt", @live.body)  # Actually HTML...
-# p Dir.pwd
   File.write("teaser.txt", @meta.teaser)
   
   fields = [:num, :title, :date, :pubdate, :views, :tags]
@@ -261,7 +209,6 @@ STDERR.puts "------ cd into #@postdir"
   f2 = File.open(fname2, "w") do |f2| 
     fields.each {|fld| f2.puts "#{fld}: #{@meta.send(fld)}" }
   end
-STDERR.puts ">>> #{__method__}: @meta = #{@meta.to_h.inspect}"
   Dir.chdir(save)
 rescue => err
   puts "err = #{err}"
@@ -271,11 +218,8 @@ end
 def teaser
   raise "'post' was not called" unless @meta
   @meta.teaser = _body_text
-STDERR.puts ">>> #{__method__}: @meta = #{@meta.to_h.inspect}"
   _out @meta.teaser + "\n"
 STDERR.puts "TEASER cwd = #{Dir.pwd}"
-# file = @vdir + "/teaser.txt"
-# File.write(file, @meta.teaser)
   # FIXME
 end
 
@@ -291,7 +235,6 @@ def finalize
   @slug = @blog.make_slug(@meta)
   slug_dir = @slug
   @postdir = @blog.view.dir + "/posts/#{slug_dir}"
-STDERR.puts "Got here!"
   write_post
   @meta
 end
@@ -342,13 +285,6 @@ class Livetext::Functions
 
 end
 
-###############
-
-
-def _var(name)  # FIXME later
-  ::Livetext::Vars[name] || "[:#{name} is undefined]"
-end
-
 def head
   # Depends on vars: title, desc, host
   defaults = {}
@@ -423,11 +359,8 @@ STDERR.puts "--- inside #main: which = #{which.inspect}"
   case which
     when "recent_posts"
       all_teasers
-    when "post"   # FIXME!!!
-#     _out "<iframe src='./0001-whats-at-stubbs/whats-at-stubbs.html'><iframe>"
+    when "post"   # No longer needed??
       _out %[<iframe style="width: 100vw;height: 100vh;position: relative;" src='whats-at-stubbs.html' width=100% frameborder="0" allowfullscreen></iframe>]
-#     self.data = "post-index.lt3"
-#     _include 
   end
   _out %[</div>]
 end
@@ -484,12 +417,10 @@ end
 ### 
 
 def _find_recent_posts
-STDERR.puts "--- frp: $FileDir = #{_var(:FileDir)}"
   @vdir = _var(:FileDir).match(%r[(^.*/views/.*?)/])[1]
   posts = nil
   dir_posts = @vdir + "/posts"
   entries = Dir.entries(dir_posts)
-STDERR.puts "--- frp: dir_posts = #{dir_posts}  ent = #{entries.inspect}"
   posts = entries.grep(/^\d\d\d\d/).map {|x| dir_posts + "/" + x }
   posts.select! {|x| File.directory?(x) }
   # directories that start with four digits
@@ -498,7 +429,6 @@ STDERR.puts "--- frp: dir_posts = #{dir_posts}  ent = #{entries.inspect}"
 end
 
 def all_teasers
-STDERR.puts "-- inside #all_teasers..."
   open = <<-HTML
       <section class="posts">
   HTML
@@ -511,7 +441,6 @@ STDERR.puts "-- inside #all_teasers..."
     <head><link rel="stylesheet" href="blog-application.css"></head>
     <body>
   HTML
-# _out open
   posts = _find_recent_posts
   wanted = [5, posts.size].min  # estimate how many we want?
   enum = posts.each
@@ -522,8 +451,6 @@ STDERR.puts "-- inside #all_teasers..."
   end
   text << "</body></html>"
   File.write("recent.html", text)
-# _out close
-# _out "<iframe src='./recent.html'><iframe>"
   _out %[<iframe style="width: 100vw;height: 100vh;position: relative;" src='recent.html' width=100% frameborder="0" allowfullscreen></iframe>]
 end
 
@@ -556,14 +483,10 @@ def _teaser(slug)
   nslug, aslug, title, date, teaser_text = 
     vp.nslug, vp.aslug, vp.title, vp.date, vp.teaser_text
   path = vp.path
-STDERR.puts [">>>>> vp = ", vp].inspect
   url = "#{path}/#{aslug}.html"    # Should be relative to .blogs!! FIXME
-STDERR.puts [slug, url].inspect
     date = Date.parse(date)
     date = date.strftime("%B %e<br>%Y")
     text = _interpolate(@_post_entry, binding)
-#   File.write("../../../generated/#{slug}.html", text)
-# _out text
   text
 end
 

data/lib/runeblog.rb

@@ -1,4 +1,3 @@
-#equire 'find'
 require 'livetext'
 
 require 'runeblog_version'
@@ -9,8 +8,6 @@ require 'view'
 require 'publish'
 require 'post'
 
-# ::Home = Dir.pwd unless defined?(::Home)
-
 ###
 
 class RuneBlog
@@ -19,8 +16,6 @@ class RuneBlog
   ConfigFile = "config"
   GemData    = RuneBlog::Path + "/../data"
 
-# ::Home     = Dir.pwd
-
   make_exception(:FileNotFound,      "File $1 was not found")
   make_exception(:BlogRepoAlreadyExists, "Blog repo $1 already exists")
   make_exception(:CantAssignView,    "$1 is not a view")
@@ -51,7 +46,6 @@ class RuneBlog
     raise BlogRepoAlreadyExists if Dir.exist?(root_dir)
     new_dotfile(root: root_dir, current_view: first_view)
     create_dir(dir)
-# New code goes here! 
     Dir.chdir(dir) do
       create_dir("drafts")
       create_dir("views")
@@ -66,8 +60,7 @@ class RuneBlog
   end
 
   def initialize(top = true)   # at top? always assumes existing blog
-    # Crude - FIXME later - 
-    # What views are there? Publishing, etc.
+    # Crude - FIXME later -  # What views are there? Publishing, etc.
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     $_blog = self            # Dumber still?
     dir = ""
@@ -78,11 +71,11 @@ class RuneBlog
     file = dir.empty? ? ConfigFile : dir + "/" + ConfigFile
     errmsg = "No config file! file = #{file.inspect}  dir = #{Dir.pwd}" 
     raise errmsg unless File.exist?(file)
-# Hmm. current_view doesn't belong?
+    # Hmm. current_view doesn't belong?
     @root, @view_name, @editor = read_config(file, :root, :current_view, :editor)
+
     md = Dir.pwd.match(%r[.*/views/(.*?)/])
     @view_name = md[1] if md
-# STDERR.puts "---- vname = #@view_name"
     @views = get_views
     @view = str2view(@view_name)
     @sequence = get_sequence
@@ -173,7 +166,6 @@ class RuneBlog
     Dir.chdir(vdir)
     x = RuneBlog::Default
     create_dir('themes')
-#   create_dir("generated")
     create_dir('assets')
     create_dir('posts')
 
@@ -183,7 +175,7 @@ class RuneBlog
     pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
     dump(pub, "publish")
 
-# Add to global.lt3 here?  FIXME
+    # Add to global.lt3 here?  FIXME
 
     view = RuneBlog::View.new(arg)
     self.view = view
@@ -223,17 +215,12 @@ class RuneBlog
     Dir.chdir(self.view.dir)
     # change to create_draft ?
     post = Post.create(title: title, teaser: teaser, body: body, other_views: other_views)
-puts "cnp: num = #{post.meta.num}"
     post.edit unless testing
     post.build
     meta = post.meta
     Dir.chdir(save)
-puts "cnp: title = #{title.inspect}\n meta = #{meta.inspect}"
-    meta.num ||= 999
-return meta.num
-    Dir.chdir(save)
-    meta.num = 999
-    meta.num
+    meta.num ||= 999   # ??
+    return meta.num
   rescue => err
     puts err
     puts err.backtrace.join("\n")
@@ -268,37 +255,18 @@ return meta.num
     self.view = view   # error checking?
   end
 
-  def process_post(file)
-    raise ArgumentError unless file.is_a?(String)
-    path = @root + "/drafts/#{file}"
-    raise FileNotFound(path) unless File.exist?(path)
-    num = file.to_i       # e.g. 0098-this-is-a-title
-    live = Livetext.new # (STDOUT) # (nil)
-    Livetext.parameters = [self, num, live]
-    text = File.read(path)
-    live.process_text(text)
-  rescue => err
-    error(err)
-    getch
-  end
-
-  def generate_index(view)
-# FIXME
+  def generate_index(view) # FIXME  delete?
     debug "=== generate_index view = #{view.to_s}"
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
 
     vdir = self.view.dir
     dir0 = "#{vdir}/themes/standard/blog"
-#   dir1 = "#{vdir}/generated"
-#   system("livetext #{dir0}/generate.lt3 >#{dir1}/index.html 2>#{dir1}/errors.txt")
   rescue => err
     error(err)
     exit
   end
 
-######## New code
-
-  def generate_view(view)
+  def generate_view(view)  # huh?
   end
 
   def _get_views(draft)
@@ -306,7 +274,6 @@ return meta.num
     view_line = File.readlines(draft).grep(/^.views /)
     raise "More than one .views call!" if view_line.size > 1
     raise "No .views call!" if view_line.size < 1
-# STDERR.puts view_line.inspect
     view_line = view_line.first
     views = view_line[7..-1].split
   end
@@ -314,18 +281,18 @@ return meta.num
   # Remember: A post in multiple views will trigger multiple
   #   views needing to be rebuilt (and published)
 
-# generate a post:
-#   given draft 9999-title.lt3
-#   create VIEW/posts/9999-title/index.lt3
-# LATER: metadata!! or is it in head?
-#   Generate VIEW/posts/9999-title/head.lt3?
-#   livetext draft_wrapper_plain.lt3  >generated/posts/plain-title.html  # unframed
-#   livetext draft_generate.lt3       >generated/posts/real-title.html   # framed
-#   livetext draft_wrapper_perma.lt3  >generated/posts/perma-title.html  # permaframed
-#
-# Generate associated views:
-#   livetext ??/recent.lt3 >VIEW/working/recent.html
-#   livetext VIEW/blog/generate.lt3 ??
+  # generate a post:
+  #   given draft 9999-title.lt3
+  #   create VIEW/posts/9999-title/index.lt3
+  # LATER: metadata!! or is it in head?
+  #   Generate VIEW/posts/9999-title/head.lt3?
+  #   livetext draft_wrapper_plain.lt3  >generated/posts/plain-title.html  # unframed
+  #   livetext draft_generate.lt3       >generated/posts/real-title.html   # framed
+  #   livetext draft_wrapper_perma.lt3  >generated/posts/perma-title.html  # permaframed
+  #
+  # Generate associated views:
+  #   livetext ??/recent.lt3 >VIEW/working/recent.html
+  #   livetext VIEW/blog/generate.lt3 ??
 
   def _copy_get_dirs(draft, view)
     fname = File.basename(draft)
@@ -345,13 +312,12 @@ return meta.num
       noext, viewdir, slugdir, aslug, theme = _copy_get_dirs(draft, view)
       Dir.chdir(slugdir) do 
         html = noext[5..-1] + ".html"
-STDERR.puts "--- NEW gp into #{slugdir}: livetext #{draft} >#{html}"
         system("livetext #{draft} >#{html}")
 
         Dir.mkdir("sidebar") unless Dir.exist?("sidebar")
         system("cp #{theme}/sidebar/*.lt3 ./sidebar/")
         files = ["blog-generate.lt3", "blog-index.lt3", "global.lt3", "blog-head.lt3", 
-                 "meta.lt3", "navbar.lt3"]
+                 "meta.lt3", "navbar.lt3", "blog-application.css"]
         files2 = files.map {|x| theme + "/" + x }
         files2.each do |f| 
           system("cp #{f} .")
@@ -365,53 +331,6 @@ STDERR.puts "--- NEW gp into #{slugdir}: livetext #{draft} >#{html}"
     end
   end
 
-  def old_generate_post(draft)
-    dir = File.dirname(draft)
-    fname = File.basename(draft)
-# STDERR.puts "--- gp01 dir/fname = #{dir}  #{fname}"
-    # FIXME dumb code
-    view_line = File.readlines(draft).grep(/^.views /)
-    raise "More than one .views call!" if view_line.size > 1
-    raise "No .views call!" if view_line.size < 1
-    view_line = view_line.first
-
-    views = view_line[7..-1].split
-    slug_dir = fname.sub(/.lt3$/, "")
-    views.each do |view|
-      vdir = "#@root/views/#{view}"
-      dir = "#{vdir}/posts/#{slug_dir}/"
-      Dir.mkdir(dir) unless Dir.exist?(dir)
-      system("cp #{draft} #{dir}")
-      Dir.chdir(dir) do 
-        html = draft.sub(/.lt3$/, ".html")
-STDERR.puts "--- gp05 into #{dir}: livetext #{draft} >#{html}"
-        system("livetext #{draft} >#{html}")
-
-        # copy from theme?
-        theme = vdir + "/themes/standard"
-        Dir.mkdir("sidebar") unless Dir.exist?("sidebar")
-        system("cp #{theme}/sidebar/*.lt3 ./sidebar/")
-        files = ["blog-generate.lt3", "blog-index.lt3", "global.lt3", "blog-head.lt3", 
-                 "meta.lt3", "navbar.lt3"]
-        files2 = files.map {|x| theme + "/" + x }
-        # STDERR.puts "---- gp06: In #{Dir.pwd}: files = #{files.inspect}"
-        files2.each do |f| 
-          # STDERR.puts "---- gp07: cp #{f} ."
-          system("cp #{f} .")
-        end
-        # STDERR.puts "---- gp08: Files copied from theme"
-
-        system("livetext blog-generate.lt3 >bgen.html")
-        # STDERR.puts "---- gp09: Files went thru livetext"
-#       files.each {|fname| system("rm ./#{fname}") }
-#       system("rm -rf ./sidebar/")
-      end
-      # create framed pure slug (where?)
-    end
-  end
-
-########
-
   def relink
     self.views.each {|view| generate_index(view) }
   end
@@ -437,11 +356,10 @@ STDERR.puts "--- gp05 into #{dir}: livetext #{draft} >#{html}"
   end
 
   def rebuild_post(file)
+    raise "Doesn't currently work"
     debug "Called rebuild_post(#{file.inspect})"
     raise ArgumentError unless file.is_a?(String)
     meta = process_post(file)
-# p meta
-# sleep 4
     @views_dirty ||= []
     @views_dirty << meta.views
     @views_dirty.flatten!
@@ -494,8 +412,6 @@ STDERR.puts "--- gp05 into #{dir}: livetext #{draft} >#{html}"
   end
 
   def make_slug(meta)
-#   check_meta(meta, "makeslug")
-#   meta.num = 9999   # FIXME
     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.1.79"
+  VERSION = "0.1.80"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end

metadata

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