runeblog 0.3.18 → 0.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d935e36229c36cdae337b72491aad4151824b5c083a48d36f5c73f6a069cc10e
-  data.tar.gz: 742a6d8a782a39dc0897f4ce9d73d8e6b091c8dceb3f96230c990e556e20d994
+  metadata.gz: 2cfbb99881fa66be7a0bcdc30c24851bf8994f3586cd3e888f90da64266f5452
+  data.tar.gz: 64040a6450cab790bb2a7db4552ac610a526ea1ccd6d94319ae64c6cc6e3728d
 SHA512:
-  metadata.gz: 68fdf37438b0fe6f4de20616896a5ad4d9e9a54d5287d079e318b8751b844e748ab261cec1f4f54e8f7bc3970a2dad280fed7a64cd3854c0672f55e8d3d6146d
-  data.tar.gz: 5fd8d900cb5de28bdd51fe6d7f9700bf563ace134536e7c4097e36b7ed88520c687f4f6add2ac057677a87716697c5852717a56798a1199cb42a2118f14a034d
+  metadata.gz: 3c3df66c1d14c3ccd732949fda5a2b6e9b65bcd5121b2a1de6a60b8d7a8a6c05e38bf4660da4b175268c6f7e9292b1941f5dd1985328ccc9d6180261b5a1b844
+  data.tar.gz: 6d673eeaeca255e66db6442551b03dc17817bd2f889e6de3401fda42e47ab426620be21d1647f22382b779be17c739dc981bdde848bb65391bd3018132be2658

data/lib/exceptions.rb

@@ -0,0 +1,37 @@
+
+def make_exception(sym, str, target_class = Object)
+  return if target_class.constants.include?(sym)
+
+  target_class.const_set(sym, StandardError.dup)
+  define_method(sym) do |*args|
+    msg = str.dup
+    args.each.with_index {|arg, i| msg.sub!("%#{i+1}", arg) }
+    target_class.class_eval(sym.to_s).new(msg)
+  end
+end
+
+make_exception(:NotImplemented,        "Feature not yet implemented")
+make_exception(:CantOpen,              "Can't open '%1'")
+make_exception(:CantDelete,            "Can't open '%1'")
+make_exception(:InternalError,         "Glitch: %1 got arg '%2'")
+make_exception(:CantCopy,              "Can't copy %1 to %2")
+
+make_exception(:FileNotFound,          "File %1 was not found")
+make_exception(:FoundNeither,          "Found neither %1 nor %2")
+make_exception(:BlogRepoAlreadyExists, "Blog repo %1 already exists")
+make_exception(:CantAssignView,        "%1 is not a view")
+make_exception(:ViewAlreadyExists,     "View %1 already exists")
+make_exception(:DirAlreadyExists,      "Directory %1 already exists")
+make_exception(:CantCreateDir,         "Can't create directory %1")
+make_exception(:EditorProblem,         "Could not edit %1")
+make_exception(:NoSuchView,            "No such view: %1")
+make_exception(:NoBlogAccessor,        "Runeblog.blog is not set")
+make_exception(:ExpectedString,        "Expected nonempty string but got %1 (%2)")
+make_exception(:ExpectedView,          "Expected string or View object but got %1 (%2)")
+make_exception(:ExpectedInteger,       "Expected integer but got %1 (%2)")
+make_exception(:NoPostCall,            "Method #post not called (no metadata)")
+make_exception(:CantFindWidgetDir,     "Can't find widget dir '%1'")
+make_exception(:PublishError,          "Error during publishing")
+make_exception(:NoNumericPrefix,       "No numeric prefix on slug '%1'")
+make_exception(:NoExtensionExpected,   "No file extension expected on '%1'")
+

data/lib/helpers-repl.rb

@@ -1,11 +1,7 @@
 
-# Reopening...
-
-make_exception(:CantOpen,        "Can't open '$1'")
-make_exception(:CantDelete,      "Can't open '$1'")
-make_exception(:InternalError,   "Glitch: $1 got arg '$2'")
-make_exception(:CantCopy,        "Can't copy $1 to $2")
+require 'exceptions'
 
+# Reopening...
 
 module RuneBlog::REPL
   Patterns = 

data/lib/liveblog.rb

@@ -36,7 +36,6 @@ def init_liveblog    # FIXME - a lot of this logic sucks
 rescue => err
   STDERR.puts "err = #{err}"
   STDERR.puts err.backtrace.join("\n")
-# raise "Only works inside a blog repo"
 end
 
 ##################
@@ -189,7 +188,7 @@ def banner
           if File.exist?(src)
             preprocess src: src, dst: file, call: ".nopara" # , vars: @blog.view.globals
           else
-            raise "Neither #{file} nor #{src} found"
+            raise FoundNeither(file, src)
           end
         end
         str2 << "<td>" + File.read(file) + "</td>" + "\n"
@@ -362,7 +361,7 @@ def inset
 end
 
 def title
-  raise "'post' was not called" unless @meta
+  raise NoPostCall unless @meta
   title = @_data.chomp
   @meta.title = title
   setvar :title, title
@@ -371,7 +370,7 @@ def title
 end
 
 def pubdate
-  raise "'post' was not called" unless @meta
+  raise NoPostCall unless @meta
   _debug "data = #@_data"
   # Check for discrepancy?
   match = /(\d{4}).(\d{2}).(\d{2})/.match @_data
@@ -383,21 +382,21 @@ def pubdate
 end
 
 def tags
-  raise "'post' was not called" unless @meta
+  raise NoPostCall unless @meta
   _debug "args = #{_args}"
   @meta.tags = _args.dup || []
   _optional_blank_line
 end
 
 def views
-  raise "'post' was not called" unless @meta
+  raise NoPostCall unless @meta
   _debug "data = #{_args}"
   @meta.views = _args.dup
   _optional_blank_line
 end
 
 def pin
-  raise "'post' was not called" unless @meta
+  raise NoPostCall unless @meta
   _debug "data = #{_args}"  # verify only valid views?
   pinned = @_args
   @meta.pinned = pinned
@@ -417,7 +416,7 @@ rescue => err
 end
 
 def write_post
-  raise "'post' was not called" unless @meta
+  raise NoPostCall unless @meta
   @meta.views = @meta.views.join(" ") if @meta.views.is_a? Array
   @meta.tags  = @meta.tags.join(" ") if @meta.tags.is_a? Array
   _write_metadata
@@ -427,7 +426,7 @@ rescue => err
 end
 
 def teaser
-  raise "'post' was not called" unless @meta
+  raise NoPostCall unless @meta
   text = _body.join("\n")
   @meta.teaser = text
   setvar :teaser, @meta.teaser
@@ -584,9 +583,8 @@ def sidebar
   _body do |token|
     tag = token.chomp.strip.downcase
     wtag = "../../widgets"/tag
-    raise "Can't find #{wtag}" unless Dir.exist?(wtag)
+    raise CantFindWidgetDir(wtag) unless Dir.exist?(wtag)
     tcard = "#{tag}-card.html"
-
     case
       when standard.include?(tag)
         _handle_standard_widget(tag)

data/lib/post.rb

@@ -11,7 +11,7 @@ class RuneBlog::Post
   
   def self.load(post)
     log!(enter: __method__, args: [post], level: 3)
-    raise "Doesn't work right now"
+    raise NotImplemented
     raise NoBlogAccessor if RuneBlog.blog.nil?
     # "post" is a slug?
     pdir = RuneBlog.blog.root/:drafts/post
@@ -87,8 +87,8 @@ class RuneBlog::ViewPost
   attr_accessor :path, :title, :date, :teaser_text
 
   def self.make(blog:, view:, nslug:)
-    raise "No numeric prefix on #{nslug}" unless nslug =~ /^\d{4}-/
-    raise "Not expecting an extension" if nslug.end_with?(".lt3") || nslug.end_with?(".html")
+    raise NoNumericPrefix(nslug) unless nslug =~ /^\d{4}-/
+    raise NoExtensionExpected(nslug) if nslug.end_with?(".lt3") || nslug.end_with?(".html")
     view = view.to_s
     view.define_singleton_method :path do |subdir = ""|
       str = blog.root/:views/view

data/lib/processing.rb

@@ -12,7 +12,7 @@ end
 def stale?(src, dst, deps, force = false)
   meh = File.new("/tmp/dammit-#{src.gsub(/\//, "-")}", "w")
   log!(enter: __method__, args: [src, dst], level: 3)
-  raise "Source #{src} not found in #{Dir.pwd}" unless File.exist?(src)
+  raise FileNotFound("#{Dir.pwd}/#{src}") unless File.exist?(src)
   return true if force
   return true unless File.exist?(dst)
   return true if newer?(src, dst)

data/lib/repl.rb

@@ -2,35 +2,28 @@ require 'runeblog'
 require 'ostruct'
 require 'helpers-repl'  # FIXME structure
 require 'pathmagic'
+require 'exceptions'
 
 require 'menus'
 
-make_exception(:PublishError,  "Error during publishing")
-make_exception(:EditorProblem, "Could not edit $1")
-
 Signal.trap("INT") { puts "Don't  :)" }
 
 module RuneBlog::REPL
   def edit_file(file, vim: "")
-#   STDSCR.saveback
     ed = @blog.editor
     params = vim if ed =~ /vim$/
     result = system!("#{@blog.editor} #{file} #{params}")
     raise EditorProblem(file) unless result
-#   STDSCR.restback
     cmd_clear
   end
 
   def cmd_quit
     STDSCR.rows.times { puts " "*(STDSCR.cols-1) }
-    # FIXME please?
-    # sleep 0.1
     STDSCR.clear
     sleep 0.1
     RubyText.stop
     sleep 0.1
     system("clear")
-    # sleep 0.1
     exit
   end
 
@@ -441,7 +434,6 @@ module RuneBlog::REPL
       cmd = "cp #{name} #{@blog.root}/drafts/#@fname"
       result = system!(cmd)
       raise CantCopy(name, "#{@blog.root}/drafts/#@fname") unless result
-      # post = Post.load(@slug)
       draft = "#{@blog.root}/drafts/#@fname"
       @meta = @blog.generate_post(draft)
       puts

data/lib/runeblog.rb

@@ -15,6 +15,7 @@ require 'publish'
 require 'post'
 
 require 'pathmagic'
+require 'exceptions'
 
 ###
 
@@ -48,19 +49,6 @@ class RuneBlog
   ConfigFile = "config"
   Themes     = RuneBlog::Path/"../themes"
 
-  make_exception(:FileNotFound,          "File $1 was not found")
-  make_exception(:BlogRepoAlreadyExists, "Blog repo $1 already exists")
-  make_exception(:CantAssignView,        "$1 is not a view")
-  make_exception(:ViewAlreadyExists,     "View $1 already exists")
-  make_exception(:DirAlreadyExists,      "Directory $1 already exists")
-  make_exception(:CantCreateDir,         "Can't create directory $1")
-  make_exception(:EditorProblem,         "Could not edit $1")
-  make_exception(:NoSuchView,            "No such view: $1")
-  make_exception(:NoBlogAccessor,        "Runeblog.blog is not set")
-  make_exception(:ExpectedString,        "Expected nonempty string but got $1 ($2)")
-  make_exception(:ExpectedView,          "Expected string or View object but got $1 ($2)")
-  make_exception(:ExpectedInteger,       "Expected integer but got $1 ($2)")
-
   include ErrorChecks
 
   class << self

data/lib/runeblog_version.rb

@@ -1,9 +1,7 @@
 if !defined?(RuneBlog::Path)
 
-# if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
-
 class RuneBlog
-  VERSION = "0.3.18"
+  VERSION = "0.3.19"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)
@@ -28,18 +26,7 @@ class RuneBlog
   end
 end
 
-# Refactor, move stuff elsewhere?
-
-def make_exception(sym, str, target_class = Object)
-  return if target_class.constants.include?(sym)
-
-  target_class.const_set(sym, StandardError.dup)
-  define_method(sym) do |*args|
-    msg = str.dup
-    args.each.with_index {|arg, i| msg.sub!("$#{i+1}", arg) }
-    target_class.class_eval(sym.to_s).new(msg)
-  end
-end
+# Refactor, move elsewhere?
 
 def prefix(num)
   log!(enter: __method__, args: [num], level: 3)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.19
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -143,6 +143,7 @@ files:
 - empty_view/themes/standard/post/index.lt3
 - empty_view/themes/standard/post/permalink.lt3
 - lib/Javascript.stuff
+- lib/exceptions.rb
 - lib/helpers-blog.rb
 - lib/helpers-repl.rb
 - lib/liveblog.rb