runeblog 0.2.70 → 0.2.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0d49c8d62c0c29650322fcff89f90294b364bd631ab2c678e6fe79a5db478c3
-  data.tar.gz: e6c772a8d7cdb0a5032fee2a3ed09179a1eb6acc60278c443e40b96e8cb8d7f2
+  metadata.gz: a760647775e3857ec07a63defdbb5a32a9d9ff2120b3f53b3c13d46ad37defb2
+  data.tar.gz: 27114990eebf8a5221beef06396f86e0e744e2f1df8323b803a874157fdf4da1
 SHA512:
-  metadata.gz: ecaacf45f6a89e49204df2ca539f17bd1635cf9cd346d2212c73de6e35aa459cbde02dfb6a1376b491e9290730af11e962e7f5c120b4d7f23cc8aa36f2a08fe9
-  data.tar.gz: c14a8482023fa93f8efa06d1f728f8d314028176f1ea003191a547a5795338fc6e4c4e232d0109e165dadf0ce50c329847d166e83d1dadba4d8d9d15f4680120
+  metadata.gz: 209520abd4238593d2e21e3d5ac253b4074836ed96c88cc4b994d4fc8010ddb5f0dd29f86c4a53586f06da68a0cb75d3091610c81c311482326507072a7754dc
+  data.tar.gz: a93b099787b73569dcfa1fe8b2dd9d55cada404333586238ed9c749007d2ced9898740e2c3f5ff6cc810a3290d68d40df88a0989902752bf8666b097d1e544ae

data/bin/blog

@@ -94,7 +94,7 @@ STDERR.reopen(errfile)
 
 # read a .rubytext file here?? Call it something else?
 home = ENV['HOME']
-@fg, @bg = try_read_config("#{home}/.rubytext", fg: Blue, bg: White)
+@fg, @bg = Blue, White   ##  FIXME!! try_read_config("#{home}/.rubytext", fg: Blue, bg: White)
 @fg = @fg.downcase.to_sym
 @bg = @bg.downcase.to_sym
 

data/lib/helpers-blog.rb

@@ -1,7 +1,7 @@
 require 'runeblog_version'
 require 'fileutils'
 
-require 'pathmagic'
+#require 'pathmagic'
 require 'xlate'
 
 module RuneBlog::Helpers
@@ -32,7 +32,7 @@ module RuneBlog::Helpers
     log!(enter: __method__, level: 3)
     @editor = File.read("data/EDITOR").chomp
     @current_view = File.read("data/VIEW").chomp
-    @root = File.read("data/EDITOR").chomp
+    @root = File.read(".blogs/data/ROOT").chomp
   rescue => err
     puts "Can't read config: #{err}"
     puts err.backtrace.join("\n")

data/lib/liveblog.rb

@@ -4,14 +4,14 @@ require 'date'
 require 'find'
 
 require 'runeblog'
-require 'pathmagic'
+# require 'pathmagic'
 require 'xlate'
 
 
 def init_liveblog    # FIXME - a lot of this logic sucks
   here = Dir.pwd
   dir = here
-  loop { dir = Dir.pwd; break if File.exist?("data/ROOT"); Dir.chdir("..") }
+# loop { dir = Dir.pwd; break if File.exist?("data/ROOT"); Dir.chdir("..") }
   Dir.chdir(here)     #  here??? or dir??
   @blog = RuneBlog.new(dir)
   @root = @blog.root
@@ -443,10 +443,14 @@ rescue => err
 end
 
 def write_post
+STDERR.puts :wp1
   raise "'post' was not called" unless @meta
+STDERR.puts :wp2
   @meta.views = @meta.views.join(" ") if @meta.views.is_a? Array
   @meta.tags  = @meta.tags.join(" ") if @meta.tags.is_a? Array
+STDERR.puts :wp3
   _write_metadata
+STDERR.puts :wp4
 rescue => err
   puts "err = #{err}"
   puts err.backtrace.join("\n")
@@ -467,13 +471,19 @@ def teaser
 end
 
 def finalize
+STDERR.puts :final1
   return unless @meta
+STDERR.puts :final2
   return @meta if @blog.nil?
+STDERR.puts :final3
 
   @slug = @blog.make_slug(@meta)
+STDERR.puts :final4
   slug_dir = @slug
   @postdir = @blog.view.dir/:posts/slug_dir
+STDERR.puts :final5
   write_post
+STDERR.puts :final6
   @meta
 end
  

data/lib/post.rb

@@ -1,6 +1,6 @@
 require 'runeblog'
 require 'global'
-require 'pathmagic'
+# require 'pathmagic'
 
 class RuneBlog::Post
 
@@ -42,7 +42,9 @@ puts "-- load: opening #{pdir}"
     fname2 = "metadata.txt"
     hash = meta.to_h
 
+p :wmd1
     File.write("teaser.txt", hash[:teaser])
+p :wmd2
     hash.delete(:teaser)
     hash.delete(:body)
 
@@ -106,9 +108,14 @@ puts "-- load: opening #{pdir}"
   def build
     log!(enter: __method__)
     post = self
+p :bld1
     views = post.meta.views
+p :bld2
     text = File.read(@draft)
+p :bld3
+p @draft
     @blog.generate_post(@draft)
+p :bld4
   end
 end
 

data/lib/runeblog.rb

@@ -12,7 +12,7 @@ require 'view'
 require 'publish'
 require 'post'
 
-require 'pathmagic'
+# require 'pathmagic'
 
 ###
 
@@ -64,6 +64,7 @@ class RuneBlog
     Dir.chdir(root) do
       create_dirs(:data, :drafts, :views, :posts)
       copy_data(:config, "./data/")
+      File.write("data/ROOT", Dir.pwd + "\n")
       new_sequence
     end
     @blog = self.new(root)
@@ -90,10 +91,12 @@ class RuneBlog
 
     @root = root_dir
     read_config
-    md = Dir.pwd.match(%r[.*/views/(.*?)/])
-    @view_name = md[1] if md
     @views = get_views
-    @view = str2view(@view_name)
+    md = Dir.pwd.match(%r[.*/views/(.*?)/])
+    if md
+      @view_name = md[1] 
+      @view = str2view(@view_name)
+    end
     @sequence = get_sequence
     @post_views = []
     @post_tags = []
@@ -373,7 +376,7 @@ class RuneBlog
       text << entry
     end
     text << "</body></html>"
-    File.write(@vdir/:remote/file, text)
+    File.write(@vdir/:remote/file, text + "\n")
     return posts.size
   rescue => err
     _tmp_error(err)
@@ -385,10 +388,15 @@ class RuneBlog
     meta = nil
     views = views + [self.view.to_s]
     views.uniq!
+p :cnp1
     Dir.chdir(@root/"posts") do
+p :cnp2
       post = Post.create(title: title, teaser: teaser, body: body, pubdate: pubdate, views: views)
+p :cnp3
       post.edit unless testing
+p :cnp4
       post.build
+p :cnp5
       meta = post.meta
     end
     return meta.num
@@ -416,7 +424,7 @@ class RuneBlog
     log!(enter: __method__, args: [view], level: 3)
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     x = OpenStruct.new
-    File.write(@root/"data/VIEW", view.to_s)
+    File.write(@root/"data/VIEW", view.to_s + "\n")
     self.view = view   # error checking?
   end
 
@@ -479,16 +487,24 @@ class RuneBlog
   def _post_metadata(draft, pdraft)
     log!(enter: __method__, args: [draft, pdraft], level: 2)
     # FIXME store this somewhere
+p :pm1
     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
     pnum = nslug[0..3]                 # 0001
+p :pm2
     Dir.chdir(pdraft) do 
+p :pm3
       excerpt = File.read("teaser.txt")
+p :pm4
       date = _retrieve_metadata(:date)
+p :pm5
       longdate = ::Date.parse(date).strftime("%B %e, %Y")
+p :pm6
       title = _retrieve_metadata(:title)
+p :pm7
       tags = _retrieve_metadata(:tags)
+p :pm8
       # FIXME simplify
       vars = <<~LIVE
         .set post.num = #{pnum}
@@ -508,7 +524,9 @@ class RuneBlog
         #{longdate}
         .end
       LIVE
+p :pm9
       File.open(pdraft/"vars.lt3", "w") {|f| f.puts vars }
+p :pma
     end
   rescue => err
     _tmp_error(err)
@@ -544,39 +562,54 @@ class RuneBlog
     pdraft = @root/:posts/nslug
     remote = @root/:views/view_name/:remote
     @theme = @root/:views/view_name/:themes/:standard
+p :hp1
     # Step 1...
     create_dirs(pdraft)
+p :hp2
     # FIXME dependencies?
     xlate cwd: pdraft, src: draft, dst: "guts.html"  # , debug: true
+p :hp3
     _post_metadata(draft, pdraft)
+p :hp4
     # Step 2...
     vposts = @root/:views/view_name/:posts
     copy!(pdraft, vposts)    # ??
+p :hp5
     # Step 3..
     copy(pdraft/"guts.html", @theme/:post) 
     copy(pdraft/"vars.lt3",  @theme/:post) 
+p :hp5
     # Step 4...
     # FIXME dependencies?
     xlate cwd: @theme/:post, src: "generate.lt3", force: true, 
           dst: remote/ahtml, copy: @theme/:post    # , debug: true
+p :hp7
     # FIXME dependencies?
     xlate cwd: @theme/:post, src: "permalink.lt3", 
           dst: remote/:permalink/ahtml  # , debug: true
+p :hp8
     copy_widget_html(view_name)
+p :hp9
   rescue => err
     _tmp_error(err)
   end
 
   def generate_post(draft)
     log!(enter: __method__, args: [draft], level: 1)
+p :gp1
     views = _get_views(draft)
+p :gp2
     views.each do |view| 
+p :gp3
       unless self.view?(view)
         puts "Warning: '#{view}' is not a view"
         next
       end
+p :gp4
       _handle_post(draft, view)
+p :gp5
     end
+p :gp6
   rescue => err
     _tmp_error(err)
   end

data/lib/runeblog_version.rb

@@ -1,8 +1,10 @@
 
+require 'pathmagic'
+
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.70"
+  VERSION = "0.2.71"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/test/austin.rb

@@ -85,66 +85,66 @@ EXCERPT
 That's a good thing. But their music isn't always the greatest.
 BODY
 
-make_post(x, "The new amphitheatre is overrated", <<-EXCERPT, <<-BODY)
-It used to be that all major concerts played the Erwin Center.
-EXCERPT
-.pin around_austin
-Now, depending on what you consider "major," blah blah blah...
-BODY
-
-make_post(x, "The graffiti wall", <<-EXCERPT, <<-BODY)
-RIP, Hope Gallery
-EXCERPT
-
-.dropcap It's been a while since I was there. They say it was torn down
-while I wasn't looking. Never tagged anything there, of course, nor
-anywhere else. Spraypainting public places isn't my thing, but in this
-case I condoned it because it was sort of there for that purpose.
-
-This fake entry is a long one so as to demonstrate both drop-caps
-(above) and an inset quote. Blah blah blah. Lorem ipsum dolor and
-a partridge in a pear tree.
-
-.inset left 20
-Wherever you go, there you are. Last night I saw upon the stair
-a little man who was not there. He wasn't there again today; I
-wish, I wish he'd go away.  As far as we know, our computer has 
-never had an undetected error.  
-|On a clean disk, you can seek forever.
-And never let it be denied that 
-pobbles are happier without their toes. And may your snark never 
-be a boojum. How do you know you aren't dreaming right now? When
-you see a butterfly, think of Chuang Tzu.
-.end
-
-Contact light. Houston, this is Tranquility Base. The Eagle has
-landed. That's one small step for (a) man, one giant leap for 
-mankind.
-
-Here's the PDF of $$link["Ruby for the Old-Time C Programmer"|http://rubyhacker.com/blog2/rubydino.pdf]
-
-Pity this busy monster, manunkind, not. Pity rather... Listen:
-There's a hell of a universe next door; let's go.
-BODY
-
-make_post(x, "The Waller Creek project", <<-EXCERPT, <<-BODY)
-Will it ever be finished?
-EXCERPT
-Blah blah Waller Creek blah blah...
-BODY
-
-make_post(x, "Life on Sabine Street", <<-EXCERPT, <<-BODY)
-It's like Pooh Corner, except not.
-EXCERPT
-This is about Sabine St, blah blah lorem ipsum dolor...
-BODY
-
-make_post(x, "Remember Modest Mouse?", <<-EXCERPT, <<-BODY)
-They date to the 90s or before. 
-EXCERPT
-But I first heard of them
-in 2005.
-BODY
+# make_post(x, "The new amphitheatre is overrated", <<-EXCERPT, <<-BODY)
+# It used to be that all major concerts played the Erwin Center.
+# EXCERPT
+# .pin around_austin
+# Now, depending on what you consider "major," blah blah blah...
+# BODY
+# 
+# make_post(x, "The graffiti wall", <<-EXCERPT, <<-BODY)
+# RIP, Hope Gallery
+# EXCERPT
+# 
+# .dropcap It's been a while since I was there. They say it was torn down
+# while I wasn't looking. Never tagged anything there, of course, nor
+# anywhere else. Spraypainting public places isn't my thing, but in this
+# case I condoned it because it was sort of there for that purpose.
+# 
+# This fake entry is a long one so as to demonstrate both drop-caps
+# (above) and an inset quote. Blah blah blah. Lorem ipsum dolor and
+# a partridge in a pear tree.
+# 
+# .inset left 20
+# Wherever you go, there you are. Last night I saw upon the stair
+# a little man who was not there. He wasn't there again today; I
+# wish, I wish he'd go away.  As far as we know, our computer has 
+# never had an undetected error.  
+# |On a clean disk, you can seek forever.
+# And never let it be denied that 
+# pobbles are happier without their toes. And may your snark never 
+# be a boojum. How do you know you aren't dreaming right now? When
+# you see a butterfly, think of Chuang Tzu.
+# .end
+# 
+# Contact light. Houston, this is Tranquility Base. The Eagle has
+# landed. That's one small step for (a) man, one giant leap for 
+# mankind.
+# 
+# Here's the PDF of $$link["Ruby for the Old-Time C Programmer"|http://rubyhacker.com/blog2/rubydino.pdf]
+# 
+# Pity this busy monster, manunkind, not. Pity rather... Listen:
+# There's a hell of a universe next door; let's go.
+# BODY
+# 
+# make_post(x, "The Waller Creek project", <<-EXCERPT, <<-BODY)
+# Will it ever be finished?
+# EXCERPT
+# Blah blah Waller Creek blah blah...
+# BODY
+# 
+# make_post(x, "Life on Sabine Street", <<-EXCERPT, <<-BODY)
+# It's like Pooh Corner, except not.
+# EXCERPT
+# This is about Sabine St, blah blah lorem ipsum dolor...
+# BODY
+# 
+# make_post(x, "Remember Modest Mouse?", <<-EXCERPT, <<-BODY)
+# They date to the 90s or before. 
+# EXCERPT
+# But I first heard of them
+# in 2005.
+# BODY
 
 debug
 debug "** generate_index #{bold("around_austin")}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.70
+  version: 0.2.71
 platform: ruby
 authors:
 - Hal Fulton
@@ -77,7 +77,7 @@ files:
 - bin/blog
 - bin/mkwidget
 - data/EDITOR
-- data/ROOT
+- data/ROOT.txt
 - data/VIEW
 - empty_view/assets/austin-pano.jpg
 - empty_view/assets/sky2.jpg