runeblog 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae634ff247c9e37f85f453412336c0256c6c2d51277b602d3d6a730cc6690d0f
-  data.tar.gz: 6c1820b2b838177cf75ae2762143ac476d63800ca47fdd5965885c4e84c653c9
+  metadata.gz: a037d087baf23e47f7b3c254dac3348048cc9c498ad439a5f235149b9bbf96cb
+  data.tar.gz: f82a11b32ee3eb3738abdc1a60f3fc1606efb5252a29f5902d53591117199c6c
 SHA512:
-  metadata.gz: 373bb671173802b8a18391facbaa1f08623e2983b4af30e85b9df581fad0a8513aa0da517bead1be0cee1ae8ef1cf36d24d3be84741741dbdb1c51c30e40041b
-  data.tar.gz: 326dee189dd41fe401004684e05bc4b8587809911d2ad4ac0c9555e7da238a3febc9e4fd12b970ac4db9c47818cc4ece7b420f67807216456ed3639b6e0611b9
+  metadata.gz: 9fa1d23bd68596356383676b5d4c5c9fba04afaba2d98ccf8bb1d27fb4b68aba8b9a1078aaebcc7a61cefb8d8bb5102e51d09ecd68e82ce436afaa734c028862
+  data.tar.gz: aae6ba4be7009d1cfcc7461f6dfb5f4459d880b796a7842e67050863e6f48d9ede6923a8995c4945a0923153b7f97c051f18691f8e0d343ed450dcba586c88e0

data/lib/helpers-blog.rb

@@ -38,7 +38,7 @@ exit unless rc
     return false
   end
 
-  def livetext(src, dst=nil)
+  def livetext(src, dst=nil, dir=".")
     log!(enter: __method__, args: [src, dst])
     src << ".lt3" unless src.end_with?(".lt3")
     if dst
@@ -47,7 +47,21 @@ exit unless rc
       dst = src.sub(/.lt3$/, "")
     end
 #   return unless stale?(src, dst)
-    system("livetext #{src} >#{dst}")
+    Dir.chdir(dir) { system("livetext #{src} >#{dst}") }
+  end
+
+  def livetext!(src, dst=nil, dir=".")
+    log!(enter: __method__, args: [src, dst])
+    src << ".lt3" unless src.end_with?(".lt3")
+    if dst
+      dst << ".html" unless dst.end_with?(".html")
+    else
+      dst = src.sub(/.lt3$/, "")
+    end
+#   return unless stale?(src, dst)
+STDERR.puts "-- livetext #{src} >#{dst} \n       in: #{Dir.pwd}\n      from: #{caller[0]}"
+    Dir.chdir(dir) { system("livetext #{src} >#{dst}") }
+STDERR.puts "... completed"
   end
 
   def get_root

data/lib/runeblog.rb

@@ -206,7 +206,7 @@ class RuneBlog
     end
 
     Dir.chdir("#@root/views/#{vdir}") do
-      livetext "themes/standard/blog/generate", "remote/index"
+      livetext "generate", "../../../remote/index", "themes/standard/blog"
       pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
       dump(pub, "publish")
 
@@ -388,37 +388,73 @@ class RuneBlog
     [noext, viewdir, slugdir, aslug, theme]
   end
 
