runeblog 0.2.90 → 0.2.95

data/empty_view/themes/standard/widgets/links/links.rb

@@ -9,7 +9,7 @@ class ::RuneBlog::Widget
     def initialize(repo)
       @blog = repo
       @datafile = input = "list.data"
-      @lines = File.readlines(input)
+      @lines = _get_data(@datafile)
     end
 
     def build

data/empty_view/themes/standard/widgets/news/news.rb

@@ -7,7 +7,7 @@ class ::RuneBlog::Widget
     def initialize(repo)
       @blog = repo
       @datafile = "list.data"
-      lines = File.readlines(@datafile)
+      lines = _get_data(@datafile)
       @data = lines.map {|line| line.chomp.split(/, */) }
     end
 

data/empty_view/themes/standard/widgets/pages/pages.rb

@@ -4,12 +4,12 @@
 
 class ::RuneBlog::Widget
   class Pages
-    Type, Title = "pages", "Pages"
+    Type, Title = "pages", "My Pages"
 
     def initialize(repo)
       @blog = repo
       @datafile = "list.data"
-      @lines = File.readlines(@datafile)
+      @lines = _get_data(@datafile)
       @data = @lines.map {|x| x.chomp.split(/, */, 2) }
     end
 

data/empty_view/themes/standard/widgets/pinned/pinned.rb

@@ -7,7 +7,7 @@ class ::RuneBlog::Widget
     def initialize(repo)
       @blog = repo
       @datafile = "list.data"
-      @lines = File.exist?(@datafile) ? File.readlines(@datafile) : []
+      @lines = _get_data?(@datafile)
     end
 
     def _html_body(file, css = nil)    # FIXME

data/lib/helpers-blog.rb

@@ -3,20 +3,15 @@ require 'fileutils'
 
 require 'processing'
 
-module RuneBlog::Helpers
+require 'lowlevel'
 
-  def copy(src, dst)
-    log!(enter: __method__, args: [src, dst], level: 2)
-    cmd = "cp #{src} #{dst} 2>/dev/null"
-    rc = system!(cmd)
-    puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
-  end
+module RuneBlog::Helpers
 
-  def copy!(src, dst)
-    log!(enter: __method__, args: [src, dst], level: 2)
-    cmd = "cp -r #{src} #{dst} 2>/dev/null"
-    rc = system!(cmd)
-    puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
+  def quit_RubyText
+    return unless defined? RubyText
+    sleep 6
+    RubyText.stop
+    exit
   end
 
   def get_repo_config
@@ -31,11 +26,16 @@ module RuneBlog::Helpers
   end
 
   def copy_data(tag, dest)
-    data = RuneBlog::Path + "/../data"  # files kept inside gem
+    data  = RuneBlog::Path + "/../data"    # files kept inside gem
+    extra = RuneBlog::Path + "/../config"  # files kept inside gem
+    # FIXME names are confusing
     case tag
-      when :config; files = %w[ROOT VIEW EDITOR universal.lt3 global.lt3]
+      when :config 
+        files = %w[ROOT VIEW EDITOR universal.lt3 global.lt3]
+        files.each {|file| copy(data + "/" + file, dest) }
+      when :extra
+        copy!(extra, dest)
     end
-    files.each {|file| copy(data + "/" + file, dest) }
   end
 
   def read_vars(file)
@@ -54,8 +54,7 @@ module RuneBlog::Helpers
     puts "Can't read vars file '#{file}': #{err}"
     puts err.backtrace.join("\n")
     puts "dir = #{Dir.pwd}"
-    sleep 6; RubyText.stop
-    exit
+    stop_RubyText
   end
 
   def read_config(file, *syms)
@@ -81,8 +80,7 @@ module RuneBlog::Helpers
     puts "Can't read config file '#{file}': #{err}"
     puts err.backtrace.join("\n")
     puts "dir = #{Dir.pwd}"
-    sleep 6; RubyText.stop
-    exit
+    stop_RubyText
   end
 
   def try_read_config(file, hash)
@@ -100,32 +98,33 @@ module RuneBlog::Helpers
     end
   end
 
-  def get_views   # read from filesystem
+  def retrieve_views   # read from filesystem
     log!(enter: __method__, level: 3)
     dirs = subdirs("#@root/views/").sort
     dirs.map {|name| RuneBlog::View.new(name) }
   end
 
-  def write_repo_config(root: "#{Dir.pwd}/.blogs", view: "#{root}/data/VIEW", editor: "/usr/local/bin/vim")
+  def write_repo_config(root: "#{Dir.pwd}/.blogs", view: nil, editor: "/usr/local/bin/vim")
+    view ||= File.read("#{root}/data/VIEW").chomp rescue "[no view]"
     File.write(root + "/data/ROOT",   root + "\n")
     File.write(root + "/data/VIEW",   view.to_s + "\n")
     File.write(root + "/data/EDITOR", editor + "\n")
   end
 
-  def new_dotfile(root: ".blogs", current_view: "test_view", editor: "vi")
-    log!(enter: __method__, args: [root, current_view, editor], level: 3)
-    root = Dir.pwd + "/" + root
-    x = OpenStruct.new
-    x.root, x.current_view, x.editor = root, current_view, editor
-    write_config(x, root + "/" + RuneBlog::ConfigFile)
-    write_repo_config
-  end
+  # def new_dotfile(root: ".blogs", current_view: "test_view", editor: "vi")
+  #   log!(enter: __method__, args: [root, current_view, editor], level: 3)
+  #   root = Dir.pwd + "/" + root
+  #   x = OpenStruct.new
+  #   x.root, x.current_view, x.editor = root, current_view, editor
+  #   write_config(x, root + "/" + RuneBlog::ConfigFile)
+  #   write_repo_config
+  # end
 
   def new_sequence
     log!(enter: __method__, level: 3)
-    dump(0, "sequence")
+    dump(0, "data/sequence")
     version_info = "#{RuneBlog::VERSION}\nBlog created: #{Time.now.to_s}"
-    dump(version_info, "VERSION")
+    dump(version_info, "data/VERSION")
   end
 
   def subdirs(dir)
@@ -147,38 +146,6 @@ module RuneBlog::Helpers
     files
   end
 
-  def create_dirs(*dirs)
-    log!(enter: __method__, args: [*dirs], level: 3)
-    dirs.each do |dir|
-      dir = dir.to_s  # symbols allowed
-      next if Dir.exist?(dir)
-      cmd = "mkdir -p #{dir} >/dev/null"
-      result = system!(cmd) 
-      raise CantCreateDir(dir) unless result
-    end
-  end
-
-  def interpolate(str, bind)
-    log!(enter: __method__, args: [str, bind], level: 3)
-    wrap = "<<-EOS\n#{str}\nEOS"
-    eval wrap, bind
-  end
-
-  def error(err)  # Hmm, this is duplicated
-    log!(str: "duplicated method", enter: __method__, args: [err], level: 2)
-    str = "\n  Error: #{err}"
-    puts str
-    puts err.backtrace.join("\n")
-  end
-
-  def dump(obj, name)
-    log!(enter: __method__, args: [obj, name], level: 3)
-    File.write(name, obj)
-  end
 end
 
-def dump(obj, name)      # FIXME scope
-  log!(str: "scope problem", enter: __method__, args: [obj, name], level: 3)
-  File.write(name, obj)
-end
 

data/lib/helpers-repl.rb

@@ -109,26 +109,16 @@ module RuneBlog::REPL
     end
     meth = found || :cmd_INVALID
     params = cmd if meth == :cmd_INVALID
-# puts "choose: #{[meth, params].inspect}"
     [meth, params]
   end
 
-  def error(err)  # Hmm, this is duplicated
-    str = "\n  Error: #{err}"
-    puts str
-    puts err.backtrace.join("\n")
-  end
-
   def ask(prompt, meth = :to_s)
     print prompt
-    str = gets
-    str.chomp!
-    str.send(meth)
+    gets.chomp.send(meth)
   end
 
-  def yesno(prompt, meth = :to_s)
-    print prompt
-    gets.chomp.upcase[0] == "Y"
+  def ask!(prompt, meth = :to_s)
+    ask(fx(prompt, :bold), meth)
   end
 
   def reset_output(initial = "")

data/lib/liveblog.rb

@@ -7,6 +7,9 @@ require 'runeblog'
 require 'pathmagic'
 require 'processing'
 
+# top = Livetext::Path + "/../plugin/liveblog/"
+# eval(File.read("#{top}/testing.rb"))
+
 
 def init_liveblog    # FIXME - a lot of this logic sucks
   dir = Dir.pwd.sub(/\.blogs.*/, "")
@@ -42,23 +45,59 @@ def post
   _out "  <!-- Post number #{@meta.num} -->\n "
 end
 
+  def _got_python?
+    # Dumb - fix later - check up front as needed
+    # Should also check for praw lib
+    str = `which python3`
+    str.length > 0
+  end
+
+  def _reddit_post_url(vdir, title, url)
+    _got_python?
+    tmpfile = "/tmp/reddit-post-url.txt"
+    File.open(tmpfile, "w") do |tmp|
+      tmp.puts "[Post] " + title
+      tmp.puts url
+    end
+    rid = nil
+    Dir.chdir(vdir/:config) { rid = `python3 reddit/reddit_post_url.py` }
+    system("rm #{tmpfile}")
+    rid  # returns reddit id
+  end
+
 def post_trailer
   perma = _var("publish.proto") + "://" + _var("publish.server") +
-          "/" + _var("publish.path") + "/permalink/" + _var("post.aslug") + 
+          "/" + _var("publish.path") + "/" + _var("post.aslug") + 
           ".html"
   tags = _var("post.tags")
-  if tags.empty?
-    taglist = ""
-  else
-    taglist = "Tags: #{tags}"
+  taglist = tags.empty? ? "" : "Tags: #{tags}"
+
+  reddit_enabled = false   # FIXME
+  reddit_txt = ""
+  if reddit_enabled
+    vdir  = @blog.root/:views/@blog.view
+    nslug = "#{_var("post.num")}-#{_var("post.aslug")}"
+    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)
+      dump(rid, rid_file)
+    end
+    reddit_txt = <<~HTML
+      <hr>
+      <script src='https://redditjs.com/post.js' 
+              data-url="#{rid}" data-width=800 ></script>
+    HTML
+  # damned syntax highlighting </>
   end
   _out <<~HTML
   <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
-  # damned syntax highlighting
 end
 
 def faq
@@ -85,9 +124,10 @@ def code
 end
 
 def _read_navbar_data
-  dir = @blog.root/:views/@blog.view/"themes/standard/banner/"
+  vdir = @blog.root/:views/@blog.view
+  dir = vdir/"themes/standard/banner/navbar/"
   datafile = dir/"list.data"
-  File.readlines(datafile)
+  _get_data(datafile)
 end
 
 def banner
@@ -97,6 +137,7 @@ def banner
   high = 250
   str2 = ""
   navbar = nil
+  vdir = @blog.root/:views/@blog.view
   lines = _body.to_a
 
   lines.each do |line|
@@ -130,15 +171,9 @@ def banner
         end
         str2 << "<td>" + File.read(file) + "</td>" + "\n"
       when "navbar"
-        dir = @blog.root/:views/@blog.view/"themes/standard/banner/" + "\n"
-        _make_navbar  # horiz is default
-        file = "banner/navbar.html"
-        navbar = File.read(file)
+        navbar = _make_navbar  # horiz is default
       when "vnavbar"
-        dir = @blog.root/:views/@blog.view/"themes/standard/banner/"
-        _make_navbar(:vert)
-        file = "banner/vnavbar.html"
-        navbar = File.read(file)
+        navbar = _make_navbar(:vert)
       when "break"
          str2 << "  </tr>\n  <tr>"  + "\n"
     else
@@ -347,7 +382,7 @@ def pin
   pinned.each do |pinview|
     dir = @blog.root/:views/pinview/"themes/standard/widgets/pinned/"
     datafile = dir/"list.data"
-    pins = File.exist?(datafile) ? File.readlines(datafile) : []
+    pins = _get_data?(datafile)
     pins << "#{@meta.num} #{@meta.title}\n"
     pins.uniq!
     File.open(datafile, "w") {|out| pins.each {|pin| out.puts pin } }
@@ -502,22 +537,6 @@ rescue => err
   exit
 end
 
-# def pinned_rebuild
-#   view = @blog.view
-#   view = _args[0] unless _args.empty?
-#   Dir.chdir(@blog.root/:views/view/"themes/standard/") do
-#     wtag = "widgets/pinned"
-#     code = _load_local("pinned")
-#     if code 
-#       Dir.chdir(wtag) do 
-#         widget = code.new(@blog)
-#         widget.build
-#       end
-#       # _include_file wtag/"pinned-card.html"
-#     end
-#   end
-# end
-
 def _handle_standard_widget(tag)
   wtag = :widgets/tag
   code = _load_local(tag)
@@ -688,20 +707,20 @@ def _make_navbar(orient = :horiz)
     </td></tr></table>
   HTML
 
-  html_file = @blog.root/:views/@blog.view/"themes/standard/banner"/name
+  html_file = @blog.root/:views/@blog.view/"themes/standard/banner/navbar"/name
   output = File.new(html_file, "w")
   output.puts start
   lines = _read_navbar_data
   lines = ["index  Home"] + lines  unless _args.include?("nohome")
   lines.each do |line|
     basename, cdata = line.chomp.strip.split(" ", 2)
-    full = :banner/basename+".html"
+    full = :banner/:navbar/basename+".html"
     href_main = _main(full)
     if basename == "index"  # special case
       output.puts %[#{li1} <a class="nav-link" href="index.html">#{cdata}<span class="sr-only">(current)</span></a> #{li2}]
     else
-      dir = @blog.root/:views/@blog.view/"themes/standard/banner"
-      dest = vdir/"remote/banner"/basename+".html"
+      dir = @blog.root/:views/@blog.view/"themes/standard/banner/navbar"
+      dest = vdir/"remote/banner/navbar"/basename+".html"
       preprocess cwd: dir, src: basename, dst: dest, call: ".nopara" # , debug: true
       output.puts %[#{li1} <a class="nav-link" #{href_main}>#{cdata}</a> #{li2}]
     end
@@ -770,11 +789,6 @@ def _post_lookup(postid)    # side-effect
   vp
 end
 
-def _interpolate(str, context)   # FIXME move this later
-  wrapped = "%[" + str.dup + "]"  # could fail...
-  eval(wrapped, context)
-end
-
 def _card_generic(card_title:, middle:, extra: "")
   front = <<-HTML
     <div class="card #{extra} mb-3">

data/lib/lowlevel.rb

@@ -0,0 +1,73 @@
+
+  def dump(obj, name)
+    File.write(name, obj)
+  end
+
+  def system!(str, show: false)
+    log!(enter: __method__, args: [str], level: 2)
+    STDERR.puts str if show
+    rc = system(str)
+    return rc if rc
+    STDERR.puts "FAILED: #{str.inspect}"
+    STDERR.puts "\ncaller = \n#{caller.join("\n  ")}\n"
+    if defined?(RubyText)
+      sleep 6
+      RubyText.stop
+      exit
+    end
+    return rc
+  end
+
+  def _get_data?(file)   # File need not exist
+    if File.exist?(file)
+      _get_data(file)
+    else
+      []
+    end
+  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
+    end
+    lines
+  end
+
+  def copy(src, dst)
+    log!(enter: __method__, args: [src, dst], level: 2)
+    cmd = "cp #{src} #{dst} 2>/dev/null"
+    system!(cmd)
+  end
+
+  def copy!(src, dst)
+    log!(enter: __method__, args: [src, dst], level: 2)
+    cmd = "cp -r #{src} #{dst} 2>/dev/null"
+    system!(cmd)
+  end
+
+  def create_dirs(*dirs)
+    log!(enter: __method__, args: [*dirs], level: 3)
+    dirs.each do |dir|
+      dir = dir.to_s  # symbols allowed
+      next if Dir.exist?(dir)
+      cmd = "mkdir -p #{dir} >/dev/null"
+      result = system!(cmd) 
+      raise CantCreateDir(dir) unless result
+    end
+  end
+
+  def interpolate(str, bind)
+    log!(enter: __method__, args: [str, bind], level: 3)
+    wrap = "<<-EOS\n#{str}\nEOS"
+    eval wrap, bind
+  end
+
+  def error(err)
+    log!(str: err, enter: __method__, args: [err], level: 2)
+    str = "\n  Error: #{err}"
+    puts str
+    puts err.backtrace.join("\n")
+  end
+