runeblog 0.2.94 → 0.3.01

data/lib/repl.rb

@@ -1,6 +1,7 @@
 require 'runeblog'
 require 'ostruct'
 require 'helpers-repl'  # FIXME structure
+require 'pathmagic'
 
 make_exception(:PublishError,  "Error during publishing")
 make_exception(:EditorProblem, "Could not edit $1")
@@ -37,7 +38,7 @@ module RuneBlog::REPL
     @out
   end
 
-  def cmd_config(arg, testing = false)
+  def OLD_cmd_config(arg, testing = false)
     hash = {"global.lt3           Global configuration"                     => "global.lt3",
             "banner/top.lt3       Text portion of banner"                   => "banner/top.lt3",
             "blog/generate.lt3    Generator for view (usu not edited)"      => "blog/generate.lt3",
@@ -58,6 +59,32 @@ module RuneBlog::REPL
     edit_file(dir/target)
   end
 
+  def cmd_config(arg, testing = false)
+    hash = {"Global configuration"                     => "global.lt3",
+            "   View-specific variables"               => "../../settings/view.txt",
+            "   Recent posts"                          => "../../settings/recent.txt",
+            "   Publishing vars"                       => "../../settings/publish.txt",
+            "Banner description"                       => "blog/banner.lt3",
+            "   Text portion of banner"                => "banner/top.lt3",
+            "Generator for view (usu not edited)"      => "blog/generate.lt3",
+            "   HEAD info for view"                    => "blog/head.lt3",
+            "   User-edited detail for view"           => "blog/index.lt3",
+            "Generator for post entry in recent-posts" => "blog/post_entry.lt3",
+            "Global CSS"                               => "etc/blog.css.lt3",
+            "External JS/CSS (Bootstrap, etc.)"        => "/etc/externals.lt3",
+            "Generator for a post"                     => "post/generate.lt3",
+            "   HEAD info for post"                    => "post/head.lt3",
+            "   Content for post"                      => "post/index.lt3",
+            "Generator for permalink"                  => "post/permalink.lt3",
+           }
+
+    dir = @blog.view.dir/"themes/standard/"
+    num, target = STDSCR.menu(title: "Edit file:", items: hash)
+    edit_file(dir/target)
+  end
+
+
+
   def cmd_manage(arg, testing = false)
     case arg
       when "pages";   _manage_pages(nil, testing = false)
@@ -214,12 +241,31 @@ module RuneBlog::REPL
     puts "Error: See #{out}"
   end
 
+  def fresh?(src, dst)
+    return false unless File.exist?(dst)
+    File.mtime(src) <= File.mtime(dst)
+  end
+
+  def regen_posts
+    drafts = @blog.drafts  # current view
+    drafts.each do |draft|
+      orig = @blog.root/:drafts/draft
+      html = @blog.root/:posts/draft
+      html.sub!(/.lt3$/, "/guts.html")
+      next if fresh?(orig, html)
+      puts "  Regenerating #{draft}"
+      @blog.generate_post(orig)    # rebuild post
+    end
+    puts
+  end
+
   def cmd_rebuild(arg, testing = false)
     debug "Starting cmd_rebuild..."
     reset_output
     puts unless testing
     @blog.generate_view(@blog.view)
     @blog.generate_index(@blog.view)
+    regen_posts
     @out
   rescue => err
     out = "/tmp/blog#{rand(100)}.txt"
@@ -257,7 +303,7 @@ module RuneBlog::REPL
   def cmd_new_view(arg, testing = false)
     reset_output
     if arg.nil?
-      arg = ask("\nFilename: ")
+      arg = ask(fx("\nFilename: ", :bold))
       puts
     end
     @blog.create_view(arg)
@@ -359,10 +405,15 @@ module RuneBlog::REPL
       v = v.to_s
       v = fx(v, :bold) if v == @blog.view.name
       output v + "\n"
-      puts "  ", v unless testing
+      # FIXME: next 3 lines are crufty as hell
+      lines = File.readlines(@blog.root/"views/#{v}/themes/standard/global.lt3")
+      lines = lines.select {|x| x =~ /^blog / && x !~ /VIEW_/ }
+      title = lines.first.split(" ", 2)[1]
+      print "  ", ('%15s' % v) unless testing
+      puts  "  ", fx(title, :black) unless testing
     end
     puts unless testing
-    @out
+#   @out
   end
 
   def cmd_list_posts(arg, testing = false)
@@ -381,6 +432,12 @@ module RuneBlog::REPL
         base = post.sub(/.lt3$/, "")
         num, rest = base[0..3], base[4..-1]
         puts "  ", fx(num, Red), fx(rest, Blue) unless testing
+        draft = @blog.root/:drafts/post + ".lt3"
+        other = @blog._get_views(draft) - [@blog.view.to_s]
+        unless other.empty?
+          print fx(" "*7 + "also in: ", :bold) 
+          puts other.join(", ") 
+        end
       end
     end
     puts unless testing
@@ -401,6 +458,11 @@ module RuneBlog::REPL
         base = draft.sub(/.lt3$/, "")
         num, rest = base[0..3], base[4..-1]
         puts "  ", fx(num, Red), fx(rest, Blue) unless testing
+        other = @blog._get_views(@blog.root/:drafts/draft) - [@blog.view.to_s]
+        unless other.empty?
+          print fx(" "*7 + "also in: ", :bold) 
+          puts other.join(", ") 
+        end
       end
     end
     puts unless testing

data/lib/runeblog.rb

@@ -40,7 +40,7 @@ class RuneBlog
   end
 
   attr_reader :views, :sequence
-  attr_accessor :root, :editor
+  attr_accessor :root, :editor, :features
   attr_accessor :view  # overridden
 
   attr_accessor :post_views, :post_tags, :dirty_views
@@ -92,10 +92,13 @@ class RuneBlog
     raise BlogRepoAlreadyExists if Dir.exist?(repo_root)
     create_dirs(repo_root)
     Dir.chdir(repo_root) do
-      create_dirs(:data, :drafts, :views, :posts)
+      create_dirs(:data, :config, :drafts, :views, :posts)
       new_sequence
     end
-    copy_data(:config, repo_root/:data) unless File.exist?(repo_root/"data/VIEW")
+    unless File.exist?(repo_root/"data/VIEW")
+      copy_data(:config, repo_root/:data)   
+    end
+    copy_data(:extra,  repo_root/:config)
     write_repo_config(root: repo_root)
     @blog = self.new
     @blog
@@ -117,8 +120,7 @@ class RuneBlog
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
 
     @root = Dir.pwd/root_rel
-#   copy_data(:config, @root/:data) unless File.exist?(@root/"data/VIEW")
-    write_repo_config(root: @root)
+    write_repo_config(root: @root)   # ?? FIXME
     get_repo_config
     @views = retrieve_views
     self.view = File.read(@root/"data/VIEW").chomp
@@ -132,16 +134,67 @@ class RuneBlog
     @post_tags = []
   end
 
+  def complete_file(name, vars, hash)
+    debugging = vars.nil?
+    return if hash.empty?
+    text = File.read(name)
+    if vars.nil?   # FIXME dumbest hack ever?
+      vars = {}
+      hash.values.each {|val| vars[val] = val }
+    end
+
+    hash.each_pair {|key, var| text.gsub!(key, vars[var]) }
+    File.write(name, text)
+  end
+
+  def _generate_settings(view = nil)
+    vars = read_vars("#@root/data/universal.lt3")
+    hash = {/AUTHOR/  => "view.author",
+            /SITE/    => "view.site",
+            /FONT/    => "font.family",
+            /CHARSET/ => :charset,
+            /LOCALE/  => :locale}
+
+    # rubytext.txt - LATER
+    # complete_file(settings/"rubytext.txt", {}
+
+    if view
+      settings = @root/view/"settings"
+      ### ??? Where to get hash of view-specific vars?
+
+      # features.txt - handle specially
+      fname = settings/"features.txt"
+
+      # view.txt
+      complete_file(settings/"view.txt", 
+                        /AUTHOR/   => "view.author",
+                        /TITLE/    => "view.title",
+                        /SUBTITLE/ => "view.subtitle",
+                        /SITE/     => "view.site")
+
+      # publish.txt
+      complete_file(settings/"publish.txt", 
+                        /USER/    => "publish.user",
+                        /SERVER/  => "publish.server",
+                        /DOCROOT/ => "publish.docroot",
+                        /PATH/    => "publish.path",
+                        /PROTO/   => "publish.proto")
+                
+      # recent.txt - SKIP THIS?
+      complete_file(settings/"recent.txt",  {})
+    end
+  end
+
   def _generate_global
     vars = read_vars("#@root/data/universal.lt3")
     gfile = "#@root/data/global.lt3"
-    global = File.read(gfile)
-    global.gsub!(/AUTHOR/,  vars["author"])
-    global.gsub!(/SITE/,    vars["site"])
-    global.gsub!(/FONT/,    vars["font.family"])
-    global.gsub!(/CHARSET/, vars["charset"])
-    global.gsub!(/LOCALE/,  vars["locale"])
-    File.write(gfile, global)
+    hash = {/AUTHOR/  => "univ.author",
+            /SITE/    => "univ.site",
+            /FONT/    => "font.family",
+            /CHARSET/ => :charset,
+            /LOCALE/  => :locale}
+    complete_file(gfile, vars, hash)
+    _generate_settings
   end
 
   def _deploy_local(dir)
@@ -149,10 +202,7 @@ class RuneBlog
     Dir.chdir(dir) do
       views = _retrieve_metadata(:views)
       views.each do |v| 
-        unless self.view?(v)
-          puts "#{fx("Warning:", :red)} #{fx(v, :bold)} is not a view"
-          next
-        end
+        next unless _check_view?(v)
         system!("cp *html #@root/views/#{v}/remote", show: true)
       end
     end
@@ -160,6 +210,8 @@ class RuneBlog
     _tmp_error(err)
   end
 
+  # FIXME reconcile with _get_draft data
+
   def _retrieve_metadata(key)
     key = key.to_s
     lines = File.readlines("metadata.txt")
@@ -191,7 +243,7 @@ class RuneBlog
     dir = @root/:posts/nslug
     create_dirs(dir)
     # FIXME dependencies?
-    preprocess cwd: dir, src: @root/:drafts/sourcefile, 
+    preprocess cwd: dir, src: @root/:drafts/sourcefile, dst: @root/:posts/sourcefile.sub(/.lt3/, ".html"),  # ZZZ
                mix: "liveblog"  # , debug: true
     _deploy_local(dir)
   rescue => err
@@ -257,13 +309,13 @@ class RuneBlog
 
   def get_sequence
     log!(enter: __method__, level: 3)
-    File.read(@root/:sequence).to_i
+    File.read(@root/"data/sequence").to_i
   end
 
   def next_sequence
     log!(enter: __method__, level: 3)
     @sequence += 1
-    dump(@sequence, @root/:sequence)
+    dump(@sequence, @root/"data/sequence")
     @sequence
   end
 
@@ -371,7 +423,7 @@ class RuneBlog
     html = "/tmp/post_entry.html"
     preprocess src: post_entry_name, dst: html,
                call: ".nopara"  # , deps: depend  # , debug: true
-    @_post_entry ||= File.read(html)
+    @_post_entry = File.read(html)
     vp = post_lookup(id)
     nslug, aslug, title, date, teaser_text = 
       vp.nslug, vp.aslug, vp.title, vp.date, vp.teaser_text
@@ -497,15 +549,14 @@ class RuneBlog
              @theme/"blog/head.lt3", 
              # @theme/"navbar/navbar.lt3",
              @theme/"blog/index.lt3"]   # FIXME what about assets?
-    preprocess cwd: vdir/"themes/standard/etc", # deps: depend, debug: true,
-               src: "blog.css.lt3", copy: vdir/"remote/etc/", 
-               call: ".nopara" # , dst: "blog.css"
+    preprocess cwd: vdir/"themes/standard/etc", src: "blog.css.lt3", 
+               copy: vdir/"remote/etc/", call: [".nopara"], strip: true
     preprocess cwd: vdir/"themes/standard", deps: depend, force: true,
                src: "blog/generate.lt3", dst: vdir/:remote/"index.html", 
                call: ".nopara"
     copy!("#{vdir}/themes/standard/banner/*", "#{vdir}/remote/banner/")  # includes navbar/
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
-# rebuild widgets
+    # rebuild widgets?
     copy_widget_html(view)
   rescue => err
     STDERR.puts err
@@ -513,6 +564,27 @@ class RuneBlog
     # _tmp_error(err)
   end
 
+  def _get_draft_data(num, sym)
+    tag = prefix(num)
+    front = @blog.root/:drafts/tag
+    files = Dir[front + "*"]
+    raise "No draft #{num} found" if files.empty?
+    raise "Too many files found for #{num}!" if files.size > 1
+    file = files.first
+    lines = File.readlines(file)
+    case sym
+      when :views
+        view_line = lines.grep(/^.views /)
+        raise "More than one .views call in #{draft}" if view_line.size > 1
+        raise "No .views call in #{draft}" if view_line.size < 1
+        view_line = view_line.first
+        views = view_line[7..-1].split
+        return views.uniq 
+    else
+      raise "Unknown symbol #{sym.inspect}"
+    end
+  end
+
   def _get_views(draft)
     log!(enter: __method__, args: [draft], level: 2)
     # FIXME dumb code
@@ -602,6 +674,8 @@ class RuneBlog
     log!(enter: __method__, args: [draft, view_name], level: 2)
     # break into separate methods?
 
+    return unless _check_view?(view_name)
+
     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
@@ -626,40 +700,21 @@ class RuneBlog
     preprocess cwd: @theme/:post, src: "generate.lt3", force: true, 
                dst: remote/ahtml, copy: @theme/:post,
                call: ".nopara"    # , debug: true
-#   copy(remote/ahtml, remote/permalink/ahtml)
-    # FIXME dependencies?
-#   preprocess cwd: @theme/:post, src: "permalink.lt3", 
-#              dst: remote/:permalink/ahtml,
-#              mix: "liveblog"  # , debug: true
     copy_widget_html(view_name)
   rescue => err
     _tmp_error(err)
   end
 
-  def generate_post(draft)
-    log!(enter: __method__, args: [draft], level: 1)
-    views = _get_views(draft)
-    views.each do |view| 
-      unless self.view?(view)
-        puts "Warning: '#{view}' is not a view"
-        next
-      end
-      _handle_post(draft, view)
-    end
-  rescue => err
-    _tmp_error(err)
+  def _check_view?(view)
+    flag = self.view?(view)
+    puts "  Warning: '#{view}' is not a view" unless flag
+    flag
   end
 
-  def rebuild_post(file)
-    log!(enter: __method__, args: [file])
-    raise "Doesn't currently work"
-    debug "Called rebuild_post(#{file.inspect})"
-    raise ArgumentError unless file.is_a?(String)
-    meta = process_post(file)
-    @views_dirty ||= []
-    @views_dirty << meta.views
-    @views_dirty.flatten!
-    @views_dirty.uniq!
+  def generate_post(draft, force = false)
+    log!(enter: __method__, args: [draft], level: 1)
+    views = _get_views(draft)
+    views.each {|view| _handle_post(draft, view) }
   rescue => err
     _tmp_error(err)
   end

data/lib/runeblog_version.rb

@@ -3,7 +3,7 @@ if !defined?(RuneBlog::Path)
 # if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.94"
+  VERSION = "0.3.01"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/lib/view.rb

@@ -15,6 +15,8 @@ class RuneBlog::View
     @can_publish = true  # FIXME
     @blog.view = self
     gfile = @blog.root/"views/#{name}/themes/standard/global.lt3"
+    return unless File.exist?(gfile)  # Hackish!! how is View.new called from create_view??
+
     live = Livetext.customize(call: ".nopara")
     live.xform_file(gfile)
     @globals = live.vars

data/test/austin.rb

@@ -59,19 +59,17 @@ x = RuneBlog.new(".blogs")
 debug("create_view: #{bold('around_austin')}")
 x.create_view("around_austin")   # FIXME remember view title!
 
-#### FIXME later!!
-vars = <<-VARS
-
-.variables
-blog        Around Austin
-blog.desc   The view from downtown...
+#### FIXME
 
-font.family verdana
-.end
+vars = <<-VARS
+author     Hal Fulton
+title      Around Austin
+subtitle   The view from downtown...
+domain     foo.com
 VARS
-File.open(".blogs/views/around_austin/themes/standard/global.lt3", "a") do |f|
-  f.puts vars
-end
+vfile = ".blogs/views/around_austin/settings/view.txt"
+File.open(vfile, "w") {|f| f.puts vars }
+
 ####
 
 debug("-- change_view: #{bold('around_austin')}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.94
+  version: 0.3.01
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2019-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -85,10 +85,29 @@ files:
 - data/EDITOR
 - data/ROOT
 - data/VIEW
+- data/features.txt
 - data/global.lt3
 - data/universal.lt3
 - empty_view/assets/austin-pano.jpg
 - empty_view/assets/sky2.jpg
+- empty_view/config/exper/2svg.lt3
+- empty_view/config/exper/gen_svg.rb
+- empty_view/config/exper/meta.html
+- empty_view/config/exper/s2.html
+- empty_view/config/exper/varmint.rb
+- empty_view/config/facebook/credentials.txt
+- empty_view/config/facebook/facebook.rb
+- empty_view/config/facebook/fb.html
+- empty_view/config/facebook/fb.js.lt3
+- empty_view/config/reddit/credentials.txt
+- empty_view/config/reddit/notes.txt
+- empty_view/config/reddit/reddit_post_url.py
+- empty_view/config/reddit/redpost.rb
+- empty_view/config/reddit/the-graffiti-wall.html
+- empty_view/config/twitter/credentials.txt
+- empty_view/config/twitter/tw.html
+- empty_view/config/twitter/tw.js
+- empty_view/config/twitter/twitter.rb
 - empty_view/posts/GIT_IS_DUMB
 - empty_view/remote/assets/GIT_IS_DUMB
 - empty_view/remote/etc/GIT_IS_DUMB
@@ -98,6 +117,10 @@ files:
 - empty_view/remote/widgets/news/GIT_IS_DUMB
 - empty_view/remote/widgets/pages/GIT_IS_DUMB
 - empty_view/remote/widgets/pinned/GIT_IS_DUMB
+- empty_view/settings/features.txt
+- empty_view/settings/publish.txt
+- empty_view/settings/recent.txt
+- empty_view/settings/view.txt
 - empty_view/themes/standard/README
 - empty_view/themes/standard/banner/banner.lt3
 - empty_view/themes/standard/banner/navbar/about.lt3
@@ -113,7 +136,6 @@ files:
 - empty_view/themes/standard/etc/externals.lt3
 - empty_view/themes/standard/etc/favicon.ico
 - empty_view/themes/standard/etc/misc.js
-- empty_view/themes/standard/global.lt3
 - empty_view/themes/standard/post/generate.lt3
 - empty_view/themes/standard/post/head.lt3
 - empty_view/themes/standard/post/index.lt3
@@ -175,13 +197,6 @@ files:
 - empty_view/themes/standard/widgets/tag-cloud/tag-cloud.lt3
 - empty_view/themes/standard/widgets/tag-cloud/tag-cloud.rb
 - lib/Javascript.stuff
-- lib/exper/2svg.lt3
-- lib/exper/callout.js
-- lib/exper/fbtw-js
-- lib/exper/fbtw.rb
-- lib/exper/gen_svg.rb
-- lib/exper/s2.html
-- lib/exper/varmint.rb
 - lib/helpers-blog.rb
 - lib/helpers-repl.rb
 - lib/liveblog.rb