runeblog 0.3.24 → 0.3.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcf07214d034b5091d1b1b0910aee40fe46b8c735c33451fd364eaf57621084f
-  data.tar.gz: 7b6bab92b5a4a1835de24650c721f62aac77d0a36405877871b5db98198ba976
+  metadata.gz: a5338170556c8520e1d03e284f43a1f0b33833dbedf3d6e33991b06086dc655b
+  data.tar.gz: a0e4c476dd214cd0ca3460597e6b1a07415b2223101c2eb1a1eed1966380c41f
 SHA512:
-  metadata.gz: 14d8f4233ae7a9e8aaa91f9f9c9bb725d821f852ccfcaee2a493074743ed8ac3d830e334dda9b1367bea2951e04b5ddb78987a9f11130adaadb0af26a0ea39d1
-  data.tar.gz: 3c2904ff1064fb28dd1885f2e58f640287a9c8e3527d379eb573e2a950753bdbe01d0b206e5060d7bbbd0d28880c92c43435721b0693c27658cc08862abc02ad
+  metadata.gz: 3cd616193a36e21dc6a9ffe56cf2a16c7abc1e3b50bfe339ba0b2b3446c4fd3d7fdcb63c3f569d2a2044d59c0cdbf05a38bc15aa5a1bb70d6482e276a1eb9b91
+  data.tar.gz: aef8ad80e260ecc9805a13ea24b8ca22d9bb9fb8fbf719dd6d7f5fbb9e28032f9313335df8b96ab6993db68a60b16bbab6ccc6cba9261add841aba002dcc1930

data/README.lt3

@@ -10,14 +10,16 @@
   <li>It's based on Livetext (highly extensible Ruby-based markup)</li>
   <li>It has the concept of multiple "views" for a blog</li>
   <li>The multiple views are in effect multiple blogs managed with the same backend.</li>
+  <li>Each view may have its own "look and feel" (and even be hosted on differing domains)</li>
 </ul>
 
 
 
 .h2 What is Livetext?
 
-Livetext is a markup format that is a throwback to the old, old days of text 
-formatters such as ``nroff. It's very flexible, and it is extensible _[in Ruby]. 
+Livetext is a markup format (media generator?) that is a throwback to the old, 
+old days of text formatters such as ``nroff. It's very flexible, and it is 
+extensible _[in Ruby]. 
 
 It is far from mature or full-featured, but it is usable. Runeblog uses Livetext, 
 along with some custom definitions, to try to ease the formatting of a blog entry.
@@ -45,8 +47,8 @@ Any post can be in more than one view
 .h2 The <tt>blog</tt> environment
 
 There is a command-line tool called `blog which is a REPL (read-eval-print loop). 
-Note that this tool is a curses-based environment (mainly so it can display menus
-and such to the user).
+Note that this tool is a curses-based environment (mainly so that it can display 
+menus and such to the user).
 
 The help message looks like this:
 
@@ -57,7 +59,7 @@ The help message looks like this:
   <b>q, quit</b>           Exit the program              <b>cv VIEW</b>           Change current view
   <b>v, version</b>        Print version information     <b>new view</b>          Create a new view
   <b>clear</b>             Clear screen                  <b>list views</b>        List all views available
-                                                  <b>lsv</b>               Same as: list views
+                                                         <b>lsv</b>               Same as: list views
 <br>
   <b>Posts:</b>                                          <b>Advanced:</b>
   -------------------------------------------     -------------------------------------------
@@ -82,6 +84,7 @@ You'll then enter the editor (vim for now) to add configuration info to the `glo
 
 <!-- <pre><b>FIXME add menu screenshot here</b></pre> -->
 <!-- <pre><b>FIXME add vim screenshot here</b></pre> -->
+
 <img src="readme/vim-global.png" width="494" height="696" align="center"></img>
 
 The next thing you should do is to create at least one view of your own. Use the `[new view] 

data/README.md

@@ -44,6 +44,7 @@ But the important points are these:
  * Each view can have its own look and feel, and it can be linked/published separately from the others.
  * Each view can be hosted in a different location and/or a different server and domain
  * Any post can be in more than one view
+
 ## The <tt>blog</tt> environment
 There is a command-line tool called <font size=+1><tt>blog</tt></font>  which is a REPL (read-eval-print loop). 
 Note that this tool is a curses-based environment (mainly so it can display menus
@@ -60,7 +61,7 @@ The help message looks like this:
   <b>q, quit</b>           Exit the program              <b>cv VIEW</b>           Change current view
   <b>v, version</b>        Print version information     <b>new view</b>          Create a new view
   <b>clear</b>             Clear screen                  <b>list views</b>        List all views available
-                                                  <b>lsv</b>               Same as: list views
+                                                         <b>lsv</b>               Same as: list views
 <br>
   <b>Posts:</b>                                          <b>Advanced:</b>
   -------------------------------------------     -------------------------------------------
@@ -73,6 +74,7 @@ The help message looks like this:
   <b>edit ID</b>           Edit a post                   <b>ssh</b>               Login to remote server
   <b>import ASSETS</b>     Import assets (images, etc.)  <b>manage WIDGET</b>     Manage content/layout of a widget
 </pre>
+
 ## Getting started
 But when you first run the REPL, it checks for an existing blog repository under 
 the <font size=+1><tt>.blogs</tt></font> directory. If it doesn't find one, it asks whether you want to create 

data/empty_view/config/reddit/redpost.rb

@@ -2,15 +2,12 @@ app_name   = "raido1"
 app_client = "rAyZILgqGB7uHQ"
 secret     = "0CqLXyFu6ABb1MrErWRsB7Bo-i8"
 
-https://www.reddit.com/api/v1/authorize?client_id=rAyZILgqGB7uHQ&response_type=code&state=abc237def&redirect_uri=http%3A%2F%2Frubyhacker.com&duration=permanent&scope=identity%20edit%20flair%20history%20modconfig%20modflair%20modlog%20modposts%20modwiki%20mysubreddits%20privatemessages%20read%20report%20save%20submit%20subscribe%20vote%20wikiedit%20wikiread
-
-
+# https://www.reddit.com/api/v1/authorize?client_id=rAyZILgqGB7uHQ&response_type=code&state=abc237def&redirect_uri=http%3A%2F%2Frubyhacker.com&duration=permanent&scope=identity%20edit%20flair%20history%20modconfig%20modflair%20modlog%20modposts%20modwiki%20mysubreddits%20privatemessages%20read%20report%20save%20submit%20subscribe%20vote%20wikiedit%20wikiread
 
 require 'net/http'
 require 'uri'
 require 'json'
 
-
 =begin
 get_token = URI.parse("https://www.reddit.com/api/v1/access_token")
 data = {
@@ -20,8 +17,6 @@ data = {
        }
 =end
 
-
-
 uri = URI.parse("http://reddit.com/api/submit")
 
 header = {'Content-Type': 'text/json'}

data/lib/liveblog.rb

@@ -197,6 +197,7 @@ def banner
     count += 1
     tag, *data = line.split
     data ||= []
+    deps = [@blog.view.globals[:ViewDir]/:data/"global.lt3"]
     case tag
       when "width";   wide = data[0]
       when "height";  high = data[0]
@@ -217,7 +218,7 @@ def banner
         if ! File.exist?(file) 
           src = file.sub(/html$/, "lt3")
           if File.exist?(src)
-            preprocess src: src, dst: file, call: ".nopara", vars: @blog.view.globals
+            preprocess src: src, dst: file, deps: deps, call: ".nopara", vars: @blog.view.globals
           else
             raise FoundNeither(file, src)
           end

data/lib/menus.rb

@@ -14,33 +14,107 @@ 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(/[{}]/, " ")) }
 
+def edit_blog_generate
+  edit_file("#@std/blog/generate.lt3")
+end
+
+def edit_blog_head
+  edit_file("#@std/blog/head.lt3")
+end
+
+def edit_blog_index
+  edit_file("#@std/blog/index.lt3")
+end
+
+def edit_post_entry
+  edit_file("#@std/blog/post_entry.lt3")
+end
+
+def edit_blog_banner
+  edit_file("#@std/banner/banner.lt3")
+end
+
+def edit_blog_navbar
+  edit_file("#@std/navbar/navbar.lt3")
+end
+
+def edit_post_generate
+  edit_file("#@std/post/generate.lt3")
+end
+
+def edit_post_head
+  edit_file("#@std/post/head.lt3")
+end
+
+def edit_post_index
+  edit_file("#@std/post/index.lt3")
+end
+
+def edit_view_global
+  edit_file("#@data/global.lt3")
+end
+
+def edit_settings_view
+  edit_file("settings/view.txt")
+end
+
+def edit_settings_recent
+  edit_file("settings/recent.txt")
+end
+
+def edit_settings_publish
+  edit_file("settings/publish.txt")
+end
+
+def edit_settings_features
+  edit_file("settings/features.txt")
+end
+
+def edit_config_reddit
+  edit_file("config/reddit/credentials.txt")
+end
+
+def edit_config_facebook
+  edit_file("config/facebook/credentials.txt")
+end
+
+def edit_config_twitter
+  edit_file("config/twitter/credentials.txt")
+end
+
+def edit_etc_blog_css
+  edit_file("#@std/etc/blog.css.lt3")
+end
+
+def edit_etc_externals
+  edit_file("#@std/etc/externals.lt3") 
+end
 
 #   dir = @blog.view.dir/"themes/standard/"
 
-std = "themes/standard"
-data = "."    # CHANGED
+@std  = "themes/standard"
+@data = "."    # CHANGED
 
 Menu.top_config = {
-    "Variables (general)"                 => edit("#{data}/global.lt3"),
-    "   View-specific"                    => edit("settings/view.txt"),
-    "   Recent posts"                     => edit("settings/recent.txt"),
-    "   Publishing"                       => edit("settings/publish.txt"),
-    "Configuration: enable/disable"       => edit("settings/features.txt"),
-    "   Reddit"                           => edit("config/reddit/credentials.txt"),
-    "   Facebook"                         => edit("config/facebook/credentials.txt"),
-    "   Twitter"                          => edit("config/twitter/credentials.txt"),
-    "View: generator"                     => edit("#{std}/blog/generate.lt3"),
-    "   HEAD info"                        => edit("#{std}/blog/head.lt3"),
-    "   Layout "                          => edit("#{std}/blog/index.lt3"),
-    "   Recent-posts entry"               => edit("#{std}/blog/post_entry.lt3"),
-    "   Banner: Description"              => edit("#{std}/banner/banner.lt3"),
-    "      Navbar"                        => edit("#{std}/navbar/navbar.lt3"),
-#   "      Text portion"                  => edit("#{std}/banner/top.lt3"),
-    "Generator for a post"                => edit("#{std}/post/generate.lt3"),
-    "   HEAD info for post"               => edit("#{std}/post/head.lt3"),
-    "   Content for post"                 => edit("#{std}/post/index.lt3"),
-    "Global CSS"                          => edit("#{std}/etc/blog.css.lt3"),
-    "External JS/CSS (Bootstrap, etc.)"   => edit("/etc/externals.lt3") 
+    "View: generator"                     => proc { edit_blog_generate },
+    "   HEAD info"                        => proc { edit_blog_head },
+    "   Layout "                          => proc { edit_blog/index },
+    "   Recent-posts entry"               => proc { edit_post_entry },
+    "   Banner: Description"              => proc { edit_banner },
+    "      Navbar"                        => proc { edit_navbar },
+    "Generator for a post"                => proc { edit_post_generate },
+    "   HEAD info for post"               => proc { edit_post_head },
+    "   Content for post"                 => proc { edit_post_index },
+    "Variables (general)"                 => proc { edit_view_global },
+    "   View-specific"                    => proc { edit_settings_view },
+    "   Recent posts"                     => proc { edit_settings_recent },
+    "   Publishing"                       => proc { edit_settings_publish },
+    "Configuration: enable/disable"       => proc { edit_settings_features },
+    "   Reddit"                           => proc { edit_config_reddit },
+    "   Facebook"                         => proc { edit_config_facebook },
+    "   Twitter"                          => proc { edit_config_twitter },
+    "Global CSS"                          => proc { edit_etc_blog_css },
+    "External JS/CSS (Bootstrap, etc.)"   => proc { edit_etc_externals }
   }
   
 Menu.top_build  = { 

data/lib/processing.rb

@@ -21,10 +21,10 @@ def stale?(src, dst, deps, force = false)
 end
 
 def preprocess(cwd: Dir.pwd, src:, 
-          dst: nil, strip: false,
-          deps: [], copy: nil, debug: false, force: false, 
-          mix: [], call: [], 
-          vars: {})
+               dst: nil, strip: false,
+               deps: [], copy: nil, debug: false, force: false, 
+               mix: [], call: [], 
+               vars: {})
   src += LEXT unless src.end_with?(LEXT)
   if strip
     dst = File.basename(src).sub(/.lt3$/,"")
@@ -33,8 +33,6 @@ def preprocess(cwd: Dir.pwd, src:,
   end
   sp = " "*12
 
-
-
   Dir.chdir(cwd) do
     if debug
       STDERR.puts "#{sp} -- preprocess "

data/lib/repl.rb

@@ -251,7 +251,7 @@ log! str:  "===   ...finished!"
       end
       n = viewnames.values.find_index(@blog.view.name)
       name = @blog.view.name
-      k, name = STDSCR.menu(title: "Views", items: viewnames, curr: n)
+      k, name = STDSCR.menu(title: "Views", items: viewnames, curr: n, wrap: true)
       return if name.nil?
 log! str:  "cv Setting to #{name.inspect}"
       @blog.view = name
@@ -418,7 +418,6 @@ log! str:  "cv Setting to #{name.inspect}"
         base = draft.sub(/.lt3$/, "")
         dir = @blog.root/:posts/base
         meta = nil 
-puts "Trying chdir into #{dir}..."
         Dir.chdir(dir) { meta = @blog.read_metadata }
         num, title = meta.num, meta.title
         num = '%4d' % num.to_s

data/lib/runeblog_version.rb

@@ -1,7 +1,7 @@
 if !defined?(RuneBlog::Path)
 
 class RuneBlog
-  VERSION = "0.3.24"
+  VERSION = "0.3.27"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/lib/view.rb

@@ -39,8 +39,8 @@ class RuneBlog::View
 
     live = Livetext.customize(call: ".nopara")
     live.xform_file(gfile)
-    live._setvar("ViewDir", @blog.root/:views/@name)
-    live._setvar("View",    @name)
+    live.setvar("ViewDir", @blog.root/:views/@name)
+    live.setvar("View",    @name)
     @globals = live.vars
 #   dump_globals_stderr
   end

data/runeblog.gemspec

@@ -21,7 +21,7 @@ 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.09'
+  s.add_runtime_dependency 'livetext', '~> 0.9',  '>= 0.9.10'
   s.add_runtime_dependency 'rubytext', '~> 0.1',  '>= 0.1.23'
   s.add_runtime_dependency 'rouge',    '~> 3.25', '>= 3.25.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.3.24
+  version: 0.3.27
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2022-08-17 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.09
+        version: 0.9.10
   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.09
+        version: 0.9.10
 - !ruby/object:Gem::Dependency
   name: rubytext
   requirement: !ruby/object:Gem::Requirement
@@ -54,42 +54,42 @@ dependencies:
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.25.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.25'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.25.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.25'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.25.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.10.0
 description: A blog system based on Ruby and Livetext
 email: rubyhacker@gmail.com
 executables:
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: A command-line blogging system