runeblog 0.0.91 → 0.0.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2ff1adf77bd4d84b2abc678661e31fb63171e6e
-  data.tar.gz: 19347aaaeb617a47eb3466c0860bd9eda2110b38
+  metadata.gz: d401049bff7f80d13c2708674608b2c2c418d77e
+  data.tar.gz: 0a8dead9268c46004a4a31d8977724d119adabeb
 SHA512:
-  metadata.gz: 04449624f1a73aa9ea968c144417884336fec5803905b0071c46a190a7ccd4f2f04b93c7b732c23db73044c0ac5f57c236ae1249c96a31ef1eba0ec145044c49
-  data.tar.gz: b70c923bed20854a310a3bc43ff3026e1050022868f8b69d36d6e859165c4fed1237832cdae5a1d1fecdd71207380945ebc6bce7594a1eb2a027911aba4d2087
+  metadata.gz: d0d9364fa2a1dc901ebd178fa7f5b7544ec519ee756dcad417cdcb7542cbed97129f3e2b814025b12e884feb5e9142a74bc03c2f64b9b946d68a5f0771cc4a46
+  data.tar.gz: 4f47211d17dab06700c3afd9f956c3f20b0b9ccd7f6b69d1fcdd2cded31efd6f1d68d2ab47059a102c983b4dca19094c4c63ca8fe8f685a5a639b6215d1c4eb3

data/lib/deploy.rb

@@ -37,7 +37,7 @@ class RuneBlog::Deployment
     cmd = "scp -r #{list} #@user@##server:#{dir} >/dev/null 2>&1"
     output! "Deploying #{files.size} files...\n"
     result = system(cmd)
-    raise "Problem occurred in deployment" unless result
+    raise DeploymentError unless result
 
     dump(files, "#{@blog.view.dir}/last_deployed")
     output! "...finished.\n"

data/lib/helpers-blog.rb

@@ -38,7 +38,7 @@ module RuneBlog::Helpers
   end
 
   def new_dotfile(root: "data", current_view: "no_default", editor: "vi")
-    raise "Blog already exists" if Dir.exist?(".blog")
+    raise BlogAlreadyExists if Dir.exist?(".blog")
     Dir.mkdir(".blog")
     x = OpenStruct.new
     x.root, x.current_view, x.editor = root, current_view, editor
@@ -71,7 +71,7 @@ module RuneBlog::Helpers
     return if Dir.exist?(dir)  #  && File.directory?(dir)
     cmd = "mkdir -p #{dir} >/dev/null 2>&1"
     result = system(cmd) 
-    raise "Can't create #{dir}" unless result
+    raise CantCreateDir(dir) unless result
   end
 
   def interpolate(str)

data/lib/helpers-repl.rb

@@ -1,6 +1,11 @@
 
 # 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")
+
 module RuneBlog::REPL
   Patterns = 
     {"help"              => :cmd_help, 
@@ -128,12 +133,9 @@ module RuneBlog::REPL
     n.times { @out << "\n" }
   end
 
-  FileNotFound = StandardError.dup
-  CantOpen     = StandardError.dup
-  CantDelete   = StandardError.dup 
 
   def check_empty(arg)
-    raise "Glitch: #{caller[0]} got arg #{arg.inspect}" unless arg.nil?
+    raise InternalError(caller[0], arg.inspect)  unless arg.nil?
   end
 
   def get_integer(arg)
@@ -143,15 +145,15 @@ module RuneBlog::REPL
   end
 
   def check_file_exists(file)
-    raise FileNotFound, file unless File.exist?(file)
+    raise FileNotFound(file) unless File.exist?(file)
   end
 
   def error_cant_delete(files)
     case files
       when String
-        raise CantDelete, "Error deleting #{files}"
+        raise CantDelete(files)
       when Array
-        raise CantDelete, "Error deleting: \n#{files.join("\n")}"
+        raise CantDelete(files.join("\n"))
     end
   end
 
@@ -186,7 +188,7 @@ module RuneBlog::REPL
     @slug = @blog.make_slug(@title)
     @fname = @slug + ".lt3"
     result = system("cp #{name} #@root/src/#@fname")
-    raise "Could not copy #{name} to #@root/src/#@fname" unless result
+    raise CantCopy(name, "#@root/src/#@fname") unless result
 
     edit_initial_post(@fname)
     process_post(@fname)

data/lib/post.rb

@@ -1,6 +1,8 @@
 require 'helpers-blog'
 require 'runeblog'
 
+make_exception(:NoBlogAccessor, "Runeblog.blog is not set")
+
 class RuneBlog::Post
 
   attr_reader :id, :title, :date, :views, :num, :slug
@@ -15,7 +17,7 @@ class RuneBlog::Post
   
   def self.load(post)
     # FIXME weird logic here
-    raise "RuneBlog.blog is not set!" if RuneBlog.blog.nil?
+    raise NoBlogAccessor if RuneBlog.blog.nil?
     pdir = RuneBlog.blog.view.dir + "/" + post
     meta = nil
     Dir.chdir(pdir) do
@@ -31,7 +33,7 @@ class RuneBlog::Post
 
   def initialize(meta, view_name)
     # FIXME weird logic here
-    raise "RuneBlog.blog is not set!" if RuneBlog.blog.nil?
+    raise NoBlogAccessor if RuneBlog.blog.nil?
     @blog = RuneBlog.blog
     @title = meta.title
     @view = @blog.str2view(view_name)
@@ -46,7 +48,7 @@ class RuneBlog::Post
 
   def edit
     result = system("vi #@draft +8")
-    raise "Problem editing #@draft" unless result
+    raise EditorProblem(draft) unless result
     nil
   rescue => err
     error(err)
@@ -55,7 +57,7 @@ class RuneBlog::Post
   def publish
     livetext = Livetext.new(STDOUT)
     @meta = livetext.process_file(@draft, binding)
-    raise "process_file returned nil" if @meta.nil?
+    raise LivetextError(@draft) if @meta.nil?
 
     @meta.views.each do |view_name|   # Create dir using slug (index.html, metadata?)
       view = @blog.str2view(view_name)
@@ -76,7 +78,6 @@ class RuneBlog::Post
 
   def create_post_subtree(vdir)
     create_dir("assets") 
-#   dump(@meta.to_yaml, "metadata.yaml")
     write_metadata(@meta)
     template = RuneBlog::Default::TeaserTemplate   # FIXME template into custom dir?
     text = interpolate(template)

data/lib/repl.rb

@@ -2,6 +2,9 @@ require 'runeblog'
 require 'ostruct'
 require 'helpers-repl'  # FIXME structure
 
+make_exception(:DeploymentError, "Error during deployment")
+make_exception(:EditorProblem,   "Could not edit $1")
+
 module RuneBlog::REPL
 
   def cmd_quit(arg)
@@ -27,7 +30,7 @@ module RuneBlog::REPL
       return @out
     end
     result = system("open '#{url}'")
-    raise CantOpen, url unless result
+    raise CantOpen(url) unless result
     nil
   rescue => err
     error(err)
@@ -38,7 +41,7 @@ module RuneBlog::REPL
     check_empty(arg)
     local = @blog.view.index
     result = system("open #{local}")
-    raise CantOpen, local unless result
+    raise CantOpen(local) unless result
   rescue => err
     error(err)
   end
@@ -64,7 +67,7 @@ module RuneBlog::REPL
     cmd = "scp -r #{files.join(' ')} root@#{server}:#{dir} >/dev/null 2>&1"
     output! "Deploying #{files.size} files...\n"
     result = system(cmd)
-    raise "Problem occurred in deployment" unless result
+    raise DeploymentError unless result
 
     dump(files, "#{vdir}/last_deployed")
     output! "...finished.\n"
@@ -197,7 +200,7 @@ module RuneBlog::REPL
 
     file = files.first
     result = system("vi #{@blog.root}/src/#{file}")
-    raise "Problem editing #{file}" unless result
+    raise EditorProblem(file) unless result
 
     @blog.rebuild_post(file)
     nil

data/lib/runeblog.rb

@@ -1,5 +1,4 @@
 require 'find'
-# require 'yaml'   # get rid of YAML later
 require 'livetext'
 require 'skeleton'
 require 'helpers-blog'
@@ -9,15 +8,6 @@ require 'deploy'
 require 'post'
 require 'version'
 
-def make_exception(sym, str)
-  Object.const_set(sym, StandardError.dup)
-  define_method(sym) do |*args|
-    msg = str
-    args.each.with_index {|arg, i| msg.sub!("$#{i+1}", arg) }
-    Object.class_eval(sym.to_s).new(msg)
-  end
-end
-
 
 ###
 
@@ -30,9 +20,12 @@ class RuneBlog
   make_exception(:BlogAlreadyExists, "Blog $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(:LivetextError,     "Livetext#process_file returned nil for $1")
+  
   class << self
     attr_accessor :blog
     include Helpers
@@ -129,7 +122,7 @@ class RuneBlog
     raise ViewAlreadyExists(arg) if names.include?(arg)
 
     dir = "#@root/views/#{arg}/"
-    raise "Can't happen: #{dir} exists already" if Dir.exist?(dir)
+    raise DirAlreadyExists(dir) if Dir.exist?(dir)
     create_dir(dir)
     up = Dir.pwd
     Dir.chdir(dir)
@@ -213,10 +206,10 @@ class RuneBlog
   def process_post(file)
     raise ArgumentError unless file.is_a?(String)
     path = @root + "/src/#{file}"
-    raise "File not found: #{path}" unless File.exist?(path)
+    raise FileNotFound(path) unless File.exist?(path)
     livetext = Livetext.new(STDOUT) # (nil)
     @meta = livetext.process_file(path, binding)
-    raise "process_file returned nil" if @meta.nil?
+    raise LivetextError(path) if @meta.nil?
 
     num, slug = self.make_slug(@meta.title, self.sequence)
     slug = file.sub(/.lt3$/, "")
@@ -241,7 +234,6 @@ class RuneBlog
     dir = vdir + @meta.slug + "/"
     create_dir(dir + "assets") 
     Dir.chdir(dir) do
-#?    dump(@meta.to_yaml, "metadata.yaml")
       dump(@meta.teaser, "teaser.txt")
       dump(@meta.body, "body.txt")
       # FIXME make get_post_template method
@@ -271,7 +263,6 @@ class RuneBlog
     @blogtail = interpolate(tail)
 
     # Output view
-#?  posts.map! {|post| YAML.load(File.read("#{vdir}/#{post}/metadata.yaml")) }
     posts.map! do |post|
       meta = nil
       pdir = vdir + "/" + post

data/lib/skeleton.rb

@@ -17,3 +17,13 @@ class RuneBlog
   end
 end
 
+def make_exception(sym, str)
+  return if Object.constants.include?(sym)
+  Object.const_set(sym, StandardError.dup)
+  define_method(sym) do |*args|
+    msg = str
+    args.each.with_index {|arg, i| msg.sub!("$#{i+1}", arg) }
+    Object.class_eval(sym.to_s).new(msg)
+  end
+end
+

data/lib/version.rb

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

data/lib/view.rb

@@ -8,7 +8,7 @@ class RuneBlog::View
   include RuneBlog::Helpers
 
   def initialize(name)
-    raise "RuneBlog.blog is not set!" if RuneBlog.blog.nil?
+    raise NoBlogAccessor if RuneBlog.blog.nil?
     @blog = RuneBlog.blog
     @name = name
     dep_file = @blog.root + "/views/#@name/deploy"

data/test/general.rb

@@ -43,7 +43,7 @@ class TestREPL < Minitest::Test
     lines = out.split("\n").length 
     assert lines >= 2, "Expecting at least 2 lines"
   end
-
+ 
   def test_004_change_view!
     out = cmd_change_view(nil)  # no param
     assert out.is_a?(String), "Expected a string; got: #{out.inspect}"
@@ -224,7 +224,45 @@ if File.exist?("testing.deploy")
     assert result.nil?, "Expected to detect login error (bad server)"
   end
 
-end
+end  # conditional tests
+
+  def test_019_exception_existing_blog
+    assert_raises(BlogAlreadyExists) { RuneBlog.create_new_blog }
+  end
+
+  def test_020_exception_missing_blog_accessor
+    save = RuneBlog.blog
+    RuneBlog.blog = nil
+    assert_raises(NoBlogAccessor) { RuneBlog::Post.load(1) }
+    RuneBlog.blog = save
+  end
+
+  def test_021_exception_cant_assign_view
+    assert_raises(CantAssignView) { @blog.view = 99 }
+  end
+
+  def test_022_exception_no_such_view
+    assert_raises(NoSuchView) { @blog.view = 'not_a_view_name' }
+  end
+
+  def test_023_exception_view_already_exists
+    assert_raises(ViewAlreadyExists) { @blog.view = 'alpha_view' }
+  end
+
+  def test_024_exception_cant_edit_file
+    assert_raises(EditorProblem) { @blog.edit_initial_post(999) }
+  end
+
+  def xtest_025_exception_livetext_error   # FIXME Doesn't work! Change Livetext
+    testfile = "testfile.lt3"
+    path = @blog.root + "/src/" + testfile
+    cmd = "echo .no_such_command > #{path}"
+    p cmd
+    system(cmd)
+    system("ls -l #{path}")
+    assert_raises(LivetextError) { @blog.process_post(testfile) }
+    File.rm(path)
+  end
 
   # later tests...
   # new view asks for deployment info and writes it

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.91
+  version: 0.0.93
 platform: ruby
 authors:
 - Hal Fulton