+  def _handle_post(draft, view)
+    noext, viewdir, slugdir, aslug, @theme = _copy_get_dirs(draft, view)
+    html = noext[5..-1]    # strip "nnnn-"
+    remote = viewdir + "/remote"
+    Dir.chdir(slugdir) do 
+      copy(draft, ".")              # copy source into slugdir
+      lt3 = draft.split("/")[-1]    # Remember: Some posts may be in more than 
+      copy(lt3, remote)             #    one view -- careful with links back
+STDERR.puts "1  pwd = #{Dir.pwd}"
+      livetext! draft, html         
+STDERR.puts "    copy #{html}, #{remote}/#{html}"
+      copy(html, "#{remote}/#{html}")
+
+      title_line = File.readlines(draft).grep(/^.title /).first
+      title = title_line.split(" ", 2)[1]
+      excerpt = File.read("teaser.txt")
+      vars = %[.set title="#{title.chomp}"\n] + 
+             %[.set teaser="#{excerpt.chomp}"]
+      theme = "#{viewdir}/themes/standard"
+      File.open("#{theme}/post/vars.lt3", "w") {|f| f.puts vars }
+
+      livetext! "generate.lt3", "#{remote}/html", "#{theme}/post"
+      copy("#{remote}/#{html}", "#{theme}/post")
+
+      livetext! "permalink.lt3", "#{remote}/permalink/#{html}", "#{theme}/post"
+      log!(str: "About to enter remote/", pwd: true, dir: true)
+      Dir.chdir(remote) do 
+        log!(str: "Now in remote/", pwd: true, dir: true)
+        system("cp -r ../themes/standard/widgets .")
+        log!(str: "finished with remote/", pwd: true, dir: true)
+      end
+    end
+  end
+
   def generate_post(draft)
     log!(enter: __method__, args: [draft])
     views = _get_views(draft)
     views.each do |view|
-      noext, viewdir, slugdir, aslug, @theme = _copy_get_dirs(draft, view)
-      remote = viewdir + "/remote"
-      Dir.chdir(slugdir) do 
-        copy(draft, ".")
-        lt3 = draft.split("/")[-1]
-        # Remember: Some posts may be in more than one view -- careful with links back
-        copy(lt3, remote)
-        html = noext[5..-1]
-        livetext draft, html  # livetext "foobar.lt3", "foobar.html"
-        copy(html, "../../remote/post/index.html")
-        title_line = File.readlines(draft).grep(/^.title /).first
-        title = title_line.split(" ", 2)[1]
-        excerpt = File.read("teaser.txt")
-        vars = %[.set title="#{title.chomp}"\n] + 
-               %[.set teaser="#{excerpt.chomp}"]
-        theme = "../../theme/standard"
-        File.open("vars.lt3", "w") {|f| f.puts vars }
-        livetext "#{theme}/post/generate.lt3", "#{remote}/#{html}"
-        livetext "#{theme}/post/permalink.lt3", "#{remote}/permalink/#{html}"
-        log!(str: "About to enter remote/", pwd: true, dir: true)
-        Dir.chdir(remote) do 
-          log!(str: "Now in remote/", pwd: true, dir: true)
-          system("cp -r ../themes/standard/widgets .")
-          log!(str: "finished with remote/", pwd: true, dir: true)
-        end
-      end
+      _handle_post(draft, view)
     end
+#      noext, viewdir, slugdir, aslug, @theme = _copy_get_dirs(draft, view)
+#      remote = viewdir + "/remote"
+#      Dir.chdir(slugdir) do 
+#        copy(draft, ".")
+#        lt3 = draft.split("/")[-1]
+#        # Remember: Some posts may be in more than one view -- careful with links back
+#        copy(lt3, remote)
+#        html = noext[5..-1]    # strip "nnnn-"
+#        livetext! draft, html
+#        copy(html, "#{remote}/#{html}")
+#        title_line = File.readlines(draft).grep(/^.title /).first
+#        title = title_line.split(" ", 2)[1]
+#        excerpt = File.read("teaser.txt")
+#        vars = %[.set title="#{title.chomp}"\n] + 
+#               %[.set teaser="#{excerpt.chomp}"]
+#        theme = "#{viewdir}/themes/standard"
+#        File.open("#{theme}/post/vars.lt3", "w") {|f| f.puts vars }
+#        livetext! "generate.lt3", "#{remote}/html", "#{theme}/post"
+#        copy("#{remote}/html", "#{theme}/post")
+#        livetext! "permalink.lt3", "#{remote}/permalink/#{html}", "#{theme}/post"
+#        log!(str: "About to enter remote/", pwd: true, dir: true)
+#        Dir.chdir(remote) do 
+#          log!(str: "Now in remote/", pwd: true, dir: true)
+#          system("cp -r ../themes/standard/widgets .")
+#          log!(str: "finished with remote/", pwd: true, dir: true)
+#        end
+#      end
   end
 
   def relink

data/lib/runeblog_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2019-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext