runeblog 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a037d087baf23e47f7b3c254dac3348048cc9c498ad439a5f235149b9bbf96cb
-  data.tar.gz: f82a11b32ee3eb3738abdc1a60f3fc1606efb5252a29f5902d53591117199c6c
+  metadata.gz: bbd97f1cfd9631550e0ef799e14f8c5dfd621d29c4231dfb9f5bbc0f065b436e
+  data.tar.gz: 449f13d68fc2a247e9e307083c7b0f4c9034bc4e85d307d7775d8a7a881284a7
 SHA512:
-  metadata.gz: 9fa1d23bd68596356383676b5d4c5c9fba04afaba2d98ccf8bb1d27fb4b68aba8b9a1078aaebcc7a61cefb8d8bb5102e51d09ecd68e82ce436afaa734c028862
-  data.tar.gz: aae6ba4be7009d1cfcc7461f6dfb5f4459d880b796a7842e67050863e6f48d9ede6923a8995c4945a0923153b7f97c051f18691f8e0d343ed450dcba586c88e0
+  metadata.gz: 476e0804dd0085123c19019548bd7803ccfeff526d27e70b5bab1dcf3904fe8ec414b69a9562b34a9fd2e0574843cdbe66cdf9ed226b94d0d2aca92aebb1a7b5
+  data.tar.gz: 598f65529e5a1d52558142a3ad5230fa53bab77f12325efedc9a6c9f688a737633b4937088bf234e5e5b2fbee8bb17fc0778968e7547797ded0d116dbe024abc

data/lib/helpers-blog.rb

@@ -3,6 +3,8 @@ require 'fileutils'
 
 # Home = Dir.pwd # unless Home
 
+LEXT = ".lt3"
+
 module RuneBlog::Helpers
 
   def copy(src, dst)
@@ -31,37 +33,57 @@ exit unless rc
 #   end
   end
 
-  def stale?(src, dst)
+  def stale?(src, dst, force = false)
     log!(enter: __method__, args: [src, dst])
+    raise "Source #{src} not found in #{Dir.pwd}" unless File.exist?(src)
+    return true if force
     return true unless File.exist?(dst)
     return true if File.mtime(src) > File.mtime(dst)
     return false
   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)
-    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$/, "")
+#  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)
+#    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 xlate(cwd: Dir.pwd, src:, 
+            dst: (strip = true; src.sub(/.lt3$/,"")), 
+            copy: nil, debug: false, force: false)
+    src += LEXT unless src.end_with?(LEXT)
+    dst += ".html" unless dst.end_with?(".html") || strip
+    Dir.chdir(cwd) do
+      return unless stale?(src, dst, force)
+      if debug
+        STDERR.puts "-- xlate #{src} >#{dst}"
+        STDERR.puts "     in:   #{Dir.pwd}"
+        STDERR.puts "     from: #{caller[0]}"
+        STDERR.puts "     copy: #{copy}" if copy
+      end
+      rc = system("livetext #{src} >#{dst}")
     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"
+    STDERR.puts "...completed (shell returned #{rc})" if debug
   end
 
   def get_root

data/lib/liveblog.rb

@@ -236,23 +236,20 @@ def pin
   _optional_blank_line
 end
 
-def write_post
-  raise "'post' was not called" unless @meta
-  save = Dir.pwd
-  @postdir.gsub!(/\/\//, "/")  # FIXME unneeded?
-  Dir.mkdir(@postdir) unless Dir.exist?(@postdir) # FIXME remember assets!
-  Dir.chdir(@postdir)
-  @meta.views = @meta.views.join(" ") if @meta.views.is_a? Array
-  @meta.tags  = @meta.tags.join(" ") if @meta.tags.is_a? Array
+def _write_metadata
   File.write("teaser.txt", @meta.teaser)
-  
   fields = [:num, :title, :date, :pubdate, :views, :tags]
-  
   fname2 = "metadata.txt"
   f2 = File.open(fname2, "w") do |f2| 
     fields.each {|fld| f2.puts "#{fld}: #{@meta.send(fld)}" }
   end
-  Dir.chdir(save)
+end
+
+def write_post
+  raise "'post' was not called" unless @meta
+  @meta.views = @meta.views.join(" ") if @meta.views.is_a? Array
+  @meta.tags  = @meta.tags.join(" ") if @meta.tags.is_a? Array
+  _write_metadata
 rescue => err
   puts "err = #{err}"
   puts err.backtrace.join("\n")
@@ -267,19 +264,25 @@ def teaser
 end
 
 def finalize
+STDERR.puts :cp1
   unless @meta
     puts @live.body
     return
   end
+STDERR.puts :cp4
   if @blog.nil?
     return @meta
   end
 
+STDERR.puts :cp6
   @slug = @blog.make_slug(@meta)
+STDERR.puts :cp7
   slug_dir = @slug
   @postdir = @blog.view.dir + "/posts/#{slug_dir}"
   STDERR.puts "--- finalize: pwd = #{Dir.pwd} postdir = #@postdir"
+STDERR.puts :cp8
   write_post
+STDERR.puts :cp9
   @meta
 end
  

data/lib/runeblog.rb

@@ -60,7 +60,7 @@ class RuneBlog
     create_dirs(root)
     Dir.chdir(root) do
       system("cp #{RuneBlog::Path}/../empty_view.tgz .")
-      create_dirs(:drafts, :views)
+      create_dirs(:drafts, :views, :posts)
       new_sequence
     end
     put_config(root: root)
@@ -99,6 +99,23 @@ class RuneBlog
     @post_tags = []
   end
 
+  def _deploy_local(dir)
+    log!(enter: __method__, args: [dir])
+    Dir.chdir(dir) do
+      views = File.readlines("metadata.txt").grep(/^.views /).first[7..-1].split
+      views.each {|v| system("cp *html #@root/views/#{v}/remote") }
+    end
+  end
+
+  def process_post(sourcefile)
+    log!(enter: __method__, args: [dir])
+    nslug = sourcefile.sub(/.lt3/, "")
+    dir = @root + "/posts/#{nslug}"
+    create_dir(dir)
+    xlate cwd: dir, src: sourcefile, debug: true
+    _deploy_local(dir)
+  end
+
   def inspect
     log!(enter: __method__)
     str = "blog: "
@@ -177,45 +194,59 @@ class RuneBlog
     Dir.exist?(DotDir) && File.exist?(DotDir + "/" + ConfigFile)
   end
 
-  def _copy_to_staging
-    copy!("themes/standard/", "staging/")
-    copy!("themes/standard/widgets/", "staging/")
+  def make_dummy_publish_file(view_name)
+    log!(enter: __method__, args: [view_name])
+    vdir = "#@root/views/#{view_name}"
+    pub = [:user, :server, :docroot, :path, :proto]
+    pub = pub.map {|x| x.to_s + ": undefined" }
+    pub = pub.join("\n") + "\n"
+    dump(pub, "#{vdir}/publish")
   end
 
-  def _copy_to_remote
-    copy!("themes/standard/etc", "remote/")
-    copy!("themes/standard/assets", "remote/")
-    copy!("themes/standard/widgets", "remote/")
+  def mark_last_published(str)
+    log!(enter: __method__, args: [str])
+    dump(str, "last_published")
   end
 
-  def create_view(arg)
-    log!(enter: __method__, args: [arg])
-    raise ArgumentError unless arg.is_a?(String) && ! arg.empty?
-
-    names = self.views.map(&:to_s)
-    raise ViewAlreadyExists(arg) if names.include?(arg)
-
-    vdir = arg.dup
-    raise DirAlreadyExists(vdir) if Dir.exist?(vdir)
+  def add_view(view_name)
+    log!(enter: __method__, args: [view_name])
+    view = RuneBlog::View.new(view_name)
+    @view = view    # current view
+    @views << view  # all views
+    view
+  end
 
+  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/#{arg}"
+      cmd2 = "cp -r empty_view views/#{view_name}"
       system(cmd1)
       system(cmd2)
     end
+  end
 
-    Dir.chdir("#@root/views/#{vdir}") do
-      livetext "generate", "../../../remote/index", "themes/standard/blog"
-      pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
-      dump(pub, "publish")
+  def check_valid_new_view(view_name)
+    log!(enter: __method__, args: [view_name])
+    raise ArgumentError unless view_name.is_a?(String)
+    raise ArgumentError if view_name.empty?
+    names = self.views.map(&:to_s)
+    bad = names.include?(view_name)
+    raise ViewAlreadyExists(view_name) if bad
+    vdir = "@root/views/#{view_name}"
+    raise DirAlreadyExists(view_name) if Dir.exist?(vdir)
+    return true   # hm?
+  end
 
-      view = RuneBlog::View.new(arg)
-      self.view = view
-      dump("Initial creation", "last_published")
-    end  
-    @views << view
-    @views
+  def create_view(view_name)
+    log!(enter: __method__, args: [view_name])
+    check_valid_new_view(view_name)
+    make_empty_view_tree(view_name)
+#   xlate cwd: "#@root/views/#{view_name}/themes/standard/blog",
+#         src: "generate", dst: "../../../remote/index"
+    make_dummy_publish_file(view_name)
+    mark_last_published("Initial creation")
+    add_view(view_name)
   end
 
   def delete_view(name, force = false)
@@ -304,7 +335,7 @@ class RuneBlog
   def create_new_post(title, testing = false, teaser: nil, body: nil, other_views: [])
     log!(enter: __method__, args: [title, testing, teaser, body, other_views])
     meta = nil
-    Dir.chdir(self.view.dir) do
+    Dir.chdir("#@root/posts/") do
       post = Post.create(title: title, teaser: teaser, body: body, other_views: other_views)
       post.edit unless testing
       post.build
@@ -322,6 +353,7 @@ class RuneBlog
     sourcefile = "#@root/drafts/#{file}"
     result = system("#@editor #{sourcefile} +8") unless testing
     raise EditorProblem(sourcefile) unless result
+    process_post(sourcefile)
     nil
   rescue => err
     error(err)
@@ -359,9 +391,9 @@ class RuneBlog
   def generate_view(view)  # huh?
     log!(enter: __method__, args: [view])
     generate_index(view)   # recent posts (recent.html)
-    Dir.chdir(@root + "/views/#{view}/themes/standard") do
-      livetext "blog/generate.lt3", "../../remote/index.html"
-    end
+    vdir = "#@root/views/#{view}"
+    xlate cwd: "#{vdir}/themes/standard",
+          src: "blog/generate.lt3", dst: "#{vdir}/remote/index.html"
   end
 
   def _get_views(draft)
@@ -388,73 +420,66 @@ 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]
+  def _post_metadata(draft, pdraft)
+    log!(enter: __method__, args: [draft, pdraft])
+    title_line = File.readlines(draft).grep(/^.title /).first
+    title = title_line.split(" ", 2)[1]
+#   pdir = "
+    Dir.chdir(pdraft) do 
       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
+      File.open("#{pdraft}/vars.lt3", "w") {|f| f.puts vars }
+    end
+  end
+
+  def copy_widget_html   # FIXME make better?
+    log!(enter: __method__)
+    wdir = "../themes/standard/widgets"
+    widgets = Dir["#{wdir}/*"].select {|w| File.directory?(w) }
+    widgets.each do |w|
+      dir = File.basename(w)
+      rem = "#{remote}/#{w}" 
+      create_dirs(rem)
+      system("cp #{w}/*html  #{rem}")
     end
   end
 
+  def _handle_post(draft, view)
+    log!(enter: __method__, args: [draft, view])
+
+    fname = File.basename(draft)       # 0001-this-is-a-post.lt3
+    nslug = fname.sub(/.lt3$/, "")     # 0001-this-is-a-post
+    aslug = nslug.sub(/\d\d\d\d-/, "") # this-is-a-post
+    ahtml = aslug + ".html"            # this-is-a-post.html
+    pdraft = "#@root/posts/#{nslug}"
+    remote = "#@root/views/#{view}/remote"
+    @theme = "#@root/views/#{view}/themes/standard"
+    # Step 1...
+    create_dirs(pdraft)
+    xlate cwd: pdraft, src: draft, dst: "guts.html"
+    _post_metadata(draft, pdraft)
+    # Step 2...
+    vposts = "#@root/views/#{view}/posts/"
+    copy!(pdraft, vposts)    # ??
+    # Step 3..
+    copy(pdraft + "/guts.html", "#@theme/post") 
+    copy(pdraft + "/vars.lt3",  "#@theme/post") 
+    # Step 4...
+    xlate cwd: "#{@theme}/post", src: "generate.lt3", 
+          dst: "#{remote}/#{ahtml}", copy: "#{@theme}/post"
+    xlate cwd: "#{@theme}/post", src: "permalink.lt3", 
+          dst: "#{remote}/permalink/#{ahtml}"
+    copy_widget_html
+  end
+
   def generate_post(draft)
     log!(enter: __method__, args: [draft])
     views = _get_views(draft)
-    views.each do |view|
+    views.each do |view| 
       _handle_post(draft, view)
+      generate_view(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.10"
+  VERSION = "0.2.11"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/runeblog.gemspec

@@ -20,7 +20,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.8', '>= 0.8.92'
+  s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.93'
   s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.16'
 
   # Files...

data/test/make_blog.rb

@@ -42,10 +42,6 @@ x = RuneBlog.new(".blogs")
 
 x.create_view("around_austin")   # FIXME remember view title!
 
-# puts "=== about to call: x.generate_view('around_austin')"
-x.generate_view("around_austin")
-# puts "=== ...returned"
-
 # Hack:
 if File.exist?("publish")
   system("cp publish .blogs/views/around_austin/publish")
@@ -130,6 +126,8 @@ But I first heard of them
 in 2005.
 BODY
 
+x.generate_view("around_austin")
+
 x.change_view("around_austin")
 
 puts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-28 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -19,7 +19,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.92
+        version: 0.8.93
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.92
+        version: 0.8.93
 - !ruby/object:Gem::Dependency
   name: rubytext
   requirement: !ruby/object:Gem::Requirement