runeblog 0.2.70 → 0.2.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0d49c8d62c0c29650322fcff89f90294b364bd631ab2c678e6fe79a5db478c3
-  data.tar.gz: e6c772a8d7cdb0a5032fee2a3ed09179a1eb6acc60278c443e40b96e8cb8d7f2
+  metadata.gz: 30280ea49b4f2f3da058889fb7cabd535ee55a8a5321a12bd5fc105d5ed74302
+  data.tar.gz: e0310e08c54c0f0cae977596221b710dfb700f5416547cebe0f57a1375e95482
 SHA512:
-  metadata.gz: ecaacf45f6a89e49204df2ca539f17bd1635cf9cd346d2212c73de6e35aa459cbde02dfb6a1376b491e9290730af11e962e7f5c120b4d7f23cc8aa36f2a08fe9
-  data.tar.gz: c14a8482023fa93f8efa06d1f728f8d314028176f1ea003191a547a5795338fc6e4c4e232d0109e165dadf0ce50c329847d166e83d1dadba4d8d9d15f4680120
+  metadata.gz: 83b9df4e7179689012a1eb1b24d2cb26a2295735099331badd450ea08d6ca2b2944cb5f2af0b4ccdf79d7d2bff75665852bc08997c7795c92c63762351242248
+  data.tar.gz: cd4d4717ab5bfe99532d7f3be3f1aa512725c4fbd6cfa1a24f1639a631c0d196237be04b15f7d72b1376feb214623fb22f9b13a97844de23918554f3833c267a

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/global.rb

@@ -39,6 +39,7 @@ def system!(str, show: false)
   else
     STDERR.puts "FAILED: #{str.inspect}"
     STDERR.puts "\ncaller = \n#{caller.join("\n  ")}\n"
+exit
     return rc
   end
   rc

data/lib/helpers-blog.rb

@@ -1,7 +1,6 @@
 require 'runeblog_version'
 require 'fileutils'
 
-require 'pathmagic'
 require 'xlate'
 
 module RuneBlog::Helpers
@@ -20,38 +19,84 @@ module RuneBlog::Helpers
     puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
   end
 
+  def get_repo_config
+    log!(enter: __method__, level: 3)
+    @editor = File.read("#@root/data/EDITOR").chomp
+    @current_view = File.read("#@root/data/VIEW").chomp
+    @root = File.read("#@root/data/ROOT").chomp
+  rescue => err
+    STDERR.puts "Can't read config: #{err}"
+    STDERR.puts err.backtrace.join("\n")
+    STDERR.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("data/EDITOR").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.map {|name| RuneBlog::View.new(name) }
   end
 
+  def write_repo_config(root: "#{Dir.pwd}/.blogs", view: "[no view]", editor: "/usr/local/bin/vim")
+    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

@@ -5,15 +5,13 @@ require 'find'
 
 require 'runeblog'
 require 'pathmagic'
-require 'xlate'
+# 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("..") }
-  Dir.chdir(here)     #  here??? or dir??
-  @blog = RuneBlog.new(dir)
+  dir = Dir.pwd.sub(/\.blogs.*/, "")
+  @blog = nil
+  Dir.chdir(dir) { @blog = RuneBlog.new }
   @root = @blog.root
   @view = @blog.view
   @view_name = @blog.view.name unless @view.nil?
@@ -118,7 +116,6 @@ def banner
         str2 << "      <td colspan=#{span}><img src=#{image} #{width} height=#{high}></img></td>" + "\n"
       when "svg_title"
         stuff, hash = _svg_title(*data)
-STDERR.puts hash.inspect
         wide = hash["width"]
         str2 << "      <td colspan=#{span} width=#{wide}>#{stuff}</td>" + "\n"
       when "text"
@@ -639,7 +636,7 @@ def sidebar
         File.open(wtag/"vars.lt3", "w") do |f| 
           f.puts ".set ad.image = #{img}"
         end
-        xlate cwd: wtag, src: tag, dst: tcard, force: true # , deps: depend # , debug: true
+        preprocess cwd: wtag, src: tag, dst: tcard, force: true # , deps: depend # , debug: true
     end
 
     _include_file wtag/tcard
@@ -748,7 +745,7 @@ def navbar
 end
 
 def _make_navbar(orient = :horiz)
-  vdir = @blog.view.dir
+  vdir = @root/:views/@blog.view
   title = _var(:blog)
 
   extra = ""
@@ -779,7 +776,7 @@ def _make_navbar(orient = :horiz)
       output.puts %[<li class="nav-item active"> <a class="nav-link" href="index.html">#{cdata}<span class="sr-only">(current)</span></a> </li>]
     else
       dir = @blog.root/:views/@blog.view/"themes/standard/banner"
-      xlate cwd: dir, src: basename, dst: vdir/"remote/banner"/basename+".html" # , debug: true
+      preprocess cwd: dir, src: basename, dst: vdir/"remote/banner"/basename+".html" # , debug: true
       output.puts %[<li class="nav-item"> <a class="nav-link" #{href_main}>#{cdata}</a> </li>]
     end
   end

data/lib/runeblog.rb

@@ -19,6 +19,7 @@ require 'pathmagic'
 class RuneBlog
  
   DotDir     = ".blogs"
+  ConfigFile = "config"
   Themes     = RuneBlog::Path/"../themes"
 
   make_exception(:FileNotFound,          "File $1 was not found")
@@ -52,48 +53,48 @@ class RuneBlog
     puts "Error: See #{out}"
   end
 
-  def self.create_new_blog_repo(root = ".blogs")
-    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.
+  def self.create_new_blog_repo(root_rel = ".blogs")
+    log!(enter: __method__, args: [root_rel])
+    raise ArgumentError unless root_rel.is_a?(String) && ! root_rel.empty?
     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
+    repo_root = Dir.pwd/root_rel
+    raise BlogRepoAlreadyExists if Dir.exist?(repo_root)
+    create_dirs(repo_root)
+    Dir.chdir(repo_root) do
       create_dirs(:data, :drafts, :views, :posts)
-      copy_data(:config, "./data/")
       new_sequence
     end
-    @blog = self.new(root)
+    copy_data(:config, repo_root/:data)
+    write_repo_config(root: repo_root)
+    @blog = self.new
     @blog
   rescue => err
-    puts "Can't create blog repo: '#{root}' - #{err}"
+    puts "Can't create blog repo: '#{repo_root}' - #{err}"
     puts err.backtrace.join("\n")
   end
 
-  def self.open(root = ".blogs")
-    log!(enter: __method__, args: [root])
-    # Crude - FIXME later -  # What views are there? Publishing, etc.
+  def self.open(root_rel = ".blogs")
+    log!(enter: __method__, args: [root_rel])
     self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
-    root = Dir.pwd/root
-    blog = self.new(root)
+    blog = self.new(root_rel)
   rescue => err
     _tmp_error(err)
   end
 
-  def initialize(root_dir = ".blogs")   # always assumes existing blog
-    log!(enter: "initialize", args: [root_dir])
-    # Crude - FIXME later -  # What views are there? Publishing, etc.
+  def initialize(root_rel = ".blogs")   # always assumes existing blog
+    log!(enter: "initialize", args: [root_rel])
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
 
-    @root = root_dir
-    read_config
-    md = Dir.pwd.match(%r[.*/views/(.*?)/])
-    @view_name = md[1] if md
+    @root = Dir.pwd/root_rel
+    copy_data(:config, @root/:data)
+    write_repo_config(root: @root)
+    get_repo_config
     @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 = []
@@ -146,7 +147,7 @@ class RuneBlog
     dir = @root/:posts/nslug
     create_dirs(dir)
     # FIXME dependencies?
-    xlate cwd: dir, src: @root/:drafts/sourcefile   # , debug: true
+    preprocess cwd: dir, src: @root/:drafts/sourcefile   # , debug: true
     _deploy_local(dir)
   rescue => err
     _tmp_error(err)
@@ -190,7 +191,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
@@ -221,15 +221,15 @@ class RuneBlog
 
   def viewdir(v = nil)   # delete?
     log!(enter: __method__, args: [v], level: 3)
+    v ||= @view
     v = str2view(v) if v.is_a?(String)
     raise ArgumentError unless v.nil? || v.is_a?(RuneBlog::View)
-    v ||= @view
     return @root/:views/v
   end
 
   def self.exist?
     log!(enter: __method__, level: 3)
-    Dir.exist?(DotDir) && File.exist?(DotDir/ConfigFile)
+    Dir.exist?(DotDir)
   end
 
   def mark_last_published(str)
@@ -240,7 +240,8 @@ class RuneBlog
   def add_view(view_name)
     log!(enter: __method__, args: [view_name], level: 2)
     view = RuneBlog::View.new(view_name)
-    @view = view    # current view
+    self.view = view    # current view
+    File.write(@root/"data/VIEW", view_name)
     @views << view  # all views
     view
   end
@@ -269,7 +270,6 @@ class RuneBlog
 
   def create_view(view_name)
     log!(enter: __method__, args: [view_name], level: 2)
-    check_valid_new_view(view_name)
     make_empty_view_tree(view_name)
     add_view(view_name)
     mark_last_published("Initial creation")
@@ -318,11 +318,8 @@ class RuneBlog
     text = nil
     @theme = @view.dir/"themes/standard"
     post_entry_name = @theme/"blog/post_entry.lt3"
-# STDERR.puts "--  @pename = #{post_entry_name}"
-# STDERR.puts "--  @pe = #{@_post_entry.inspect}"
     depend = [post_entry_name]
-    xlate src: post_entry_name, dst: "/tmp/post_entry.html" # , deps: depend  # , debug: true
-# STDERR.puts "-- xlate result: #{`ls -l /tmp/post_entry.html`}"
+    preprocess src: post_entry_name, dst: "/tmp/post_entry.html" # , deps: depend  # , debug: true
     @_post_entry ||= File.read("/tmp/post_entry.html")
     vp = post_lookup(id)
     nslug, aslug, title, date, teaser_text = 
@@ -415,8 +412,8 @@ class RuneBlog
   def change_view(view)
     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)
+    # write_repo_config
     self.view = view   # error checking?
   end
 
@@ -438,14 +435,16 @@ class RuneBlog
              @theme/"blog/head.lt3", 
              # @theme/"navbar/navbar.lt3",
              @theme/"blog/index.lt3"]   # FIXME what about assets?
-    xlate cwd: vdir/"themes/standard/etc", deps: depend,
-          src: "blog.css.lt3", copy: vdir/"remote/etc/blog.css" # , debug: true
-    xlate cwd: vdir/"themes/standard", deps: depend, force: true,
+    preprocess cwd: vdir/"themes/standard/etc", deps: depend,
+          src: "blog.css.lt3", copy: vdir/"remote/etc/"  # , debug: true
+    preprocess cwd: vdir/"themes/standard", deps: depend, force: true,
           src: "blog/generate.lt3", dst: vdir/:remote/"index.html"
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
     copy_widget_html(view)
   rescue => err
-    _tmp_error(err)
+    STDERR.puts err
+    STDERR.puts err.backtrace.join("\n")
+    # _tmp_error(err)
   end
 
   def _get_views(draft)
@@ -547,7 +546,7 @@ class RuneBlog
     # Step 1...
     create_dirs(pdraft)
     # FIXME dependencies?
-    xlate cwd: pdraft, src: draft, dst: "guts.html"  # , debug: true
+    preprocess cwd: pdraft, src: draft, dst: "guts.html"  # , debug: true
     _post_metadata(draft, pdraft)
     # Step 2...
     vposts = @root/:views/view_name/:posts
@@ -557,10 +556,10 @@ class RuneBlog
     copy(pdraft/"vars.lt3",  @theme/:post) 
     # Step 4...
     # FIXME dependencies?
-    xlate cwd: @theme/:post, src: "generate.lt3", force: true, 
+    preprocess cwd: @theme/:post, src: "generate.lt3", force: true, 
           dst: remote/ahtml, copy: @theme/:post    # , debug: true
     # FIXME dependencies?
-    xlate cwd: @theme/:post, src: "permalink.lt3", 
+    preprocess cwd: @theme/:post, src: "permalink.lt3", 
           dst: remote/:permalink/ahtml  # , debug: true
     copy_widget_html(view_name)
   rescue => err

data/lib/runeblog_version.rb

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

data/lib/view.rb

@@ -14,6 +14,7 @@ class RuneBlog::View
     @name = name
     @publisher = RuneBlog::Publishing.new(name)
     @can_publish = true  # FIXME
+    @blog.view = self
   end
 
   def dir

data/lib/xlate.rb

@@ -1,4 +1,6 @@
+require 'livetext'
 
+LIVE = Livetext.new
 LEXT = ".lt3"
 
 def newer?(f1, f2)
@@ -16,26 +18,28 @@ def stale?(src, dst, deps, force = false)
   return false
 end
 
-def prerprocess(cwd: Dir.pwd, src:, 
+def preprocess(cwd: Dir.pwd, src:, 
           dst: (strip = true; File.basename(src).sub(/.lt3$/,"")), 
           deps: [], copy: nil, debug: false, force: false)
   src += LEXT unless src.end_with?(LEXT)
   dst += ".html" unless (dst.end_with?(".html"))   # || strip)
-  indent = " "*12
+  sp = " "*12
   Dir.chdir(cwd) do
     if debug
-      puts "#{indent} -- xlate #{src} >#{dst}"
-      puts "#{indent}      in:   #{Dir.pwd}"
-      puts "#{indent}      from: #{caller[0]}"
-      puts "#{indent}      copy: #{copy}" if copy
+      puts "#{sp} -- preprocess 
+      puts "#{sp}      src:  #{src}"
+      puts "#{sp}      dst:  #{dst}"
+      puts "#{sp}      in:   #{Dir.pwd}"
+      puts "#{sp}      from: #{caller[0]}"
+      puts "#{sp}      copy: #{copy}" if copy
     end
     stale = stale?(src, dst, deps, force)
     if stale
-      rc = system("livetext #{src} >#{dst}")
-      puts "...completed (shell returned #{rc})" if debug
+      out = LIVE.xform_file(src)
+      File.write(dst, out)
       system!("cp #{dst} #{copy}") if copy
     else
-      puts "#{indent} -- ^ Already up to date!" if debug
+      puts "#{sp} -- ^ Already up to date!" if debug
       return
     end
   end
@@ -45,7 +49,7 @@ def xlate(cwd: Dir.pwd, src:,
           dst: (strip = true; File.basename(src).sub(/.lt3$/,"")), 
           deps: [], copy: nil, debug: false, force: false)
   src += LEXT unless src.end_with?(LEXT)
-  dst += ".html" unless (dst.end_with?(".html"))   # || strip)
+  dst += ".html" unless (dst.end_with?(".html") || strip)
   indent = " "*12
   Dir.chdir(cwd) do
     if debug

data/runeblog.gemspec

@@ -23,7 +23,7 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.95'
   s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.16'
 
-  s.add_development_dependency 'minitest', '>= 5.10.0'
+  s.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.0'
 
   # Files...
   main = Find.find("bin").to_a + 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.70
+  version: 0.2.75
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -57,6 +57,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.10.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -64,6 +67,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.10.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
 description: A blog system based on Ruby and Livetext
 email: rubyhacker@gmail.com
 executables: