runeblog 0.2.82 → 0.2.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf0392a5b2be6bcfaf114bedc0840674a9c7d2908015409ea79eef9908b0d624
-  data.tar.gz: 494acd91ce701943026f595ac91f8db9559b918a6831935d14e1fa3439bbe19c
+  metadata.gz: bc20c73da7ee238b37adbc948c5e883f1e5f0b9b8c7f7add232c31dfbc2e3bd3
+  data.tar.gz: 294b35d978b4ff2859f1073d460a3f61947284b659a041037f43f319cb38c4c8
 SHA512:
-  metadata.gz: f69efa439801300a96ffe32b9d0f78abd36ea641e22b39f78102f3fc123bc2150cd600fc8818708f3ca3228907c0d618483a7822cd16acfb98f5fb999d67a4ac
-  data.tar.gz: da42919ea67d3393036663a3178f2223d7ad9aec800a78c13fc536d7f871d6e5a834233e94bd001ed9519d61302dd900e3847689530e322c05df00d54ebfd3a5
+  metadata.gz: 2b8b9925f49e63203942d6c325960c7774c0ad96671e065e279b880cee8d80ff60c215488e9e403c3657ec9b4e2d89efc8f4e5052d0bffe9ff887dcd67556bd3
+  data.tar.gz: 5b44950c664496a2032010c1e50da51a6091cf1d689ed1f49536ecb54c1586f4046de94bc9a5d1ae12fca675c3ba0969208f6c42cc93cd0dc0750c5687bdc205

data/bin/blog

@@ -9,32 +9,31 @@ require 'repl'
 
 include RuneBlog::REPL
 
-def yesno(question)
+def yesno(question, noskip=false)
   puts fx("\n  #{question}", :bold)
+  puts unless noskip
   r, c = STDSCR.rc
-  num, str = STDSCR.menu(r: r+1, c: c+6, items: ["yes", "no"])
+  num, str = STDSCR.menu(r: r, c: c+6, items: ["yes", "no"])
   num == 0
 end
 
 def pick_editor
   choices = %w[vim emacs vi nano]
   r, c = STDSCR.rc
-  num, name = STDSCR.menu(r: r+1, c: c+6, title: "Default editor", items: choices)
+  num, name = STDSCR.menu(r: r, c: c+6, title: "Default editor", items: choices)
   file = `which #{name}`.chomp
 end
 
 def get_started
-  puts
-  puts fx("\n  Blog repo successfully created.", :bold)
-  
   if yesno("Do you want to qo a quick setup?")
-    puts "\n  First choose your editor."
+    puts "\n      First choose your editor."
     @blog.editor = pick_editor
     File.write("#{@blog.root}/data/EDITOR", @blog.editor)
 
     if yesno("Edit settings now?")
       fname = "#{@blog.root}/data/universal.lt3"
-      edit_file(fname)
+      vim_params = '-c ":set hlsearch" -c ":hi Search ctermfg=2 ctermbg=6" +/"\(AUTHOR.*\|SITE.*\)"'
+      edit_file(fname, vim: vim_params)
     end
     # Now create a custom global.lt3
     @blog._generate_global
@@ -142,19 +141,21 @@ home = ENV['HOME']
 
 RubyText.start(:_echo, :keypad, scroll: true, log: "binblog.txt", fg: @fg, bg: @bg)
 
-if RuneBlog.exist?
-  @blog = RuneBlog.new
-else
-  if yesno("No blog repo found. Create new one?")
-    RuneBlog.create_new_blog_repo
-    @blog = RuneBlog.new
-    @blog.root = ".blogs"  # So far, always using default... hmm
-    get_started
-  else
-    exit
-  end
+
+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
 
+@blog = RuneBlog.new
+get_started if new_repo
+
+print fx("  For help", :bold)
+puts " type h or help.\n "
+
 puts fx("\n  RuneBlog", :bold), fx(" v #{RuneBlog::VERSION}\n", Red)
 
 @cmdhist = []

data/data/global.lt3

@@ -10,11 +10,11 @@ blog.desc   VIEW_SUBTITLE
 site        SITE
 
 host        http://SITE
-charset     CHARSET
+charset     utf-8
 url         http://SITE
-locale      LOCALE
+locale      en_US
 
-font.family       FONT
+font.family       verdana
 
 post.title.color  #010101
 post.title.size   28px

data/data/universal.lt3

@@ -9,14 +9,13 @@
 
 .variables
 . Identity
-author      Your name here
-site        rubyhacker.com
+author        AUTHOR
+site          SITE_DOMAIN
 
 . Style
-font.family       verdana
+font.family   verdana
 
 . Details
-charset     utf-8
-locale      en_US
-
+charset       utf-8
+locale        en_US
 .end

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

@@ -1,4 +1,18 @@
-  <div style="text-align: center; color: white; background: #101035">
-    <h1>Around Austin</h1><br>
-    The view from downtown...
-  </div>
+<svg width="95%" height="55"
+     viewBox="0 0 95% 55">
+  <defs>
+    <linearGradient id="grad1" x1="100%" y1="100%" x2="0%" y2="100%">
+      <stop offset="0%" style="stop-color:rgb(198,198,228);stop-opacity:1" />
+      <stop offset="100%" style="stop-color:rgb(30,30,50);stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <style>
+    .small { font: 13px sans-serif; fill: #98baff }
+    .heavy { font: bold 35px sans-serif; fill: #76a9ff }
+  </style>
+
+<rect x="0" y="0" rx="3" ry="3" width="95%" height="55" fill="url(#grad1)"/>
+
+<text x="5" y="33" class=heavy>$blog</text>
+<text x="5" y="48" class=small>$blog.desc</text>
+</svg>

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

@@ -1,8 +1,7 @@
 .banner
   height  100
-  bgcolor 101035 
-  svg_title bgcolor: #b08080 size: 29px xy: 75,50 align: center size2: 15px xy2: 75,70 align2: center
-  image   austin-pano.jpg 
+  bgcolor 101035
+  text    top.html
   break
   navbar
 .end

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

@@ -7,13 +7,13 @@
 <div class="post">
   <table width=100% cellpadding=7>
     <tr>
-      <td width=14% valign=top align=right style="margin-top: -1px;">
+      <td width=16% valign=top align=right style="margin-top: -1px;">
         <font size=-1>#{date}</font>
       </td>
       <td> 
         <span class="post-title-text"><a href="#{url}" style="margin-top: -5px">#{title}</a></span>
         <b>#{teaser_text}</b>&nbsp;&nbsp;
-        <a style="text-decoration: none" href="#{url}"><small>Keep reading...</small></a> 
+        <a style="text-decoration: none" href="#{url}"><small>Keep&nbsp;reading</small></a> 
       </td>
     </tr>
   </table>

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

@@ -6,10 +6,11 @@
 
 .seek themes/standard/global.lt3
 
-* { font-family: $font.family }
+body { font-family: $font.family }
 
 \.post-title a {
   color: $post.title.color;
+  font-family: $font.family;
   font-size: $post.title.size;
   float: right;
   display: inline-block;
@@ -23,6 +24,7 @@
 
 \.post-title-text a {
   color: $post.text.color;
+  font-family: $font.family;
   font-size: $post.text.size; 
   display: block;
   text-decoration: none;
@@ -34,6 +36,7 @@
 
 \.post-date {
   color: $post.date.color;
+  font-family: $font.family;
   font-size: $post.date.size;
   display: block;
   float: left;

data/lib/helpers-blog.rb

@@ -104,7 +104,7 @@ module RuneBlog::Helpers
     dirs.map {|name| RuneBlog::View.new(name) }
   end
 
-  def write_repo_config(root: "#{Dir.pwd}/.blogs", view: "#{root}/data/VIEW", editor: "#{root}/data/EDITOR")
+  def write_repo_config(root: "#{Dir.pwd}/.blogs", view: "#{root}/data/VIEW", editor: "/usr/local/bin/vim")
     File.write(root + "/data/ROOT",   root + "\n")
     File.write(root + "/data/VIEW",   view.to_s + "\n")
     File.write(root + "/data/EDITOR", editor + "\n")

data/lib/liveblog.rb

@@ -753,14 +753,16 @@ def _make_navbar(orient = :horiz)
     list1, list2 = '<l class="navbar-nav mr-auto">', "</ul>"
   end
   
+#      <!-- FIXME weird bug here!!! -->
   start = <<-HTML
-       <!-- FIXME weird bug here!!! -->
+   <table><tr><td>
    <nav class="navbar #{extra} navbar-light bg-light">
       #{list1}
   HTML
   finish = <<-HTML
       #{list2}
     </nav>
+    </td></tr></table>
   HTML
 
   html_file = @blog.root/:views/@blog.view/"themes/standard/banner"/name

data/lib/repl.rb

@@ -7,16 +7,21 @@ make_exception(:PublishError,  "Error during publishing")
 make_exception(:EditorProblem, "Could not edit $1")
 
 module RuneBlog::REPL
-  def edit_file(file)
-    result = system!("#{@blog.editor} #{file}")
+  def edit_file(file, vim: "")
+    STDSCR.saveback
+    ed = @blog.editor
+    params = vim if ed =~ /vim$/
+    result = system!("#{@blog.editor} #{file} #{params}")
     raise EditorProblem(file) unless result
-    cmd_clear(nil)
+    STDSCR.restback
+#   cmd_clear(nil)
   end
 
   def cmd_quit(arg, testing = false)
+    cmd_clear(nil)
     RubyText.stop
     sleep 0.1
-    cmd_clear(nil)
+    
     sleep 0.1
     exit
   end
@@ -271,7 +276,8 @@ module RuneBlog::REPL
       puts
     end
     @blog.create_view(arg)
-    edit_file(@blog.view.dir/"themes/standard/global.lt3")
+    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)
     @blog.change_view(arg)
     @out
   rescue ViewAlreadyExists
@@ -346,6 +352,7 @@ module RuneBlog::REPL
 
     file = files.first
     draft = @blog.root/:drafts/file
+    vim_params = '-c G'
     result = edit_file(draft)
     @blog.generate_post(draft)
   rescue => err

data/lib/runeblog.rb

@@ -114,7 +114,6 @@ class RuneBlog
     global.gsub!(/CHARSET/, vars["charset"])
     global.gsub!(/LOCALE/,  vars["locale"])
     File.write("#@root/data/global.lt3", global)
-STDERR.puts "Remember: fix global.lt3"
   end
 
   def _deploy_local(dir)
@@ -290,6 +289,7 @@ STDERR.puts "Remember: fix global.lt3"
     make_empty_view_tree(view_name)
     add_view(view_name)
     mark_last_published("Initial creation")
+    system("cp #@root/data/global.lt3 #@root/views/#{view_name}/themes/standard/global.lt3")
   rescue => err
     _tmp_error(err)
   end

data/lib/runeblog_version.rb

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

data/test/austin.rb

@@ -64,8 +64,10 @@ x.create_view("around_austin")   # FIXME remember view title!
 vars = <<-VARS
 
 .variables
-blog       Around Austin
-blog.desc  The view from downtown...
+blog        Around Austin
+blog.desc   The view from downtown...
+
+font.family verdana
 .end
 VARS
 File.open(".blogs/views/around_austin/themes/standard/global.lt3", "a") do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.82
+  version: 0.2.83
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-14 00:00:00.000000000 Z
+date: 2019-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext