runeblog 0.2.74 → 0.2.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a66a7e9938f682fe72d0a6f693cad408fffbeb93f34da1f91732548d879211cf
-  data.tar.gz: c2beeb6b86e7d08926bca781d6adca2560f7413501319295abf23a194ee6e039
+  metadata.gz: 30280ea49b4f2f3da058889fb7cabd535ee55a8a5321a12bd5fc105d5ed74302
+  data.tar.gz: e0310e08c54c0f0cae977596221b710dfb700f5416547cebe0f57a1375e95482
 SHA512:
-  metadata.gz: dd1d9d4a194f2f28683e20fbf027b87f3f27e4ced5c16e21c1e7e292dceacc75f87f718b6abe018e46e37c3645c32c107e3e24a4e1c5fb14aa5c38925198dbb1
-  data.tar.gz: 2d4ce56d3dd5d97b168692d984706ac941fa6f5a3daf3f227dfd42023ae1c7a5c734692eed321e8752eb4eca601809c5e5d350ff58851be6cb12feca84ec933a
+  metadata.gz: 83b9df4e7179689012a1eb1b24d2cb26a2295735099331badd450ea08d6ca2b2944cb5f2af0b4ccdf79d7d2bff75665852bc08997c7795c92c63762351242248
+  data.tar.gz: cd4d4717ab5bfe99532d7f3be3f1aa512725c4fbd6cfa1a24f1639a631c0d196237be04b15f7d72b1376feb214623fb22f9b13a97844de23918554f3833c267a

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
-        xlate cwd: wtag, src: tag, dst: tcard, force: true # , deps: depend # , debug: true
+        preprocess 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"
-      xlate cwd: dir, src: basename, dst: vdir/"remote/banner"/basename+".html" # , debug: true
+      preprocess 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?
-    xlate cwd: dir, src: @root/:drafts/sourcefile   # , debug: true
+    preprocess 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]
-    xlate src: post_entry_name, dst: "/tmp/post_entry.html" # , deps: depend  # , debug: true
+    preprocess 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?
-    xlate cwd: vdir/"themes/standard/etc", deps: depend,
+    preprocess cwd: vdir/"themes/standard/etc", deps: depend,
           src: "blog.css.lt3", copy: vdir/"remote/etc/"  # , debug: true
-    xlate cwd: vdir/"themes/standard", deps: depend, force: true,
+    preprocess 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?
-    xlate cwd: pdraft, src: draft, dst: "guts.html"  # , debug: true
+    preprocess 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?
-    xlate cwd: @theme/:post, src: "generate.lt3", force: true, 
+    preprocess cwd: @theme/:post, src: "generate.lt3", force: true, 
           dst: remote/ahtml, copy: @theme/:post    # , debug: true
     # FIXME dependencies?
-    xlate cwd: @theme/:post, src: "permalink.lt3", 
+    preprocess 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.74"
+  VERSION = "0.2.75"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/lib/xlate.rb

@@ -1,4 +1,6 @@
+require 'livetext'
 
+LIVE = Livetext.new
 LEXT = ".lt3"
 
 def newer?(f1, f2)
@@ -16,26 +18,28 @@ def stale?(src, dst, deps, force = false)
   return false
 end
 
-def prerprocess(cwd: Dir.pwd, src:, 
+def preprocess(cwd: Dir.pwd, src:, 
           dst: (strip = true; File.basename(src).sub(/.lt3$/,"")), 
           deps: [], copy: nil, debug: false, force: false)
   src += LEXT unless src.end_with?(LEXT)
   dst += ".html" unless (dst.end_with?(".html"))   # || strip)
-  indent = " "*12
+  sp = " "*12
   Dir.chdir(cwd) do
     if debug
-      puts "#{indent} -- xlate #{src} >#{dst}"
-      puts "#{indent}      in:   #{Dir.pwd}"
-      puts "#{indent}      from: #{caller[0]}"
-      puts "#{indent}      copy: #{copy}" if copy
+      puts "#{sp} -- preprocess 
+      puts "#{sp}      src:  #{src}"
+      puts "#{sp}      dst:  #{dst}"
+      puts "#{sp}      in:   #{Dir.pwd}"
+      puts "#{sp}      from: #{caller[0]}"
+      puts "#{sp}      copy: #{copy}" if copy
     end
     stale = stale?(src, dst, deps, force)
     if stale
-      rc = system("livetext #{src} >#{dst}")
-      puts "...completed (shell returned #{rc})" if debug
+      out = LIVE.xform_file(src)
+      File.write(dst, out)
       system!("cp #{dst} #{copy}") if copy
     else
-      puts "#{indent} -- ^ Already up to date!" if debug
+      puts "#{sp} -- ^ Already up to date!" if debug
       return
     end
   end

data/runeblog.gemspec

@@ -23,7 +23,7 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.95'
   s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.16'
 
-  s.add_development_dependency 'minitest', '>= 5.10.0'
+  s.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.0'
 
   # Files...
   main = Find.find("bin").to_a + 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.74
+  version: 0.2.75
 platform: ruby
 authors:
 - Hal Fulton
@@ -57,6 +57,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.10.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -64,6 +67,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.10.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
 description: A blog system based on Ruby and Livetext
 email: rubyhacker@gmail.com
 executables: