runeblog 0.3.20 → 0.3.25

data/lib/runeblog.rb

@@ -97,7 +97,6 @@ class RuneBlog
   def self.create_new_blog_repo(root_rel = ".blogs")
     log!(enter: __method__, args: [root_rel])
     check_nonempty_string(root_rel)
-    self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     repo_root = Dir.pwd/root_rel
     check_error(BlogRepoAlreadyExists) { Dir.exist?(repo_root) }
 
@@ -113,16 +112,17 @@ class RuneBlog
     end
 #   copy_data(:extra,  repo_root/:config)
     write_repo_config(root: repo_root)
-    @blog = self.new
-    @blog
+    # Weird. Like a singleton - dumbass circular dependency?
+    self.blog = blog = self.new
+    blog
   rescue => err
     puts "Can't create blog repo: '#{repo_root}' - #{err}"
     puts err.backtrace.join("\n")
   end
 
   def self.open(root_rel = ".blogs")
+    raise "Not impl"
     log!(enter: __method__, args: [root_rel])
-    self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     blog = self.new(root_rel)
   rescue => err
     _tmp_error(err)
@@ -130,10 +130,11 @@ class RuneBlog
 
   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?
+    # Weird. Like a singleton - dumbass circular dependency?
+    self.class.blog = self   
 
     @root = Dir.pwd/root_rel
-    write_repo_config(root: @root)   # ?? FIXME
+    # write_repo_config(root: @root)   # ?? FIXME
     get_repo_config
     read_features   # top level
     @views = retrieve_views
@@ -146,6 +147,11 @@ class RuneBlog
     @sequence = get_sequence
     @post_views = []
     @post_tags = []
+  rescue => err
+    puts "Error - see stdout.txt"
+    STDERR.puts err.inspect
+    STDERR.puts err&.backtrace
+    sleep 3
   end
 
   def complete_file(name, vars, hash)
@@ -241,7 +247,7 @@ class RuneBlog
     create_dirs(dir)
     # FIXME dependencies?
     preprocess cwd: dir, src: @root/:drafts/sourcefile, dst: @root/:posts/sourcefile.sub(/.lt3/, ".html"),  # ZZZ
-               mix: "liveblog"  # , debug: true
+               mix: "liveblog", vars: @view.globals  # , debug: true
     _deploy_local(dir)
   rescue => err
     _tmp_error(err)
@@ -264,13 +270,13 @@ class RuneBlog
     views.any? {|x| x.name == name }
   end
 
-  def view(name = nil)
-    log!(enter: __method__, args: [name], level: 3)
-    return @view if name.nil?
-
-    check_nonempty_string(name)
-    return str2view(name)
-  end
+# def view(name = nil)
+#   log!(enter: __method__, args: [name], level: 3)
+#   return @view if name.nil?
+# 
+#   check_nonempty_string(name)
+#   return str2view(name)
+# end
 
   def str2view(str)
     log!(enter: __method__, args: [str], level: 3)
@@ -287,26 +293,28 @@ class RuneBlog
 
   def view=(arg)
     log!(enter: __method__, args: [arg], level: 2)
+    if arg == "[no view]"
+      @view = nil
+      return
+    end
+# STDERR.puts "view=  #{arg.inspect}"
+
     case arg
-      when "[no view]"
-        # puts "Warning: No current view set"
-        @view = nil
       when RuneBlog::View
         @view = arg
-        read_features(@view)
-        @view.get_globals
-        _set_publisher
+        @view.get_globals(true)
       when String
         new_view = str2view(arg)
-# puts "new_view = #{new_view} (#{new_view.class})"
+# STDERR.puts "view=  new view #{new_view.inspect}"
         check_error(NoSuchView, arg) { new_view.nil? }
         @view = new_view
-        read_features(@view)
-        @view.get_globals
-        _set_publisher
       else 
         raise CantAssignView(arg.class.to_s)
     end
+    read_features(@view)
+    @view.get_globals(true)
+    _set_publisher
+    File.write(@root/"data/VIEW", @view.to_s)
   rescue => err
     _tmp_error(err)
   end
@@ -327,7 +335,9 @@ class RuneBlog
     log!(enter: __method__, args: [v], level: 3)
     return @view if v.nil?
     check_nonempty_string(v)
-    return @root/:views/v
+    dir = @root/:views/v
+    puts "Dir = #{dir}"  # ; sleep 5
+    return dir
   end
 
   def self.exist?
@@ -375,8 +385,9 @@ class RuneBlog
     make_empty_view_tree(view_name)
     add_view(view_name)
     mark_last_published("Initial creation")
-    system("cp #@root/data/global.lt3 #@root/views/#{view_name}/themes/standard/global.lt3")
-    @view.get_globals
+    # system("cp #@root/data/global.lt3 #@root/views/#{view_name}/themes/standard/global.lt3")
+    system("cp #@root/data/global.lt3 #@root/views/#{view_name}/data/global.lt3")
+    @view.get_globals(true)
   rescue => err
     _tmp_error(err)
   end
