runeblog 0.2.72 → 0.2.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a248b5068862971d08b4a7bf8ee2a9d28e243134e1447821de1c6f34144a614a
-  data.tar.gz: 289722c7383bd6940581277fe6b729c63c5de819702deaa59388811f7969d5f1
+  metadata.gz: 0afccf0c622078eba670e387c4fec271552c9b2d289c25b1f325a266d94da6c7
+  data.tar.gz: 3cea7d0e10b8e393d2845b10c4d466f54bbfc92f1ea326eec4ee42ad8fba3927
 SHA512:
-  metadata.gz: 3ebed576737715de06b58a472974f31f078de11dc98126fb55207b7fe7931095031216185676e116815d4d102cd83e3a8fd06e78622cd5894cbd29419133436d
-  data.tar.gz: 3dabb68f2519418c09a64e916bb3fee96afac35e1d8e89aab56386e3a204460621f9d60fd96fe8eaa2bf2497f7417615b099cf1147557224e6560f475341174e
+  metadata.gz: e69baf6404c61da8028502b554008a663ec405c359707d9a33f103dd47f17b0e9a00482f09a32cb2e52c5457fe9904177db067b2592b7021ef1ddf0a5c15b698
+  data.tar.gz: d6942079ebdcb48d948b938bf06377caa55eabe7ea3b4de6566ed0586b83920e6c51fee272d7e35e38cb7f00e812a20cc3b0a2c66252ca03e66bcf6cc5df9337

data/lib/helpers-blog.rb

@@ -1,7 +1,6 @@
 require 'runeblog_version'
 require 'fileutils'
 
-#require 'pathmagic'
 require 'xlate'
 
 module RuneBlog::Helpers
@@ -20,38 +19,85 @@ module RuneBlog::Helpers
     puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
   end
 
+  def get_repo_config
+    log!(enter: __method__, level: 3)
+    @editor = File.read(".blogs/data/EDITOR").chomp
+    @current_view = File.read(".blogs/data/VIEW").chomp
+    @root = File.read(".blogs/data/ROOT").chomp
+  rescue => err
+    puts "Can't read config: #{err}"
+    puts err.backtrace.join("\n")
+    puts "dir = #{Dir.pwd}"
+  end
+
   def copy_data(tag, dest)
-    data = RuneBlog::Path/"../data"  # files kept inside gem
+    data = RuneBlog::Path + "/../data"  # files kept inside gem
     case tag
       when :config; files = %w[ROOT VIEW EDITOR]
     end
-    files.each {|file| copy(data/file, dest) }
+    files.each {|file| copy(data + "/" + file, dest) }
   end
 
-  def read_config
-    log!(enter: __method__, level: 3)
-    @editor = File.read("data/EDITOR").chomp
-    @current_view = File.read("data/VIEW").chomp
-    @root = File.read(".blogs/data/ROOT").chomp
+  def read_config(file, *syms)
+    log!(enter: __method__, args: [file, *syms], level: 3)
+    lines = File.readlines(file).map(&:chomp)
+    obj = ::OpenStruct.new
+    lines.each do |line|
+      next if line == "\n" || line[0] == "#"
+      key, val = line.split(/: +/, 2)
+      obj.send(key+"=", val)
+    end
+    return obj if syms.empty?
+
+    vals = []
+    if syms.empty?
+      vals = obj.to_hash.values
+    else
+      syms.each {|sym| vals << obj.send(sym) }
+    end
+    return vals
   rescue => err
-    puts "Can't read config: #{err}"
+    puts "Can't read config file '#{file}': #{err}"
     puts err.backtrace.join("\n")
     puts "dir = #{Dir.pwd}"
     exit
   end
 
+  def try_read_config(file, hash)
+    log!(enter: __method__, args: [file, hash], level: 3)
+    return hash.values unless File.exist?(file)
+    vals = read_config(file, *hash.keys)
+    vals
+  end
+
+  def write_config(obj, file)
+    log!(enter: __method__, args: [obj, file], level: 2)
+    hash = obj.to_h
+    File.open(file, "w") do |out|
+      hash.each_pair {|key, val| out.puts "#{key}: #{val}" }
+    end
+  end
+
   def get_views   # read from filesystem
     log!(enter: __method__, level: 3)
-    dirs = subdirs("#@root/views/").sort
+    dirs = subdirs("#@root + "/" + views/").sort
     dirs.map {|name| RuneBlog::View.new(name) }
   end
 
+  def write_repo_config(root: "#{Dir.pwd}/.blogs", view: "#{root}/data/VIEW", editor: "#{root}/data/EDITOR")
+p root
+    File.write(root + "/data/ROOT",   root + "\n")
+    File.write(root + "/data/VIEW",   view.to_s + "\n")
+    File.write(root + "/data/EDITOR", editor + "\n")
+  end
+
   def new_dotfile(root: ".blogs", current_view: "test_view", editor: "vi")
     log!(enter: __method__, args: [root, current_view, editor], level: 3)
-    root = Dir.pwd/root
+    root = Dir.pwd + "/" + root
     x = OpenStruct.new
     x.root, x.current_view, x.editor = root, current_view, editor
-    write_config(x, root/RuneBlog::ConfigFile)
+    write_config(x, root + "/" + RuneBlog::ConfigFile)
+    write_repo_config
   end
 
   def new_sequence

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?("config"); Dir.chdir("..") }
   Dir.chdir(here)     #  here??? or dir??
   @blog = RuneBlog.new(dir)
   @root = @blog.root
@@ -443,14 +443,10 @@ 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")
@@ -471,19 +467,13 @@ 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,9 +42,7 @@ 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)
 
@@ -108,14 +106,9 @@ p :wmd2
   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,13 +12,14 @@ require 'view'
 require 'publish'
 require 'post'
 
-# require 'pathmagic'
+require 'pathmagic'
 
 ###
 
 class RuneBlog
  
   DotDir     = ".blogs"
+  ConfigFile = "config"
   Themes     = RuneBlog::Path/"../themes"
 
   make_exception(:FileNotFound,          "File $1 was not found")
@@ -56,17 +57,18 @@ class RuneBlog
     log!(enter: __method__, args: [root])
     raise ArgumentError unless root.is_a?(String) && ! root.empty?
     root_dir = Dir.pwd/root
-    # Crude - FIXME later -  # What views are there? Publishing, etc.
     self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     root = Dir.pwd/root
     raise BlogRepoAlreadyExists if Dir.exist?(root)
     create_dirs(root)
     Dir.chdir(root) do
-      create_dirs(:data, :drafts, :views, :posts)
-      copy_data(:config, "./data/")
-      File.write("data/ROOT", Dir.pwd + "\n")
+      create_dirs(:drafts, :views, :posts)
       new_sequence
     end
+    x = OpenStruct.new
+    x.root, x.current_view, x.editor = root, "test_view", "/usr/bin/vim "   # dumb - FIXME later
+    write_config(x, root/ConfigFile)
+    write_repo_config
     @blog = self.new(root)
     @blog
   rescue => err
@@ -90,13 +92,16 @@ class RuneBlog
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
 
     @root = root_dir
-    read_config
-    @views = get_views
+    file = @root/ConfigFile
+    errmsg = "No config file! file = #{file.inspect}  dir = #{Dir.pwd}" 
+    raise errmsg unless File.exist?(file)
+
+    get_repo_config
+    @root, @view_name, @editor = read_config(file, :root, :current_view, :editor)
     md = Dir.pwd.match(%r[.*/views/(.*?)/])
-    if md
-      @view_name = md[1] 
-      @view = str2view(@view_name)
-    end
+    @view_name = md[1] if md
+    @views = get_views
+    @view = str2view(@view_name)
     @sequence = get_sequence
     @post_views = []
     @post_tags = []
@@ -193,7 +198,6 @@ class RuneBlog
 
   def view=(arg)
     log!(enter: __method__, args: [arg], level: 2)
-    # FIXME should write VIEW file?
     case arg
       when RuneBlog::View
         @view = arg
@@ -376,7 +380,7 @@ class RuneBlog
       text << entry
     end
     text << "</body></html>"
-    File.write(@vdir/:remote/file, text + "\n")
+    File.write(@vdir/:remote/file, text)
     return posts.size
   rescue => err
     _tmp_error(err)
@@ -388,15 +392,10 @@ 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
@@ -424,7 +423,9 @@ p :cnp5
     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 + "\n")
+    x.root, x.current_view, x.editor = @root, view.to_s, @editor   # dumb - FIXME later
+    copy_data(:config, @root/:data)
+    write_config(x, @root/ConfigFile)
     self.view = view   # error checking?
   end
 
@@ -487,24 +488,16 @@ p :cnp5
   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}
@@ -524,9 +517,7 @@ p :pm8
         #{longdate}
         .end
       LIVE
-p :pm9
       File.open(pdraft/"vars.lt3", "w") {|f| f.puts vars }
-p :pma
     end
   rescue => err
     _tmp_error(err)
@@ -562,54 +553,39 @@ p :pma
     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,10 +1,8 @@
 
-require 'pathmagic'
-
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.72"
+  VERSION = "0.2.73"
 
   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.72
+  version: 0.2.73
 platform: ruby
 authors:
 - Hal Fulton