RubyGems - runeblog - Versions diffs - 0.2.5 → 0.2.10 - Mend

runeblog 0.2.5 → 0.2.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b72b0b4ca22d08e40c691a27c1a9affa94dc9c3f8ff1063d85f7b72be8b83838
-  data.tar.gz: d1919b3fef470e70acb7b7f8cc5f36f6ed7cb58176ee36e424e09691e83bd495
+  metadata.gz: a037d087baf23e47f7b3c254dac3348048cc9c498ad439a5f235149b9bbf96cb
+  data.tar.gz: f82a11b32ee3eb3738abdc1a60f3fc1606efb5252a29f5902d53591117199c6c
 SHA512:
-  metadata.gz: 9a4feafd8e972f87280c3f4fbe43321d62de61a6eb9913deef08790e967c94d09fd2f451e7235f3cc4cc0620dd92087cb0c39ef6bb1fed6afe6a197fc1fc5450
-  data.tar.gz: d5a9fec4a3412ff28a1acf607f60614a1c3ed4d1fdbdf43747b5250e4f6930503028ad8ba2d866ea4c00695b6b81bf52a376e9e642b906427f84bb09a5711718
+  metadata.gz: 9fa1d23bd68596356383676b5d4c5c9fba04afaba2d98ccf8bb1d27fb4b68aba8b9a1078aaebcc7a61cefb8d8bb5102e51d09ecd68e82ce436afaa734c028862
+  data.tar.gz: aae6ba4be7009d1cfcc7461f6dfb5f4459d880b796a7842e67050863e6f48d9ede6923a8995c4945a0923153b7f97c051f18691f8e0d343ed450dcba586c88e0

data/empty_view.tgz CHANGED

Binary file

data/lib/helpers-blog.rb CHANGED

@@ -38,7 +38,7 @@ exit unless rc
     return false
   end
-  def livetext(src, dst=nil)
+  def livetext(src, dst=nil, dir=".")
     log!(enter: __method__, args: [src, dst])
     src << ".lt3" unless src.end_with?(".lt3")
     if dst
@@ -47,7 +47,21 @@ exit unless rc
       dst = src.sub(/.lt3$/, "")
     end
 #   return unless stale?(src, dst)
-    system("livetext #{src} >#{dst}")
+    Dir.chdir(dir) { system("livetext #{src} >#{dst}") }
+  end
+  def livetext!(src, dst=nil, dir=".")
+    log!(enter: __method__, args: [src, dst])
+    src << ".lt3" unless src.end_with?(".lt3")
+    if dst
+      dst << ".html" unless dst.end_with?(".html")
+    else
+      dst = src.sub(/.lt3$/, "")
+    end
+#   return unless stale?(src, dst)
+STDERR.puts "-- livetext #{src} >#{dst} \n       in: #{Dir.pwd}\n      from: #{caller[0]}"
+    Dir.chdir(dir) { system("livetext #{src} >#{dst}") }
+STDERR.puts "... completed"
   end
   def get_root

data/lib/liveblog.rb CHANGED

@@ -423,6 +423,7 @@ def sidebar
   _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
   _args do |token|
     tag = token.chomp.strip.downcase
+# Doesn't handle "split personality" widgets yet
     Dir.chdir("widgets/#{tag}") do
       livetext tag, "card-#{tag}.html"
       _include_file "card-#{tag}.html"
@@ -447,59 +448,43 @@ def script
   _out %[<script src="#{url}" integrity="#{integ}" crossorigin="#{cross}"></script>]
 end
-### How this next bit works:
-###
-###   all_teasers will call _find_recent_posts
-###
-###   _find_recent_posts will search higher in the directory structure
-###   for where the posts are (0001, 0002, ...) NOTE: This implies you
-###   must be in some specific place when this code is run.
-###   It returns the 20 most recent posts.
-###
-###   all_teasers will then pick a small number of posts and call _teaser
-###   on each one. (The code in _teaser really belongs in a small template
-###   somewhere.)
-###
-def _find_recent_posts
-  @vdir = _var(:FileDir).match(%r[(^.*/views/.*?)/])[1]
-  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[0..19]  # return 20 at most
-end
-def all_teasers
-  open = <<-HTML
-      <section class="posts">
-  HTML
-  close = <<-HTML
-      </section>
-  HTML
-  text = <<-HTML
-    <html>
-    <head><link rel="stylesheet" href="etc/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("recent.html", text)
-  _out %[<iframe id="main" style="width: 100vw; height: 100vh; position: relative;" src='recent.html' width=100% frameborder="0" allowfullscreen></iframe>]
-end
+# def _find_recent_posts
+#   @vdir = _var(:FileDir).match(%r[(^.*/views/.*?)/])[1]
+#   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[0..19]  # return 20 at most
+# end
+#
+# def all_teasers
+#   open = <<-HTML
+#       <section class="posts">
+#   HTML
+#   close = <<-HTML
+#       </section>
+#   HTML
+#
+#   text = <<-HTML
+#     <html>
+#     <head><link rel="stylesheet" href="etc/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("recent.html", text)
+#   _out %[<iframe id="main" style="width: 100vw; height: 100vh; position: relative;" src='recent.html' width=100% frameborder="0" allowfullscreen></iframe>]
+# end
 def _post_lookup(postid)    # side-effect
   # .. = templates, ../.. = views/thisview
