runeblog 0.2.53 → 0.2.58

data/lib/helpers-repl.rb

@@ -15,6 +15,7 @@ module RuneBlog::REPL
      "v"                 => :cmd_version,
      "list views"        => :cmd_list_views, 
      "lsv"               => :cmd_list_views, 
+     "clear"             => :cmd_clear,
 
      "new view $name"    => :cmd_new_view,
 

data/lib/liveblog.rb

@@ -19,7 +19,7 @@ def init_liveblog    # FIXME - a lot of this logic sucks
   @root = @blog.root
   @view = @blog.view
   @view_name = @blog.view.name unless @view.nil?
-  @vdir = @blog.view.dir
+  @vdir = @blog.view.dir rescue "NONAME"
   @version = RuneBlog::VERSION
   @theme = @vdir/:themes/:standard
 end
@@ -87,36 +87,45 @@ def backlink
 end
 
 def banner  # still experimental
-  _out "<table>"
-  _body do |line|
-    pieces = line.split
-    cols = pieces.size
-    span = cols == 2 ? 1 : 2   # whaaat?
-    _out "  <tr>"
-    pieces.each do |piece|
-      _out "    <td colspan=#{span}>"
-      case
-        when piece.start_with?("hnav")
-          # horizontal navbar
-          # _out "<center>hnav1 hnav2 hnav3 hnav4</center>"
-        when piece.start_with?("vnav")
-          # vertical navbar
-          # _out "vnav1<br>vnav2<br>vnav3<br>vnav4<br>"
-        when piece.start_with?("text")
-          file = piece.split(":")[1]
-          file ||= "banner/text.html"
-          _out File.read(file)
-        when piece.start_with?("image")
-          image = piece.split(":")[1]
-          image ||= "banner/banner.jpg"
-          _out "      <img src=#{image} height=100></img>"
-      else
-        _out "        '#{piece}' isn't known"
-      end
-      _out "    </td>"
+  _out "<table width=100% bgcolor=#101035>"
+  _out "  <tr>"
+  enum = _args.each
+  count = 0
+  span = 1
+  loop do
+    count += 1
+    arg = enum.next
+    case arg
+      when "image"
+        image = "banner/banner.jpg"
+        _out "      <td colspan=#{span}><img src=#{image} height=150></img></td>"
+      when "image:"
+        image = "banner/#{enum.next}"
+        _out "      <td colspan=#{span}><img src=#{image} height=150></img></td>"
+      when "text"
+        file = "banner/text.html"
+        _out "<td colspan=#{span}>" + File.read(file) + "</td>"
+      when "text:"
+        file = "banner/#{enum.next}"
+        _out "<td colspan=#{span}>" + File.read(file) + "</td>"
+      when "navbar"
+        dir = @blog.root/:views/@blog.view/"themes/standard/navbar/"
+        xlate cwd: dir, src: "navbar.lt3", dst: "navbar.html"   # , debug: true
+        file = "navbar/navbar.html"
+        _out "<td colspan=#{span}><div style='text-align: center'>" + File.read(file) + "</div></td>"
+      when "vnavbar"
+        dir = @blog.root/:views/@blog.view/"themes/standard/navbar/"
+        xlate cwd: dir, src: "vnavbar.lt3", dst: "vnavbar.html"   # , debug: true
+        file = "navbar/vnavbar.html"
+        _out "<td colspan=#{span}>" + File.read(file) + "</td>"
+      when "//"
+         span = count - 1
+         _out "  </tr>\n  <tr>"
+    else
+      _out "        '#{arg}' isn't known"
     end
-    _out "  </tr>"
   end
+  _out "  </tr>"
   _out "</table>"
 end
 
@@ -268,22 +277,30 @@ end
 
 def pin
   raise "'post' was not called" unless @meta
-  _debug "data = #{_args}"
-  # verify only already-specified views?
-  @meta.pinned = _args.dup
-  dir = @blog.view.dir/"themes/standard/widgets/pinned/"
-  datafile = dir/"list.data"
-  pins = File.readlines(datafile) rescue []
-damn = File.new("/tmp/dammit", "w")
-  pins << "#{@meta.num} #{@meta.title}\n"
-damn.puts pins
-  pins.uniq!
-damn.puts pins
-damn.close
-  File.open(datafile, "w") do
-    pins.each {|pin| File.puts pin }
+  _debug "data = #{_args}"  # verify only valid views?
+  pinned = @_args
+  @meta.pinned = pinned
+  pinned.each do |pinview|
+    dir = @blog.root/:views/pinview/"themes/standard/widgets/pinned/"
+    datafile = dir/"list.data"
+    if File.exist?(datafile)
+      pins = File.readlines(datafile)
+    else
+      pins = []
+    end
+    pins << "#{@meta.num} #{@meta.title}\n"
+    pins.uniq!
+    outfile = File.new(datafile, "w")
+    pins.each do |pin| 
+      outfile.puts pin 
+    end
+    outfile.close
   end
   _optional_blank_line
+rescue => err
+  puts "err = #{err}"
+  puts err.backtrace.join("\n")
+  gets
 end
 
 def write_post
@@ -434,12 +451,16 @@ rescue => err
 end
 
 def sidebar
+  _debug "--- handling sidebar\r"
   if _args.include? "off"
     _body { }  # iterate, do nothing
     return 
   end
 
   _out %[<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">]
+
+  standard = %w[pinned pages links]
+
   _body do |token|
     tag = token.chomp.strip.downcase
     wtag = :widgets/tag
@@ -448,12 +469,14 @@ def sidebar
 
     code = _load_local(tag)
     if code 
-      if ["pages", "links"].include? tag
+      if ["news", "pages", "links", "pinned"].include? tag
         Dir.chdir(wtag) do 
           widget = code.new(@blog)
           widget.build
         end
       end
+      _include_file wtag/tcard
+      next
     end
 
     if tag == "ad"
@@ -471,7 +494,8 @@ def sidebar
     depend += %w[pieces/card-head.lt3 pieces/card-tail.lt3]
     depend += %w[pieces/main-head.lt3 pieces/main-tail.lt3]
     depend.map! {|x| @blog.view.dir/"themes/standard/widgets"/wtag/x }
-    xlate cwd: wtag, src: tag, dst: tcard, force: true, deps: depend  , debug: (tag == "ad")
+_debug "--- call xlate #{tag} src = #{tag}  dst = #{tcard}\r"
+    xlate cwd: wtag, src: tag, dst: tcard, force: true, deps: depend # , debug: true
     _include_file wtag/tcard
   end
   _out %[</div>]
@@ -481,26 +505,6 @@ rescue => err
   exit
 end
 
-=begin
-ets/widgets/pages//card.css
-ets/widgets/pages//custom.rb
-ets/widgets/pages//disclaim.lt3
-ets/widgets/pages//faq.lt3
-ets/widgets/pages//like-dislike.lt3
-ets/widgets/pages//list.data
-ets/widgets/pages//local-vars.lt3
-ets/widgets/pages//local.rb
-ets/widgets/pages//main.css
-ets/widgets/pages//other-stuff.lt3
-ets/widgets/pages//pages.lt3
-ets/widgets/pages//pages.rb
-ets/widgets/pages//pieces
-ets/widgets/pages//pieces/card-head.lt3
-ets/widgets/pages//pieces/card-tail.lt3
-ets/widgets/pages//pieces/main-head.lt3
-ets/widgets/pages//pieces/main-tail.lt3
-=end
-
 def stylesheet
   lines = _body
   url = lines[0]
@@ -646,42 +650,55 @@ def tag_cloud
 end
 
 def vnavbar
+  _custom_navbar(:vert)
 end
 
-def navbar2
+def hnavbar
+  _custom_navbar  # horiz is default
+end
+
+def navbar
+  _custom_navbar  # horiz is default
+end
+
+def _custom_navbar(orient = :horiz)
   vdir = @blog.view.dir
   title = _var(:blog)
 
-  open = <<-HTML
-   <nav class="navbar navbar-light bg-light">
-      <a class="navbar-brand" href="index.html">#{title}</a>
-        <ul class="navbar-nav mr-auto">
+  extra = ""
+  extra = "navbar-expand-lg" if orient == :horiz
+
+  start = <<-HTML
+       <!-- FIXME weird bug here!!! -->
+   <nav class="navbar #{extra} navbar-light bg-light">
+      <ul class="navbar-nav mr-auto">
   HTML
-  close = <<-HTML
-        </ul>
-      </div>
+  finish = <<-HTML
+      </ul>
     </nav>
   HTML
 
-  first = true
-  _out open
-  lines = _body
+  navdir = @blog.root/:views/@blog.view/:themes/:standard/:navbar
+  html_file = navdir/"navbar.html"
+  output = File.new(navdir/"navbar.html", "w")
+  output.puts start
+  lines = _body.to_a
+  lines = ["  index  Home"] + lines  unless _args.include?("nohome")
   lines.each do |line|
     basename, cdata = line.chomp.strip.split(" ", 2)
-    full = :navbar/basename+".html"
+    full = :navdir/basename+".html"
     href_main = _main(full)
-    if first
-      first = false # hardcode this part??
-      _out %[<li class="nav-item active"> <a class="nav-link" href="index.html">#{cdata}<span class="sr-only">(current)</span></a> </li>]
+    if basename == "index"  # special case
+      output.puts %[<li class="nav-item active"> <a class="nav-link" href="index.html">#{cdata}<span class="sr-only">(current)</span></a> </li>]
     else
-      xlate cwd: "navbar", src: basename, dst: vdir/"remote/navbar"/basename+".html" # , debug: true
-      _out %[<li class="nav-item"> <a class="nav-link" #{href_main}>#{cdata}</a> </li>]
+      xlate cwd: navdir, src: basename, dst: vdir/"remote/navbar"/basename+".html" # , debug: true
+      output.puts %[<li class="nav-item"> <a class="nav-link" #{href_main}>#{cdata}</a> </li>]
     end
   end
-  _out close
+  output.puts finish
 end
 
-def navbar
+def _old_navbar
   vdir = @blog.view.dir
   title = _var(:blog)
 
@@ -772,7 +789,7 @@ def _write_card(cardfile, mainfile, pairs, card_title, tag)
       wrapper = %[<li class="list-group-item">#{anchor}</li>]
       f.puts wrapper
     end
-    _include_file cardfile+".html"
+     _include_file cardfile+".html"
     f.puts <<-EOS
           </div>
         </div>

data/lib/post.rb

@@ -9,12 +9,12 @@ class RuneBlog::Post
 
   include RuneBlog::Helpers
 
-  def self.files(num, root)
-    log!(enter: __method__, args: [num, root], level: 3)
-    files = ::Find.find(root).to_a
-    result = files.grep(/#{prefix(num)}-/)
-    result
-  end
+# def self.files(num, root)
+#   log!(enter: __method__, args: [num, root], level: 3)
+#   files = ::Find.find(root).to_a
+#   result = files.grep(/#{prefix(num)}-/)
+#   result
+# end
   
   def self.load(post)
     log!(enter: __method__, args: [post], level: 3)

data/lib/repl.rb

@@ -54,7 +54,7 @@ module RuneBlog::REPL
 
   def cmd_manage(arg, testing = false)
     case arg
-      when "pages";    _manage_pages(nil, testing = false)
+      when "pages";   _manage_pages(nil, testing = false)
       when "links";   _manage_links(nil, testing = false)
       when "navbar";  _manage_navbar(nil, testing = false)
 #     when "pinned";  _manage_pinned(nil, testing = false)  # ditch this??
@@ -71,7 +71,6 @@ module RuneBlog::REPL
   end
 
   def _manage_navbar(arg, testing = false)   # cloned from manage_pages
-puts "Got to #{__method__}"
     check_empty(arg)
     dir = @blog.view.dir/"themes/standard/navbar"
     files = Dir.entries(dir) - %w[. .. navbar.lt3]
@@ -328,7 +327,7 @@ puts "Got to #{__method__}"
     id = get_integer(arg)
     # Simplify this
     tag = "#{'%04d' % id}"
-    files = ::Find.find(@blog.root+"/drafts").to_a
+    files = ::Find.find(@blog.root/:drafts).to_a
     files = files.grep(/#{tag}-.*lt3/)
     files = files.map {|f| File.basename(f) }
     if files.size > 1
@@ -345,7 +344,7 @@ puts "Got to #{__method__}"
     end
 
     file = files.first
-    draft = "#{file}"  # FIXME ?
+    draft = @blog.root/:drafts/file
     result = edit_file(draft)
     @blog.generate_post(draft)
   rescue => err
@@ -478,10 +477,6 @@ puts "Got to #{__method__}"
       cmd = "cp #{name} #{@blog.root}/drafts/#@fname"
       result = system!(cmd)
       raise CantCopy(name, "#{@blog.root}/drafts/#@fname") unless result
-puts(`ls -l #{@blog.root}/drafts`)
-puts "@fname = #@fname"
-puts "Pause..."
-gets
       # post = Post.load(@slug)
       draft = "#{@blog.root}/drafts/#@fname"
       @meta = @blog.generate_post(draft)
@@ -499,9 +494,10 @@ gets
   {h, help}           This message                  {change view VIEW}  Change current view
   {q, quit}           Exit the program              {cv VIEW}           Change current view
   {v, version}        Print version information     {new view}          Create a new view
-                                                    {list views}        List all views available
+  {clear}             Clear screen                  {list views}        List all views available
                                                     {lsv}               Same as: list views
                    
+
   {Posts:}                                          {Advanced:}
   -------------------------------------------       -------------------------------------------
   {p, post}           Create a new post             {config}            Edit various system files

data/lib/runeblog.rb

@@ -118,13 +118,10 @@ class RuneBlog
     Dir.chdir(dir) do
       views = _retrieve_metadata(:views)
       views.each do |v| 
-puts "VIEW = #{v}   dir = #{dir}"
         unless self.view?(v)
           puts "#{fx("Warning:", :red)} #{fx(v, :bold)} is not a view"
           next
         end
-puts "pwd = #{Dir.pwd}"
-puts "cp *html #@root/views/#{v}/remote"
         system!("cp *html #@root/views/#{v}/remote", show: true)
       end
     end
@@ -161,13 +158,9 @@ puts "cp *html #@root/views/#{v}/remote"
     log!(enter: __method__, args: [sourcefile], level: 2)
     nslug = sourcefile.sub(/.lt3/, "")
     dir = @root/:posts/nslug
-# puts "sourcefile = #{sourcefile}"
-puts "-- dir = #{dir}\n   pwd = #{Dir.pwd}\n   @root = #@root"
-gets
     create_dirs(dir)
     # FIXME dependencies?
     xlate cwd: dir, src: @root/:drafts/sourcefile   # , debug: true
-# puts `ls -l #{dir}`
     _deploy_local(dir)
   rescue => err
     _tmp_error(err)
@@ -346,7 +339,6 @@ gets
       vp.nslug, vp.aslug, vp.title, vp.date, vp.teaser_text
     path = vp.path
     url = aslug + ".html"
-# puts "--- vp = #{[vp.nslug, vp.aslug, vp.title, vp.date, vp.teaser_text].inspect}"; gets
     date = ::Date.parse(date)
     date = date.strftime("%B %e<br><div style='float: right'>%Y</div>")
     text = interpolate(@_post_entry, binding)
@@ -447,11 +439,12 @@ gets
     depend = [vdir/"remote/etc/blog.css", @theme/"global.lt3", 
              @theme/"blog/head.lt3", @theme/"navbar/navbar.lt3",
              @theme/"blog/index.lt3"]   # FIXME what about assets?
-    xlate cwd: vdir/"themes/standard/etc", deps: depend, 
+    xlate cwd: vdir/"themes/standard/etc", deps: depend,
           src: "blog.css.lt3", copy: vdir/"remote/etc/blog.css" # , debug: true
-    xlate cwd: vdir/"themes/standard", deps: depend, 
+    xlate cwd: vdir/"themes/standard", deps: depend, force: true,
           src: "blog/generate.lt3", dst: vdir/:remote/"index.html"
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
+    copy_widget_html(view)
   rescue => err
     _tmp_error(err)
   end
@@ -459,7 +452,6 @@ gets
   def _get_views(draft)
     log!(enter: __method__, args: [draft], level: 2)
     # FIXME dumb code
-#   view_line = File.readlines(self.root/:drafts/draft).grep(/^.views /)
     view_line = File.readlines(draft).grep(/^.views /)
     raise "More than one .views call!" if view_line.size > 1
     raise "No .views call!" if view_line.size < 1

data/lib/runeblog_version.rb

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

data/lib/xlate.rb

@@ -24,19 +24,18 @@ def xlate(cwd: Dir.pwd, src:,
   indent = " "*12
   Dir.chdir(cwd) do
     if debug
-      STDERR.puts "#{indent} -- xlate #{src} >#{dst}"
-      STDERR.puts "#{indent}      in:   #{Dir.pwd}"
-      STDERR.puts "#{indent}      from: #{caller[0]}"
-      STDERR.puts "#{indent}      copy: #{copy}" if copy
+      puts "#{indent} -- xlate #{src} >#{dst}"
+      puts "#{indent}      in:   #{Dir.pwd}"
+      puts "#{indent}      from: #{caller[0]}"
+      puts "#{indent}      copy: #{copy}" if copy
     end
     stale = stale?(src, dst, deps, force)
-# puts "stale? src = #{src}\n       dst = #{dst}\n       #{stale}"
     if stale
       rc = system("livetext #{src} >#{dst}")
-      STDERR.puts "...completed (shell returned #{rc})" if debug
+      puts "...completed (shell returned #{rc})" if debug
       system!("cp #{dst} #{copy}") if copy
     else
-      STDERR.puts "#{indent} -- ^ Already up to date!" if debug
+      puts "#{indent} -- ^ Already up to date!" if debug
       return
     end
   end