runeblog 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0fcd07e427eb105db2a6dcad6fdd340570b031bbf9bf4c2a07e69d92ec4fcf7
-  data.tar.gz: 8d4b005099a777e60819439a0e34270dccdb2adbc284e5d8092dfea470a4be58
+  metadata.gz: a7f74526fa315a736ee77fcc1bb3ca62a35dab08dea644e5d734239f2f285e14
+  data.tar.gz: 02bf784d0020ffd59e707cabc1fb4c1ff57c66d149405f3e83650ecaf836608d
 SHA512:
-  metadata.gz: f31952b35035981bf3f7a8a6166da37b4c227ece9388d4ccdb6efa02a3415e0b22dd5e01fcbf7c8e5ce1c2e8616b573c2d9211c7bcd61ebc22f2bda720be0ebe
-  data.tar.gz: b3a3d44b0b14f20d8e87ff74f91ff5c858d2460942755cc8000b9598725db2ff8b80b26b1791fe7ce3ac0c47ed8382af0894fc3c5e582dbbf70490d010cbe2ef
+  metadata.gz: 4af84cc5d0c71b67c3d9aaf8ef76924057579193a08e516d3914e07bc1f99f8cc4689c7b4c0649290932d420fc1df84e4e918d8052dcff238ebd663119245a01
+  data.tar.gz: 72f5a4d0ac5cbaa68cf9e6df062d93485efb45735b501de8f89201880df1d6e1278aab4e4b41ae805e0bd7a73b3d5779a28a6507e885e95de0a9021dfd421385

data/lib/helpers-blog.rb

@@ -37,7 +37,9 @@ module RuneBlog::Helpers
   end
 
   def get_views   # read from filesystem
-    verify(Dir.exist?("#@root/views") => "#{@root/views} doesn't exist")
+    verify(@root => "#@root is nil",
+           Dir.exist?(@root) => "#@root doesn't exist",
+           Dir.exist?("#@root/views") => "#@root/views doesn't exist")
     dirs = subdirs("#@root/views/").sort
     dirs.map {|name| RuneBlog::View.new(name) }
   end
@@ -57,17 +59,16 @@ module RuneBlog::Helpers
   end
 
   def subdirs(dir)
+    verify(Dir.exist?(dir) => "Directory #{dir} not found")
     dirs = Dir.entries(dir) - %w[. ..]
     dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
     dirs
-  rescue => err
-    STDERR.puts "Can't find dir '#{dir}'"
-    puts err
-    puts err.backtrace
-    exit
   end
 
   def find_src_slugs
+    verify(@root => "#@root is nil",
+           Dir.exist?(@root) => "#@root doesn't exist",
+           Dir.exist?("#@root/src") => "#{@root/src} doesn't exist")
     files = Dir.entries("#@root/src/").grep /\d{4}.*.lt3$/
     files.map! {|f| File.basename(f) }
     files = files.sort.reverse

data/lib/helpers-repl.rb

@@ -6,61 +6,8 @@ make_exception(:CantDelete,      "Can't open '$1'")
 make_exception(:InternalError,   "Glitch: $1 got arg '$2'")
 make_exception(:CantCopy,        "Can't copy $1 to $2")
 
-module WithANSI
-  def clear
-    puts "\e[H\e[2J"  # clear screen  # CHANGE_FOR_CURSES?
-  end
-
-  def red(text)
-    "\e[31m#{text}\e[0m"  # CHANGE_FOR_CURSES?
-  end
-
-  def blue(text)
-    "\e[34m#{text}\e[0m"  # CHANGE_FOR_CURSES?
-  end
-
-  def bold(str)
-    "\e[1m#{str}\e[22m"  # CHANGE_FOR_CURSES?
-  end
-
-end
-
-module NoANSI
-
-  def gets
-    str = ""
-    loop do
-      ch = ::STDSCR.getch
-      if ch == 10
-        STDSCR.crlf
-        break 
-      end
-      str << ch
-    end
-    str
-  end
-
-  def clear
-#   puts "\e[H\e[2J"  # clear screen  # CHANGE_FOR_CURSES?
-  end
-
-  def red(text)
-    text
-  end
-
-  def blue(text)
-    text
-  end
-
-  def bold(str)
-    str
-  end
-end
-
 
 module RuneBlog::REPL
-  include NoANSI
-
   Patterns = 
     {"help"              => :cmd_help, 
      "h"                 => :cmd_help,
@@ -130,7 +77,6 @@ module RuneBlog::REPL
     params = nil
     Regexes.each_pair do |rx, meth|
       m = cmd.match(rx)
-# puts "#{rx} =~ #{cmd.inspect}  --> #{m.to_a.inspect}"
       result = m ? m.to_a : nil
       next unless result
       found = meth
@@ -180,9 +126,9 @@ module RuneBlog::REPL
     @out << str
   end
 
-  def output!(str)  # red, \n and indent
+  def output!(str)  # \n and indent
     @out ||= ""
-    @out << "  " + red(str)
+    @out << "  " + str
   end
 
   def output_newline(n = 1)
@@ -215,11 +161,10 @@ module RuneBlog::REPL
   end
 
   def colored_slug(slug)
-    red(slug[0..3])+blue(slug[4..-1])  # CHANGE_FOR_CURSES?
+    slug[0..3] + slug[4..-1]
   end
 
   def import(arg = nil)
-#   open_blog unless @blog
     raise "Not implemented at present..."
     arg = nil if arg == ""
     arg ||= ask("Filename: ")  # check validity later
@@ -239,6 +184,8 @@ module RuneBlog::REPL
   end
 
   def ask_publishing_info   # returns Publishing object
+    verify(@blog => "@blog is nil", 
+           @blog.view => "@blog.view is nil")
     # user, server, root, path, protocol = "http"
     puts "Please enter publishing data for view #{@blog.view}..."
     user = ask("User: ")
@@ -251,27 +198,6 @@ module RuneBlog::REPL
     RuneBlog::Publishing.new(user, server, root, path, proto)
   end
 
-  def dumb_menu(array)
-    # { string => :meth, ... }
-    max = array.size
-    puts "\n  Select from:"  # CHANGE_FOR_CURSES?
-    array.each.with_index do |string, i|
-      puts "   #{red('%2d' % (i+1))} #{string}"  # CHANGE_FOR_CURSES?
-    end
-    picked = nil
-    loop do
-      print red("> ")  # CHANGE_FOR_CURSES?
-      num = gets.to_i
-      if num.between?(1, max)
-        picked = array[num-1]
-        break
-      else
-        puts "Huh? Must be 1 to #{max}"  # CHANGE_FOR_CURSES?
-      end
-    end
-    picked
-  end
-
   ### find_asset
 
   # FIXME is this per-post?

data/lib/post.rb

@@ -19,15 +19,21 @@ class RuneBlog::Post
     # FIXME weird logic here
     raise NoBlogAccessor if RuneBlog.blog.nil?
     pdir = RuneBlog.blog.view.dir + "/" + post
+    verify(Dir.exist?(pdir) => "Directory #{pdir} not found")
     meta = nil
     Dir.chdir(pdir) do
+      verify(File.exist?("metadata.txt") => "metadata.txt not found",
+             File.exist?("teaser.txt") => "teaser.txt not found",
+             File.exist?("body.txt") => "body.txt not found")
       meta = read_config("metadata.txt")
+      verify(meta.date  => "meta.date is nil",
+             meta.views => "meta.views is nil",
+             meta.tags  => "meta.tags is nil")
       meta.date = Date.parse(meta.date)
       meta.views = meta.views.split
       meta.tags = meta.tags.split
       meta.teaser = File.read("teaser.txt")
       meta.body = File.read("body.txt")
-      check_meta(meta, "Post.load")
     end
     meta
   end
@@ -61,7 +67,6 @@ class RuneBlog::Post
   end
 
   def initialize
-    debug "=== Post#initialize"
     @blog = RuneBlog.blog || raise(NoBlogAccessor)
   end
 
@@ -70,12 +75,14 @@ class RuneBlog::Post
     post = self.new
     post.new_metadata(title)
     post.create_draft
-    post.create_post_subtree  # gets done in build anyway
-#   post.build   # where livetext gets called
+    post.create_post_subtree
+    # post.build is not called here! It is called
+    # in runeblog.rb:create_new_post AFTER post.edit
     post
   end
 
   def new_metadata(title)
+    verify(title.is_a?(String) => "Title #{title.inspect} is not a string")
     meta = OpenStruct.new
     meta.title = title
     meta.teaser = "Teaser goes here."
@@ -83,8 +90,7 @@ class RuneBlog::Post
     meta.pubdate = Time.now.strftime("%Y-%m-%d")
     meta.date = meta.pubdate  # fix later
     meta.views = [@blog.view.to_s]
-    # only place next_sequence is called
-    meta.num   = @blog.next_sequence
+    meta.num   = @blog.next_sequence   # ONLY place next_sequence is called!
     @blog.make_slug(meta)  # adds to meta
     @meta = meta
   end
@@ -92,28 +98,16 @@ class RuneBlog::Post
   def create_draft
     html = RuneBlog.post_template(title: @meta.title, date: @meta.pubdate, 
                view: @meta.view, teaser: @meta.teaser, body: @meta.body)
-    @draft = "#{@blog.root}/src/#{@meta.slug}.lt3"
+    srcdir = "#{@blog.root}/src/"
+    verify(Dir.exist?(srcdir) => "#{srcdir} not found",
+           @meta.slug.is_a?(String) => "slug #{@meta.slug.inspect} is invalid")
+    fname  = @meta.slug + ".lt3"
+    @draft = srcdir + fname
     dump(html, @draft)
   end
 
-  def old_initialize(meta, view_name)
-    # FIXME weird logic here
-    @blog = RuneBlog.blog || raise(NoBlogAccessor)
-    @blog.make_slug(meta)  # Post#initialize
-    check_meta(meta, "Post#initialize")
-    html = RuneBlog.post_template(title: meta.title, date: meta.pubdate, 
-                                  view: meta.view, teaser: meta.teaser, 
-                                  body: meta.body)
-    slug = meta.slug
-    @meta = meta
-    @draft = "#{@blog.root}/src/#{slug}.lt3"
-    dump(html, @draft)
-  rescue => err
-    puts err
-    puts err.backtrace
-  end
-
   def edit
+    verify(File.exist?(@draft) => "File #{@draft} not found")
     result = system("vi #@draft +8")  # TODO improve this
     raise EditorProblem(draft) unless result
     nil

data/lib/runeblog_version.rb

@@ -1,6 +1,6 @@
 
 class RuneBlog
-  VERSION = "0.1.25"
+  VERSION = "0.1.26"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-01 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext