runeblog 0.2.73 → 0.2.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0afccf0c622078eba670e387c4fec271552c9b2d289c25b1f325a266d94da6c7
-  data.tar.gz: 3cea7d0e10b8e393d2845b10c4d466f54bbfc92f1ea326eec4ee42ad8fba3927
+  metadata.gz: a66a7e9938f682fe72d0a6f693cad408fffbeb93f34da1f91732548d879211cf
+  data.tar.gz: c2beeb6b86e7d08926bca781d6adca2560f7413501319295abf23a194ee6e039
 SHA512:
-  metadata.gz: e69baf6404c61da8028502b554008a663ec405c359707d9a33f103dd47f17b0e9a00482f09a32cb2e52c5457fe9904177db067b2592b7021ef1ddf0a5c15b698
-  data.tar.gz: d6942079ebdcb48d948b938bf06377caa55eabe7ea3b4de6566ed0586b83920e6c51fee272d7e35e38cb7f00e812a20cc3b0a2c66252ca03e66bcf6cc5df9337
+  metadata.gz: dd1d9d4a194f2f28683e20fbf027b87f3f27e4ced5c16e21c1e7e292dceacc75f87f718b6abe018e46e37c3645c32c107e3e24a4e1c5fb14aa5c38925198dbb1
+  data.tar.gz: 2d4ce56d3dd5d97b168692d984706ac941fa6f5a3daf3f227dfd42023ae1c7a5c734692eed321e8752eb4eca601809c5e5d350ff58851be6cb12feca84ec933a

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

@@ -21,13 +21,13 @@ module RuneBlog::Helpers
 
   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
+    @editor = File.read("#@root/data/EDITOR").chomp
+    @current_view = File.read("#@root/data/VIEW").chomp
+    @root = File.read("#@root/data/ROOT").chomp
   rescue => err
-    puts "Can't read config: #{err}"
-    puts err.backtrace.join("\n")
-    puts "dir = #{Dir.pwd}"
+    STDERR.puts "Can't read config: #{err}"
+    STDERR.puts err.backtrace.join("\n")
+    STDERR.puts "dir = #{Dir.pwd}"
   end
 
   def copy_data(tag, dest)
@@ -80,12 +80,11 @@ module RuneBlog::Helpers
 
   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
+  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")

data/lib/liveblog.rb

@@ -9,11 +9,9 @@ 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?("config"); 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"
@@ -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 = ""

data/lib/runeblog.rb

@@ -53,55 +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
+  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
-      create_dirs(:drafts, :views, :posts)
+    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)
       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)
+    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
-    file = @root/ConfigFile
-    errmsg = "No config file! file = #{file.inspect}  dir = #{Dir.pwd}" 
-    raise errmsg unless File.exist?(file)
-
+    @root = Dir.pwd/root_rel
+    copy_data(:config, @root/:data)
+    write_repo_config(root: @root)
     get_repo_config
-    @root, @view_name, @editor = read_config(file, :root, :current_view, :editor)
-    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 = []
@@ -228,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)
@@ -247,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
@@ -276,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")
@@ -325,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`}"
     @_post_entry ||= File.read("/tmp/post_entry.html")
     vp = post_lookup(id)
     nslug, aslug, title, date, teaser_text = 
@@ -422,10 +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
-    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)
+    File.write(@root/"data/VIEW", view)
+    # write_repo_config
     self.view = view   # error checking?
   end
 
@@ -448,13 +436,15 @@ class RuneBlog
              # @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
+          src: "blog.css.lt3", copy: vdir/"remote/etc/"  # , debug: true
     xlate 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)

data/lib/runeblog_version.rb

@@ -2,7 +2,7 @@
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.73"
+  VERSION = "0.2.74"
 
   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

@@ -45,7 +45,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.73
+  version: 0.2.74
 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