RubyGems - runeblog - Versions diffs - 0.2.7 → 0.2.12 - Mend

runeblog 0.2.7 → 0.2.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdab9850e7d3b37635a64ae5467b5e228f6cce4c60f26e6a74453ac9b14a861e
-  data.tar.gz: d858b5a90eb834d2cb9d057c5aaaf920d75867f869b2de0b632fb3c98e2e6e7b
+  metadata.gz: '08da4eebd5d24bcb8586ed0c4a977d79651fde7953df71fd94e7e6e74a09484f'
+  data.tar.gz: ec0907dc80d37026393c70327f81a572c418a5a3553a4eb2d256cecb2deae035
 SHA512:
-  metadata.gz: a4bd722b8643c614047ccbdaa4d2e1ba63a4a5c9c6f4169f50e311fa340601b8c1c0f937f21a3caa6afa251aa8fc1c3b8b3d456e63adadb336177941bd0ea42a
-  data.tar.gz: c69da06c60cf1da59dedd4fb94cfc99ae159a9c259b52b87785693d606f6d4e7b2e7dfaddcaf12b4fdbaad9e2ea258654b5dee3c57c01e6eb3bb568014b55c33
+  metadata.gz: 1645347a827726674875a324cd16ad9c21993c741a9b5d79f83c04459cc23b0d0a17bf1ad6c9b91d64ae57f71d180dd7bbfea850d28e1e46dc66e825cb641b53
+  data.tar.gz: 6bd64ef0e17ed76612b5d914de41fbcd4e916865a418acc6ae44755ad2d83fa852cce555c18a2d4c2c4b0a7569395ad4b84beca7ad070b5def25aa0209af8518

data/empty_view.tgz CHANGED

Binary file

data/lib/helpers-blog.rb CHANGED

@@ -3,6 +3,8 @@ require 'fileutils'
 # Home = Dir.pwd # unless Home
+LEXT = ".lt3"
 module RuneBlog::Helpers
   def copy(src, dst)
@@ -31,23 +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)
-    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)
-    system("livetext #{src} >#{dst}")
+    STDERR.puts "...completed (shell returned #{rc})" if debug
   end
   def get_root

data/lib/liveblog.rb CHANGED

@@ -96,50 +96,72 @@ def list!
   _optional_blank_line
 end
-def html_body(file)
+def _html_body(file)
   file.puts "<html>\n  <body>"
   yield
   file.puts "  </body>\n</html>"
 end
-def make_news_links
-  # FIXME remember strings may not be safe
-  line = _data.chomp
-  input, cardfile, mainfile, card_title = *line.split(" ", 4)
-  pairs = File.readlines(input).map {|line| line.chomp.split(",", 2) }
-  # HTML for main area (iframe)
-  File.open("#{mainfile}.html", "w") do |f|
-    html_body(f) do
-      f.puts "<h1>#{card_title}</h1>"
-      pairs.each do |file, title|
-        f.puts %[<a style="text-decoration: none; font-size: 24px" href="#{file}">#{title}</a> <br>]
-      end
-    end
-  end
+def _write_card(cardfile, mainfile, pairs, card_title, tag, relative: true)
   # HTML for sidebar card
+  log!(str: "Creating #{cardfile}.html", pwd: true)
+  TTY.puts "Creating #{cardfile}.html - pwd = #{Dir.pwd}"
   File.open("#{cardfile}.html", "w") do |f|
     f.puts <<-EOS
       <div class="card mb-3">
         <div class="card-body">
           <h5 class="card-title">
             <a href="javascript: void(0)"
-               onclick="javascript:open_main('widgets/news/#{mainfile}.html')"
+               onclick="javascript:open_main('widgets/#{tag}/#{mainfile}.html')"
                style="text-decoration: none; color: black">#{card_title}</a>
           </h5>
+<!--          <ul class="list-group list-group-flush"> -->
     EOS
+    log!(str: "Writing data pairs to #{cardfile}.html", pwd: true)
+    top = relative ? "widgets/#{tag}/" : ""
     pairs.each do |file, title|
       f.puts <<-EOS
         <li class="list-group-item"> <a href="javascript: void(0)"
-        onclick="javascript:open_main('#{file}')">#{title}</a> </li>
+        onclick="javascript:open_main('#{top}#{file}')">#{title}</a> </li>
       EOS
     end
     f.puts <<-EOS
+<!--          </ul> -->
         </div>
       </div>
     EOS
   end
 end
+def _write_main(mainfile, pairs, card_title)
+  # HTML for main area (iframe)
+  log!(str: "Creating #{mainfile}.html", pwd: true)
+  TTY.puts "Creating #{mainfile}.html - pwd = #{Dir.pwd}"
+  File.open("#{mainfile}.html", "w") do |f|
+    _html_body(f) do
+      f.puts "<h1>#{card_title}</h1>"
+      pairs.each do |file, title|
+        f.puts %[<a style="text-decoration: none; font-size: 24px" href="#{file}">#{title}</a> <br>]
+      end
+    end
+  end
+end
+def make_main_links
+  log!(enter: __method__)
+  # FIXME remember strings may not be safe
+  line = _data.chomp
+  tag, card_title = *line.split(" ", 2)
+  cardfile, mainfile = "card-#{tag}", "main-#{tag}"
+  input = "list.data"
+  log!(str: "Reading #{input}", pwd: true)
+  pairs = File.readlines(input).map {|line| line.chomp.split(",", 2) }
+  _write_main(mainfile, pairs, card_title)
+  widget_relative = false  # (tag != "news")  # FIXME kludge!!!
+  _write_card(cardfile, mainfile, pairs, card_title, tag, relative: widget_relative)
+  log!(str: "...returning from method", pwd: true)
+end
 ### inset
 def inset
@@ -236,23 +258,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 +286,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 CHANGED

@@ -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 "themes/standard/blog/generate", "remote/index"
-      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,36 +420,65 @@ class RuneBlog
     [noext, viewdir, slugdir, aslug, theme]
   end
+  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}"]
+      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|
-      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
+    views.each do |view|
+      _handle_post(draft, view)
+      generate_view(view)
     end
   end

data/lib/runeblog_version.rb CHANGED

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

data/runeblog.gemspec CHANGED

@@ -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...
@@ -30,7 +30,7 @@ spec = Gem::Specification.new do |s|
   test = Find.find("test").to_a
   misc = %w[./README.lt3 ./README.md ./runeblog.gemspec]
-  system("tar zcvf empty_view.tgz empty_view")
+# system("tar zcvf empty_view.tgz empty_view")
   s.files       =  main + misc + test + ["empty_view.tgz"]
   s.homepage    = 'https://github.com/Hal9000/runeblog'

data/test/make_blog.rb CHANGED

@@ -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")
@@ -116,7 +112,7 @@ Blah blah Waller Creek blah blah...
 BODY
 make_post(x, "Life on Sabine Street", <<-EXCERPT, <<-BODY)
-It's like Pooh Corner, except not.
+It's like Pooh Corner (except not).
 EXCERPT
 This is about Sabine St, blah blah lorem ipsum dolor...
 BODY
@@ -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 CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.12
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-26 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