runeblog 0.2.93 → 0.2.94

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51a1371a11eb69a62ff435090be403f586c0bddfd8c62ef7dc3e4f97020fee12
-  data.tar.gz: 4d1e82de93ebb0d408964b5d06e6dc4a42f450e064b7174eecd4cb8328054f4a
+  metadata.gz: 7ed9580d074b2ce228aff385bbe22e907a9ae0c330f625aa2d42ee58464a1d3b
+  data.tar.gz: 0ce0642e8b2f0026cca4133916ff0dd3f992bb1ae8cb89e3304d90221d8195a8
 SHA512:
-  metadata.gz: 8e27ae9cb582a3a84746db31ce664b1ed3a5ed8c47fff9178de4ff5a55e9c41687390b655a13b8df533e498edfe5ffb16af2f3f832c9d9c082353409e2dd17bb
-  data.tar.gz: 73e512eb67281d74c141ecda0de9f75aec04e64402b5ef23a3552d0798e681b3b43aefa2a88fdb9b23bfda95f00b37938a6455599be11a665bcf182ff2b60659
+  metadata.gz: 84d30bada582bd3393e075a1cba653ec11e719941c675d1a9753d6dbf921643137e6096205b5120c91f385e6d9cb4a1e823440607b1db5ee23232c87885128bc
+  data.tar.gz: 0b0207066da6493400d66e9473c00659bef4b4169fb26cdbe554d220a59778579bd06207643516a409df39247fa8b263ae77229c16344912e81a8befb0237c6b

data/bin/blog

@@ -25,8 +25,8 @@ end
 def get_universal
   univ = "#{@blog.root}/data/universal.lt3"
   if yesno("Faster initial setup? (no: edit universal.lt3)")
-    author = ask("Author name: ")
-    site   = ask("Site/domain: ")
+    author = ask!("Author name: ")
+    site   = ask!("Site/domain: ")
     # Now stash it...
     str = File.read(univ)
     str = str.gsub(/AUTHOR/, author)
@@ -41,8 +41,8 @@ def get_global
   if yesno("Faster view setup? (no: edit global.lt3)")
     view_name = ask("\nFilename: ")
     @blog.create_view(view_name)   # call change_view??
-    title     = ask("View title: ")
-    subtitle  = ask("Subtitle  : ")
+    title     = ask!("View title: ")
+    subtitle  = ask!("Subtitle  : ")
     gname = "#{@blog.root}/views/#{view_name}/themes/standard/global.lt3" 
     text = File.read(gname)
     text = text.gsub(/VIEW_NAME/,     view_name)
@@ -50,7 +50,7 @@ def get_global
     text = text.gsub(/VIEW_SUBTITLE/, subtitle)
     File.write(gname, text)
   else
-    view_name = ask("\nFilename: ")
+    view_name = ask!("\nFilename: ")
     @blog.create_view(view_name)   # call change_view??
     vim_params = '-c ":set hlsearch" -c ":hi Search ctermfg=2 ctermbg=6" +/"\(VIEW_.*\|SITE.*\)"'
     edit_file(@blog.view.dir/"themes/standard/global.lt3", vim: vim_params)

data/lib/helpers-blog.rb

@@ -3,37 +3,15 @@ require 'fileutils'
 
 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
+require 'lowlevel'
 
-  def copy(src, dst)
-    log!(enter: __method__, args: [src, dst], level: 2)
-    cmd = "cp #{src} #{dst} 2>/dev/null"
-    rc = system!(cmd)
-    puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
-  end
+module RuneBlog::Helpers
 
-  def copy!(src, dst)
-    log!(enter: __method__, args: [src, dst], level: 2)
-    cmd = "cp -r #{src} #{dst} 2>/dev/null"
-    rc = system!(cmd)
-    puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
+  def quit_RubyText
+    return unless defined? RubyText
+    sleep 6
+    RubyText.stop
+    exit
   end
 
   def get_repo_config
@@ -71,8 +49,7 @@ module RuneBlog::Helpers
     puts "Can't read vars file '#{file}': #{err}"
     puts err.backtrace.join("\n")
     puts "dir = #{Dir.pwd}"
-    sleep 6; RubyText.stop
-    exit
+    stop_RubyText
   end
 
   def read_config(file, *syms)
@@ -98,8 +75,7 @@ module RuneBlog::Helpers
     puts "Can't read config file '#{file}': #{err}"
     puts err.backtrace.join("\n")
     puts "dir = #{Dir.pwd}"
-    sleep 6; RubyText.stop
-    exit
+    stop_RubyText
   end
 
   def try_read_config(file, hash)
@@ -123,20 +99,21 @@ module RuneBlog::Helpers
     dirs.map {|name| RuneBlog::View.new(name) }
   end
 
-  def write_repo_config(root: "#{Dir.pwd}/.blogs", view: File.read("#{root}/data/VIEW").chomp, editor: "/usr/local/bin/vim")
+  def write_repo_config(root: "#{Dir.pwd}/.blogs", view: nil, editor: "/usr/local/bin/vim")
+    view ||= File.read("#{root}/data/VIEW").chomp rescue "[no view]"
     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
-    x = OpenStruct.new
-    x.root, x.current_view, x.editor = root, current_view, editor
-    write_config(x, root + "/" + RuneBlog::ConfigFile)
-    write_repo_config
-  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
+  #   x = OpenStruct.new
+  #   x.root, x.current_view, x.editor = root, current_view, editor
+  #   write_config(x, root + "/" + RuneBlog::ConfigFile)
+  #   write_repo_config
+  # end
 
   def new_sequence
     log!(enter: __method__, level: 3)
@@ -164,38 +141,6 @@ module RuneBlog::Helpers
     files
   end
 
-  def create_dirs(*dirs)
-    log!(enter: __method__, args: [*dirs], level: 3)
-    dirs.each do |dir|
-      dir = dir.to_s  # symbols allowed
-      next if Dir.exist?(dir)
-      cmd = "mkdir -p #{dir} >/dev/null"
-      result = system!(cmd) 
-      raise CantCreateDir(dir) unless result
-    end
-  end
-
-  def interpolate(str, bind)
-    log!(enter: __method__, args: [str, bind], level: 3)
-    wrap = "<<-EOS\n#{str}\nEOS"
-    eval wrap, bind
-  end
-
-  def error(err)  # Hmm, this is duplicated
-    log!(str: "duplicated method", enter: __method__, args: [err], level: 2)
-    str = "\n  Error: #{err}"
-    puts str
-    puts err.backtrace.join("\n")
-  end
-
-  def dump(obj, name)
-    log!(enter: __method__, args: [obj, name], level: 3)
-    File.write(name, obj)
-  end
 end
 
-def dump(obj, name)      # FIXME scope
-  log!(str: "scope problem", enter: __method__, args: [obj, name], level: 3)
-  File.write(name, obj)
-end
 

data/lib/helpers-repl.rb

@@ -109,26 +109,16 @@ module RuneBlog::REPL
     end
     meth = found || :cmd_INVALID
     params = cmd if meth == :cmd_INVALID
-# puts "choose: #{[meth, params].inspect}"
     [meth, params]
   end
 
-  def error(err)  # Hmm, this is duplicated
-    str = "\n  Error: #{err}"
-    puts str
-    puts err.backtrace.join("\n")
-  end
-
   def ask(prompt, meth = :to_s)
     print prompt
-    str = gets
-    str.chomp!
-    str.send(meth)
+    gets.chomp.send(meth)
   end
 
-  def yesno(prompt, meth = :to_s)
-    print prompt
-    gets.chomp.upcase[0] == "Y"
+  def ask!(prompt, meth = :to_s)
+    ask(fx(prompt, :bold), meth)
   end
 
   def reset_output(initial = "")

data/lib/liveblog.rb

@@ -501,22 +501,6 @@ rescue => err
   exit
 end
 
-# def pinned_rebuild
-#   view = @blog.view
-#   view = _args[0] unless _args.empty?
-#   Dir.chdir(@blog.root/:views/view/"themes/standard/") do
-#     wtag = "widgets/pinned"
-#     code = _load_local("pinned")
-#     if code 
-#       Dir.chdir(wtag) do 
-#         widget = code.new(@blog)
-#         widget.build
-#       end
-#       # _include_file wtag/"pinned-card.html"
-#     end
-#   end
-# end
-
 def _handle_standard_widget(tag)
   wtag = :widgets/tag
   code = _load_local(tag)
@@ -769,11 +753,6 @@ def _post_lookup(postid)    # side-effect
   vp
 end
 
-def _interpolate(str, context)   # FIXME move this later
-  wrapped = "%[" + str.dup + "]"  # could fail...
-  eval(wrapped, context)
-end
-
 def _card_generic(card_title:, middle:, extra: "")
   front = <<-HTML
     <div class="card #{extra} mb-3">

data/lib/lowlevel.rb

@@ -0,0 +1,73 @@
+
+  def dump(obj, name)
+    File.write(name, obj)
+  end
+
+  def system!(str, show: false)
+    log!(enter: __method__, args: [str], level: 2)
+    STDERR.puts str if show
+    rc = system(str)
+    return rc if rc
+    STDERR.puts "FAILED: #{str.inspect}"
+    STDERR.puts "\ncaller = \n#{caller.join("\n  ")}\n"
+    if defined?(RubyText)
+      sleep 6
+      RubyText.stop
+      exit
+    end
+    return rc
+  end
+
+  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"
+    system!(cmd)
+  end
+
+  def copy!(src, dst)
+    log!(enter: __method__, args: [src, dst], level: 2)
+    cmd = "cp -r #{src} #{dst} 2>/dev/null"
+    system!(cmd)
+  end
+
+  def create_dirs(*dirs)
+    log!(enter: __method__, args: [*dirs], level: 3)
+    dirs.each do |dir|
+      dir = dir.to_s  # symbols allowed
+      next if Dir.exist?(dir)
+      cmd = "mkdir -p #{dir} >/dev/null"
+      result = system!(cmd) 
+      raise CantCreateDir(dir) unless result
+    end
+  end
+
+  def interpolate(str, bind)
+    log!(enter: __method__, args: [str, bind], level: 3)
+    wrap = "<<-EOS\n#{str}\nEOS"
+    eval wrap, bind
+  end
+
+  def error(err)
+    log!(str: err, enter: __method__, args: [err], level: 2)
+    str = "\n  Error: #{err}"
+    puts str
+    puts err.backtrace.join("\n")
+  end
+

data/lib/publish.rb

@@ -37,21 +37,15 @@ class RuneBlog::Publishing
     url = "#@proto://#@server/#@path"  # /#{vname}"
   end
 
-  def system!(str)
-    log!(enter: __method__, args: [str], level: 1)
-    rc = system(str)
-    rc
-  end
-
   def publish
     log!(enter: __method__, level: 1)
     dir = @docroot/@path
     view_name = @blog.view.name
     viewpath = dir # /view_name
     # FIXME rsync doesn't work
-    cmd = "rsync -a -r -z #{@blog.root}/views/#{@blog.view}/remote/ #@user@#@server:#{viewpath}/"
+    cmd = "rsync -r -z #{@blog.root}/views/#{@blog.view}/remote/ #@user@#@server:#{viewpath}/"
     system!(cmd)
-    dump(files, "#{@blog.view.dir}/last_published")
+    dump("#{@blog.view} at #{Time.now}", "#{@blog.view.dir}/last_published")
     true
   end
 

data/lib/repl.rb

@@ -194,7 +194,7 @@ module RuneBlog::REPL
     end
 
     ret = RubyText.spinner(label: " Publishing... ") do
-      @blog.view.publisher.publish(files, assets)  # FIXME weird?
+      @blog.view.publisher.publish
     end
     return @out unless ret
 

data/lib/runeblog.rb

@@ -10,7 +10,6 @@ require 'logging'
 
 require 'runeblog_version'
 require 'helpers-blog'
-require 'default'
 require 'view'
 require 'publish'
 require 'post'
@@ -48,6 +47,34 @@ class RuneBlog
 
   include Helpers
 
+    class Default
+
+    # This will all become much more generic later.
+
+    def RuneBlog.post_template(num: 0, title: "No title", date: nil, view: "test_view", 
+                               teaser: "No teaser", body: "No body", tags: ["untagged"], 
+                               views: [], back: "javascript:history.go(-1)", home: "no url")
+      log!(enter: __method__, args: [num, title, date, view, teaser, body, tags, views, back, home], level: 3)
+      viewlist = (views + [view.to_s]).join(" ")
+      taglist = ".tags " + tags.join(" ")
+
+      <<~TEXT
+      .post #{num}
+
+      .title #{title}
+      .pubdate #{date}
+      .views #{viewlist}
+      #{taglist}
+
+      .teaser
+      #{teaser}
+      .end
+      #{body}
+      TEXT
+    end
+
+  end
+
   def _tmp_error(err)   # FIXME move to helpers
     out = "/tmp/blog#{rand(100)}.txt"
     File.open(out, "w") do |f|
@@ -68,7 +95,7 @@ class RuneBlog
       create_dirs(:data, :drafts, :views, :posts)
       new_sequence
     end
-    copy_data(:config, repo_root/:data)
+    copy_data(:config, repo_root/:data) unless File.exist?(repo_root/"data/VIEW")
     write_repo_config(root: repo_root)
     @blog = self.new
     @blog
@@ -90,7 +117,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")
+#   copy_data(:config, @root/:data) unless File.exist?(@root/"data/VIEW")
     write_repo_config(root: @root)
     get_repo_config
     @views = retrieve_views
@@ -210,6 +237,9 @@ class RuneBlog
   def view=(arg)
     log!(enter: __method__, args: [arg], level: 2)
     case arg
+      when "[no view]"
+        # puts "Warning: No current view set"
+        @view = nil
       when RuneBlog::View
         @view = arg
         _set_publisher
@@ -487,8 +517,8 @@ class RuneBlog
     log!(enter: __method__, args: [draft], level: 2)
     # FIXME dumb code
     view_line = File.readlines(draft).grep(/^.views /)
-    raise "More than one .views call!" if view_line.size > 1
-    raise "No .views call!" if view_line.size < 1
+    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
     views.uniq 

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.93"
+  VERSION = "0.2.94"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)
@@ -41,22 +41,6 @@ def make_exception(sym, str)
   end
 end
 
-def system!(str, show: false)
-  log!(enter: __method__, args: [str], level: 2)
-  STDERR.puts str if show
-  rc = system(str)
-  if rc
-    return rc
-  else
-    STDERR.puts "FAILED: #{str.inspect}"
-    STDERR.puts "\ncaller = \n#{caller.join("\n  ")}\n"
-    sleep 6; RubyText.stop
-exit
-    return rc
-  end
-  rc
-end
-
 def prefix(num)
   log!(enter: __method__, args: [num], level: 3)
   "#{'%04d' % num.to_i}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.93
+  version: 0.2.94
 platform: ruby
 authors:
 - Hal Fulton
@@ -175,7 +175,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/default.rb
 - lib/exper/2svg.lt3
 - lib/exper/callout.js
 - lib/exper/fbtw-js
@@ -187,6 +186,7 @@ files:
 - lib/helpers-repl.rb
 - lib/liveblog.rb
 - lib/logging.rb
+- lib/lowlevel.rb
 - lib/pathmagic.rb
 - lib/post.rb
 - lib/processing.rb

data/lib/default.rb

@@ -1,31 +0,0 @@
-class RuneBlog::Default
-
-# This will all become much more generic later.
-
-def RuneBlog.post_template(num: 0, title: "No title", date: nil, view: "test_view", 
-                       teaser: "No teaser", body: "No body", tags: ["untagged"], 
-                       views: [], back: "javascript:history.go(-1)", home: "no url")
-  log!(enter: __method__, args: [num, title, date, view, teaser, body, tags, views, back, home], level: 3)
-  viewlist = (views + [view.to_s]).join(" ")
-  taglist = ".tags " + tags.join(" ")
-
-# .mixin liveblog
-# . ^ get rid of this later
-
-<<-TEXT
-.post #{num}
- 
-.title #{title}
-.pubdate #{date}
-.views #{viewlist}
-#{taglist}
- 
-.teaser
-#{teaser}
-.end
-#{body}
-TEXT
-
-end
-
-end