runeblog 0.2.75 → 0.2.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30280ea49b4f2f3da058889fb7cabd535ee55a8a5321a12bd5fc105d5ed74302
-  data.tar.gz: e0310e08c54c0f0cae977596221b710dfb700f5416547cebe0f57a1375e95482
+  metadata.gz: b0c80c77d6bdb17bf32c8a90ed26aa3e98b43493c7b38f7341a359e53bda7cff
+  data.tar.gz: 89d0a30d6f2ac56b932c8fd65d966ddcebed9320627ec032ae2d2ac68971a2e6
 SHA512:
-  metadata.gz: 83b9df4e7179689012a1eb1b24d2cb26a2295735099331badd450ea08d6ca2b2944cb5f2af0b4ccdf79d7d2bff75665852bc08997c7795c92c63762351242248
-  data.tar.gz: cd4d4717ab5bfe99532d7f3be3f1aa512725c4fbd6cfa1a24f1639a631c0d196237be04b15f7d72b1376feb214623fb22f9b13a97844de23918554f3833c267a
+  metadata.gz: 6bc7626f7e00f7e656982c3bb6f5fea92da173ae430a1b4cdb888dfb170a6af84c33dcd99b6541f57e67c716e23ed484e947ba616f43156dacc7242a97871af2
+  data.tar.gz: dd235b09c2f2f592f5a16afa574c62949731cbd634945b79e6969cfdfedbd9eb1132dad5bbd976416354972b4b9bf9d585e75bcd7aec264ec1d40c8f57e92a34

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

@@ -1,4 +1,5 @@
 <!-- Miscellaneous local JS pieces are defined here -->
+.nopara
 
 <script>
   function open_main(url) {

data/lib/helpers-blog.rb

@@ -21,13 +21,13 @@ module RuneBlog::Helpers
 
   def get_repo_config
     log!(enter: __method__, level: 3)
-    @editor = File.read("#@root/data/EDITOR").chomp
-    @current_view = File.read("#@root/data/VIEW").chomp
-    @root = File.read("#@root/data/ROOT").chomp
+    @editor = File.read(".blogs/data/EDITOR").chomp
+    @current_view = File.read(".blogs/data/VIEW").chomp
+    @root = File.read(".blogs/data/ROOT").chomp
   rescue => err
-    STDERR.puts "Can't read config: #{err}"
-    STDERR.puts err.backtrace.join("\n")
-    STDERR.puts "dir = #{Dir.pwd}"
+    puts "Can't read config: #{err}"
+    puts err.backtrace.join("\n")
+    puts "dir = #{Dir.pwd}"
   end
 
   def copy_data(tag, dest)
@@ -84,7 +84,7 @@ module RuneBlog::Helpers
     dirs.map {|name| RuneBlog::View.new(name) }
   end
 
-  def write_repo_config(root: "#{Dir.pwd}/.blogs", view: "[no view]", editor: "/usr/local/bin/vim")
+  def write_repo_config(root: "#{Dir.pwd}/.blogs", view: "#{root}/data/VIEW", editor: "#{root}/data/EDITOR")
     File.write(root + "/data/ROOT",   root + "\n")
     File.write(root + "/data/VIEW",   view.to_s + "\n")
     File.write(root + "/data/EDITOR", editor + "\n")
@@ -108,6 +108,7 @@ module RuneBlog::Helpers
 
   def subdirs(dir)
     log!(enter: __method__, args: [dir], level: 3)
+STDERR.puts dir
     dirs = Dir.entries(dir) - %w[. ..]
     dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
     dirs

data/lib/liveblog.rb

@@ -5,7 +5,7 @@ require 'find'
 
 require 'runeblog'
 require 'pathmagic'
-# require 'xlate'
+require 'xlate'
 
 
 def init_liveblog    # FIXME - a lot of this logic sucks
@@ -636,7 +636,7 @@ def sidebar
         File.open(wtag/"vars.lt3", "w") do |f| 
           f.puts ".set ad.image = #{img}"
         end
-        preprocess cwd: wtag, src: tag, dst: tcard, force: true # , deps: depend # , debug: true
+        xlate cwd: wtag, src: tag, dst: tcard, force: true # , deps: depend # , debug: true
     end
 
     _include_file wtag/tcard
@@ -776,7 +776,7 @@ def _make_navbar(orient = :horiz)
       output.puts %[<li class="nav-item active"> <a class="nav-link" href="index.html">#{cdata}<span class="sr-only">(current)</span></a> </li>]
     else
       dir = @blog.root/:views/@blog.view/"themes/standard/banner"
-      preprocess cwd: dir, src: basename, dst: vdir/"remote/banner"/basename+".html" # , debug: true
+      xlate cwd: dir, src: basename, dst: vdir/"remote/banner"/basename+".html" # , debug: true
       output.puts %[<li class="nav-item"> <a class="nav-link" #{href_main}>#{cdata}</a> </li>]
     end
   end

data/lib/runeblog.rb

@@ -147,7 +147,7 @@ class RuneBlog
     dir = @root/:posts/nslug
     create_dirs(dir)
     # FIXME dependencies?
-    preprocess cwd: dir, src: @root/:drafts/sourcefile   # , debug: true
+    xlate cwd: dir, src: @root/:drafts/sourcefile   # , debug: true
     _deploy_local(dir)
   rescue => err
     _tmp_error(err)
@@ -319,7 +319,7 @@ class RuneBlog
     @theme = @view.dir/"themes/standard"
     post_entry_name = @theme/"blog/post_entry.lt3"
     depend = [post_entry_name]
-    preprocess src: post_entry_name, dst: "/tmp/post_entry.html" # , deps: depend  # , debug: true
+    xlate src: post_entry_name, dst: "/tmp/post_entry.html" # , deps: depend  # , debug: true
     @_post_entry ||= File.read("/tmp/post_entry.html")
     vp = post_lookup(id)
     nslug, aslug, title, date, teaser_text = 
@@ -435,9 +435,9 @@ class RuneBlog
              @theme/"blog/head.lt3", 
              # @theme/"navbar/navbar.lt3",
              @theme/"blog/index.lt3"]   # FIXME what about assets?
-    preprocess cwd: vdir/"themes/standard/etc", deps: depend,
+    xlate cwd: vdir/"themes/standard/etc", deps: depend,
           src: "blog.css.lt3", copy: vdir/"remote/etc/"  # , debug: true
-    preprocess cwd: vdir/"themes/standard", deps: depend, force: true,
+    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)
@@ -546,7 +546,7 @@ class RuneBlog
     # Step 1...
     create_dirs(pdraft)
     # FIXME dependencies?
-    preprocess cwd: pdraft, src: draft, dst: "guts.html"  # , debug: true
+    xlate cwd: pdraft, src: draft, dst: "guts.html"  # , debug: true
     _post_metadata(draft, pdraft)
     # Step 2...
     vposts = @root/:views/view_name/:posts
@@ -556,10 +556,10 @@ class RuneBlog
     copy(pdraft/"vars.lt3",  @theme/:post) 
     # Step 4...
     # FIXME dependencies?
-    preprocess cwd: @theme/:post, src: "generate.lt3", force: true, 
+    xlate cwd: @theme/:post, src: "generate.lt3", force: true, 
           dst: remote/ahtml, copy: @theme/:post    # , debug: true
     # FIXME dependencies?
-    preprocess cwd: @theme/:post, src: "permalink.lt3", 
+    xlate cwd: @theme/:post, src: "permalink.lt3", 
           dst: remote/:permalink/ahtml  # , debug: true
     copy_widget_html(view_name)
   rescue => err

data/lib/runeblog_version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.75
+  version: 0.2.76
 platform: ruby
 authors:
 - Hal Fulton