@@ -521,21 +506,21 @@ def _interpolate(str, context)   # FIXME move this later
   eval(wrapped, context)
 end
-def _teaser(slug)
-  id = slug.to_i
-  text = nil
-  post_entry_name = @theme + "blog/post_entry.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
-    date = Date.parse(date)
-    date = date.strftime("%B %e<br>%Y")
-    text = _interpolate(@_post_entry, binding)
-  text
-end
+# def _teaser(slug)
+#   id = slug.to_i
+#   text = nil
+#   post_entry_name = @theme + "blog/post_entry.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
+#     date = Date.parse(date)
+#     date = date.strftime("%B %e<br>%Y")
+#     text = _interpolate(@_post_entry, binding)
+#   text
+# end
 def _card_generic(card_title:, middle:, extra: "")
   front = <<-HTML

data/lib/logging.rb CHANGED

@@ -1,6 +1,6 @@
 unless self.respond_to?("log!")
   $logging = true
-  $log = File.new("/tmp/runeblog}.log","w")
+  $log = File.new("/tmp/runeblog.log","w")
   def log!(str: "", enter: nil, args: [], pwd: false, dir: false)
     return unless $logging
@@ -31,28 +31,28 @@ unless self.respond_to?("log!")
     $log = File.new("/tmp/runeblog.log","a")
   end
-  def log(str: "", enter: nil, args: [], pwd: false, dir: false)
-    return unless $logging
-    time = Time.now.strftime("%H:%M:%S")
-    meth = ""
-    meth = "#{enter}" if enter
-    para = " args: #{args.inspect[1..-2]}"
-    source = caller[0].sub(/.*\//, " in ").sub(/:/, " line ").sub(/:.*/, "")
-    source = " in #{source} (probably liveblog.rb)" if source.include? "(eval)"
-    str = "  ... #{str}" unless str.empty?
-    indent = " "*12
-    STDERR.puts "#{time} #{str} #{meth}"
-    STDERR.puts "#{indent} #{source}"
-    STDERR.puts "#{indent} pwd = #{Dir.pwd} " if pwd
-    if dir
-      files = (Dir.entries('.') - %w[. ..]).join(" ")
-      STDERR.puts "#{indent} dir/* = #{files}"
-    end
-    STDERR.puts "#{indent} #{para} " unless args.empty?
-  # STDERR.puts "#{indent} livetext params = #{livedata.inpect} " unless livedata.nil?
-    STDERR.puts
-    # $log.close
-    # $log = File.new("/tmp/runeblog.log","a")
-  end
+#   def log(str: "", enter: nil, args: [], pwd: false, dir: false)
+#     return unless $logging
+#     time = Time.now.strftime("%H:%M:%S")
+#     meth = ""
+#     meth = "#{enter}" if enter
+#     para = " args: #{args.inspect[1..-2]}"
+#     source = caller[0].sub(/.*\//, " in ").sub(/:/, " line ").sub(/:.*/, "")
+#     source = " in #{source} (probably liveblog.rb)" if source.include? "(eval)"
+#     str = "  ... #{str}" unless str.empty?
+#     indent = " "*12
+#     STDERR.puts "#{time} #{str} #{meth}"
+#     STDERR.puts "#{indent} #{source}"
+#     STDERR.puts "#{indent} pwd = #{Dir.pwd} " if pwd
+#     if dir
+#       files = (Dir.entries('.') - %w[. ..]).join(" ")
+#       STDERR.puts "#{indent} dir/* = #{files}"
+#     end
+#     STDERR.puts "#{indent} #{para} " unless args.empty?
+#   # STDERR.puts "#{indent} livetext params = #{livedata.inpect} " unless livedata.nil?
+#     STDERR.puts
+#     # $log.close
+#     # $log = File.new("/tmp/runeblog.log","a")
+#   end
 end

data/lib/runeblog.rb CHANGED

@@ -59,7 +59,6 @@ class RuneBlog
     raise BlogRepoAlreadyExists if Dir.exist?(root)
     create_dirs(root)
     Dir.chdir(root) do
-#     puts "  pwd = #{Dir.pwd}  Trying: cp #{RuneBlog::Path}/../empty_view.tgz ."
       system("cp #{RuneBlog::Path}/../empty_view.tgz .")
       create_dirs(:drafts, :views)
       new_sequence
@@ -108,7 +107,6 @@ class RuneBlog
       val = self.instance_variable_get(iv)
       str << "#{iv}: #{val}  "
     end
-#   str << "]]"
     str
   end
@@ -200,32 +198,15 @@ class RuneBlog
     vdir = arg.dup
     raise DirAlreadyExists(vdir) if Dir.exist?(vdir)
-# puts "cv: pwd = #{Dir.pwd}  file = #{`ls`}"
-  Dir.chdir(@root) do
-#   puts "---- (#{arg}) tar operation..."
-# system("bash")
-    cmd1 = "tar zxvf empty_view.tgz >/dev/null 2>&1"
-    cmd2 = "cp -r empty_view views/#{arg}"
-    system(cmd1)
-#   puts "    pwd = #{Dir.pwd}"
-#   puts "    . => #{`echo *`}"
-#   puts "    ./views => #{`ls views`}"
-#   puts "    #{cmd1}\n    #{cmd2}"
-    system(cmd2)
-  end
-#   create_dirs(vdir)
+    Dir.chdir(@root) do
+      cmd1 = "tar zxvf empty_view.tgz >/dev/null 2>&1"
+      cmd2 = "cp -r empty_view views/#{arg}"
+      system(cmd1)
+      system(cmd2)
+    end
-# puts "vdir = #{vdir}  pwd = #{Dir.pwd}"
     Dir.chdir("#@root/views/#{vdir}") do
-# system("bash")
-#      x = RuneBlog::Default
-#      copy!("#{Themes}", "themes")
-#      create_dirs(:assets, :posts, :staging, "remote/permalink", "remote/navbar")
-#      livetext "themes/standard/etc/blog.css.lt3" # strip ext
-#      _copy_to_staging
-#      _copy_to_remote
-      livetext "themes/standard/blog/generate", "remote/index"
+      livetext "generate", "../../../remote/index", "themes/standard/blog"
       pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
       dump(pub, "publish")
@@ -257,7 +238,6 @@ class RuneBlog
   def post_lookup(postid)    # side-effect?
     log!(enter: __method__, args: [postid])
-    # .. = templates, ../.. = views/thisview
     slug = title = date = teaser_text = nil
     dir_posts = @vdir + "/posts"
@@ -281,7 +261,6 @@ class RuneBlog
     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")
@@ -379,7 +358,7 @@ class RuneBlog
   def generate_view(view)  # huh?
     log!(enter: __method__, args: [view])
-    generate_index(view)
+    generate_index(view)   # recent posts (recent.html)
     Dir.chdir(@root + "/views/#{view}/themes/standard") do
       livetext "blog/generate.lt3", "../../remote/index.html"
     end
@@ -396,22 +375,6 @@ class RuneBlog
     views
   end
-  # 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 ??
   def _copy_get_dirs(draft, view)
     log!(enter: __method__, args: [draft, view])
     fname = File.basename(draft)
@@ -425,48 +388,73 @@ class RuneBlog
     [noext, viewdir, slugdir, aslug, theme]
   end
+  def _handle_post(draft, view)
+    noext, viewdir, slugdir, aslug, @theme = _copy_get_dirs(draft, view)
+    html = noext[5..-1]    # strip "nnnn-"
+    remote = viewdir + "/remote"
+    Dir.chdir(slugdir) do
+      copy(draft, ".")              # copy source into slugdir
+      lt3 = draft.split("/")[-1]    # Remember: Some posts may be in more than
+      copy(lt3, remote)             #    one view -- careful with links back
+STDERR.puts "1  pwd = #{Dir.pwd}"
+      livetext! draft, html
+STDERR.puts "    copy #{html}, #{remote}/#{html}"
+      copy(html, "#{remote}/#{html}")
+      title_line = File.readlines(draft).grep(/^.title /).first
+      title = title_line.split(" ", 2)[1]
+      excerpt = File.read("teaser.txt")
+      vars = %[.set title="#{title.chomp}"\n] +
+             %[.set teaser="#{excerpt.chomp}"]
+      theme = "#{viewdir}/themes/standard"
+      File.open("#{theme}/post/vars.lt3", "w") {|f| f.puts vars }
+      livetext! "generate.lt3", "#{remote}/html", "#{theme}/post"
+      copy("#{remote}/#{html}", "#{theme}/post")
+      livetext! "permalink.lt3", "#{remote}/permalink/#{html}", "#{theme}/post"
+      log!(str: "About to enter remote/", pwd: true, dir: true)
+      Dir.chdir(remote) do
+        log!(str: "Now in remote/", pwd: true, dir: true)
+        system("cp -r ../themes/standard/widgets .")
+        log!(str: "finished with remote/", pwd: true, dir: true)
+      end
+    end
+  end
   def generate_post(draft)
     log!(enter: __method__, args: [draft])
     views = _get_views(draft)
     views.each do |view|
-      noext, viewdir, slugdir, aslug, @theme = _copy_get_dirs(draft, view)
-#     staging = viewdir + "/staging"
-      remote = viewdir + "/remote"
-      Dir.chdir(slugdir) do
-        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?
-#       copy!("#{@theme}/*", "#{staging}")
-#       copy(lt3, staging)
-        copy(lt3, remote)
-        html = noext[5..-1]
-        livetext draft, html  # livetext "foobar.lt3", "foobar.html"
-#       copy(html, "../../staging/post/index.html")
-        copy(html, "../../remote/post/index.html")
-        title_line = File.readlines(draft).grep(/^.title /).first
-        title = title_line.split(" ", 2)[1]
-        excerpt = File.read("teaser.txt")
-        vars = %[.set title="#{title.chomp}"\n] +
-               %[.set teaser="#{excerpt.chomp}"]
-        theme = "../../theme/standard"
-        File.open("vars.lt3", "w") {|f| f.puts vars }
-        livetext "#{theme}/post/generate.lt3", "#{remote}/#{html}"
-        livetext "#{theme}/post/permalink.lt3", "#{remote}/permalink/#{html}"
-# puts <<-TEXT
-#   File.open("vars.lt3", "w") {|f| f.puts vars }
-#   livetext "../post/generate.lt3", "#{remote}/#{html}"
-#   livetext "../post/permalink.lt3", "#{remote}/permalink/#{html}"
-# TEXT
-# system("bash")
-        log!(str: "About to enter remote/", pwd: true, dir: true)
-        Dir.chdir(remote) do
-          log!(str: "Now in remote/", pwd: true, dir: true)
-          system("cp -r ../themes/standard/widgets .")
-          log!(str: "finished with remote/", pwd: true, dir: true)
-        end
-      end
+      _handle_post(draft, view)
     end
+#      noext, viewdir, slugdir, aslug, @theme = _copy_get_dirs(draft, view)
+#      remote = viewdir + "/remote"
+#      Dir.chdir(slugdir) do
+#        copy(draft, ".")
+#        lt3 = draft.split("/")[-1]
+#        # Remember: Some posts may be in more than one view -- careful with links back
+#        copy(lt3, remote)
+#        html = noext[5..-1]    # strip "nnnn-"
+#        livetext! draft, html
+#        copy(html, "#{remote}/#{html}")
+#        title_line = File.readlines(draft).grep(/^.title /).first
+#        title = title_line.split(" ", 2)[1]
+#        excerpt = File.read("teaser.txt")
+#        vars = %[.set title="#{title.chomp}"\n] +
+#               %[.set teaser="#{excerpt.chomp}"]
+#        theme = "#{viewdir}/themes/standard"
+#        File.open("#{theme}/post/vars.lt3", "w") {|f| f.puts vars }
+#        livetext! "generate.lt3", "#{remote}/html", "#{theme}/post"
+#        copy("#{remote}/html", "#{theme}/post")
+#        livetext! "permalink.lt3", "#{remote}/permalink/#{html}", "#{theme}/post"
+#        log!(str: "About to enter remote/", pwd: true, dir: true)
+#        Dir.chdir(remote) do
+#          log!(str: "Now in remote/", pwd: true, dir: true)
+#          system("cp -r ../themes/standard/widgets .")
+#          log!(str: "finished with remote/", pwd: true, dir: true)
+#        end
+#      end
   end
   def relink

data/lib/runeblog_version.rb CHANGED

@@ -2,7 +2,7 @@
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 class RuneBlog
-  VERSION = "0.2.5"
+  VERSION = "0.2.10"
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/runeblog.gemspec CHANGED

@@ -30,6 +30,8 @@ spec = Gem::Specification.new do |s|
   test = Find.find("test").to_a
   misc = %w[./README.lt3 ./README.md ./runeblog.gemspec]
+# system("tar zcvf empty_view.tgz empty_view")
   s.files       =  main + misc + test + ["empty_view.tgz"]
   s.homepage    = 'https://github.com/Hal9000/runeblog'
   s.license     = "Ruby"

data/test/make_blog.rb CHANGED

@@ -21,7 +21,7 @@ end
 def make_post(x, title, teaser, body, views=[])
 # STDERR.puts "\n========= make_post '#{title}'"
   print "."
-  num = x.create_new_post(title, true, teaser: teaser, body: body, other_views: views)
+  x.create_new_post(title, true, teaser: teaser, body: body, other_views: views)
   views.each {|view| x.generate_index(view) }  # recent.html
 end
@@ -132,5 +132,6 @@ BODY
 x.change_view("around_austin")
+puts
 puts Time.now
 puts

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.10
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2019-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext