runeblog 0.2.91 → 0.2.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27cc38e2e368d435cd84531411f2e929a0bb629d4fcc3d05714db84c5a55a777
-  data.tar.gz: e7508aa230cac2adfddb9e7f9bd9175da281b801924ae567fee8315deb10de3a
+  metadata.gz: 5a01afc10ad3439db402e06d8c0d5674d247485fe82c63c29160ca70d8e43a6d
+  data.tar.gz: 50df27f119a4df78b1c366dc119e4b84c8fb45a9707a02d43e1e20e8caa32e01
 SHA512:
-  metadata.gz: 27b4e7dcdc6d9a1b3bd82d6c1733267f21656d2efa8ad7f13667152bf09b9eab52ad4adc5aba330d4e0e3a2a8c7a79093d12a39b9dcdd0f6595ca0e0a419e364
-  data.tar.gz: 1034eb0b04e9c33a855be6fcdee7ee86408b9a65d4570db8416d4c4ae248137561261168c7cf941dfe86000be65da9375804b3b01f28d11889ce1fdfe76efaf8
+  metadata.gz: 8f3ffe63bab275d26f14c516f24b48c127fc8bd4a661c32b17528a9d0bd399a85294fbb33af24436984a0dfe749d7a7651acc37b096819a71dbb763375d2ef3f
+  data.tar.gz: 6ee5c12a07c7f493b71352ca0aa0bd633810222efda55e19925ed8dc71b4ee42a27b58a352bfce2d1bd815768513c9e9c6216178278995f26cf2188aae8bca93

data/bin/blog

@@ -146,7 +146,10 @@ end
 
 major, minor = RUBY_VERSION.split(".").values_at(0,1)
 ver = major.to_i*10 + minor.to_i
-abort "Need Ruby 2.4 or greater" unless ver >= 24
+unless ver >= 24
+  RubyText.stop
+  abort "Need Ruby 2.4 or greater" 
+end
 
 include RuneBlog::Helpers  # for try_read_config
 

data/empty_view/themes/standard/global.lt3

@@ -29,7 +29,7 @@ post.date.size    15px
 publish.user      root
 publish.server    rubyhacker.com
 publish.docroot   /var/www/
-publish.path      around_austin
+publish.path      stuff
 publish.proto     http
 .end
 

data/empty_view/themes/standard/post/index.lt3

@@ -6,19 +6,19 @@
 . likely be the place.
 . --------------------------------------------------
 
-.mixin liveblog
-. ^ get rid of this later
-
 .post 0
  
-.title The new amphitheatre is overrated
+.title This is my title
 .pubdate 2019-07-09
-.views around_austin 
+.views stuff 
 .tags 
  
 .teaser
-It used to be that all major concerts played the Erwin Center.
-
+This is only a short excerpt from the top of the blog post. 
 .end
-Now, depending on what you consider "major," blah blah blah...
+
+And now we continue the post.
+Do we have anything to say?
+
+Apparently not much.
 

data/empty_view/themes/standard/widgets/links/links.rb

@@ -9,7 +9,7 @@ class ::RuneBlog::Widget
     def initialize(repo)
       @blog = repo
       @datafile = input = "list.data"
-      @lines = File.readlines(input)
+      @lines = _get_data(@datafile)
     end
 
     def build

data/empty_view/themes/standard/widgets/news/news.rb

@@ -7,7 +7,7 @@ class ::RuneBlog::Widget
     def initialize(repo)
       @blog = repo
       @datafile = "list.data"
-      lines = File.readlines(@datafile)
+      lines = _get_data(@datafile)
       @data = lines.map {|line| line.chomp.split(/, */) }
     end
 

data/empty_view/themes/standard/widgets/pages/pages.rb

@@ -9,7 +9,7 @@ class ::RuneBlog::Widget
     def initialize(repo)
       @blog = repo
       @datafile = "list.data"
-      @lines = File.readlines(@datafile)
+      @lines = _get_data(@datafile)
       @data = @lines.map {|x| x.chomp.split(/, */, 2) }
     end
 

data/empty_view/themes/standard/widgets/pinned/pinned.rb

@@ -7,7 +7,7 @@ class ::RuneBlog::Widget
     def initialize(repo)
       @blog = repo
       @datafile = "list.data"
-      @lines = File.exist?(@datafile) ? File.readlines(@datafile) : []
+      @lines = _get_data?(@datafile)
     end
 
     def _html_body(file, css = nil)    # FIXME

data/lib/helpers-blog.rb

@@ -5,6 +5,23 @@ require 'processing'
 
 module RuneBlog::Helpers
 
+  def _get_data?(file)   # File need not exist
+    if File.exist?(file)
+      _get_data(file)
+    else
+      []
+    end
+  end
+
+  def _get_data(file)
+    lines = File.readlines(file)
+    lines.reject! {|line| line[0] == "-" }  # allow rejection of lines
+    lines = lines.map do |line|
+      line.sub(/ *# .*$/, "")               # allow trailing comments
+    end
+    lines
+  end
+
   def copy(src, dst)
     log!(enter: __method__, args: [src, dst], level: 2)
     cmd = "cp #{src} #{dst} 2>/dev/null"
@@ -100,13 +117,13 @@ module RuneBlog::Helpers
     end
   end
 
-  def get_views   # read from filesystem
+  def retrieve_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: "#{root}/data/VIEW", editor: "/usr/local/bin/vim")
+  def write_repo_config(root: "#{Dir.pwd}/.blogs", view: File.read("#{root}/data/VIEW").chomp, 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

@@ -86,9 +86,9 @@ end
 
 def _read_navbar_data
   vdir = @blog.root/:views/@blog.view
-  dir = vdir/"themes/standard/banner/"
+  dir = vdir/"themes/standard/banner/navbar/"
   datafile = dir/"list.data"
-  File.readlines(datafile)
+  _get_data(datafile)
 end
 
 def banner
@@ -100,6 +100,9 @@ def banner
   navbar = nil
   vdir = @blog.root/:views/@blog.view
   lines = _body.to_a
+TTY.puts "-"*30
+lines.each {|x| TTY.puts x }
+TTY.puts "-"*30
 
   lines.each do |line|
     count += 1
@@ -343,7 +346,7 @@ def pin
   pinned.each do |pinview|
     dir = @blog.root/:views/pinview/"themes/standard/widgets/pinned/"
     datafile = dir/"list.data"
-    pins = File.exist?(datafile) ? File.readlines(datafile) : []
+    pins = _get_data?(datafile)
     pins << "#{@meta.num} #{@meta.title}\n"
     pins.uniq!
     File.open(datafile, "w") {|out| pins.each {|pin| out.puts pin } }

data/lib/repl.rb

@@ -114,7 +114,7 @@ module RuneBlog::REPL
     dir = @blog.view.dir/"themes/standard/widgets/pages"
     # Assume child files already generated (and list.data??)
     data = dir/"list.data"
-    lines = File.readlines(data)
+    lines = _get_data?(data)
     hash = {}
     lines.each do |line|
       url, name = line.chomp.split(",")
@@ -229,6 +229,7 @@ module RuneBlog::REPL
     debug "Starting cmd_rebuild..."
     reset_output
     puts unless testing
+TTY.puts "rebuilding #{@blog.view.inspect}"
     @blog.generate_view(@blog.view)
     @blog.generate_index(@blog.view)
     @out

data/lib/runeblog.rb

@@ -90,10 +90,13 @@ class RuneBlog
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
 
     @root = Dir.pwd/root_rel
-    copy_data(:config, @root/:data)
+    copy_data(:config, @root/:data) unless File.exist?(@root/"data/VIEW")
     write_repo_config(root: @root)
     get_repo_config
-    @views = get_views
+    @views = retrieve_views
+puts @views.inspect
+system("cat #@root/data/VIEW")
+    self.view = File.read(@root/"data/VIEW").chomp
     md = Dir.pwd.match(%r[.*/views/(.*?)/])
     if md
       @view_name = md[1]
@@ -460,6 +463,7 @@ class RuneBlog
 
   def generate_view(view)  # huh?
     log!(enter: __method__, args: [view])
+puts "gv: view = #{view}"
     vdir = @root/:views/view
     @theme = @root/:views/view/:themes/:standard
     depend = [vdir/"remote/etc/blog.css.lt3", @theme/"global.lt3", 

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.91"
+  VERSION = "0.2.92"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.91
+  version: 0.2.92
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2019-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext