RubyGems - runeblog - Versions diffs - 0.3.07 → 0.3.08 - Mend

runeblog 0.3.07 → 0.3.08

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 (14) hide show

checksums.yaml +4 -4
data/bin/blog +2 -1
data/empty_view/assets/reddit-logo.png +0 -0
data/empty_view/themes/standard/post/generate.lt3 +1 -1
data/empty_view/themes/standard/widgets/pages/faq.lt3 +2 -1
data/lib/helpers-blog.rb +1 -2
data/lib/liveblog.rb +28 -8
data/lib/lowlevel.rb +4 -0
data/lib/publish.rb +10 -2
data/lib/repl.rb +24 -19
data/lib/runeblog.rb +14 -6
data/lib/runeblog_version.rb +1 -1
metadata +3 -3
data/empty_view/config/reddit/the-graffiti-wall.html +0 -91

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9c40711649cc90ed5892d256311a01c9841655a1945cc2dcfcc9bd8dd0e77e5
-  data.tar.gz: ff3b53cdf4d0f6d7136e31cef2aca74a4843d836d45518909baa082f134ec089
+  metadata.gz: b757eafd85e4ea485fee79a8bee301835900810d1692b9f9ef840c486668ca85
+  data.tar.gz: 8542cbb10ada3de44d5f261876409e818fe4dc07a75bf7848488f6566168e8e0
 SHA512:
-  metadata.gz: 667ae25acb4c5230f9674fc067bbfca36b18562f8bf9f740f066e39621ae3eff9a952309eb28b3ed754c8f4c4acc0cc7a25054db1f7999844c8f49ac6621cb9c
-  data.tar.gz: cda360ef27a9733285d4aa0c50f402cd00c385f30f49f40d0fd1d61fc1046aec84dc2b0d8f6bb9e4db018c8f4266eb7381c1e9171ff5096166a7054fda98e8ea
+  metadata.gz: d587dfae5d4649dfc85495f27785b365a07bc37e4a8b5c99eefa5a240b608ef741f8c7be60719fc4a13d2aea5e8d8a5a3ea460d1ff55e04590d77e3850016683
+  data.tar.gz: 97f657d2a11ad08aa1dd244c1465b3c3530a8bbd842657325231dc8a46b5719f8987c5b4177f06153372f815eb7c193e40b82fba32ca8027a9226667fa530905

data/bin/blog CHANGED

@@ -153,7 +153,8 @@ ver = major.to_i*10 + minor.to_i
 unless ver >= 24
   RubyText.stop
   sleep 0.2
-  abort "Needs Ruby 2.4 or greater"
+  puts "Needs Ruby 2.4 or greater"
+  exit
 end
 include RuneBlog::Helpers  # for try_read_config

data/empty_view/assets/reddit-logo.png ADDED

Binary file

data/empty_view/themes/standard/post/generate.lt3 CHANGED

@@ -23,6 +23,7 @@ style       blog.css
 <section class="post">
   <div class="recent-content">
+    $.post_toolbar
     <table border=0 width=100%><tr>
       <td align=left valign=bottom><h2 class="recent-title">$title</h2></td>
       <td align=right valign=top><font size=-5><br></font>$longdate</td>
@@ -32,7 +33,6 @@ style       blog.css
 </section>
 <br>
-<hr>
 .post_trailer
 </body>
 </html>

data/empty_view/themes/standard/widgets/pages/faq.lt3 CHANGED

@@ -1,3 +1,4 @@
+.nopara    # FIXME later
 .mixin liveblog
 <html>
@@ -27,7 +28,7 @@ Don't be stupid. I just told you I was a rabbit.
 .end
 .faq Why do you answer a question with a question?
-*Do I in fact answer a question with a question?
+ *Do I in fact answer a question with a question?
 .end
 .faq Are you serious?

data/lib/helpers-blog.rb CHANGED

@@ -39,9 +39,8 @@ module RuneBlog::Helpers
     puts "dir = #{Dir.pwd}"
   end
-  def copy_data(tag, dest)
+  def copy_data(dest)
     data  = RuneBlog::Path + "/../data"    # files kept inside gem
-    # 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

data/lib/liveblog.rb CHANGED

@@ -21,6 +21,18 @@ def init_liveblog    # FIXME - a lot of this logic sucks
   @vdir = @blog.view.dir rescue "NONAME"
   @version = RuneBlog::VERSION
   @theme = @vdir/:themes/:standard
+  @reddit_comments = ""
+  @reddit_enabled = @blog.features["reddit"]
+  if @reddit_enabled
+    @reddit_comments = <<~HTML
+      <a href="#reddit_comments">
+        <img src="assets/reddit-logo.png"
+             width=24 height=24
+             alt="Scroll to reddit comments"></img>
+      </a>
+    HTML
+  end
 rescue
   raise "Only works inside a blog repo"
 end
@@ -52,11 +64,11 @@ end
     str.length > 0
   end
-  def _reddit_post_url(vdir, title, url)
+  def _reddit_post_url(vdir, date, title, url)
     _got_python?
     tmpfile = "/tmp/reddit-post-url.txt"
     File.open(tmpfile, "w") do |tmp|
-      tmp.puts "[Post] " + title
+      tmp.puts "[#{date}]  #{title}"
       tmp.puts url
     end
     rid = nil
@@ -65,6 +77,13 @@ end
     rid  # returns reddit id
   end
+def post_toolbar
+  back = %[<a style="text-decoration: none" href="javascript:history.go(-1)">[Back]</a>]
+  _out <<~HTML
+    <div align='right'>#{back} #@reddit_comments</div>
+  HTML
+end
 def post_trailer
   perma = _var("publish.proto") + "://" + _var("publish.server") +
           "/" + _var("publish.path") + "/" + _var("post.aslug") +
@@ -72,31 +91,32 @@ def post_trailer
   tags = _var("post.tags")
   taglist = tags.empty? ? "" : "Tags: #{tags}"
-  reddit_enabled = @blog.features["reddit"]
   reddit_txt = ""
-  if reddit_enabled
+  if @reddit_enabled
     vdir  = @blog.root/:views/@blog.view
     nslug = "#{_var("post.num")}-#{_var("post.aslug")}"
+    date  = _var("post.date")
     rid_file = vdir/:posts/nslug/"reddit.id"
     rid = File.exist?(rid_file) ? File.read(rid_file).chomp : nil
     if rid.nil?
       title = _var("title")
-      rid = _reddit_post_url(vdir, title, perma)
+      rid = _reddit_post_url(vdir, date, title, perma)
       dump(rid, rid_file)
     end
     reddit_txt = <<~HTML
-      <hr>
+      <a name='reddit_comments'>
       <script src='https://redditjs.com/post.js'
               data-url="#{rid}" data-width=800 ></script>
     HTML
   # damned syntax highlighting </>
   end
   _out <<~HTML
+  #{reddit_txt}
+  <hr>
   <table width=100%><tr>
     <td width=10%><a style="text-decoration: none" href="javascript:history.go(-1)">[Back]</a></td>
     <td width=10%><a style="text-decoration: none" href="#{perma}"> [permalink] </a></td>
     <td width=80% align=right><font size=-3>#{taglist}</font></td></tr></table>
-  #{reddit_txt}
   HTML
 end
@@ -105,7 +125,7 @@ def faq
   _out "<br>" if @faq_count == 0
   @faq_count += 1
   ques = _data.chomp
-  ans  = _body_text
+  ans  = _body.join("\n")
   id = "faq#@faq_count"
   _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>]

data/lib/lowlevel.rb CHANGED

@@ -12,6 +12,10 @@
     File.write(name, obj)
   end
+  def timelog(line, file)
+    File.open(file, "a") {|f| f.puts "#{Time.now} #{line}" }
+  end
   def system!(str, show: false)
     log!(enter: __method__, args: [str], level: 2)
     STDERR.puts str if show

data/lib/publish.rb CHANGED

@@ -38,14 +38,22 @@ class RuneBlog::Publishing
     url = "#@proto://#@server/#@path"  # /#{vname}"
   end
+  def check_new_posts
+    # How do we know??
+    # If it's newly published:
+    #   autopost on reddit   (if enabled and not already)
+    #       "    "  twitter  (if enabled and not already)
+    #       "    "  facebook (if enabled and not already)
+  end
   def publish
     log!(enter: __method__, level: 1)
     dir = @docroot/@path
     view_name = @blog.view.name
-    viewpath = dir # /view_name
-    # FIXME rsync doesn't work
+    viewpath = dir
     cmd = "rsync -r -z #{@blog.root}/views/#{@blog.view}/remote/ #@user@#@server:#{viewpath}/"
     system!(cmd)
+    check_new_posts
     dump("#{@blog.view} at #{Time.now}", "#{@blog.view.dir}/last_published")
     true
   end

data/lib/repl.rb CHANGED

@@ -41,24 +41,25 @@ module RuneBlog::REPL
   end
   def cmd_config
-    hash = {"Global configuration"                     => "global.lt3",
-            "   View-specific variables"               => "../../settings/view.txt",
-            "   Recent posts"                          => "../../settings/recent.txt",
-            "   Publishing vars"                       => "../../settings/publish.txt",
-            "   Config for reddit"                     => "../../config/reddit/credentials.txt",
-            "   Config for Facebook"                   => "../../config/facebook/credentials.txt",
-            "   Config for Twitter"                    => "../../config/twitter/credentials.txt",
-            "View generator"                           => "blog/generate.lt3",
-            "   Banner: Description"                   => "blog/banner.lt3",
-            "   Banner: Text portion"                  => "banner/top.lt3",
-            "   HEAD info for view"                    => "blog/head.lt3",
-            "   User-edited detail for view"           => "blog/index.lt3",
-            "   Generator for recent-posts entry"      => "blog/post_entry.lt3",
-            "Generator for a post"                     => "post/generate.lt3",
-            "   HEAD info for post"                    => "post/head.lt3",
-            "   Content for post"                      => "post/index.lt3",
-            "Global CSS"                               => "etc/blog.css.lt3",
-            "External JS/CSS (Bootstrap, etc.)"        => "/etc/externals.lt3"
+    hash = {"Variables (general)"                 => "global.lt3",
+            "   View-specific"                    => "../../settings/view.txt",
+            "   Recent posts"                     => "../../settings/recent.txt",
+            "   Publishing"                       => "../../settings/publish.txt",
+            "Configuration: enable/disable"       => "../../settings/features.txt",
+            "   Reddit"                           => "../../config/reddit/credentials.txt",
+            "   Facebook"                         => "../../config/facebook/credentials.txt",
+            "   Twitter"                          => "../../config/twitter/credentials.txt",
+            "View: generator"                     => "blog/generate.lt3",
+            "   HEAD info"                        => "blog/head.lt3",
+            "   Layout "                          => "blog/index.lt3",
+            "   Recent-posts entry"               => "blog/post_entry.lt3",
+            "   Banner: Description"              => "blog/banner.lt3",
+            "      Text portion"                  => "banner/top.lt3",
+            "Generator for a post"                => "post/generate.lt3",
+            "   HEAD info for post"               => "post/head.lt3",
+            "   Content for post"                 => "post/index.lt3",
+            "Global CSS"                          => "etc/blog.css.lt3",
+            "External JS/CSS (Bootstrap, etc.)"   => "/etc/externals.lt3"
            }
     dir = @blog.view.dir/"themes/standard/"
@@ -209,12 +210,13 @@ module RuneBlog::REPL
   def regen_posts
     drafts = @blog.drafts  # current view
+    puts "  Regenerating posts..." unless drafts.empty?
     drafts.each do |draft|
       orig = @blog.root/:drafts/draft
       html = @blog.root/:posts/draft
       html.sub!(/.lt3$/, "/guts.html")
       next if fresh?(orig, html)
-      puts "  Regenerating #{draft}"
+      puts "    #{draft}"
       @blog.generate_post(orig)    # rebuild post
     end
     puts
@@ -224,8 +226,11 @@ module RuneBlog::REPL
     debug "Starting cmd_rebuild..."
     puts
     regen_posts
+    puts "  Generating view"
     @blog.generate_view(@blog.view)
+    puts "  Generating index"
     @blog.generate_index(@blog.view)
+    puts "  ...finished!"
   rescue => err
     _tmp_error(err)
   end

data/lib/runeblog.rb CHANGED

@@ -87,9 +87,9 @@ class RuneBlog
       new_sequence
     end
     unless File.exist?(repo_root/"data/VIEW")
-      copy_data(:config, repo_root/:data)
+      copy_data(repo_root/:data)
     end
-    copy_data(:extra,  repo_root/:config)
+#   copy_data(:extra,  repo_root/:config)
     write_repo_config(root: repo_root)
     @blog = self.new
     @blog
@@ -494,13 +494,14 @@ class RuneBlog
     log!(enter: __method__, level: 3)
     dir = self.view.dir/:posts
     posts = Dir.entries(dir).grep(/^\d{4}/)
-    posts
+    posts.sort
   end
   def drafts
     log!(enter: __method__, level: 3)
     dir = @root/:drafts
     drafts = Dir.entries(dir).grep(/^\d{4}.*/)
+    drafts.sort
   end
   def change_view(view)
@@ -589,6 +590,9 @@ class RuneBlog
         .heredoc post.aslug
         #{aslug}
         .end
+        .heredoc post.date
+        #{date}
+        .end
         .heredoc title
         #{title.chomp}
         .end
@@ -653,10 +657,11 @@ class RuneBlog
     copy(pdraft/"guts.html", @theme/:post)
     copy(pdraft/"vars.lt3",  @theme/:post)
     # Step 4...
-    # FIXME dependencies?
     preprocess cwd: @theme/:post, src: "generate.lt3", force: true,
-               dst: remote/ahtml, copy: @theme/:post,
+               dst: remote/ahtml, # copy: @theme/:post,
                call: ".nopara"    # , debug: true
+    FileUtils.rm_f(remote/"published")
+    timelog("Generated", remote/"history")
     copy_widget_html(view_name)
   rescue => err
     _tmp_error(err)
@@ -664,7 +669,7 @@ class RuneBlog
   def _check_view?(view)
     flag = self.view?(view)
-    puts "  Warning: '#{view}' is not a view" unless flag
+    puts "        Warning: '#{view}' is not a view" unless flag
     flag
   end
@@ -672,6 +677,9 @@ class RuneBlog
     log!(enter: __method__, args: [draft], level: 1)
     views = _get_views(draft)
     views.each {|view| _handle_post(draft, view) }
+    # For current view:
+    slug = File.basename(draft).sub(/.lt3$/, "")
+    postdir = self.view.dir/"remote/post/"/slug
   rescue => err
     _tmp_error(err)
   end

data/lib/runeblog_version.rb CHANGED

@@ -3,7 +3,7 @@ if !defined?(RuneBlog::Path)
 # if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 class RuneBlog
-  VERSION = "0.3.07"
+  VERSION = "0.3.08"
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.3.07
+  version: 0.3.08
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2020-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -89,6 +89,7 @@ files:
 - data/global.lt3
 - data/universal.lt3
 - empty_view/assets/austin-pano.jpg
+- empty_view/assets/reddit-logo.png
 - empty_view/assets/sky2.jpg
 - empty_view/config/exper/2svg.lt3
 - empty_view/config/exper/gen_svg.rb
@@ -103,7 +104,6 @@ files:
 - empty_view/config/reddit/notes.txt
 - empty_view/config/reddit/reddit_post_url.py
 - empty_view/config/reddit/redpost.rb
-- empty_view/config/reddit/the-graffiti-wall.html
 - empty_view/config/twitter/credentials.txt
 - empty_view/config/twitter/tw.html
 - empty_view/config/twitter/tw.js

data/empty_view/config/reddit/the-graffiti-wall.html DELETED

@@ -1,91 +0,0 @@
-<html>
-  <!-- Generated from /Users/Hal/Dropbox/files/runeblog/.blogs/views/around_austin/themes/standard/global.lt3 on 2019-12-19; editing not recommended.   -->
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title>
-  Around Austin | The view from downtown...
-  </title>
-  <meta name="generator" content="Runeblog v 0.2.91">
-  <meta property="og:title" content="The graffiti wall ">
-  <meta property="og:locale" content="en_US">
-  <meta property="description" content="RIP, Hope Gallery">
-  <meta property="og:description" content="The view from downtown...">
-  <link rel="canonical" href="http://SITE">
-  <meta property="og:url" content="http://SITE">
-  <meta property="og:site_name" content="Around Austin">
-  <link type="application/atom+xml" rel="alternate" href="http://SITE/feed.xml" title="Around Austin">
-  <link rel="shortcut icon" type="image/x-icon" href="etc/favicon.ico">
- <link rel="apple-touch-icon" href="etc/favicon.ico">
-  <link rel="stylesheet" href="etc/blog.css">
-<body>
-<section class="post">
-  <div class="recent-content">
-    <table border=0 width=100%><tr>
-      <td align=left valign=bottom><h2 class="recent-title">The graffiti wall</h2></td>
-      <td align=right valign=top><font size=-5><br></font>December  2, 2019</td>
-    </tr></table><hr>
-  <!-- Post number 3 -->
-RIP, Hope Gallery
-<div class='mydrop'>I</div>
-<div style="padding-top: 1px">t's been a while since I was there. They say it was torn down
-while I wasn't looking. Never tagged anything there, of course, nor
-anywhere else. Spraypainting public places isn't my thing, but in this
-case I condoned it because it was sort of there for that purpose.
-<p>
-This fake entry is a long one so as to demonstrate both drop-caps
-(above) and an inset quote. Blah blah blah. Lorem ipsum dolor and
-a partridge in a pear tree.
-<p>
-</p>
-Wherever you go, there you are. Last night I saw upon the stair
-a little man who was not there. He wasn't there again today; I
-wish, I wish he'd go away.  As far as we know, our computer has
-<div style='float:left; width: 20%; padding:8px; padding-right:12px'><b><i> On a clean disk, you can seek forever.</i></b></div>
-never had an undetected error.
- On a clean disk, you can seek forever.
-And never let it be denied that
-pobbles are happier without their toes. And may your snark never
-be a boojum. How do you know you aren't dreaming right now? When
-you see a butterfly, think of Chuang Tzu.
-<p>
-Contact light. Houston, this is Tranquility Base. The Eagle has
-landed. That's one small step for (a) man, one giant leap for
-mankind.
-<p>
-Here's the PDF of <a style='text-decoration: none' href='http://rubyhacker.com/blog2/rubydino.pdf'>"Ruby for the Old-Time C Programmer"</a>
-<p>
-Pity this busy monster, manunkind, not. Pity rather... Listen:
-There's a hell of a universe next door; let's go.
-<p>
-  </div>
-</section>
-<br>
-<!-- <script src='https://redditjs.com/subreddit.js' data-subreddit='RubyElixirEtc' data-width=600></script> -->
-<!-- https://www.reddit.com/r/RubyElixirEtc/comments/ed48ra/post_this_is_only_a_test/ -->
-<hr>
-<table width=100%><tr>
-  <td width=10%><a style="text-decoration: none" href="javascript:history.go(-1)">[Back]</a></td>
-  <td width=10%><a style="text-decoration: none" href="http://SITE/VIEW_NAME/permalink/the-graffiti-wall.html"> [permalink] </a></td>
-  <td width=80% align=right><font size=-3></font></td></tr></table>
-<hr>
-<script src='https://redditjs.com/post.js' data-url="ed48ra" data-width=800 ></script>
-</body>
-</html>