runeblog 0.1.80 → 0.1.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57d59b2120fa25efd7d1542b31200079497991ae27240e30c936701a3ac1e066
-  data.tar.gz: 3b5c8f7bde8e3ca0c7989406ecca1edb6cc35c6b8ad1b76ea55dd25cddf15f9b
+  metadata.gz: cb6100ad69994f06dcb9d75dcef71d5f485f56119725efb419607c3ca5521b89
+  data.tar.gz: 025a5cc03d7203cd32db22c2bb283c3db7ad6aa1eb4b110ec5f1613bb5740fe9
 SHA512:
-  metadata.gz: e1dc62eedd0bca2d772c3363fc0a8565499d4b92911fc3f418cb0b5ab1e2d9eecd44b637040fdb52f424375a13ddf94a71118d1244b9410b61b0aaeff1e98c1c
-  data.tar.gz: 271ba003372c3562aa83f2e1bd84021a4ae333ab2d863fc2473df915d1b667f9303d0c3681ff3156da11fe6f22cf4c0e91f7e255a361b201c8e55e0d9d65c6af
+  metadata.gz: b89cca81ab11b4a2b7ea4694cb0f9c6f875f0691629a7eb14daa4ce3dc6b77b167db71eb5be3abc4777da3940ccc62a250d513119cebe775f6af09bea50c781d
+  data.tar.gz: 7b495793aeb39e03d7ca07002c66fcf309d330fe877b712ceaa524cd7e09d8da25dae2d9fcfd64ba014aa291fc177981b254fc0d5063047142b38d65741ad43c

data/lib/default.rb

@@ -23,6 +23,9 @@ def RuneBlog.post_template(num: 0, title: "No title", date: nil, view: "test_vie
 #{teaser}
 .end
 #{body}
+
+<br>
+<a href="javascript:history.go(-1)">[Back]</a>
 TEXT
 
 end

data/lib/helpers-blog.rb

@@ -4,6 +4,20 @@ require 'runeblog_version'
 
 module RuneBlog::Helpers
 
+  def copy(src, dst)
+    system("cp #{src}  #{dst}")
+  end
+
+  def copy!(src, dst)
+    system("cp -r #{src}  #{dst}")
+  end
+
+  def livetext(src, dst)
+    src << ".lt3" unless src.end_with?(".lt3")
+    dst << ".html" unless src.end_with?(".html")
+    system("livetext #{src} >#{dst}")
+  end
+
   def get_root
     if $_blog
       if $_blog.root
@@ -51,6 +65,17 @@ module RuneBlog::Helpers
     vals
   end
 
+def put_config(root:, view:"test_view", editor: "/bin/vim")
+  Dir.mkdir(root) unless Dir.exist?(root)
+  Dir.chdir(root) do 
+    File.open("config", "w") do |cfg|
+      cfg.puts "root: #{root}"
+      cfg.puts "current_view: #{view}"
+      cfg.puts "editor: #{editor}"
+    end
+  end
+end 
+
   def write_config(obj, file)
     hash = obj.to_h
 # Dir.chdir(::Home)
@@ -72,9 +97,10 @@ module RuneBlog::Helpers
 #   end
   end
 
-  def new_dotfile(root: "./.blogs/data", current_view: "no_default", editor: "vi")
-    raise BlogAlreadyExists if Dir.exist?(".blogs")
-    Dir.mkdir(".blogs")
+  def new_dotfile(root: ".blogs", current_view: "test_view", editor: "vi")
+#   raise BlogAlreadyExists if Dir.exist?(".blogs")
+#   Dir.mkdir(".blogs")
+    root = Dir.pwd + "/" + root
     x = OpenStruct.new
     x.root, x.current_view, x.editor = root, current_view, editor
     write_config(x, ".blogs/" + RuneBlog::ConfigFile)
@@ -87,8 +113,10 @@ module RuneBlog::Helpers
   end
 
   def subdirs(dir)
+STDERR.puts "== SUB dir = #{dir}"
     verify(Dir.exist?(dir) => "Directory #{dir} not found")
     dirs = Dir.entries(dir) - %w[. ..]
+STDERR.puts "== SUB   dirs = #{dirs.inspect}"
     dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
     dirs
   end
@@ -114,9 +142,9 @@ module RuneBlog::Helpers
     raise CantCreateDir(dir) unless result
   end
 
-  def interpolate(str)
+  def interpolate(str, binding)
     wrap = "<<-EOS\n#{str}\nEOS"
-    eval wrap
+    eval wrap, binding
   end
 
   def error(err)  # Hmm, this is duplicated

data/lib/liveblog.rb

@@ -20,7 +20,11 @@ STDERR.reopen(errfile)
 =end
 
 def init_liveblog    # FIXME - a lot of this logic sucks
-  @blog = $_blog = RuneBlog.new(false)
+  here = Dir.pwd
+  dir = here
+  loop { dir = Dir.pwd; break if File.exist?("config"); Dir.chdir("..") }
+  Dir.chdir(here)
+  @blog = $_blog = RuneBlog.new(dir)
   @root = @blog.root
   @view = @blog.view
   @view_name = @blog.view.name
@@ -32,6 +36,7 @@ end
 def post
   @meta = OpenStruct.new
   @meta.num = _args[0]
+  _out "  <!-- Post number #{@meta.num} -->\n "
 end
 
 def _view_from_cwd
@@ -235,6 +240,7 @@ def finalize
   @slug = @blog.make_slug(@meta)
   slug_dir = @slug
   @postdir = @blog.view.dir + "/posts/#{slug_dir}"
+  STDERR.puts "--- finalize: pwd = #{Dir.pwd} postdir = #@postdir"
   write_post
   @meta
 end
@@ -272,17 +278,18 @@ end
 ###### experimental...
 
 class Livetext::Functions
-
   def _var(name)
     ::Livetext::Vars[name] || "[:#{name} is undefined]"
   end
 
-
   def link
     file, cdata = self.class.param.split("||", 2)
     %[<link type="application/atom+xml" rel="alternate" href="#{_var(:host)}#{file}" title="#{_var(:title)}">]
   end
+end
 
+def _var(name)  # FIXME scope issue!
+  ::Livetext::Vars[name] || "[:#{name} is undefined]"
 end
 
 def head
@@ -299,7 +306,7 @@ def head
                "linkc"          => %[<link rel="canonical" href="#{_var(:host)}">],
                "og:url"         => %[<meta property="og:url" content="#{_var(:host)}">],
                "og:site_name"   => %[<meta property="og:site_name" content="#{_var(:title)}">],
-               "style"          => %[<link rel="stylesheet" href="blog-application.css">],
+               "style"          => %[<link rel="stylesheet" href="assets/blog.css">],
                "feed"           => %[<link type="application/atom+xml" rel="alternate" href="#{_var(:host)}/feed.xml" title="#{_var(:title)}">],
                "favicon"        => %[<link rel="shortcut icon" type="image/x-icon" href="../assets/favicon.ico">\n <link rel="apple-touch-icon" href="../assets/favicon.ico">]
              }
@@ -324,7 +331,7 @@ def head
     end
   end
   hash = defaults.dup.update(result)  # FIXME collisions?
-  _out "<html lang=en_US>"
+#  _out "<html lang=en_US>"
   _out "<head>"
   hash.each_value {|x| _out "  " + x }
   _out "</head>"
@@ -401,6 +408,7 @@ def script
   _out %[<script src="#{url}" integrity="#{integ}" crossorigin="#{cross}"></script>]
 end
 
+
 ### How this next bit works:
 ### 
 ###   all_teasers will call _find_recent_posts
@@ -438,7 +446,7 @@ def all_teasers
 
   text = <<-HTML
     <html>
-    <head><link rel="stylesheet" href="blog-application.css"></head>
+    <head><link rel="stylesheet" href="assets/blog.css"></head>
     <body>
   HTML
   posts = _find_recent_posts
@@ -490,6 +498,7 @@ def _teaser(slug)
   text
 end
 
+
 def card_iframe
   title = _data
   lines = _body

data/lib/post.rb

@@ -139,6 +139,7 @@ end
 class RuneBlog::ViewPost
   attr_reader :path, :nslug, :aslug, :title, :date,
               :teaser_text
+              
   def initialize(view, postdir)
     # Assumes already parsed/processed
     @blog = RuneBlog.blog || raise(NoBlogAccessor)
@@ -153,5 +154,18 @@ class RuneBlog::ViewPost
     @title = lines.grep(/title:/).first[7..-1].chomp
     @date  = lines.grep(/pubdate:/).first[9..-1].chomp
   end
+
+  def get_dirs
+    fname = File.basename(draft)
+    noext = fname.sub(/.lt3$/, "")
+    vdir = "#@root/views/#{view}"
+    dir = "#{vdir}/posts/#{noext}/"
+    Dir.mkdir(dir) unless Dir.exist?(dir)
+    system("cp #{draft} #{dir}")
+    viewdir, slugdir, aslug = vdir, dir, noext[5..-1]
+    theme = viewdir + "/themes/standard"
+    [noext, viewdir, slugdir, aslug, theme]
+  end
+
 end
 

data/lib/runeblog.rb

@@ -1,4 +1,5 @@
-require 'livetext'
+require 'date'
+# require 'livetext'
 
 require 'runeblog_version'
 require 'global'
@@ -14,7 +15,7 @@ class RuneBlog
  
   DotDir     = ".blogs"
   ConfigFile = "config"
-  GemData    = RuneBlog::Path + "/../data"
+  GemData    = RuneBlog::Path + "/../themes"
 
   make_exception(:FileNotFound,      "File $1 was not found")
   make_exception(:BlogRepoAlreadyExists, "Blog repo $1 already exists")
@@ -24,7 +25,7 @@ class RuneBlog
   make_exception(:CantCreateDir,     "Can't create directory $1")
   make_exception(:EditorProblem,     "Could not edit $1")
   make_exception(:NoSuchView,        "No such view: $1")
-  make_exception(:LivetextError,     "Livetext#process_file returned nil for $1")
+# make_exception(:LivetextError,     "Livetext#process_file returned nil for $1")
   make_exception(:NoBlogAccessor, "Runeblog.blog is not set")
 
   
@@ -40,40 +41,54 @@ class RuneBlog
 
   include Helpers
 
-  def self.create_new_blog_repo(first_view, dir = ".blogs/data")
+  def self.create_new_blog_repo(dir = ".blogs")
     raise ArgumentError unless dir.is_a?(String) && ! dir.empty?
     root_dir = Dir.pwd + "/" + dir
-    raise BlogRepoAlreadyExists if Dir.exist?(root_dir)
-    new_dotfile(root: root_dir, current_view: first_view)
-    create_dir(dir)
-    Dir.chdir(dir) do
+    self.create(dir)
+  rescue => err
+    puts "Can't create blog repo: '#{dir}' - #{err}"
+    puts err.backtrace.join("\n")
+  end
+
+  def self.create(root = ".blogs")
+    # Crude - FIXME later -  # What views are there? Publishing, etc.
+    self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
+    $_blog = self            # Dumber still?
+    root = Dir.pwd + "/" + root
+    raise BlogRepoAlreadyExists if Dir.exist?(root)
+    create_dir(root)
+    Dir.chdir(root) do
       create_dir("drafts")
       create_dir("views")
 #?    create_dir("assets")
       new_sequence
     end
-    blog = self.new
-    blog.create_view(first_view)
-  rescue => err
-    puts "Can't create blog repo: '#{dir}' - #{err}"
-    puts err.backtrace.join("\n")
+    put_config(root: root)
+    @blog = self.new(root)
+    @blog.create_view("test_view")
+    @blog
   end
 
-  def initialize(top = true)   # at top? always assumes existing blog
+  def self.open(root = ".blogs")
+    # Crude - FIXME later -  # What views are there? Publishing, etc.
+    self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
+    $_blog = self            # Dumber still?
+    root = Dir.pwd + "/" + root
+    blog = self.new(root)
+  end
+
+  def initialize(root_dir = ".blogs")   # always assumes existing blog
     # 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 = ""
-    unless top
-      md = Dir.pwd.match(%r[.*.blogs])
-      dir = md[0]
-    end
-    file = dir.empty? ? ConfigFile : dir + "/" + ConfigFile
+
+    @root = root_dir
+    file = @root + "/" + ConfigFile
+STDERR.puts "--- init: file = #{file}"
     errmsg = "No config file! file = #{file.inspect}  dir = #{Dir.pwd}" 
     raise errmsg unless File.exist?(file)
-    # Hmm. current_view doesn't belong?
-    @root, @view_name, @editor = read_config(file, :root, :current_view, :editor)
 
+    @root, @view_name, @editor = read_config(file, :root, :current_view, :editor)
     md = Dir.pwd.match(%r[.*/views/(.*?)/])
     @view_name = md[1] if md
     @views = get_views
@@ -169,8 +184,14 @@ class RuneBlog
     create_dir('assets')
     create_dir('posts')
 
+    create_dir('staging')
+    create_dir('staging/assets')
+    create_dir('remote')
+    create_dir('remote/assets')
+
     Dir.chdir("themes") { system("tar zxvf #{GemData}/standard.tgz >/dev/null 2>&1") }
-#   system("cp themes/standard/blog/assets/* assets/")
+    copy!("themes/standard/*", "staging/")
+    copy("themes/standard/assets/*", "remote/assets/")
     
     pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
     dump(pub, "publish")
@@ -210,6 +231,71 @@ class RuneBlog
     result
   end
 
+  def post_lookup(postid)    # side-effect?
+    # .. = templates, ../.. = views/thisview
+    slug = title = date = teaser_text = nil
+
+    dir_posts = @vdir + "/posts"
+    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
+    vp = RuneBlog::ViewPost.new(self.view, postdir)
+    vp
+  end
+
+  def teaser(slug)
+    id = slug.to_i
+    text = nil
+    post_entry_name = @theme + "/blog-_postentry.lt3"
+    @_post_entry ||= File.read(post_entry_name)
+    vp = post_lookup(id)
+    nslug, aslug, title, date, teaser_text = 
+      vp.nslug, vp.aslug, vp.title, vp.date, vp.teaser_text
+    path = vp.path
+#   url = "#{path}/#{aslug}.html"    # Should be relative to .blogs!! FIXME
+    url = "#{aslug}.html"    # Should be relative to .blogs!! FIXME
+      date = ::Date.parse(date)
+      date = date.strftime("%B %e<br>%Y")
+      text = interpolate(@_post_entry, binding)
+    text
+  end
+
+  def collect_recent_posts(file)
+    @vdir = ".."
+    posts = nil
+    dir_posts = @vdir + "/posts"
+    entries = Dir.entries(dir_posts)
+    posts = entries.grep(/^\d\d\d\d/).map {|x| dir_posts + "/" + x }
+    posts.select! {|x| File.directory?(x) }
+    # directories that start with four digits
+    posts = posts.sort {|a, b| b.to_i <=> a.to_i }  # sort descending
+    posts = posts[0..19]  # return 20 at most
+    text = <<-HTML
+      <html>
+      <head><link rel="stylesheet" href="assets/blog.css"></head>
+      <body>
+    HTML
+    # posts = _find_recent_posts
+    wanted = [5, posts.size].min  # estimate how many we want?
+    enum = posts.each
+    wanted.times do
+      postid = File.basename(enum.next)
+      postid = postid.to_i
+      text << teaser(postid)    # side effect! calls _out
+    end
+    text << "</body></html>"
+    File.write(file, text) # FIXME ???
+    iframe_text = <<-HTML
+      <iframe style="width: 100vw;height: 100vh;position: relative;" 
+              src='recent.html' width=100% frameborder="0" allowfullscreen>
+      </iframe>
+    HTML
+    # _out iframe_text # FIXME ??
+  end
+
   def create_new_post(title, testing = false, teaser: nil, body: nil, other_views: [])
     save = Dir.pwd
     Dir.chdir(self.view.dir)
@@ -276,6 +362,8 @@ class RuneBlog
     raise "No .views call!" if view_line.size < 1
     view_line = view_line.first
     views = view_line[7..-1].split
+STDERR.puts "--- gv: #{views.inspect}"
+    views 
   end
 
   # Remember: A post in multiple views will trigger multiple
@@ -309,25 +397,27 @@ class RuneBlog
   def generate_post(draft)
     views = _get_views(draft)
     views.each do |view|
-      noext, viewdir, slugdir, aslug, theme = _copy_get_dirs(draft, view)
+      noext, viewdir, slugdir, aslug, @theme = _copy_get_dirs(draft, view)
+      staging = viewdir + "/staging"
       Dir.chdir(slugdir) do 
-        html = noext[5..-1] + ".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", "blog-application.css"]
-        files2 = files.map {|x| theme + "/" + x }
-        files2.each do |f| 
-          system("cp #{f} .")
+        copy(draft, ".")
+        lt3 = draft.split("/")[-1]
+        # Remember: Some posts may be in more than one view -- careful with links back
+        # system("livetext #{draft} >staging/#{name}/index.html")  # permalink?
+# Structure is borked?
+        copy!("#{@theme}/*", "#{staging}")
+        copy(lt3, staging)
+        html = noext[5..-1]
+        Dir.chdir(staging) do 
+          STDERR.puts "--- gp: pwd = #{Dir.pwd}  draft = #{draft}  html = #{html}"
+          livetext draft, html
+          # link to POST??
+          copy html, "../remote"
+          collect_recent_posts("recent.html")
+          copy("recent.html", "../remote")
+          livetext "blog-generate",  "../remote/index"
         end
-
-#       system("livetext blog-generate.lt3 >bgen.html")
-#       files.each {|fname| system("rm ./#{fname}") }
-#       system("rm -rf ./sidebar/")
       end
-      # create framed pure slug (where?)
     end
   end
 

data/lib/runeblog_version.rb

@@ -2,7 +2,7 @@
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.1.80"
+  VERSION = "0.1.85"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end

data/lib/view.rb

@@ -25,7 +25,7 @@ class RuneBlog::View
   end
 
   def local_index
-    dir + "/generated/index.html"
+    dir + "/remote/index.html"
   end
 
   def index
@@ -39,7 +39,7 @@ class RuneBlog::View
   def publishable_files
     vdir = dir()
     files = [local_index()]
-    others = Dir.entries(vdir + "/generated").grep(/^\d\d\d\d/).map {|x| "#{vdir}/generated/#{x}" }
+    others = Dir.entries(vdir + "/remote").grep(/^\d\d\d\d/).map {|x| "#{vdir}/remote/#{x}" }
 abort "FIXME... publishable_files"
     deep_assets = Dir["#{vdir}/themes/standard/assets/*"]
     deep_assets.each do |file|   # Do this at view creation

data/runeblog.gemspec

@@ -27,11 +27,7 @@ spec = Gem::Specification.new do |s|
   main = Find.find("bin").to_a  + 
          Find.find("lib").to_a
 
-  Dir.chdir("data") do 
-    system("tar zcvf standard.tgz standard/ >/dev/null 2>&1")
-  end
-
-  std_theme = ["data/standard.tgz"]
+  std_theme = ["themes/standard.tgz"]
 
   misc = %w[./README.lt3 ./README.md ./runeblog.gemspec]
   test = Find.find("test").to_a

data/test/make_blog.rb

@@ -19,7 +19,8 @@ def debug(str)
 end
 
 def make_post(x, title, teaser, body, views=[])
-STDERR.puts "\n========= make_post '#{title}'"
+# STDERR.puts "\n========= make_post '#{title}'"
+  print "."
   meta = OpenStruct.new
   num = x.create_new_post(title, true, teaser: teaser, body: body, other_views: views)
   num
@@ -32,15 +33,19 @@ def show_lines(text)
   str
 end
 
+
+
+puts
+
 system("rm -rf .blogs")
-RuneBlog.create_new_blog_repo('test_view', ".blogs/data")
-x = RuneBlog.new
+RuneBlog.create_new_blog_repo(".blogs")
+x = RuneBlog.new(".blogs")
 
 x.create_view("around_austin")   # FIXME remember view title!
 
 # Hack:
 if File.exist?("publish")
-  system("cp publish .blogs/data/views/around_austin/publish")
+  system("cp publish .blogs/views/around_austin/publish")
 end
 
 x.create_view("computing")
@@ -61,36 +66,36 @@ EXCERPT
 Now, depending on what you consider "major," blah blah blah...
 BODY
 
-# x.change_view("computing")     # 3 5 6
-# 
-# make_post(x, "Elixir Conf coming up...", <<-EXCERPT, <<-BODY)
-# The next Elixir Conf is always coming up. 
-# EXCERPT
-# I mean, unless the previous one was the last one ever, which I don't expect to 
-# happen for a couple of decades.
-# BODY
-# 
-# x.change_view("music")    # 4 10
-# 
-# make_post(x, "Does indie still matter?", <<-EXCERPT, <<-BODY)
-# Indie msic blah blah blah blah....
-# EXCERPT
-# And more about indie music.
-# BODY
-# 
-# x.change_view("computing")
-# 
-# make_post(x, "The genius of Scenic", <<-EXCERPT, <<-BODY)
-# Boyd Multerer is a genius.
-# EXCERPT
-# And so is Scenic.
-# BODY
-# 
-# make_post(x, "The future of coding", <<-EXCERPT, <<-BODY)
-# Someday you can forget your text editor entirely.
-# EXCERPT
-# But that day hasn't come yet.
-# BODY
+x.change_view("computing")     # 3 5 6
+
+make_post(x, "Elixir Conf coming up...", <<-EXCERPT, <<-BODY)
+The next Elixir Conf is always coming up. 
+EXCERPT
+I mean, unless the previous one was the last one ever, which I don't expect to 
+happen for a couple of decades.
+BODY
+
+x.change_view("music")    # 4 10
+
+make_post(x, "Does indie still matter?", <<-EXCERPT, <<-BODY)
+Indie msic blah blah blah blah....
+EXCERPT
+And more about indie music.
+BODY
+
+x.change_view("computing")
+
+make_post(x, "The genius of Scenic", <<-EXCERPT, <<-BODY)
+Boyd Multerer is a genius.
+EXCERPT
+And so is Scenic.
+BODY
+
+make_post(x, "The future of coding", <<-EXCERPT, <<-BODY)
+Someday you can forget your text editor entirely.
+EXCERPT
+But that day hasn't come yet.
+BODY
 
 x.change_view("around_austin")
 
@@ -124,3 +129,4 @@ BODY
 
 x.change_view("around_austin")
 
+puts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.80
+  version: 0.1.85
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -61,7 +61,6 @@ files:
 - "./README.md"
 - "./runeblog.gemspec"
 - bin/blog
-- data/standard.tgz
 - lib/Javascript.stuff
 - lib/default.rb
 - lib/global.rb
@@ -78,6 +77,7 @@ files:
 - test/general_test.rb
 - test/make_blog.rb
 - test/test
+- themes/standard.tgz
 homepage: https://github.com/Hal9000/runeblog
 licenses:
 - Ruby