runeblog 0.3.12 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0372218e12e1f9436b17621b6d32a0894daf4e58bbf7f2cd55dd6fc48eca5af5'
-  data.tar.gz: 33da1a53944d8db1b681f885446721e626699b8a3b0126bd3b854df1f707a203
+  metadata.gz: d17e951cf12388a3cd71091a7e8a014bcc71d3e08d08a6001b91deb8b545bdf5
+  data.tar.gz: e76a74b9751d248c1bc71387bfc684376f6b130e641b856bb94ef5715b948062
 SHA512:
-  metadata.gz: 8d5fd3bf878e11f7d9d1cba4659c9f199a0cc7908bf2bf9596e6e2716e56a53863cd0cf978dfa3c0db033c8129ab5ddf2f29daf315fa058e50171b783c926012
-  data.tar.gz: 5790b07d2a6b3ca787b67e473f83e99ee4d29171ffc6bdbe30e5275b2ae098c7a388bd873cd9a6e1bb1a3206082e59f1bbefcffc158b3f704a0fda3a02637d7e
+  metadata.gz: 237fc6eca980f18aff1fc950831d7579b944727a587e23ea3fae538b5e8a222d8299432b4ad16a1f0371702fbd82fdb63d4d057146fedc9edb146a74711ae2dc
+  data.tar.gz: 331ba90a0ef26f7e34bcc9358776259eeac2a90aadeb0a311050a4e94d97c4fbd4035ad3464141c58fff4a61541d55d24079cbbfad36e9ff510171be08fe707d

data/bin/blog

@@ -5,6 +5,8 @@
 require 'runeblog'
 require 'rubytext'
 
+require 'menus'
+
 require 'repl'
 
 include RuneBlog::REPL
@@ -90,11 +92,21 @@ def mainloop
   info = @blog.view || "no view"
   print fx("[#{info}] ", Red, :bold)
   cmd = STDSCR.gets(history: @cmdhist, tab: @tabcom)
-  cmd_quit if cmd.nil?   # ^D
-  cmd.chomp!
-  return if cmd.empty?   # CR does nothing
-  invoking = RuneBlog::REPL.choose_method(cmd)
-  ret = send(*invoking)
+  case
+    when cmd == RubyText::Keys::Escape
+      show_top_menu
+      puts
+      return
+    when cmd == RubyText::Keys::CtlD    # ^D
+      cmd_quit
+    when cmd.is_a?(String)
+      cmd.chomp!
+      return if cmd.empty?  # CR does nothing
+      invoking = RuneBlog::REPL.choose_method(cmd)
+      ret = send(*invoking)
+  else
+    puts "Don't understand '#{cmd.inspect}'\n "
+  end
 rescue => err
   puts err
 end

data/empty_view/themes/standard/banner/navbar/faq.lt3

@@ -1 +1 @@
-.include ../../widgets/pages/faq.lt3
+.include ../../../../widgets/pages/faq.lt3

data/empty_view/themes/standard/blog/index.lt3

@@ -9,7 +9,6 @@
 
 .sidebar
   links 
-  ad 
   pinned
   pages 
   news 

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

@@ -9,10 +9,8 @@
   <!-- Generated from $File on $$date; editing not recommended.   -->
 
 .seek global.lt3
-.include vars.lt3
 
 . FIXME
-
 .head
 og:title    $title 
 description $teaser

data/empty_view/themes/standard/post/permalink.lt3

@@ -13,7 +13,6 @@
   <!-- It was generated from $File on $$date.  -->
 
 .seek    global.lt3
-.include vars.lt3
 
 .head
 og:title    $title

data/lib/helpers-blog.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 
 require 'processing'
 
+require 'pathmagic'
 require 'lowlevel'
 
 module RuneBlog::Helpers
@@ -16,10 +17,11 @@ module RuneBlog::Helpers
 
   def read_features(view = nil)
     hash = {}
-    if view.nil?  # toplevel default
-      dir = @root/"data"
+    root = @blog.root rescue ".blogs"
+    if view.nil?  # toplevel
+      dir = root/"data"
     else
