RubyGems - runeblog - Versions diffs - 0.2.24 → 0.2.25 - Mend

runeblog 0.2.24 → 0.2.25

Files changed (14) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 707ca8bf9834f7ed3bf831fa47189203ed2815a069051bd65bde6640a98b9828
-  data.tar.gz: 21ad77269fc5fe291cab102a71a252635b8be69b052b655a16820c2515f2e27b
+  metadata.gz: 4160901e4e8ca9580c110d5d0f907038d6e4c1395e7e7c0fbcf1096c2edc109b
+  data.tar.gz: 54231043df23b1ffe47d170b663d8c476fb23346cd4808162cc622034e8bc519
 SHA512:
-  metadata.gz: 3e68f4e2d5865b12a6e2e384065e134ed13eb41f1136d4d4fd10f76f26ed695d3764ae7a9478b1b38bd753b44b453b9da2bd2215e02770ef1d5f01811aeb9e40
-  data.tar.gz: 8d9cb531a9adbf9607f5d116940817ca6488fc7dfc4eecb18ea98fb945ec2fe129dba1c1111213286d77f367a128d34e318201dfe69cc649756fdc113a26732c
+  metadata.gz: '051840ed1ffacbb132573e80c9c50c46fd6f513ffa656f98a3a02e069ce8e33642c41b6173822c76637da10045e42e27a4c841a1d8845d4e88a96d671a4a5d9b'
+  data.tar.gz: 2a0d66f7b39c840d2ecf714c7b4d279c202423b009405b003451586154b31fa75494fd893a122c97b096380fe9597ba80ecf3e59dee7ac4dc84b6dac1030d636

data/empty_view.tgz CHANGED Viewed

Binary file

data/lib/global.rb CHANGED Viewed

@@ -30,6 +30,19 @@ def make_exception(sym, str)
   end
 end
+  def system!(str)
+    log!(enter: __method__, args: [str])
+    rc = system(str)
+    if rc
+      return rc
+    else
+      STDERR.puts "FAILED: #{str.inspect}"
+      STDERR.puts "\ncaller = \n#{caller.join("\n  ")}\n"
+      return rc
+    end
+    rc
+  end
 def prefix(num)
   log!(enter: __method__, args: [num])
   "#{'%04d' % num.to_i}"

data/lib/helpers-blog.rb CHANGED Viewed

@@ -8,14 +8,14 @@ module RuneBlog::Helpers
   def copy(src, dst)
     log!(enter: __method__, args: [src, dst])
     cmd = "cp #{src} #{dst} 2>/dev/null"
-    rc = system(cmd)
+    rc = system!(cmd)
     puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
   end
   def copy!(src, dst)
     log!(enter: __method__, args: [src, dst])
     cmd = "cp -r #{src} #{dst} 2>/dev/null"
-    rc = system(cmd)
+    rc = system!(cmd)
     puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
   end
@@ -133,7 +133,7 @@ end
       dir = dir.to_s  # symbols allowed
       next if Dir.exist?(dir)
       cmd = "mkdir -p #{dir} >/dev/null"
-      result = system(cmd)
+      result = system!(cmd)
       raise CantCreateDir(dir) unless result
     end
   end

data/lib/helpers-repl.rb CHANGED Viewed

@@ -197,7 +197,7 @@ module RuneBlog::REPL
     @title = grep.sub(/^.title /, "")
     @slug = @blog.make_slug(@title) # import (not impl)
     @fname = @slug + ".lt3"
-    result = system("cp #{name} #@root/drafts/#@fname")
+    result = system!("cp #{name} #@root/drafts/#@fname")
     raise CantCopy(name, "#@root/drafts/#@fname") unless result
     edit_initial_post(@fname)

data/lib/liveblog.rb CHANGED Viewed

@@ -525,8 +525,14 @@ end
 # helper methods
 ##################
-def _html_body(file)
-  file.puts "<html>\n  <body>"
+def _html_body(file, css = nil)
+  file.puts "<html>"
+  if css
+    file.puts "    <head>"
+    file.puts "        <style>\n#{css}\n          </style>"
+    file.puts "    </head>"
+  end
+  file.puts "  <body>"
   yield
   file.puts "  </body>\n</html>"
 end
@@ -607,7 +613,8 @@ def _write_main(mainfile, pairs, card_title, tag)
           when ["no", true]               # CAN'T iframe, local file (possible?)
             url_ref = _blank(file)
         end
-        f.puts %[<a style="text-decoration: none; font-size: 24px" #{url_ref}>#{title}</a> <br>]
+        css = "color: #8888FF; text-decoration: none; font-size: 24px; font-family: verdana"
+        f.puts %[<a style="#{css}" #{url_ref}>#{title}</a> <br>]
       end
     end
   end

data/lib/post.rb CHANGED Viewed

@@ -93,7 +93,7 @@ class RuneBlog::Post
   def edit
     log!(enter: __method__)
     verify(File.exist?(@draft) => "File #{@draft} not found")
-    result = system("vi #@draft +8")  # TODO improve this
+    result = system!("vi #@draft +8")  # TODO improve this
     raise EditorProblem(draft) unless result
     nil
   rescue => err
@@ -136,7 +136,7 @@ class RuneBlog::ViewPost
     vdir = @root/:views/view
     dir = vdir/:posts/noext + "/"
     Dir.mkdir(dir) unless Dir.exist?(dir)
-    system("cp #{draft} #{dir}")
+    system!("cp #{draft} #{dir}")
     viewdir, slugdir, aslug = vdir, dir, noext[5..-1]
     theme = viewdir/:themes/:standard
     [noext, viewdir, slugdir, aslug, theme]

data/lib/repl.rb CHANGED Viewed

@@ -9,7 +9,7 @@ make_exception(:EditorProblem, "Could not edit $1")
 module RuneBlog::REPL
   def edit_file(file)
-    result = system("#{@blog.editor} #{file}")
+    result = system!("#{@blog.editor} #{file}")
     raise EditorProblem(file) unless result
     sleep 0.1
     STDSCR.clear
@@ -18,7 +18,7 @@ module RuneBlog::REPL
   def cmd_quit(arg, testing = false)
     check_empty(arg)
     RubyText.stop
-    system("tput clear")
+    system!("tput clear")
     exit
   end
@@ -66,7 +66,7 @@ module RuneBlog::REPL
   def cmd_import(arg, testing = false)
     check_empty(arg)
     files = ask("\n  File(s) = ")
-    system("cp #{files} #{@blog.root}/views/#{@blog.view.name}/assets/")
+    system!("cp #{files} #{@blog.root}/views/#{@blog.view.name}/assets/")
   end
   def cmd_browse(arg, testing = false)
@@ -78,7 +78,7 @@ module RuneBlog::REPL
       puts "\n  Publish first."
       return @out
     end
-    result = system("open '#{url}'")
+    result = system!("open '#{url}'")
     raise CantOpen(url) unless result
     return @out
   end
@@ -87,7 +87,7 @@ module RuneBlog::REPL
     reset_output
     check_empty(arg)
     local = @blog.view.local_index
-    result = system("open #{local}")
+    result = system!("open #{local}")
     raise CantOpen(local) unless result
     @out
   end
@@ -334,7 +334,7 @@ module RuneBlog::REPL
   def cmd_ssh(arg, testing = false)
     pub = @blog.view.publisher
-    system("ssh #{pub.user}@#{pub.server}")
+    system!("ssh #{pub.user}@#{pub.server}")
   end
   def cmd_INVALID(arg, testing = false)

data/lib/runeblog.rb CHANGED Viewed

@@ -61,7 +61,7 @@ class RuneBlog
     raise BlogRepoAlreadyExists if Dir.exist?(root)
     create_dirs(root)
     Dir.chdir(root) do
-      system("cp #{RuneBlog::Path}/../empty_view.tgz .")
+      system!("cp #{RuneBlog::Path}/../empty_view.tgz .")
       create_dirs(:drafts, :views, :posts)
       new_sequence
     end
@@ -107,7 +107,7 @@ class RuneBlog
 #     views = File.readlines("metadata.txt").grep(/^views: /).first[7..-1].split
       views = _retrieve_metadata(:views)
 STDERR.puts "---- deploy: views = #{views.inspect}"
-      views.each {|v| system("cp *html #@root/views/#{v}/remote") }
+      views.each {|v| system!("cp *html #@root/views/#{v}/remote") }
     end
   end
@@ -249,8 +249,8 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     Dir.chdir(@root) do
       cmd1 = "tar zxvf empty_view.tgz >/dev/null 2>&1"
       cmd2 = "cp -r empty_view views/#{view_name}"
-      system(cmd1)
-      system(cmd2)
+      system!(cmd1)
+      system!(cmd2)
     end
   end
@@ -280,7 +280,7 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     raise ArgumentError unless name.is_a?(String) && ! name.empty?
     if force
       vname = @root/:views/name
-      system("rm -rf #{vname}")
+      system!("rm -rf #{vname}")
       @views -= [str2view(name)]
     end
   end
@@ -313,15 +313,16 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     id = slug.to_i
     text = nil
     post_entry_name = @theme/"blog/post_entry.lt3"
-    @_post_entry ||= File.read(post_entry_name)
+    xlate src: post_entry_name, dst: "/tmp/post_entry.html", debug: true
+    @_post_entry ||= File.read("/tmp/post_entry.html")
     vp = post_lookup(id)
     nslug, aslug, title, date, teaser_text =
       vp.nslug, vp.aslug, vp.title, vp.date, vp.teaser_text
     path = vp.path
     url = aslug + ".html"
-      date = ::Date.parse(date)
-      date = date.strftime("%B %e<br>%Y")
-      text = interpolate(@_post_entry, binding)
+    date = ::Date.parse(date)
+    date = date.strftime("%B %e<br>%Y")
+    text = interpolate(@_post_entry, binding)
     text
   end
@@ -370,7 +371,7 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     log!(enter: __method__, args: [file, testing])
     debug "=== edit_initial_post #{file.inspect}  => #{sourcefile}"
     sourcefile = @root/:drafts/file
-    result = system("#@editor #{sourcefile} +8") unless testing
+    result = system!("#@editor #{sourcefile} +8") unless testing
     raise EditorProblem(sourcefile) unless result
     process_post(sourcefile)
     nil
@@ -435,7 +436,7 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     vdir = @root/:views/view
     dir = vdir/:posts/noext
     Dir.mkdir(dir) unless Dir.exist?(dir)
-    system("cp #{draft} #{dir}")
+    system!("cp #{draft} #{dir}")
     viewdir, slugdir, aslug = vdir, dir, noext[5..-1]
     theme = viewdir/:themes/:standard
     [noext, viewdir, slugdir, aslug, theme]
@@ -446,8 +447,8 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     Dir.chdir(pdraft) do
       excerpt = File.read("teaser.txt")
       title = _retrieve_metadata(:title)
-      vars = %[.set title="#{title.chomp}"\n] +
-             %[.set teaser="#{excerpt.chomp}"]
+      vars = %[.heredoc title\n"#{title.chomp}"\n.end\n] +
+             %[.heredoc teaser\n"#{excerpt.chomp}"\n.end\n]
       File.open(pdraft/"vars.lt3", "w") {|f| f.puts vars }
     end
   end
@@ -464,7 +465,7 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
       create_dirs(rem)
       files = Dir[w/"*"]
       next unless files.any? {|x| x =~ /html$/ }
-      system("cp #{w}/*html #{rem}")
+      system!("cp #{w}/*html #{rem}")
     end
   end
@@ -557,7 +558,7 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     dest = list.map {|f| f.sub(/(?<num>\d{4}-)/, "_\\k<num>") }
     list.each.with_index do |src, i|
       cmd = "mv #{src} #{dest[i]} 2>/dev/null"
-      system(cmd)
+      system!(cmd)
     end
     # FIXME - update index/etc
     true
@@ -573,7 +574,7 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     dest = list.map {|f| f.sub(/_(?<num>\d{4}-)/, "\\k<num>") }
     list.each.with_index do |src, i|
       cmd = "mv #{src} #{dest[i]} 2>/dev/null"
-      system(cmd)
+      system!(cmd)
     end
     # FIXME - update index/etc
     true
@@ -583,7 +584,7 @@ STDERR.puts "--- retrieve:  key = #{key.inspect}"
     log!(enter: __method__, args: [num])
     raise ArgumentError unless num.is_a?(Integer)
     tag = prefix(num)
-    system("rm -rf #@root/drafts/#{tag}-*")
+    system!("rm -rf #@root/drafts/#{tag}-*")
   end
   def make_slug(meta)

data/lib/runeblog_version.rb CHANGED Viewed

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

data/lib/xlate.rb CHANGED Viewed

@@ -29,9 +29,9 @@ LEXT = ".lt3"
         STDERR.puts "#{indent} -- ^ Already up to date!" if debug
         return
       end
-      rc = system("livetext #{src} >#{dst}")
+      rc = system!("livetext #{src} >#{dst}")
       STDERR.puts "...completed (shell returned #{rc})" if debug
-      system("cp #{dst} #{copy}") if copy
+      system!("cp #{dst} #{copy}") if copy
     end
   end

data/runeblog.gemspec CHANGED Viewed

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

data/test/make_blog.rb CHANGED Viewed

@@ -10,21 +10,29 @@ require 'global'
 require 'runeblog'
 require 'repl'
+def bold(str)
+  "\e[1m#{str}\e[0m"
+end
 def getch
 # sleep 5
 end
 def debug(str = "")
-  STDERR.puts "#{Time.now.strftime("%H:%M:%S")} #{str}"
+  t = Time.now
+  time = t.to_f.to_s
+  n = time.index(".")
+  msec = time[n..-1]
+  time = t.strftime("%H:%M:%S") + msec
+  STDERR.puts "#{'%-16s' % time}  #{str}"
 end
 def make_post(x, title, teaser, body, views=[])
-  debug "     make_post '#{title}'"
-# print "."
+  debug "      make_post #{bold(title)}"
   x.create_new_post(title, true, teaser: teaser, body: body, other_views: views)
   views.each do |view|
     debug
-    debug "** generate_index #{view}"
+    debug "** generate_index #{bold(view)}"
     x.generate_index(view)
   end  # recent.html
 end
@@ -44,21 +52,16 @@ system("rm -rf .blogs")
 RuneBlog.create_new_blog_repo(".blogs")
 x = RuneBlog.new(".blogs")
-debug("create_view: around_austin")
+debug("create_view: #{bold('around_austin')}")
 x.create_view("around_austin")   # FIXME remember view title!
-# Hack:
-if File.exist?("publish")
-  system("cp publish .blogs/views/around_austin/publish")
-end
-debug("create_view: computing")
+debug("create_view: #{bold('computing')}")
 x.create_view("computing")
-debug("create_view: music")
+debug("create_view: #{bold('music')}")
 x.create_view("music")
-debug("-- change_view: around_austin")
+debug("-- change_view: #{bold('around_austin')}")
 x.change_view("around_austin")    # 1 2 7 8 9
 make_post(x, "What's at Stubbs...", <<-EXCERPT, <<-BODY, ["music"])
@@ -73,7 +76,7 @@ EXCERPT
 Now, depending on what you consider "major," blah blah blah...
 BODY
-debug("-- change_view: computing")
+debug("-- change_view: #{bold('computing')}")
 x.change_view("computing")     # 3 5 6
 make_post(x, "Elixir Conf coming up...", <<-EXCERPT, <<-BODY)
@@ -83,7 +86,7 @@ I mean, unless the previous one was the last one ever, which I don't expect to
 happen for a couple of decades.
 BODY
-debug("-- change_view: music")
+debug("-- change_view: #{bold('music')}")
 x.change_view("music")    # 4 10
 make_post(x, "Does indie still matter?", <<-EXCERPT, <<-BODY)
@@ -92,7 +95,7 @@ EXCERPT
 And more about indie music.
 BODY
-debug("-- change_view: computing")
+debug("-- change_view: #{bold('computing')}")
 x.change_view("computing")
 make_post(x, "The genius of Scenic", <<-EXCERPT, <<-BODY)
@@ -107,11 +110,11 @@ EXCERPT
 But that day hasn't come yet.
 BODY
-debug("-- change_view: around_austin")
+debug("-- change_view: #{bold('around_austin')}")
 x.change_view("around_austin")
 make_post(x, "The graffiti wall", <<-EXCERPT, <<-BODY)
-RIP Hope Gallery
+RIP, Hope Gallery
 EXCERPT
 It's been a while since I was there. They say it was torn down
 while I wasn't looking.
@@ -124,12 +127,12 @@ 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
-debug("-- change_view: music")
+debug("-- change_view: #{bold('music')}")
 x.change_view("music")
 make_post(x, "Remember Modest Mouse?", <<-EXCERPT, <<-BODY, ["around_austin"])
@@ -140,7 +143,7 @@ in 2005.
 BODY
 debug
-debug("** generate_view: around_austin")
+debug("** generate_view: #{bold('around_austin')}")
 x.generate_view("around_austin")
 debug

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.25
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2019-10-11 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.93
+        version: 0.8.94
   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.93
+        version: 0.8.94
 - !ruby/object:Gem::Dependency
   name: rubytext
   requirement: !ruby/object:Gem::Requirement