runeblog 0.2.31 → 0.2.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24f0f2eb8b2b217131e1a0bf2c74edd38efd672161f4cfbbe2f32caca0f7198a
-  data.tar.gz: a356e607a4e20cf4e024995441966f42031f98ce58ef1bff1b616d3f44446cd2
+  metadata.gz: dcfdb93b7e151b307a4776601a4c171e5dba3a88a63b859d3c319bb796215981
+  data.tar.gz: fa8e91e0f9be6fd7e0111a3b584fec90ff397b0079eb48969d3c2de40467b73e
 SHA512:
-  metadata.gz: 23d9b96c624032f42f9928e376c3df6d075a548b4f53278c8adecc9c7379ab999b0d2c2964f867c9379fb78d0373863a5de57b52e8c12a3dfbca463f502b288e
-  data.tar.gz: 50b81e2e7db6e3f418600bf529fedd1353eeffb39a1bab6f58ed72641e244d4608c44c580864e9c420a6bdd3f39d40f3a8314b551197ef5d26bcee93366852c6
+  metadata.gz: 4c40488f1169eef37e142b9550ec589737a345fcca6ceb669baebea94a2d651583cda37ee7d89f11ee83abac9f2ed29584ac3b41b0a6e87c50fff18bc54e13da
+  data.tar.gz: 0b389d93a294814f62de4dba5065ba5ac15805e7ac068408d867e83b05901fc6e3848d57e539fc445781d34e564bdb6bd367f8bf59cd39fcc7ff8ee175f54f4a

data/bin/blog

@@ -24,7 +24,7 @@ TEXT
 end
 
 def mainloop
-  print fx("blog> ", Red, :bold)
+  print fx("#{@blog.view}> ", Red, :bold)
   cmd = STDSCR.gets(history: @cmdhist, tab: @tabcom)
   cmd_quit(nil) if cmd.nil?   # ^D
   cmd.chomp!

data/empty_view/remote/assets/GIT_IS_DUMB

@@ -0,0 +1 @@
+meh

data/empty_view/remote/etc/GIT_IS_DUMB

@@ -0,0 +1 @@
+meh

data/empty_view/remote/navbar/GIT_IS_DUMB

@@ -0,0 +1 @@
+meh

data/empty_view/remote/permalink/GIT_IS_DUMB

@@ -0,0 +1 @@
+meh

data/empty_view/remote/widgets/links/list.data

@@ -0,0 +1,3 @@
+https://www.mensa.org, no, Mensa International
+http://space.com, yes, Space.com: NASA, Space Exploration and Astronomy News
+https://arstechnica.com, no, Ars Technica

data/empty_view/remote/widgets/news/list.data

@@ -0,0 +1,4 @@
+https://techcrunch.com/2019/09/16/fossa-scores-8-5-million-series-a-to-help-enterprise-manage-open-source-licenses/, yes, FOSSA scores \$8.5 million Series A to help enterprise manage open-source licenses
+https://techcrunch.com/2019/09/17/spacexs-orbital-starship-prototype-construction-progress-detailed-in-new-photos/, yes, SpaceX’s orbital Starship prototype construction progress detailed in new photos
+https://developers.googleblog.com/2019/05/Flutter-io19.html, yes, Flutter: a Portable UI Framework for Mobile, Web, Embedded, and Desktop
+https://jaycarlson.net/microcontrollers/, no, The Amazing \$1 Microcontroller (2017)

data/empty_view/remote/widgets/pages/SUBFILES

@@ -0,0 +1 @@
+Causes other *.lt3 files to be generated

data/empty_view/remote/widgets/pages/list.data

@@ -0,0 +1,4 @@
+faq.html,Frequently Asked Questions
+like-dislike.html,Likes and Dislikes
+disclaim.html,Disclaimer
+lifestory.html,My Life Story

data/empty_view/themes/standard/README

@@ -0,0 +1,59 @@
+New structure:
+
+themes/standard           The first "default theme" - more later
+├── README                This file
+├── assets                Assets (images/videos/etc) for entire view
+├── banner                Top banner for the view
+├── blog                  All files/info for view
+│   ├── generate.lt3      Generate index.html from wrapper (rarely edited)
+│   ├── head.lt3          Header info for index.html
+│   ├── index.lt3         "Guts" of view (user-edited, wrapped by generate.lt3) 
+│   └── post_entry.lt3          
+├── etc          
+│   ├── blog.css          
+│   ├── externals.lt3          
+│   ├── global.lt3          
+│   └── favicon.ico          
+├── navbar          
+│   ├── about.html          
+│   └── navbar.lt3          
+├── pages          
+├── post          
+│   ├── generate.lt3          
+│   ├── head.lt3          
+│   ├── index.lt3          
+│   └── permalink.lt3          
+└── sidebar          
+    ├── ad.lt3          
+    ├── calendar.lt3          
+    ├── news.lt3          
+    └── tag-cloud.lt3          
+
+
+Old structure:
+
+templates                     The first "default theme" - more later
+├── README                    This file
+├── about.html                An "about" file (will move)
+├── assets                    Assets for entire view (blog)
+│   ├── application.css       "Global" CSS
+│   ├── favicon.ico           Favicon
+│   └── ...                   Other files later, images, etc.
+├── blog                      ** The whole template for this view (blog)
+│   ├── _postentry.lt3        Used repeatedly in list of blog posts
+│   ├── generate.lt3          The "main wrapper" that actually generates everything
+│   ├── index.lt3             The main "user editable" portion of the template
+│   ├── navbar.lt3            The navigation bar
+│   └── sidebar               The sidebar (which may include different things)
+│       ├── ad.lt3              Code to generate an advertisement
+│       ├── calendar.lt3        Code for a calendar
+│       ├── news.lt3            Recent news
+│       └── tag-cloud.lt3       Tag cloud (generated automatically of course)
+├── global.lt3                Some global settings (MOVED TO etc)
+├── head.lt3                  A standard <head> section
+├── meta.lt3                  Standard meta tags
+└── post                
+    ├── head.lt3              Specific to post (adds to higher-level head)
+    ├── generate.lt3          The "main wrapper" that actually generates the post
+    └── index.lt3             The main "user editable" portion of the post template
+

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

@@ -0,0 +1,37 @@
+. --------------------------------------------------
+. This file will usually not be edited by the user. 
+. It is used to generate the top-level index.html   
+. The user will more often edit blog/index.lt3 in   
+. the process of blog setup.
+. --------------------------------------------------
+
+.mixin liveblog
+
+<html>
+  <!-- Generated from $File on $$date.  Editing not recommended. -->
+
+.seek global.lt3
+.include blog/head.lt3
+  <body>
+
+. FIXME
+<table width=100%>
+<tr>
+  <td width=30% bgcolor=black>
+    <div style="text-align: center; color: white">
+      <h1>Around Austin</h1><br>
+      The view from downtown...
+    </div>
+  </td>
+  <td><img src=assets/sky2.jpg width=100%></img>
+</tr>
+</table>
+
+    $.include navbar/navbar.lt3
+    <div class="content container-fluid mt-4">
+      <div class="row">
+        $.include blog/index.lt3
+      </div>
+    </div>
+  </body>
+</html>

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

@@ -0,0 +1,16 @@
+. --------------------------------------------------
+. This file will usually not be edited by the user. 
+. It is used to generate the <HEAD> for the overall 
+. blog and for the individual post.                 
+. SUBJECT TO CHANGE, like everything else but moreso
+. --------------------------------------------------
+
+<head>
+.include etc/externals.lt3
+.include etc/misc.js
+
+. fix/remove later
+.head  
+.end
+
+</head>

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

@@ -0,0 +1,17 @@
+. --------------------------------------------------
+. This file describes the actual layout of the blog.
+. It is referenced from blog/generate.lt3           
+. --------------------------------------------------
+
+. figure out how to put navbar here
+
+.recent_posts
+
+.sidebar
+  ad 
+  links 
+  news 
+  pages 
+  tag-cloud
+.end
+

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

@@ -0,0 +1,22 @@
+. --------------------------------------------------
+. This HTML fragment gives the format of a post's   
+. "index" entry (recent posts on blog front page).  
+. --------------------------------------------------
+
+<div class="post">
+  <table width=100%>
+    <tr>
+      <td width=12% valign=top>
+        <span class="post-date mt-1 mb-1">
+          <b>#{date}</b>
+        </span>
+      </td>
+      <td> <!--        <span class="post-title-box"> -->
+          <span class="post-title-text"><a href="#{url}">#{title}</a></span>
+          <b>#{teaser_text}</b>
+          <br>
+          <a style="text-decoration: none" href="#{url}"><small>Keep reading...</small></a></p> <!--        </span>  -->
+      </td>
+    </tr>
+  </table>
+</div>

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

@@ -0,0 +1,43 @@
+. --------------------------------------------------
+. This file is processed to create blog.css         
+. Most of the global CSS goes here                  
+. --------------------------------------------------
+.nopara
+
+.seek themes/standard/global.lt3
+
+* { font-family: $font.family }
+
+\.post-title a {
+  color: $post.title.color;
+  font-size: $post.title.size;
+  float: right;
+  display: inline-block;
+  text-align: top;
+  text-decoration: none;
+}
+
+\.post-title a:hover {
+  text-decoration: none;
+}
+
+\.post-title-text a {
+  color: $post.text.color;
+  font-size: $post.text.size; 
+# float: right;
+  display: block;
+  text-decoration: none;
+}
+
+\.post-title-text a:hover {
+  text-decoration: none;
+}
+
+\.post-date {
+  color: $post.date.color;
+  font-size: $post.date.size;
+  display: block;
+  float: left;
+  text-align: top;
+}
+

data/empty_view/themes/standard/etc/externals.lt3

@@ -0,0 +1,24 @@
+. --------------------------------------------------
+. External JS and CSS resources (Bootstrap, etc.)   
+. are defined here                                  
+. --------------------------------------------------
+
+.stylesheet
+https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css
+sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T
+.end
+
+.script
+https://code.jquery.com/jquery-3.3.1.slim.min.js
+sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo
+.end
+
+.script
+https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js
+sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1
+.end
+
+.script
+https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js
+sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM
+.end

data/empty_view/themes/standard/etc/misc.js

@@ -0,0 +1,8 @@
+<!-- Miscellaneous local JS pieces are defined here -->
+
+<script>
+function open_main(url) {
+    var site = url+'?toolbar=0&amp;navpanes=0&amp;scrollbar=0';
+    document.getElementById('main').src = site;
+}
+</script>

data/empty_view/themes/standard/global.lt3

@@ -0,0 +1,35 @@
+. --------------------------------------------------
+. Global settings are stored here in the form       
+.   <variable>  <value>                             
+. --------------------------------------------------
+
+.variables
+author      Your name here
+blog        Blog title goes here
+blog.desc   Subtitle (if any) goes here
+site        rubyhacker.com
+
+host        localhost:4000//
+charset     utf-8
+url         localhost:4000//
+locale      en_US
+
+font.family       verdana
+
+post.title.color  #010101
+post.title.size   28px
+
+post.text.color   #0101a1
+post.text.size    22px
+
+post.date.color   #9a9a9a
+post.date.size    15px
+
+
+publish.user      root
+publish.server    rubyhacker.com
+publish.docroot   /var/www/
+publish.path      around_austin
+publish.proto     http
+.end
+

data/empty_view/themes/standard/navbar/about.lt3

@@ -0,0 +1,18 @@
+. --------------------------------------------------
+. This is a sample file typical of page referenced  
+. directly from the navigation bar.
+. It is like a special case of a page in the "pages"
+. widget.
+. --------------------------------------------------
+
+.set this.title="About me"
+. make this better later
+<html><body>
+    <div class="content container-fluid mt-4">
+      <div class="row">
+        <h1>$this.title</h1>
+. content starts here...
+Blah blah blah...
+      </div>
+    </div>
+</body></html>

data/empty_view/themes/standard/navbar/contact.lt3

@@ -0,0 +1,18 @@
+. --------------------------------------------------
+. This is a sample file typical of page referenced  
+. directly from the navigation bar.
+. It is like a special case of a page in the "pages"
+. widget.
+. --------------------------------------------------
+
+.set this.title="Contact"
+. make this better later
+<html><body>
+    <div class="content container-fluid mt-4">
+      <div class="row">
+        <h1>$this.title</h1>
+. content starts here...
+How to contact me by email, smoke signals, ICBM, seance, ...
+      </div>
+    </div>
+</body></html>

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

@@ -0,0 +1,16 @@
+. --------------------------------------------------
+. This defines the content of the navigation bar.   
+. The first one is a special case.
+. The others are understood to refer to .lt3 files  
+. such as navbar/about.lt3 (which is processed into 
+. HTML).
+. The title may be more than one word. Quotes are   
+. not needed.
+. --------------------------------------------------
+
+.navbar
+  index   Home
+  about   About
+  contact Contact
+.end
+

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

@@ -0,0 +1,30 @@
+. --------------------------------------------------
+. This is used to generate a single post.           
+. The logic behind it is convoluted and may be      
+. subject to change.                                
+. --------------------------------------------------
+
+.mixin liveblog
+
+<html>
+  <!-- Editing this file is not recommended.   -->
+  <!-- It was generated from $File on $$date.  -->
+
+.seek global.lt3
+.include vars.lt3
+
+.head
+og:title    $title 
+description $teaser
+.end
+
+<section class="post">
+  <div class="entry-content">
+    $.copy guts.html
+  </div>
+</section>
+
+<br>
+<a href="javascript:history.go(-1)">[Back]</a>
+</body>
+</html>

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

@@ -0,0 +1,7 @@
+. --------------------------------------------------
+. This file is currently unused and may go away.    
+. It is intended to manage the <HEAD> for a post (as
+. opposed to the entire blog).
+. --------------------------------------------------
+
+. To be done...

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

@@ -0,0 +1,24 @@
+. --------------------------------------------------
+. This file is overwritten and customized as the    
+. blog is maintained.
+. Currently there is no user-friendly way to change 
+. the "skeleton" of a post. When there is, this will
+. likely be the place.
+. --------------------------------------------------
+
+.mixin liveblog
+. ^ get rid of this later
+
+.post 0
+ 
+.title The new amphitheatre is overrated
+.pubdate 2019-07-09
+.views around_austin 
+.tags 
+ 
+.teaser
+It used to be that all major concerts played the Erwin Center.
+
+.end
+Now, depending on what you consider "major," blah blah blah...
+

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

@@ -0,0 +1,32 @@
+. --------------------------------------------------
+. A permalink differs very little from the original 
+. post except that it lacks "context" (navigation   
+. bar, banner, sidebar, etc.).
+. It does have a link back to the current front page
+. of the blog.
+. --------------------------------------------------
+
+.mixin liveblog
+
+<html>
+  <!-- Editing this file is not recommended.   -->
+  <!-- It was generated from $File on $$date.  -->
+
+.seek    global.lt3
+.include vars.lt3
+
+.head
+og:title    $title
+description $teaser
+.end
+
+<section class="post">
+  <div class="entry-content">
+    $.copy guts.html
+  </div>
+</section>
+
+<br>
+<a href="../index.html" style="text-decoration: none">[Home: $blog]</a>
+</body>
+</html>

data/empty_view/themes/standard/widgets/README

@@ -0,0 +1,4 @@
+bydates   Browse blog entries for past dates
+links     List of links (typically offsite)
+pages     List of pages (my own local stuff)
+search    Search posts by tag, title, body, etc.

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

@@ -0,0 +1,15 @@
+. In real life, ads won't work this way...
+
+.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"
+
+<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>
+  </div>
+</div>
+

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

@@ -0,0 +1,6 @@
+
+.card_iframe Calendar
+https://calendar.google.com/calendar/embed?src=en-gb.indian%23holiday%40group.v.calendar.google.com&ctz=Asia%2FKolkata
+height="350"
+.end
+

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

@@ -0,0 +1,2 @@
+.mixin liveblog
+.make_main_links links Links (to Elsewhere)

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

@@ -0,0 +1,3 @@
+https://www.mensa.org, no, Mensa International
+http://space.com, yes, Space.com: NASA, Space Exploration and Astronomy News
+https://arstechnica.com, no, Ars Technica

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

@@ -0,0 +1,4 @@
+https://techcrunch.com/2019/09/16/fossa-scores-8-5-million-series-a-to-help-enterprise-manage-open-source-licenses/, yes, FOSSA scores \$8.5 million Series A to help enterprise manage open-source licenses
+https://techcrunch.com/2019/09/17/spacexs-orbital-starship-prototype-construction-progress-detailed-in-new-photos/, yes, SpaceX’s orbital Starship prototype construction progress detailed in new photos
+https://developers.googleblog.com/2019/05/Flutter-io19.html, yes, Flutter: a Portable UI Framework for Mobile, Web, Embedded, and Desktop
+https://jaycarlson.net/microcontrollers/, no, The Amazing \$1 Microcontroller (2017)

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

@@ -0,0 +1,2 @@
+.mixin liveblog
+.make_main_links news Recent News

data/empty_view/themes/standard/widgets/pages/README

@@ -0,0 +1,2 @@
+This is a work in progress...
+

data/empty_view/themes/standard/widgets/pages/SUBFILES

@@ -0,0 +1 @@
+Causes other *.lt3 files to be generated

data/empty_view/themes/standard/widgets/pages/disclaim.lt3

@@ -0,0 +1,10 @@
+.mixin liveblog
+
+<h2>Disclaimer</h2>
+
+This is just a 
+dummy file
+
+disclaimer, blah blah 
+
+.backlink

data/empty_view/themes/standard/widgets/pages/faq.lt3

@@ -0,0 +1,9 @@
+.mixin liveblog
+
+<h2>Frequently Asked Questions</h2>
+
+This is 
+just a 
+  FAAAAAQ....
+
+.backlink

data/empty_view/themes/standard/widgets/pages/generated.lt3

@@ -0,0 +1,4 @@
+        <a href="faq.lt3">Frequently Asked Questions</a> <br>
+        <a href="like-dislike.lt3">Likes and Dislikes</a> <br>
+        <a href="disclaim.lt3">Disclaimer</a> <br>
+        <a href="lifestory.lt3">My Life Story</a> <br>

data/empty_view/themes/standard/widgets/pages/like-dislike.lt3

@@ -0,0 +1,11 @@
+.mixin liveblog
+
+<h2>My Likes and Dislikes</h2>
+
+This is 
+stuff that I
+like
+and
+dislike...
+
+.backlink

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

@@ -0,0 +1,4 @@
+faq.html,Frequently Asked Questions
+like-dislike.html,Likes and Dislikes
+disclaim.html,Disclaimer
+other-stuff.html,Other Stuff

data/empty_view/themes/standard/widgets/pages/other-stuff.lt3

@@ -0,0 +1,10 @@
+.mixin liveblog
+
+<h2>Other Stuff</h2>
+
+This is 
+just 
+some
+other stuff...
+
+.backlink

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

@@ -0,0 +1,2 @@
+.mixin liveblog
+.make_main_links pages Pages

data/empty_view/themes/standard/widgets/tag-cloud/tag-cloud.lt3

@@ -0,0 +1,12 @@
+.mixin liveblog
+
+.tag_cloud
+https://google.com/,btn btn-dark m-1,Programming
+https://google.com/,btn btn-danger m-1,Science Fiction
+https://google.com/,btn btn-light m-1,Art
+https://google.com/,btn btn-dark m-1,Robotics
+https://google.com/,btn btn-warning m-1,Food and Travel
+https://google.com/,btn btn-light m-1,DIY Hacks
+https://google.com/,btn btn-info m-1,Surfing
+.end
+

data/lib/helpers-repl.rb

@@ -18,7 +18,6 @@ module RuneBlog::REPL
 
      "new view $name"    => :cmd_new_view,
 
-#    "customize"         => :cmd_customize,
      "tags"              => :cmd_tags,
      "import"            => :cmd_import,
 
@@ -41,11 +40,9 @@ module RuneBlog::REPL
      "list assets"       => :cmd_list_assets,
      "lsa"               => :cmd_list_assets,
 
-     "rm $postid"        => :cmd_remove_post,
+     "delete >postid"        => :cmd_remove_post,
      "undel $postid"     => :cmd_undelete_post,
 
-     "kill >postid"      => :cmd_kill, 
-
      "edit $postid"      => :cmd_edit_post,
      "ed $postid"        => :cmd_edit_post,
      "e $postid"         => :cmd_edit_post,
@@ -54,8 +51,6 @@ module RuneBlog::REPL
 
      "browse"            => :cmd_browse,
 
-     "relink"            => :cmd_relink,
-
      "rebuild"           => :cmd_rebuild,
 
      "publish"           => :cmd_publish,
@@ -108,6 +103,7 @@ module RuneBlog::REPL
     end
     meth = found || :cmd_INVALID
     params = cmd if meth == :cmd_INVALID
+puts "choose: #{[meth, params].inspect}"
     [meth, params]
   end
 

data/lib/liveblog.rb

@@ -118,8 +118,7 @@ def make_main_links
   log!(str: "Reading #{input}", pwd: true)
   pairs = File.readlines(input).map {|line| line.chomp.split(/, */, 2) }
   _write_main(mainfile, pairs, card_title, tag)
-  widget_relative = false  # (tag != "news")  # FIXME kludge!!!
-  _write_card(cardfile, mainfile, pairs, card_title, tag, relative: widget_relative)
+  _write_card(cardfile, mainfile, pairs, card_title, tag)
   log!(str: "...returning from method", pwd: true)
 end
 
@@ -543,7 +542,7 @@ def _html_body(file, css = nil)
   file.puts "  </body>\n</html>"
 end
 
-def _write_card(cardfile, mainfile, pairs, card_title, tag, relative: true)
+def _write_card(cardfile, mainfile, pairs, card_title, tag)
   log!(str: "Creating #{cardfile}.html", pwd: true)
   url = mainfile
   url = :widgets/tag/mainfile + ".html"
@@ -565,7 +564,7 @@ def _write_card(cardfile, mainfile, pairs, card_title, tag, relative: true)
       url = file
       type, title = page_type(tag, title)
       case type
-        when :local;   url_ref = _widget_main(file, tag)  # local always frameable
+        when :local;   url_ref = _widget_card(file, tag)  # local always frameable
         when :frame;   url_ref = _main(file)              # remote, frameable
         when :noframe; url_ref = _blank(file)             # remote, not frameable
       end
@@ -708,6 +707,6 @@ end
 
 def _widget_card(url, tag)
   url2 = :widgets/tag/url
-  %[href="#{url2}"]
+  %[href="javascript: void(0)" onclick="javascript:open_main('#{url2}')"]
 end
 

data/lib/pathmagic.rb

@@ -2,7 +2,7 @@ module PathSep
   def /(right)
     s1 = self.to_s.dup
     s2 = right.to_s.dup
-    s1 << "/" unless s2.end_with?("/") || s2.start_with?("/")
+    s1 << "/" unless s1.end_with?("/") || s2.start_with?("/")
     path = s1 + s2
     path.gsub!("//", "/")
     path

data/lib/publish.rb

@@ -10,16 +10,6 @@ class RuneBlog::Publishing
   def initialize(view)
     log!(enter: __method__, args: [view.to_s])
     @blog = RuneBlog.blog
-#     # Clunky...
-#     if params.size == 1 && params[0].is_a?(OpenStruct)
-#       obj = params[0]
-#       array = obj.to_h.values_at(:user, :server, :docroot, 
-#                                  :path, :proto)
-#       @user, @server, @docroot, @path, @proto = *array
-#     else
-#       @user, @server, @docroot, @path, @proto = *params
-#     end
-    # find a better way?
     gfile = @blog.root/:views/view/"themes/standard/global.lt3"
     data = File.readlines(gfile)
     grab = ->(var) { data.grep(/^#{var} /).first.chomp.split(" ", 2)[1] }

data/lib/repl.rb

@@ -131,23 +131,7 @@ module RuneBlog::REPL
     reset_output
     check_empty(arg)
     puts unless testing
-    files = @blog.find_draft_slugs
-    if files.empty? 
-      msg = "No files changed"
-      output! msg
-      puts "\n  #{msg}\n " unless testing
-      return @out
-    end
-    files.each {|file| @blog.rebuild_post(file) }
-    @blog.dirty_views.each {|view| generate_index(view) }  # All views for now?
-    File.write("#{@blog.root}/drafts/last_rebuild", Time.now)
-    @out
-  end
-
-  def cmd_relink(arg, testing = false)
-    reset_output
-    check_empty(arg)
-    @blog.relink
+    @blog.generate_view(@blog.view)
     @out
   end
 
@@ -176,6 +160,7 @@ module RuneBlog::REPL
   def cmd_new_view(arg, testing = false)
     reset_output
     @blog.create_view(arg)
+    edit_file(@blog.view.dir/"themes/standard/global.lt3")
     @blog.change_view(arg)
     @out
   rescue ViewAlreadyExists
@@ -194,12 +179,19 @@ module RuneBlog::REPL
     puts err.backtrace.join("\n")
   end
 
-  def cmd_kill(arg, testing = false)
+  def _remove_post(arg, testing=false)
+    id = get_integer(arg)
+    result = @blog.remove_post(id)
+    puts "Post #{id} not found" if result.nil?
+  end
+
+  def cmd_remove_post(arg, testing = false)
+puts "arg = #{arg.inspect} is a #{arg.class}"
     reset_output
     args = arg.split
     args.each do |x| 
       # FIXME
-      ret = cmd_remove_post(x.to_i, false)
+      ret = _remove_post(x.to_i, false)
       puts ret
       output ret
     end
@@ -208,16 +200,6 @@ module RuneBlog::REPL
 
   #-- FIXME affects linking, building, publishing...
 
-  def cmd_remove_post(arg, testing = false)
-    reset_output
-    id = get_integer(arg)
-    result = @blog.remove_post(id)
-    output! "Post #{id} not found" if result.nil?
-    @out
-  end
-
-  #-- FIXME affects linking, building, publishing...
-
   def cmd_edit_post(arg, testing = false)
     reset_output
     id = get_integer(arg)
@@ -356,26 +338,24 @@ module RuneBlog::REPL
        list views        List all views available
        lsv               Same as: list views
 
-       config            Edit the publish file or the templates
-       customize         (BUGGY) Change set of tags, extra views
+*      config            Edit the publish file or the templates
+*      customize         (BUGGY) Change set of tags, extra views
   
        p, post           Create a new post
        new post          Same as post (create a post)
 
-       import ASSETS     Import assets (images, etc.)
+*      import ASSETS     Import assets (images, etc.)
 
        lsp, list posts   List posts in current view
 
        lsd, list drafts  List all posts regardless of view
   
-       rm ID             Remove a post
-       kill ID ID ID...  Remove multiple posts
+       delete ID [ID...] Remove multiple posts
        undelete ID       Undelete a post
        edit ID           Edit a post
   
        preview           Look at current (local) view in browser
        browse            Look at current (published) view in browser
-       relink            Regenerate index for all views
        rebuild           Regenerate all posts and relink
        publish           Publish (current view)
        ssh               Login to remote server

data/lib/runeblog.rb

@@ -60,7 +60,6 @@ class RuneBlog
     raise BlogRepoAlreadyExists if Dir.exist?(root)
     create_dirs(root)
     Dir.chdir(root) do
-      system!("cp #{RuneBlog::Path}/../empty_view.tgz .")
       create_dirs(:drafts, :views, :posts)
       new_sequence
     end
@@ -218,7 +217,7 @@ class RuneBlog
 
   def mark_last_published(str)
     log!(enter: __method__, args: [str])
-    dump(str, "last_published")
+    dump(str, "#{self.view.dir}/last_published")
   end
 
   def add_view(view_name)
@@ -232,10 +231,8 @@ class RuneBlog
   def make_empty_view_tree(view_name)
     log!(enter: __method__, args: [view_name])
     Dir.chdir(@root) do
-      cmd1 = "tar zxvf empty_view.tgz >/dev/null 2>&1"
-      cmd2 = "cp -r empty_view views/#{view_name}"
-      system!(cmd1)
-      system!(cmd2)
+      cmd = "cp -r #{RuneBlog::Path}/../empty_view views/#{view_name}"
+      system!(cmd)
     end
   end
 
@@ -255,8 +252,8 @@ class RuneBlog
     log!(enter: __method__, args: [view_name])
     check_valid_new_view(view_name)
     make_empty_view_tree(view_name)
-    mark_last_published("Initial creation")
     add_view(view_name)
+    mark_last_published("Initial creation")
   end
 
   def delete_view(name, force = false)
@@ -296,6 +293,7 @@ class RuneBlog
     log!(enter: __method__, args: [slug])
     id = slug.to_i
     text = nil
+    @theme = @view.dir/"themes/standard"
     post_entry_name = @theme/"blog/post_entry.lt3"
     xlate src: post_entry_name, dst: "/tmp/post_entry.html" # , debug: true
     @_post_entry ||= File.read("/tmp/post_entry.html")
@@ -397,12 +395,17 @@ class RuneBlog
     log!(enter: __method__, args: [view])
     generate_index(view)   # recent posts (recent.html)
     vdir = @root/:views/view
+    @theme = @root/:views/view/:themes/:standard
     xlate cwd: vdir/"themes/standard/etc",
           src: "blog.css.lt3", copy: vdir/"remote/etc/blog.css" # , debug: true
     xlate cwd: vdir/"themes/standard",
           src: "blog/generate.lt3", dst: vdir/:remote/"index.html"
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
-
+  rescue => err
+    puts err
+    puts err.backtrace.join("\n")
+    print "Pause... "
+    gets
   end
 
   def _get_views(draft)
@@ -494,11 +497,6 @@ class RuneBlog
     end
   end
 
-  def relink   # FIXME no longer used?
-    log!(enter: __method__)
-    self.views.each {|view| generate_index(view) }
-  end
-
   def index_entry(view, meta)
     log!(enter: __method__, args: [view, meta])
     debug "=== index_entry #{view.to_s.inspect}  #{meta.num} #{meta.title.inspect}"
@@ -538,6 +536,7 @@ class RuneBlog
   def remove_post(num)
     log!(enter: __method__, args: [num])
     raise ArgumentError unless num.is_a?(Integer)
+    # FIXME update original draft .views
     tag = prefix(num)
     files = Find.find(self.view.dir).to_a
     list = files.select {|x| File.directory?(x) and x =~ /#{tag}/ }

data/lib/runeblog_version.rb

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

data/lib/view.rb

@@ -61,7 +61,7 @@ class RuneBlog::View
 
   def recent?(file)
     log!(enter: __method__, args: [file])
-    File.mtime(file) > File.mtime("#{dir()}/last_published")
+    File.mtime(file) > File.mtime("#{self.dir()}/last_published")
   rescue
     true
   end

data/runeblog.gemspec

@@ -28,10 +28,10 @@ spec = Gem::Specification.new do |s|
          Find.find("lib").to_a
   test = Find.find("test").to_a
   misc = %w[./README.lt3 ./README.md ./runeblog.gemspec]
+  empty_view = Find.find("empty_view").to_a
 
-# system("tar zcvf empty_view.tgz empty_view")
 
-  s.files       =  main + misc + test + ["empty_view.tgz"]
+  s.files       =  main + misc + test + empty_view
   s.homepage    = 'https://github.com/Hal9000/runeblog'
   s.license     = "Ruby"
 end

data/test/general_test.rb

@@ -27,7 +27,6 @@ class TestREPL < Minitest::Test
   def setup
     # To be strictly correct in testing (though slower),
     #   run make_blog here.
-#   system("tar zcvf last-test.tgz .blog/ && rm -rf .blog")
     system("ruby test/make_blog.rb") if ARGV.first == "new"
     @blog = RuneBlog.new
   end

data/test/make_blog.rb

@@ -136,7 +136,7 @@ toes. And may your snark never be a boojum.
 Contact light. Houston, this is Tranquility Base. The Eagle has
 landed. That's one small step for (a) man, one giant leap for 
 mankind.
-.inset left
+.inset left 20
 On a clean disk, you can seek forever.
 .end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.31
+  version: 0.2.36
 platform: ruby
 authors:
 - Hal Fulton
@@ -61,7 +61,49 @@ files:
 - "./README.md"
 - "./runeblog.gemspec"
 - bin/blog
-- empty_view.tgz
+- empty_view/assets/sky2.jpg
+- empty_view/remote/assets/GIT_IS_DUMB
+- empty_view/remote/etc/GIT_IS_DUMB
+- empty_view/remote/navbar/GIT_IS_DUMB
+- empty_view/remote/permalink/GIT_IS_DUMB
+- empty_view/remote/widgets/links/list.data
+- empty_view/remote/widgets/news/list.data
+- empty_view/remote/widgets/pages/SUBFILES
+- empty_view/remote/widgets/pages/list.data
+- empty_view/themes/standard/README
+- empty_view/themes/standard/blog/generate.lt3
+- empty_view/themes/standard/blog/head.lt3
+- empty_view/themes/standard/blog/index.lt3
+- empty_view/themes/standard/blog/post_entry.lt3
+- empty_view/themes/standard/etc/blog.css.lt3
+- empty_view/themes/standard/etc/externals.lt3
+- empty_view/themes/standard/etc/favicon.ico
+- empty_view/themes/standard/etc/misc.js
+- empty_view/themes/standard/global.lt3
+- empty_view/themes/standard/navbar/about.lt3
+- empty_view/themes/standard/navbar/contact.lt3
+- empty_view/themes/standard/navbar/navbar.lt3
+- empty_view/themes/standard/post/generate.lt3
+- 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/calendar/calendar.lt3
+- empty_view/themes/standard/widgets/links/links.lt3
+- empty_view/themes/standard/widgets/links/list.data
+- empty_view/themes/standard/widgets/news/list.data
+- empty_view/themes/standard/widgets/news/news.lt3
+- empty_view/themes/standard/widgets/pages/README
+- empty_view/themes/standard/widgets/pages/SUBFILES
+- empty_view/themes/standard/widgets/pages/disclaim.lt3
+- empty_view/themes/standard/widgets/pages/faq.lt3
+- empty_view/themes/standard/widgets/pages/generated.lt3
+- empty_view/themes/standard/widgets/pages/like-dislike.lt3
+- empty_view/themes/standard/widgets/pages/list.data
+- empty_view/themes/standard/widgets/pages/other-stuff.lt3
+- empty_view/themes/standard/widgets/pages/pages.lt3
+- empty_view/themes/standard/widgets/tag-cloud/tag-cloud.lt3
 - lib/Javascript.stuff
 - lib/default.rb
 - lib/global.rb