-      dir = @root/:views/self.view/:settings
+      dir = root/:views/view/:settings
     end
     file = dir/"features.txt"
     pairs = read_pairs(file)
@@ -28,6 +30,30 @@ module RuneBlog::Helpers
     @features = enabled
   end
 
+  def write_features(hash, view = nil)
+    root = @blog.root rescue ".blogs"
+    if view.nil?  # toplevel
+      dir = root/"data"
+    else
+      dir = root/:views/view/:settings
+    end
+    file = dir/"features.txt"
+    lines = File.readlines(file)
+    names = hash.keys
+    names.each do |name|
+      n, item = find_item!(lines) {|x| x =~ /^#{name} / }
+      k = name.length + 1  # 2nd blank after name
+      loop { break if item[k] != " "; k += 1 }
+      item[k] = hash[name]
+      lines[n] = item
+    end
+    File.write(file, lines.join)
+  rescue => err
+    puts "Error: #{err}"
+    puts err.backtrace.join("\n")
+    puts
+  end
+
   def get_repo_config
     log!(enter: __method__, level: 3)
     @editor = File.read(".blogs/data/EDITOR").chomp
@@ -39,6 +65,21 @@ module RuneBlog::Helpers
     puts "dir = #{Dir.pwd}"
   end
 
+  def get_all_widgets(dest)
+    wdir  = RuneBlog::Path + "/widgets"    # files kept inside gem
+    copy!(wdir/"*", dest)
+  end
+
+  def get_widget(dest, widget: :all)   # recursive
+    wdir  = ".blogs/widgets"
+    wdir  = RuneBlog::Path + "/widgets"    # files kept inside gem
+    if widget == :all
+      copy!(wdir/"*", dest)
+    else
+      copy!(wdir/widget, dest)
+    end
+  end 
+
   def copy_data(dest)
     data  = RuneBlog::Path + "/../data"    # files kept inside gem
     files = %w[ROOT VIEW EDITOR universal.lt3 global.lt3 features.txt]

data/lib/helpers-repl.rb

@@ -31,6 +31,13 @@ module RuneBlog::REPL
      "cv"                => :cmd_change_view,  # 0-arity must come second
 
      "config"            => :cmd_config,
+
+     "list widgets"      => :cmd_list_widgets,
+     "lsw"               => :cmd_list_widgets,
+     "install $widget"   => :cmd_install_widget,
+     "enable $widget"    => :cmd_enable_widget,
+     "disable $widget"   => :cmd_disable_widget,
+     "update $widget"    => :cmd_update_widget,
      "manage $widget"    => :cmd_manage,
 
      "legacy"            => :cmd_legacy,
@@ -89,6 +96,7 @@ module RuneBlog::REPL
     rx = "^" + pat
     rx.gsub!(/ /, " +")
     rx.gsub!(/\$(\w+) */) { " *(?<#{$1}>\\w+)" }
+    # FIXME - detect when command is missing an arg
     # How to handle multiple optional args?
     rx.sub!(/>(\w+)$/) { "(.+)" }
     rx << "$"

data/lib/liveblog.rb

@@ -33,8 +33,10 @@ def init_liveblog    # FIXME - a lot of this logic sucks
       </a>
     HTML
   end
-rescue
-  raise "Only works inside a blog repo"
+rescue => err
+  STDERR.puts "err = #{err}"
+  STDERR.puts err.backtrace.join("\n")
+# raise "Only works inside a blog repo"
 end
 
 ##################
@@ -380,14 +382,6 @@ def pubdate
   _optional_blank_line
 end
 
-def image   # primitive so far
-  _debug "img: huh? <img src=#{_args.first}></img>"
-  fname = _args.first
-  path = :assets/fname
-  _out "<img src=#{path}></img>"
-  _optional_blank_line
-end
-
 def tags
   raise "'post' was not called" unless @meta
   _debug "args = #{_args}"
@@ -408,7 +402,7 @@ def pin
   pinned = @_args
   @meta.pinned = pinned
   pinned.each do |pinview|
-    dir = @blog.root/:views/pinview/"themes/standard/widgets/pinned/"
+    dir = @blog.root/:views/pinview/"widgets/pinned/"
     datafile = dir/"list.data"
     pins = _get_data?(datafile)
     pins << "#{@meta.num} #{@meta.title}\n"
@@ -552,7 +546,7 @@ def _make_class_name(app)
 end
 
 def _load_local(widget)
-  Dir.chdir("widgets/#{widget}") do
+  Dir.chdir("../../widgets/#{widget}") do
     rclass = _make_class_name(widget)
     found = (require("./#{widget}") if File.exist?("#{widget}.rb"))
     code = found ? ::RuneBlog::Widget.class_eval(rclass) : nil
@@ -566,7 +560,7 @@ rescue => err
 end
 
 def _handle_standard_widget(tag)
-  wtag = :widgets/tag
+  wtag = "../../widgets"/tag
   code = _load_local(tag)
   if code 
     Dir.chdir(wtag) do 
@@ -589,21 +583,15 @@ def sidebar
 
   _body do |token|
     tag = token.chomp.strip.downcase
-    wtag = :widgets/tag
+    wtag = "../../widgets"/tag
     raise "Can't find #{wtag}" unless Dir.exist?(wtag)
     tcard = "#{tag}-card.html"
 
     case
       when standard.include?(tag)
         _handle_standard_widget(tag)
-      when tag == "ad"
-        num = rand(1..4)
-        img = "widgets/ad/ad#{num}.png"
-        src, dst = img, @root/:views/@view_name/"remote/widgets/ad/"
-        system!("cp #{src} #{dst}")
-        File.open(wtag/"vars.lt3", "w") {|f| f.puts ".set ad.image = #{img}" }
-        preprocess cwd: wtag, src: tag, dst: tcard, call: ".nopara", 
-                   force: true # , debug: true # , deps: depend 
+      else
+        raise "Nonstandard widget?"
     end
 
     _include_file wtag/tcard

data/lib/lowlevel.rb

@@ -103,9 +103,28 @@
     puts err.backtrace.join("\n")
   end
 
+  def find_item(list)
+    list2 = list.select(&block)
+    exactly_one(list2)
+  end
+
+  def find_item!(list, &block)
+    list2 = list.select(&block)
+    item = exactly_one(list2)
+    n = list.index(&block)
+    [n, item]
+  end
+
   def exactly_one(list)
     raise "List: Zero instances" if list.empty?
     raise "List: More than one instance" if list.size > 1
     list.first
   end
 
+  def addvar(vars, hash)
+    hash.each_pair do |k, v| 
+      vars[k.to_s] = v
+      vars[k.to_sym] = v
+    end
+    vars
+  end

data/lib/menus.rb

@@ -0,0 +1,115 @@
+
+require 'ostruct'
+require 'rubytext'
+require 'repl'
+
+Menu = OpenStruct.new
+
+notimp = proc { RubyText.splash("Not implemented yet") }
+
+top_about  = proc { RubyText.splash("RuneBlog v #{RuneBlog::VERSION}") }
+top_help   = proc { RubyText.splash(RuneBlog::REPL::Help.gsub(/[{}]/, " ")) }
+
+Menu.top_build  = { 
+     Rebuild: proc { cmd_rebuild },
+     Preview: proc { cmd_preview },
+     Publish: proc { cmd_publish },
+     Browse:  proc { cmd_browse }, 
+     ssh:     proc { cmd_ssh }
+  }
+
+Menu.top_items = {
+    About:  top_about,
+    Views:  notimp,
+    Build:  proc { STDSCR.menu(items: Menu.top_build) },
+    Config: notimp,
+    Help:   top_help,
+    Quit:   proc { cmd_quit }
+  }
+
+def show_top_menu
+  STDSCR.topmenu(items: Menu.top_items)
+end
+
+# about_items 
+
+
+=begin
+   About (version)
+   Help
+   Views
+     New view
+     (select)
+   Posts
+     New post
+     (select)
+   Drafts
+     (select) hmm...
+   Widgets
+     (select) 
+   Assets
+
+   Build
+     rebuild  
+     preview  
+     publish  
+     browse   
+     ssh      
+
+     quit         
+=end
+
+    {
+
+     "tags"              => :cmd_tags,
+     "import"            => :cmd_import,
+
+     "config"            => :cmd_config,
+
+     "install $widget"   => :cmd_install_widget,
+     "enable $widget"    => :cmd_enable_widget,
+     "disable $widget"   => :cmd_disable_widget,
+     "update $widget"    => :cmd_update_widget,
+     "manage $widget"    => :cmd_manage,
+
+     "list assets"       => :cmd_list_assets,
+     "lsa"               => :cmd_list_assets,
+
+     "pages"             => :cmd_pages,
+
+     "delete >postid"    => :cmd_remove_post,
+     "undel $postid"     => :cmd_undelete_post,
+
+     "edit $postid"      => :cmd_edit_post,
+     "ed $postid"        => :cmd_edit_post,
+     "e $postid"         => :cmd_edit_post,
+
+   }
+
+#   def cmd_config
+#     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/"
+#     num, target = STDSCR.menu(title: "Edit file:", items: hash)
+#     edit_file(dir/target)
+#   end
+# 

data/lib/processing.rb

@@ -2,7 +2,7 @@ if ! defined?(LIVE)
 
 require 'livetext'
 
-LIVE = Livetext.new
+LIVE = "defined"
 LEXT = ".lt3"
 
 def newer?(f1, f2)
@@ -39,6 +39,7 @@ def preprocess(cwd: Dir.pwd, src:,
       STDERR.puts "#{sp}      in:   #{Dir.pwd}"
       STDERR.puts "#{sp}      from: #{caller[0]}"
       STDERR.puts "#{sp}      copy: #{copy}" if copy
+      STDERR.puts "#{sp}      vars: #{vars.inspect}" unless vars == {}
     end
     stale = stale?(src, dst, deps, force)
     if stale

data/lib/publish.rb

@@ -52,7 +52,6 @@ class RuneBlog::Publishing
     view_name = @blog.view.name
     viewpath = dir 
     cmd = "rsync -r -z #{@blog.root}/views/#{@blog.view}/remote/ #@user@#@server:#{viewpath}/"
-puts cmd
     system!(cmd)
     check_new_posts
     dump("#{@blog.view} at #{Time.now}", "#{@blog.view.dir}/last_published")

data/lib/repl.rb

@@ -3,6 +3,8 @@ require 'ostruct'
 require 'helpers-repl'  # FIXME structure
 require 'pathmagic'
 
+require 'menus'
+
 make_exception(:PublishError,  "Error during publishing")
 make_exception(:EditorProblem, "Could not edit $1")
 
@@ -81,7 +83,7 @@ module RuneBlog::REPL
   end
 
   def _manage_pinned   # cloned from manage_links
-    dir = @blog.view.dir/"themes/standard/widgets/pinned"
+    dir = @blog.view.dir/"widgets/pinned"
     data = dir/"list.data"
     edit_file(data)
   end
@@ -116,13 +118,13 @@ module RuneBlog::REPL
   end
 
   def _manage_links
-    dir = @blog.view.dir/"themes/standard/widgets/links"
+    dir = @blog.view.dir/"widgets/links"
     data = dir/"list.data"
     edit_file(data)
   end
 
-  def _manage_pages
-    dir = @blog.view.dir/"themes/standard/widgets/pages"
+  def _manage_pages    # FIXME move into widget code
+    dir = @blog.view.dir/"widgets/pages"
     # Assume child files already generated (and list.data??)
     data = dir/"list.data"
     lines = _get_data?(data)
@@ -376,7 +378,7 @@ module RuneBlog::REPL
         puts "  ", fx(num, Red), "  ", fx(title, Black)
         other = @blog._get_views(@blog.root/:drafts/draft) - [@blog.view.to_s]
         unless other.empty?
-          print fx(" "*9 + "also in: ", Bold) 
+          print fx(" "*9 + "also in: ", :bold) 
           puts other.join(", ") 
         end
       end
@@ -449,6 +451,41 @@ module RuneBlog::REPL
     error(err)
   end
 
+=begin
+  {lsw, list widgets} List all known widgets
+  {install WIDGET}    Install a widget
+  {enable WIDGET}     Use widget in this view
+  {disable WIDGET}    Don't use widget in this view
+  {update WIDGET}     Update widget code (this view)
+  {manage WIDGET}     Manage widget content/layout 
+=end
+
+  def cmd_list_widgets
+    # find/list all available widgets
+    puts "\n  STUB: #{__method__}\n "
+  end
+
+  def cmd_install_widget(arg)
+    # install a widget (view? global?)
+    puts "\n  STUB: #{__method__}\n "
+  end
+
+  def cmd_enable_widget(arg)
+    write_features({arg.to_sym => "1"}, @blog.view)
+    puts "\n  Enabled #{arg}\n "
+  end
+
+  def cmd_disable_widget(arg)
+    write_features({arg.to_sym => "0"}, @blog.view)
+    puts "\n  Disabled #{arg}\n "
+  end
+
+  def cmd_update_widget(arg)
+    # update widget code
+    puts "\n  STUB: #{__method__}\n "
+  end
+
+
   Help = <<-EOS
 
   {Basics:}                                         {Views:}
@@ -469,7 +506,18 @@ module RuneBlog::REPL
   {delete ID [ID...]} Remove multiple posts         {rebuild}           Regenerate all posts and relink
   {undelete ID}       Undelete a post               {publish}           Publish (current view)
   {edit ID}           Edit a post                   {ssh}               Login to remote server
-  {import ASSETS}     Import assets (images, etc.)  {manage WIDGET}     Manage content/layout of a widget
+  {import ASSETS}     Import assets (images, etc.)  
+
+
+  {Widgets:}
+  -------------------------------------------       
+  {lsw, list widgets} List all known widgets
+  {install WIDGET}    Install a widget
+  {enable WIDGET}     Use widget in this view
+  {disable WIDGET}    Don't use in this view
+  {update WIDGET}     Update code (this view)
+  {manage WIDGET}     Manage content/layout 
+
   EOS
 
   def cmd_help

data/lib/runeblog.rb

@@ -114,7 +114,9 @@ class RuneBlog
 
     create_dirs(repo_root)
     Dir.chdir(repo_root) do
-      create_dirs(:data, :config, :drafts, :views, :posts)
+      create_dirs(:data, :config, :widgets, :drafts, :views, :posts)  # ?? widgets?
+      # FIXME
+      get_all_widgets("widgets")
       new_sequence
     end
     unless File.exist?(repo_root/"data/VIEW")
@@ -361,6 +363,8 @@ class RuneBlog
     Dir.chdir(@root) do
       cmd = "cp -r #{RuneBlog::Path}/../empty_view views/#{view_name}"
       system!(cmd)
+      cmd = "cp -r widgets views/#{view_name}"
+      system!(cmd)
     end
   rescue => err
     _tmp_error(err)
@@ -621,6 +625,7 @@ class RuneBlog
     nslug = fname.sub(/.lt3$/, "")     # 0001-this-is-a-post
     aslug = nslug.sub(/\d\d\d\d-/, "") # this-is-a-post
     pnum = nslug[0..3]                 # 0001
+    hash = {}
     Dir.chdir(pdraft) do 
       excerpt = File.read("teaser.txt")
       meta = read_metadata
@@ -629,29 +634,12 @@ class RuneBlog
       title = meta.title
       tags = meta.tags
       # FIXME simplify
-      vars = <<~LIVE
-        .set post.num = #{pnum}
-        .heredoc post.aslug
-        #{aslug}
-        .end
-        .heredoc post.date
-        #{date}
-        .end
-        .heredoc title
-        #{title.chomp}
-        .end
-        .heredoc post.tags
-        #{tags.join(" ")}
-        .end
-        .heredoc teaser
-        #{excerpt.chomp}
-        .end
-        .heredoc longdate
-        #{longdate}
-        .end
-      LIVE
-      File.open(pdraft/"vars.lt3", "w") {|f| f.puts vars }
+      addvar(hash, "post.num" => pnum,      "post.aslug" => aslug,
+             "post.date" => date,           title: title.chomp, 
+             "post.tags" => tags.join(" "), teaser: excerpt.chomp,
+             longdate: longdate)
     end
+    hash
   rescue => err
     _tmp_error(err)
   end
@@ -660,14 +648,14 @@ class RuneBlog
     log!(enter: __method__, level: 2)
     vdir = @root/:views/view
     remote = vdir/:remote
-    wdir = vdir/:themes/:standard/:widgets
+    wdir = vdir/:widgets
     widgets = Dir[wdir/"*"].select {|w| File.directory?(w) }
     widgets.each do |w|
       dir = File.basename(w)
-      rem = w.sub(/themes.standard/, "remote")
+      rem = w.sub(/widgets/, "remote/widgets")
       create_dirs(rem)
       files = Dir[w/"*"]
-      files = files.select {|x| x =~ /(html|css)$/ }
+      # files = files.select {|x| x =~ /(html|css)$/ }
       tag = File.basename(w)
       files.each {|file| system!("cp #{file} #{rem}", show: (tag == "zzz")) }
     end
@@ -677,8 +665,6 @@ class RuneBlog
 
   def _handle_post(draft, view_name = self.view.to_s)
     log!(enter: __method__, args: [draft, view_name], level: 2)
-    # break into separate methods?
-
     return unless _check_view?(view_name)
 
     fname = File.basename(draft)       # 0001-this-is-a-post.lt3
@@ -688,22 +674,17 @@ class RuneBlog
     pdraft = @root/:posts/nslug
     remote = @root/:views/view_name/:remote
     @theme = @root/:views/view_name/:themes/:standard
-    # Step 1...
-    create_dirs(pdraft)
-    # FIXME dependencies?
-    preprocess cwd: pdraft, src: draft, dst: "guts.html",
-               mix: "liveblog"  # , debug: true
-    _post_metadata(draft, pdraft)
-    # Step 2...
-    vposts = @root/:views/view_name/:posts
+
+    create_dirs(pdraft)                                # Step 1...
+    preprocess cwd: pdraft, src: draft,                # FIXME dependencies?
+               dst: "guts.html", mix: "liveblog"
+    hash = _post_metadata(draft, pdraft)
+    vposts = @root/:views/view_name/:posts             # Step 2...
     copy!(pdraft, vposts)    # ??
-    # Step 3..
-    copy(pdraft/"guts.html", @theme/:post) 
-    copy(pdraft/"vars.lt3",  @theme/:post) 
-    # Step 4...
-    preprocess cwd: @theme/:post, src: "generate.lt3", force: true, 
-               dst: remote/ahtml, # copy: @theme/:post,
-               call: ".nopara"    # , debug: true
+    copy(pdraft/"guts.html", @theme/:post)             # Step 3...
+    preprocess cwd: @theme/:post, src: "generate.lt3", # Step 4...
+               force: true, vars: hash, 
+               dst: remote/ahtml, call: ".nopara" 
     FileUtils.rm_f(remote/"published")
     timelog("Generated", remote/"history")
     copy_widget_html(view_name)

data/lib/runeblog_version.rb

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

data/{empty_view/themes/standard → lib}/widgets/pages/pages.rb

@@ -86,6 +86,41 @@ class ::RuneBlog::Widget
       end
     end
 
+    def manage
+      dir = @blog.view.dir/"widgets/pages"
+      # Assume child files already generated (and list.data??)
+      data = dir/"list.data"
+      lines = _get_data?(data)
+      hash = {}
+      lines.each do |line|
+        url, name = line.chomp.split(",")
+        source = url.sub(/.html$/, ".lt3")
+        hash[name] = source
+      end
+      new_item = "[New page]"
+      num, fname = STDSCR.menu(title: "Edit page:", items: hash.keys + [new_item])
+      return if fname.nil?
+      if fname == new_item
+        print "Page title:  "
+        title = RubyText.gets
+        title.chomp!
+        print "File name (.lt3): "
+        fname = RubyText.gets
+        fname << ".lt3" unless fname.end_with?(".lt3")
+        fhtml = fname.sub(/.lt3$/, ".html")
+        File.open(data, "a") {|f| f.puts "#{fhtml},#{title}" }
+        new_file = dir/fname
+        File.open(new_file, "w") do |f|
+          f.puts "<h1>#{title}</h1>\n\n\n "
+          f.puts ".backlink"
+        end
+        edit_file(new_file)
+      else
+        target = hash[fname]
+        edit_file(dir/target)
+      end
+    end
+
     def edit_menu
     end
 

data/runeblog.gemspec

@@ -20,8 +20,8 @@ spec = Gem::Specification.new do |s|
   s.authors     = ["Hal Fulton"]
   s.email       = 'rubyhacker@gmail.com'
   s.executables << "blog"
-  s.add_runtime_dependency 'livetext', '~> 0.9', '>= 0.9.02'
-  s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.20'
+  s.add_runtime_dependency 'livetext', '~> 0.9', '>= 0.9.04'
+  s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.21'
 
   s.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.17
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-12 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -19,7 +19,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.02
+        version: 0.9.04
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.02
+        version: 0.9.04
 - !ruby/object:Gem::Dependency
   name: rubytext
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.21
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -142,68 +142,13 @@ files:
 - empty_view/themes/standard/post/head.lt3
 - empty_view/themes/standard/post/index.lt3
 - empty_view/themes/standard/post/permalink.lt3
-- empty_view/themes/standard/widgets/README
-- empty_view/themes/standard/widgets/ad/ad.lt3
-- empty_view/themes/standard/widgets/ad/ad1.png
-- empty_view/themes/standard/widgets/ad/ad2.png
-- empty_view/themes/standard/widgets/ad/ad3.png
-- empty_view/themes/standard/widgets/ad/ad4.png
-- empty_view/themes/standard/widgets/bydates/README
-- empty_view/themes/standard/widgets/bydates/bydates.rb
-- empty_view/themes/standard/widgets/bydates/card.css
-- empty_view/themes/standard/widgets/bydates/custom.rb
-- empty_view/themes/standard/widgets/bydates/main.css
-- empty_view/themes/standard/widgets/links/README
-- empty_view/themes/standard/widgets/links/card.css
-- empty_view/themes/standard/widgets/links/custom.rb
-- empty_view/themes/standard/widgets/links/links.rb
-- empty_view/themes/standard/widgets/links/list.data
-- empty_view/themes/standard/widgets/links/main.css
-- empty_view/themes/standard/widgets/news/README
-- empty_view/themes/standard/widgets/news/card.css
-- empty_view/themes/standard/widgets/news/custom.rb
-- empty_view/themes/standard/widgets/news/list.data
-- empty_view/themes/standard/widgets/news/main.css
-- empty_view/themes/standard/widgets/news/news.rb
-- empty_view/themes/standard/widgets/pages/README
-- empty_view/themes/standard/widgets/pages/card.css
-- empty_view/themes/standard/widgets/pages/custom.rb
-- empty_view/themes/standard/widgets/pages/disclaim.lt3
-- empty_view/themes/standard/widgets/pages/faq.lt3
-- empty_view/themes/standard/widgets/pages/like-dislike.lt3
-- empty_view/themes/standard/widgets/pages/list.data
-- empty_view/themes/standard/widgets/pages/local.rb
-- empty_view/themes/standard/widgets/pages/main.css
-- empty_view/themes/standard/widgets/pages/other-stuff.lt3
-- empty_view/themes/standard/widgets/pages/pages.rb
-- empty_view/themes/standard/widgets/pinned/README
-- empty_view/themes/standard/widgets/pinned/card.css
-- empty_view/themes/standard/widgets/pinned/custom.rb
-- empty_view/themes/standard/widgets/pinned/main.css
-- empty_view/themes/standard/widgets/pinned/pinned.rb
-- empty_view/themes/standard/widgets/search/README
-- empty_view/themes/standard/widgets/search/card.css
-- empty_view/themes/standard/widgets/search/custom.rb
-- empty_view/themes/standard/widgets/search/main.css
-- empty_view/themes/standard/widgets/search/search.rb
-- empty_view/themes/standard/widgets/sitemap/README
-- empty_view/themes/standard/widgets/sitemap/card.css
-- empty_view/themes/standard/widgets/sitemap/custom.rb
-- empty_view/themes/standard/widgets/sitemap/main.css
-- empty_view/themes/standard/widgets/sitemap/sitemap.rb
-- empty_view/themes/standard/widgets/tag-cloud/OLD-example.lt3
-- empty_view/themes/standard/widgets/tag-cloud/README
-- empty_view/themes/standard/widgets/tag-cloud/card.css
-- empty_view/themes/standard/widgets/tag-cloud/custom.rb
-- empty_view/themes/standard/widgets/tag-cloud/main.css
-- empty_view/themes/standard/widgets/tag-cloud/tag-cloud.lt3
-- empty_view/themes/standard/widgets/tag-cloud/tag-cloud.rb
 - lib/Javascript.stuff
 - lib/helpers-blog.rb
 - lib/helpers-repl.rb
 - lib/liveblog.rb
 - lib/logging.rb
 - lib/lowlevel.rb
+- lib/menus.rb
 - lib/pathmagic.rb
 - lib/post.rb
 - lib/processing.rb
@@ -212,6 +157,57 @@ files:
 - lib/runeblog.rb
 - lib/runeblog_version.rb
 - lib/view.rb
+- lib/widgets/README
+- lib/widgets/bydates/README
+- lib/widgets/bydates/bydates.rb
+- lib/widgets/bydates/card.css
+- lib/widgets/bydates/custom.rb
+- lib/widgets/bydates/main.css
+- lib/widgets/links/README
+- lib/widgets/links/card.css
+- lib/widgets/links/custom.rb
+- lib/widgets/links/links.rb
+- lib/widgets/links/list.data
+- lib/widgets/links/main.css
+- lib/widgets/news/README
+- lib/widgets/news/card.css
+- lib/widgets/news/custom.rb
+- lib/widgets/news/list.data
+- lib/widgets/news/main.css
+- lib/widgets/news/news.rb
+- lib/widgets/pages/README
+- lib/widgets/pages/card.css
+- lib/widgets/pages/custom.rb
+- lib/widgets/pages/disclaim.lt3
+- lib/widgets/pages/faq.lt3
+- lib/widgets/pages/like-dislike.lt3
+- lib/widgets/pages/list.data
+- lib/widgets/pages/local.rb
+- lib/widgets/pages/main.css
+- lib/widgets/pages/other-stuff.lt3
+- lib/widgets/pages/pages.rb
+- lib/widgets/pinned/README
+- lib/widgets/pinned/card.css
+- lib/widgets/pinned/custom.rb
+- lib/widgets/pinned/main.css
+- lib/widgets/pinned/pinned.rb
+- lib/widgets/search/README
+- lib/widgets/search/card.css
+- lib/widgets/search/custom.rb
+- lib/widgets/search/main.css
+- lib/widgets/search/search.rb
+- lib/widgets/sitemap/README
+- lib/widgets/sitemap/card.css
+- lib/widgets/sitemap/custom.rb
+- lib/widgets/sitemap/main.css
+- lib/widgets/sitemap/sitemap.rb
+- lib/widgets/tag-cloud/OLD-example.lt3
+- lib/widgets/tag-cloud/README
+- lib/widgets/tag-cloud/card.css
+- lib/widgets/tag-cloud/custom.rb
+- lib/widgets/tag-cloud/main.css
+- lib/widgets/tag-cloud/tag-cloud.lt3
+- lib/widgets/tag-cloud/tag-cloud.rb
 - test/austin.rb
 - test/fakeimage.jpg
 - test/general_test.rb

data/empty_view/themes/standard/widgets/ad/ad.lt3

@@ -1,22 +0,0 @@
-. In real life, ads won't work this way...
-
-.include vars.lt3
-
-.set classname="btn btn-light float-right"
-.set card.title="Advertisement"
-.set card.text="Build your amazing website with blabla.com."
-. set extra="bg-dark text-white"
-
-<!-- "$ad.image" -->
-
-<div class="card $extra mb-3">
-  <div class="card-body">
-<!--
-    <h5 class="card-title">$card.title</h5>
-    <p class="card-text">$card.text</p>
-    <a href="javascript: void(0)" onclick="javascript:open_main('widgets/ad/ad.html')" class="$classname">Visit page</a>
--->
-    <img style="max-height: 100%; max-width: 100%" src="$ad.image"></img>
-  </div>
-</div>
-