runeblog 0.3.18 → 0.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d935e36229c36cdae337b72491aad4151824b5c083a48d36f5c73f6a069cc10e
-  data.tar.gz: 742a6d8a782a39dc0897f4ce9d73d8e6b091c8dceb3f96230c990e556e20d994
+  metadata.gz: e8c5908c63aea98d2cc29ab782e11b83361d3d866bda7d0c902afb1cfdc70226
+  data.tar.gz: 7740ee4f471a6addeaea6a48394e02aa53ae30be129b9761d1b1b9eb316de7a3
 SHA512:
-  metadata.gz: 68fdf37438b0fe6f4de20616896a5ad4d9e9a54d5287d079e318b8751b844e748ab261cec1f4f54e8f7bc3970a2dad280fed7a64cd3854c0672f55e8d3d6146d
-  data.tar.gz: 5fd8d900cb5de28bdd51fe6d7f9700bf563ace134536e7c4097e36b7ed88520c687f4f6add2ac057677a87716697c5852717a56798a1199cb42a2118f14a034d
+  metadata.gz: 9421dacd34f38911af55054966a341563a70f791bc5fc080f949ad9f1724ae32b15b8163b30985546e3666a127ab87b3a33b731a31a21bf546c832011d006245
+  data.tar.gz: c1571f0a8f8109bc9ce3603142bb8f4b02117606aada8f8931eb9ec6e694ffe094ca2218ce618f37011ceea2da5291edfa8e83f9d7fa64e743bb8dd0483a31f1

data/bin/blog

@@ -27,8 +27,12 @@ end
 def get_universal
   univ = "#{@blog.root}/data/universal.lt3"
   if yesno("Faster initial setup? (no: edit universal.lt3)")
-    author = ask!("      Author name: ")
-    site   = ask!("      Site/domain: ")
+#   author = ask!("      Author name: ")
+#   site   = ask!("      Site/domain: ")
+# Temporarily, for speed:
+author, site = "Hal Fulton", "somedomain.com"
+puts "      Author name: #{author}"
+puts "      Site/domain: #{site}"
     # Now stash it...
     str = File.read(univ)
     str = str.gsub(/AUTHOR/, author)
@@ -41,22 +45,16 @@ def get_universal
 end
 
 def get_global
+  view_name = ask!("      Filename: ")
+  @blog.create_view(view_name)   # call change_view??
   if yesno("Faster view setup? (no: edit global.lt3)")
-    view_name = ask!("      Filename: ")
-    @blog.create_view(view_name)   # call change_view??
     title     = ask!("      View title: ")
     subtitle  = ask!("      Subtitle  : ")
     domain    = ask!("      Domain    : ")
-
-    vfile = "#{@blog.root}/views/#{view_name}/settings/view.txt"
-    hash = {/VIEW_NAME/     => view_name,
-            /VIEW_TITLE/    => title,
-            /VIEW_SUBTITLE/ => subtitle,
-            /VIEW_DOMAIN/   => domain}
-    @blog.complete_file(vfile, nil, hash)
+    modify_view_global(view_name)
+    modify_view_settings(name: view_name, title: title, subtitle: subtitle,
+                         domain: domain)
   else
-    view_name = ask!("      Filename: ")
-    @blog.create_view(view_name)   # call change_view??
     vim_params = '-c ":set hlsearch" -c ":hi Search ctermfg=2 ctermbg=6" +/"\(VIEW_.*\|SITE.*\)"'
     edit_file(@blog.view.dir/"themes/standard/global.lt3", vim: vim_params)
   end
@@ -109,7 +107,8 @@ def mainloop
     puts "Don't understand '#{cmd.inspect}'\n "
   end
 rescue => err
-  puts err
+  puts err.to_s
+  puts "Pausing..."; gets
 end
 
 def cmdline_preview
@@ -159,57 +158,82 @@ def handle_cmdline
   exit
 end
 
-### Main
-
-major, minor = RUBY_VERSION.split(".").values_at(0,1)
-ver = major.to_i*10 + minor.to_i
-unless ver >= 24
-  RubyText.stop
-  sleep 0.2
-  puts "Needs Ruby 2.4 or greater" 
-  exit
+def check_ruby_version
+  major, minor = RUBY_VERSION.split(".").values_at(0,1)
+  ver = major.to_i*10 + minor.to_i
+  unless ver >= 24
+    RubyText.stop
+    sleep 0.2
+    puts "Needs Ruby 2.4 or greater" 
+    exit
+  end
 end
 
-include RuneBlog::Helpers  # for try_read_config
+def reopen_stderr
+  errfile = File.new("stderr.out", "w")
+  STDERR.reopen(errfile)
+end
 
-handle_cmdline unless ARGV.empty?
+def set_fgbg
+  # read a .rubytext file here?? Call it something else?
+  home = ENV['HOME']
+  @fg, @bg = Blue, White   ##  FIXME!! try_read_config("#{home}/.rubytext", fg: Blue, bg: White)
+  @fg = @fg.downcase.to_sym
+  @bg = @bg.downcase.to_sym
 
-errfile = File.new("stderr.out", "w")
-STDERR.reopen(errfile)
+  RubyText.start(:_echo, :keypad, scroll: true, log: "binblog.txt", fg: @fg, bg: @bg)
+end
 
-# read a .rubytext file here?? Call it something else?
-home = ENV['HOME']
-@fg, @bg = Blue, White   ##  FIXME!! try_read_config("#{home}/.rubytext", fg: Blue, bg: White)
-@fg = @fg.downcase.to_sym
-@bg = @bg.downcase.to_sym
+def create_new_repo?
+  new_repo = false
+  if ! RuneBlog.exist?
+    exit unless yesno("No blog repo found. Create new one?")
+    RuneBlog.create_new_blog_repo
+    puts fx("  Blog repo successfully created.", :bold)
+    new_repo = true
+  end
 
-RubyText.start(:_echo, :keypad, scroll: true, log: "binblog.txt", fg: @fg, bg: @bg)
+  @blog = RuneBlog.new
+  get_started if new_repo
+rescue => err
+  STDERR.puts "Error - #{err.to_s}"
+  STDERR.puts err.backtrace
+end
 
+def print_intro
+  print fx("  For help", :bold)
+  puts " type h or help.\n "
 
-new_repo = false
-if ! RuneBlog.exist?
-  exit unless yesno("No blog repo found. Create new one?")
-  RuneBlog.create_new_blog_repo
-  puts fx("  Blog repo successfully created.", :bold)
-  new_repo = true
+  puts fx("\n  RuneBlog", :bold), fx(" v #{RuneBlog::VERSION}\n", Red)
 end
 
-@blog = RuneBlog.new
-get_started if new_repo
+def cmd_history_etc
+  @cmdhist = []
+  @tabcom = RuneBlog::REPL::Patterns.keys.uniq - RuneBlog::REPL::Abbr.keys
+  @tabcom.map! {|x| x.sub(/ [\$\>].*/, "") + " " }
+  @tabcom.sort!
+end
 
-print fx("  For help", :bold)
-puts " type h or help.\n "
+def exit_repl
+  # RubyText.stop
+  sleep 0.2
+  puts
+end
 
-puts fx("\n  RuneBlog", :bold), fx(" v #{RuneBlog::VERSION}\n", Red)
+### Main
 
-@cmdhist = []
-@tabcom = RuneBlog::REPL::Patterns.keys.uniq - RuneBlog::REPL::Abbr.keys
-@tabcom.map! {|x| x.sub(/ [\$\>].*/, "") + " " }
-@tabcom.sort!
-  
-loop { mainloop }
+include RuneBlog::Helpers  # for try_read_config
 
-# system("tput clear")
-sleep 0.2
-puts
+reopen_stderr
 
+check_ruby_version
+handle_cmdline unless ARGV.empty?
+set_fgbg
+print_intro
+# STDERR.puts "cp 6 - pause"; gets
+create_new_repo?
+# STDERR.puts "cp 7 - pause"; gets
+cmd_history_etc
+# STDERR.puts "cp 8 - pause"; gets
+loop { mainloop }
+exit_repl

data/data/global.lt3

@@ -3,11 +3,11 @@
 .   <variable>  <value>                             
 . --------------------------------------------------
 
-.variables view     ../../settings/view.txt
+.variables view     ../settings/view.txt
 
-.variables recent   ../../settings/recent.txt
+.variables recent   ../settings/recent.txt
 
-.variables publish  ../../settings/publish.txt
+.variables publish  ../settings/publish.txt
 
 .variables
 host        http://SITE

data/data/universal.lt3

@@ -7,6 +7,8 @@
 . --------------------------------------------------
 .nopara
 
+.set Root=REPO_ROOT
+
 .variables
 univ.author        AUTHOR
 univ.site          SITE_DOMAIN

data/empty_view/themes/standard/banner/top.lt3

@@ -1,4 +1,4 @@
-.seek global.lt3    # FIXME this is a hack!
+.include $ViewDir/data/global.lt3
 
 <svg width="98%" height="120"
      viewBox="0 0 98% 100">

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

@@ -8,7 +8,7 @@
 <html>
   <!-- Generated from $File on $$date.  
        Editing not recommended. -->
-  $.seek global.lt3
+  $.include $ViewDir/data/global.lt3
   $.include blog/head.lt3
   <body>
     $.include banner/banner.lt3

data/empty_view/themes/standard/etc/blog.css.lt3

@@ -3,7 +3,9 @@
 . Most of the global CSS goes here                  
 . --------------------------------------------------
 
-.seek global.lt3
+.say Inside $File in $FileDir: view/dir = $View $ViewDir
+
+.include $ViewDir/data/global.lt3
 
 body { font-family: $font.family }
 

data/empty_view/themes/standard/etc/github.css

@@ -0,0 +1,209 @@
+.highlight table td { padding: 5px; }
+.highlight table pre { margin: 0; }
+.highlight .cm {
+  color: #999988;
+  font-style: italic;
+}
+.highlight .cp {
+  color: #999999;
+  font-weight: bold;
+}
+.highlight .c1 {
+  color: #999988;
+  font-style: italic;
+}
+.highlight .cs {
+  color: #999999;
+  font-weight: bold;
+  font-style: italic;
+}
+.highlight .c, .highlight .ch, .highlight .cd, .highlight .cpf {
+  color: #999988;
+  font-style: italic;
+}
+.highlight .err {
+  color: #a61717;
+  background-color: #e3d2d2;
+}
+.highlight .gd {
+  color: #000000;
+  background-color: #ffdddd;
+}
+.highlight .ge {
+  color: #000000;
+  font-style: italic;
+}
+.highlight .gr {
+  color: #aa0000;
+}
+.highlight .gh {
+  color: #999999;
+}
+.highlight .gi {
+  color: #000000;
+  background-color: #ddffdd;
+}
+.highlight .go {
+  color: #888888;
+}
+.highlight .gp {
+  color: #555555;
+}
+.highlight .gs {
+  font-weight: bold;
+}
+.highlight .gu {
+  color: #aaaaaa;
+}
+.highlight .gt {
+  color: #aa0000;
+}
+.highlight .kc {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .kd {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .kn {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .kp {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .kr {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .kt {
+  color: #445588;
+  font-weight: bold;
+}
+.highlight .k, .highlight .kv {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .mf {
+  color: #009999;
+}
+.highlight .mh {
+  color: #009999;
+}
+.highlight .il {
+  color: #009999;
+}
+.highlight .mi {
+  color: #009999;
+}
+.highlight .mo {
+  color: #009999;
+}
+.highlight .m, .highlight .mb, .highlight .mx {
+  color: #009999;
+}
+.highlight .sb {
+  color: #d14;
+}
+.highlight .sc {
+  color: #d14;
+}
+.highlight .sd {
+  color: #d14;
+}
+.highlight .s2 {
+  color: #d14;
+}
+.highlight .se {
+  color: #d14;
+}
+.highlight .sh {
+  color: #d14;
+}
+.highlight .si {
+  color: #d14;
+}
+.highlight .sx {
+  color: #d14;
+}
+.highlight .sr {
+  color: #009926;
+}
+.highlight .s1 {
+  color: #d14;
+}
+.highlight .ss {
+  color: #990073;
+}
+.highlight .s, .highlight .sa, .highlight .dl {
+  color: #d14;
+}
+.highlight .na {
+  color: #008080;
+}
+.highlight .bp {
+  color: #999999;
+}
+.highlight .nb {
+  color: #0086B3;
+}
+.highlight .nc {
+  color: #445588;
+  font-weight: bold;
+}
+.highlight .no {
+  color: #008080;
+}
+.highlight .nd {
+  color: #3c5d5d;
+  font-weight: bold;
+}
+.highlight .ni {
+  color: #800080;
+}
+.highlight .ne {
+  color: #990000;
+  font-weight: bold;
+}
+.highlight .nf, .highlight .fm {
+  color: #990000;
+  font-weight: bold;
+}
+.highlight .nl {
+  color: #990000;
+  font-weight: bold;
+}
+.highlight .nn {
+  color: #555555;
+}
+.highlight .nt {
+  color: #000080;
+}
+.highlight .vc {
+  color: #008080;
+}
+.highlight .vg {
+  color: #008080;
+}
+.highlight .vi {
+  color: #008080;
+}
+.highlight .nv, .highlight .vm {
+  color: #008080;
+}
+.highlight .ow {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .o {
+  color: #000000;
+  font-weight: bold;
+}
+.highlight .w {
+  color: #bbbbbb;
+}
+.highlight {
+  background-color: #f8f8f8;
+}.highlight { font-family: courier; white-space: pre }