@@ -408,7 +419,7 @@ class RuneBlog
     posts.select! {|x| File.directory?(x) }
 
     posts = posts.select {|x| File.basename(x).to_i == postid }
-    postdir = exactly_one(posts)
+    postdir = exactly_one(posts, posts.join("/"))
     vp = RuneBlog::ViewPost.new(self.view, postdir)
     vp
   rescue => err
@@ -424,7 +435,7 @@ class RuneBlog
     depend = [post_entry_name]
     html = "/tmp/post_entry.html"
     preprocess src: post_entry_name, dst: html,
-               call: ".nopara"  # , deps: depend  # , debug: true
+               call: ".nopara", vars: @view.globals    # , deps: depend  # , debug: true
     @_post_entry = File.read(html)
     vp = post_lookup(id)
     nslug, aslug, title, date, teaser_text = 
@@ -566,15 +577,16 @@ class RuneBlog
     log!(enter: __method__, args: [view])
     vdir = @root/:views/view
     @theme = @root/:views/view/:themes/:standard
-    depend = [vdir/"remote/etc/blog.css.lt3", @theme/"global.lt3", 
+    @data  = @root/:views/view/:data
+    depend = [vdir/"remote/etc/blog.css.lt3", @data/"global.lt3", 
              @theme/"blog/head.lt3", 
              # @theme/"navbar/navbar.lt3",
              @theme/"blog/index.lt3"]   # FIXME what about assets?
     preprocess cwd: vdir/"themes/standard/etc", src: "blog.css.lt3", 
-               copy: vdir/"remote/etc/", call: [".nopara"], strip: true
+               copy: vdir/"remote/etc/", call: [".nopara"], strip: true , vars: @view.globals 
     preprocess cwd: vdir/"themes/standard", deps: depend, force: true,
                src: "blog/generate.lt3", dst: vdir/:remote/"index.html", 
-               call: ".nopara"
+               call: ".nopara" , vars: @view.globals 
     copy!("#{vdir}/themes/standard/banner/*", "#{vdir}/remote/banner/")  # includes navbar/
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
     # rebuild widgets?
@@ -588,7 +600,7 @@ class RuneBlog
   def _get_views(draft)
     log!(enter: __method__, args: [draft], level: 2)
     # FIXME dumb code
-    view_line = exactly_one(File.readlines(draft).grep(/^.views /))
+    view_line = exactly_one(File.readlines(draft).grep(/^.views /), ".view line")
     views = view_line[7..-1].split
     views.uniq 
   rescue => err
@@ -626,11 +638,14 @@ class RuneBlog
       title = meta.title
       tags = meta.tags
       # FIXME simplify
-      addvar(hash, "post.num" => pnum, "post.aslug" => aslug,
-             "post.date" => date,      title: title.chomp, 
-             teaser: excerpt.chomp,    longdate: longdate,
-             "post.nslug" => pnum + "-" + aslug,
-             "post.tags" => tags.join(" "))
+      addvar(hash, "post.num" => pnum, 
+                   "post.aslug" => aslug,
+                   "post.date" => date,      
+                   title: title.chomp, 
+                   teaser: excerpt.chomp,    
+                   longdate: longdate,
+                   "post.nslug" => pnum + "-" + aslug,
+                   "post.tags" => tags.join(" "))
     end
     hash
   rescue => err
@@ -639,19 +654,25 @@ class RuneBlog
 
   def copy_widget_html(view)
     log!(enter: __method__, level: 2)
+log! str:  "=== cwh cp 1"
     vdir = @root/:views/view
     remote = vdir/:remote
     wdir = vdir/:widgets
     widgets = Dir[wdir/"*"].select {|w| File.directory?(w) }
+log! str:  "=== cwh cp 2"
     widgets.each do |w|
       dir = File.basename(w)
       rem = w.sub(/widgets/, "remote/widgets")
+log! str:  "=== cwh cp 3  w = #{w.inspect}"
       create_dirs(rem)
       files = Dir[w/"*"]
       # files = files.select {|x| x =~ /(html|css)$/ }
       tag = File.basename(w)
-      files.each {|file| system!("cp #{file} #{rem}", show: (tag == "zzz")) }
+log! str:  "=== cwh cp 4   tag = #{tag.inspect}"
+      files.each {|file| system!("cp #{file} #{rem}", show: true) }
+log! str:  "=== cwh cp 5   tag was #{tag.inspect}"
     end
+log! str:  "=== cwh cp 6"
   rescue => err
     _tmp_error(err)
   end
@@ -667,25 +688,34 @@ class RuneBlog
     pdraft = @root/:posts/nslug
     remote = @root/:views/view_name/:remote
     @theme = @root/:views/view_name/:themes/:standard
+    pmeta  = @root/:views/view_name/:posts/nslug
+
 
     create_dirs(pdraft)                                # Step 1...
+    @view.globals ||= {}
+args = {cwd: pdraft, src: draft, debug: true, dst: "guts.html", 
+        mix: "liveblog", vars: @view.globals}
     preprocess cwd: pdraft, src: draft,                # FIXME dependencies?
-               dst: "guts.html", mix: "liveblog"
+               debug: true,
+               dst: "guts.html", mix: "liveblog", vars: @view.globals
     hash = _post_metadata(draft, pdraft)
+    hash[:CurrentPost] = pmeta
     vposts = @root/:views/view_name/:posts             # Step 2...
-puts "-- hpost:"
-hash.each_pair {|k,v| puts "    #{k}:    #{v}" if k.is_a? Symbol }
-puts
     copy!(pdraft, vposts)    # ??
-    copy(pdraft/"guts.html", @theme/:post)             # Step 3...
-    preprocess cwd: @theme/:post, src: "generate.lt3", # Step 4...
-               force: true, vars: hash, 
-               dst: remote/ahtml, call: ".nopara" 
+    copy(pdraft/"guts.html", vposts/nslug)             # Step 3...
+                                                       # Step 4...
+    preprocess cwd: pmeta, src: "../../themes/standard/post/generate.lt3", 
+               force: true, vars: hash, debug: true,
+               dst: remote/ahtml, call: ".nopara"
     FileUtils.rm_f(remote/"published")
     timelog("Generated", remote/"history")
     copy_widget_html(view_name)
   rescue => err
-    _tmp_error(err)
+    puts "Error - see stdout.txt"
+    STDERR.puts err.inspect
+    STDERR.puts err&.backtrace
+    # _tmp_error(err)
+    # puts err.backtrace.join("\n")
   end
 
   def _check_view?(view)
@@ -697,7 +727,9 @@ puts
   def generate_post(draft, force = false)
     log!(enter: __method__, args: [draft], level: 1)
     views = _get_views(draft)
-    views.each {|view| _handle_post(draft, view) }
+    views.each do |view| 
+      _handle_post(draft, view)
+    end
     # For current view: 
     slug = File.basename(draft).sub(/.lt3$/, "")
     postdir = self.view.dir/"remote/post/"/slug

data/lib/runeblog_version.rb

@@ -1,7 +1,7 @@
 if !defined?(RuneBlog::Path)
 
 class RuneBlog
-  VERSION = "0.3.20"
+  VERSION = "0.3.25"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/lib/view.rb

@@ -13,17 +13,36 @@ class RuneBlog::View
     @name = name
     @publisher = RuneBlog::Publishing.new(name)
     @can_publish = true  # FIXME
-    @blog.view = self
+    #  @blog.view = self  # NOOOO??
     get_globals
   end
 
-  def get_globals
-    gfile = @blog.root/"views/#{name}/themes/standard/global.lt3"
+  def dump_globals_stderr
+    log!(enter: __method__, args: [list], level: 2)
+    list2 = list.select(&block)
+    STDERR.puts "-- globals = "
+    log!(str: "-- globals = ")
+    @globals.each_pair do |k, v| 
+      msg = sprintf "     %-10s  %s\n", k, v if k.is_a? Symbol 
+      STDERR.puts msg
+    log!(str: msg)
+    end
+    STDERR.puts 
+    log!(str: "")
+  end
+
+  def get_globals(force = false)
+    return if @globals && !force
+    # gfile = @blog.root/"views/#@name/themes/standard/global.lt3"
+    gfile = @blog.root/"views/#@name/data/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)
+    live._setvar("ViewDir", @blog.root/:views/@name)
+    live._setvar("View",    @name)
     @globals = live.vars
+#   dump_globals_stderr
   end
 
   def dir

data/runeblog.gemspec

@@ -8,6 +8,7 @@ require "runeblog_version"
 Gem.post_install do |spec|
   Dir.chdir(RuneBlog::Path)
   system("livetext -i liveblog.rb")
+  system("livetext -i code_rouge.rb")
 end
 
 spec = Gem::Specification.new do |s|
@@ -20,8 +21,9 @@ spec = Gem::Specification.new do |s|
   s.authors     = ["Hal Fulton"]
   s.email       = 'rubyhacker@gmail.com'
   s.executables << "blog"
-  s.add_runtime_dependency 'livetext', '~> 0.9', '>= 0.9.04'
-  s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.22'
+  s.add_runtime_dependency 'livetext', '~> 0.9',  '>= 0.9.10'
+  s.add_runtime_dependency 'rubytext', '~> 0.1',  '>= 0.1.23'
+  s.add_runtime_dependency 'rouge',    '~> 3.25', '>= 3.25.0'
 
   s.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.25
 platform: ruby
 authors:
 - Hal Fulton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -19,7 +19,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.04
+        version: 0.9.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.04
+        version: 0.9.10
 - !ruby/object:Gem::Dependency
   name: rubytext
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 0.1.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,27 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 0.1.23
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.25.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.25'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.25.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.25'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +129,7 @@ files:
 - empty_view/config/twitter/tw.html
 - empty_view/config/twitter/tw.js
 - empty_view/config/twitter/twitter.rb
+- empty_view/data/GIT_IS_DUMB
 - empty_view/posts/GIT_IS_DUMB
 - empty_view/remote/assets/GIT_IS_DUMB
 - empty_view/remote/banner/navbar/GIT_IS_DUMB
@@ -235,8 +256,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: A command-line blogging system
 test_files: []