runeblog 0.0.57 → 0.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7f2f60b13ad6aefe511291f1260123897d98b25
-  data.tar.gz: 25ac133e889d49fe12d83423932999991e09d9c1
+  metadata.gz: d32821f8f0c5a59dd18a91b23edbb0927ca5bcb3
+  data.tar.gz: e5cb288cad3ac1781b09ea671b44c22d6c022281
 SHA512:
-  metadata.gz: 0ab9961f32dfea28d846998705d8639bd1b0fdc5d012d59a38e269e921a78d31b4fe9176e1565c850544ee8e9e80fe4042e1ed31e18609d1c50bdc3dc16c4cac
-  data.tar.gz: 2552eb7707a890943181eab668dfec92e03360eafd5d1483701960328083f486c851eec3a5583028b44cd46aff57e450831e254f248ef7a91990c4dc2c541162
+  metadata.gz: 23ef8da1f243feda7aae4b2c3dd75dacd7aa6de42ced265b1c016f6a2ed2f8adf971a2a381c295cc3183ad45dd185d56323c4b7549faf867da3c82cbb789b4a2
+  data.tar.gz: 3f85f7fdcb768c77c34a0d92b3dd10a8c2917601e1fc6226edad0214887b3e1ccf2398d27a4cdb4dece15d9645eb9c510a9a61ca682feb1e30bd4afc09ebccc3

data/bin/blog

@@ -32,6 +32,7 @@ if cmd.nil?   # REPL
     cmd = gets
     cmd_quit([]) if cmd.nil?   # ^D
     cmd.chomp!
+    next if cmd.empty?   # CR does nothing
     meth, params = RuneBlog::REPL.choose_method(cmd)
     str = send(meth, params)
     puts str unless str.nil?

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.57   2018-09-10
+RuneBlog v 0.0.58   2018-09-13

data/lib/helpers-repl.rb

@@ -99,6 +99,64 @@ module RuneBlog::REPL
     STDIN.gets.chomp.upcase[0] == "Y"
   end
 
+  def reset_output(initial = "")
+    @out ||= ""
+    @out.replace initial
+  end
+
+  def flush_output(initial = "")
+    @out ||= ""
+    puts @out
+    reset_output
+  end
+
+  def output(str)  # \n and indent
+    @out ||= ""
+    @out << "\n  " + str
+  end
+
+  def outstr(str)  # \n and indent
+    @out ||= ""
+    @out << str
+  end
+
+  def output!(str)  # red, \n and indent
+    @out ||= ""
+    @out << "\n  " + red(str)
+  end
+
+  def output_newline(n = 1)
+    @out ||= ""
+    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?
+  end
+
+  def get_integer(arg)
+    Integer(arg) 
+  rescue 
+    raise ArgumentError, "'#{arg}' is not an integer"
+  end
+
+  def check_file_exists(file)
+    raise FileNotFound, file unless File.exist?(file)
+  end
+
+  def error_cant_delete(files)
+    case files
+      when String
+        raise CantDelete, "Error deleting #{files}"
+      when Array
+        raise CantDelete, "Error deleting: \n#{files.join("\n")}"
+    end
+  end
+
   def clear
     puts "\e[H\e[2J"  # clear screen
   end

data/lib/repl.rb

@@ -5,63 +5,49 @@ require 'helpers-repl'  # FIXME structure
 module RuneBlog::REPL
 
   def cmd_quit(arg)
-    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
-    puts "\n "
-    exit
+    check_empty(arg)
+    abort "\n "
   end
 
   def cmd_version(arg)
-    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
-    return "\n  " + RuneBlog::VERSION
-  end
-
-  def new_blog!(arg)   # FIXME weird?
-    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
-    return if RuneBlog.exist?
-    yn = yesno(red("  No .blog found. Create new blog? "))
-    RuneBlog.create_new_blog if yn
-  rescue => err
-    error(err)
-  end 
-
-  def open_blog # Crude - FIXME later
-    @blog = RuneBlog.new
-    @view = @blog.view     # current view
-    @sequence = @blog.sequence
-    @root = @blog.root
-    @blog
-  rescue => err
-    error(err)
+    reset_output
+    check_empty(arg)
+    output RuneBlog::VERSION
+    return @out
   end
 
   def cmd_browse
-    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
+    reset_output
+    check_empty(arg)
     @deploy ||= {}
     return puts red("\n  Deploy first.") unless @deploy[@view]
 
     lines = @deploy[@view]
     user, server, sroot, spath = *lines
-    result = system("open 'http://#{server}/#{spath}'")
-    raise "Problem opening http://#{server}/#{spath}" unless result
+    url = "http://#{server}/#{spath}"
+    result = system("open '#{url}'")
+    raise CantOpen, url unless result
     nil
   rescue => err
     error(err)
   end
 
   def cmd_open_local
-    result = system("open #{@blog.viewdir(@view)}/index.html")
-    raise "Problem opening #{@blog.viewdir(@view)}/index.html" unless result
-    nil
+    reset_output
+    local = @blog.viewdir(@view) + "/index.html"
+    result = system("open #{local}")
+    raise CantOpen, local unless result
   rescue => err
     error(err)
   end
 
   def cmd_deploy(arg)  # FIXME non-string return expected in caller?
     # TBD clunky FIXME 
-    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
+    reset_output
+    check_empty(arg)
     @deploy ||= {}
     deployment = @blog.viewdir(@view) + "deploy"
-    raise "File '#{deployment}' not found" unless File.exist?(deployment)
+    check_file_exists(deployment)
 
     lines = File.readlines(deployment).map {|x| x.chomp }
     @deploy[@view] = lines
@@ -75,27 +61,28 @@ module RuneBlog::REPL
       return nil
     end
 
-    out = "\n  Files:"
-    files.each {|f| out << ("    " + f + "\n") }
-    out << "\n"
+    output "Files:"
+    files.each {|f| output "    #{f}\n" }
+    output_newline
     dir = "#{sroot}/#{spath}"
     # FIXME - may or may not already exist
     result = system("ssh root@#{server} mkdir #{dir}") 
 
     cmd = "scp -r #{files.join(' ')} root@#{server}:#{dir} >/dev/null 2>&1"
-    out << red("\n  Deploying #{files.size} files...\n")
+    output! "Deploying #{files.size} files...\n"
     result = system(cmd)
     raise "Problem occurred in deployment" unless result
 
     File.write("#{vdir}/last_deployed", files)
-    out << red("finished.\n")
-    out
+    output! "...finished.\n"
+    @out
   rescue => err
     error(err)
   end
 
   def cmd_rebuild(arg)
-    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
+    reset_output
+    check_empty(arg)
     puts
     files = Dir.entries("#@root/src/").grep /\d\d\d\d.*.lt3$/
     files.map! {|f| File.basename(f) }
@@ -107,7 +94,8 @@ module RuneBlog::REPL
   end
 
   def cmd_relink(arg)
-    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
+    reset_output
+    check_empty(arg)
     @blog.views.each {|view| generate_index(view) }
     nil
   rescue => err
@@ -115,34 +103,36 @@ module RuneBlog::REPL
   end
 
   def cmd_list_views(arg)
+    reset_output("\n")
+    check_empty(arg)
     abort "Config file not read"  unless @blog
-    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
-    out = "\n"
-    @blog.views.each {|v| out << "  #{v}\n" }
-    out
+    @blog.views.each {|v| outstr "  #{v}\n" }
+    @out
   rescue => err
     error(err)
   end
 
   def cmd_change_view(arg)
+    reset_output
     if arg.nil?
-      return "\n  #{@blog.view}"
+      output "#{@blog.view}"
+      return @out
     else
-      out = ""
       list = @blog.views.grep /^#{arg}/
       if list.size == 1
         @view = @blog.view = list.first
-        out << red("\n  View: #{@view}\n") if arg != @view
+        output! "View: #{@view}\n" if arg != @view
       else
-        out << "view #{arg.inspect} does not exist\n"
+        output! "view #{arg.inspect} does not exist\n"
       end
     end
-    out
+    @out
   rescue => err
     error(err)
   end
 
   def cmd_new_view(arg)
+    reset_output
     @blog ||= open_blog
     arg ||= ask("New view: ")  # check validity later
     raise "view #{arg} already exists" if @blog.views.include?(arg)
@@ -162,7 +152,8 @@ module RuneBlog::REPL
   end
 
   def cmd_new_post(arg)
-    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
+    reset_output
+    check_empty(arg)
     open_blog unless @blog   # duh?
     @title = ask("Title: ")
     @blog.create_new_post(@title)
@@ -171,6 +162,7 @@ module RuneBlog::REPL
   end
 
   def cmd_kill(arg)
+    reset_output
     args = arg.split
     args.each {|x| cmd_remove_post([x], false) }
     nil
@@ -181,37 +173,43 @@ module RuneBlog::REPL
   #-- FIXME affects linking, building, deployment...
 
   def cmd_remove_post(arg, safe=true)
-    out = ""
-    id = Integer(arg) rescue raise("'#{arg}' is not an integer")
+    reset_output
+    err = "'#{arg}' is not an integer"
+    id = get_integer(arg)
     tag = "#{'%04d' % id}"
     files = Find.find(@root).to_a
     files = files.grep(/#{tag}-/)
     if files.empty?
-      out = red("\n  No such post found (#{id})") 
-      return out
+      output! "No such post found (#{id})"
+      return @out
     end
 
     if safe
-      out << "\n"
-      files.each {|f| out << "  #{f}\n" }
-      puts out
-      out = ""
-      ques = files.size > 1 ? "\n  Delete all these?\n " : "\n  Delete?\n "
+      output_newline
+      files.each {|f| outstr "  #{f}\n" }
+      puts @out   # ??
+      reset_output
+      ques = "\n  Delete?\n "
+      ques.sub!(/\?/, " all these?") if files.size > 1
       yn = ask red(ques)
       if yn.downcase == "y"
         result = system("rm -rf #{files.join(' ')}")
-        raise "Problem deleting file(s)" unless result
-        out << red("\n  Deleted\n")
+        error_cant_delete(files) unless result
+        output! "Deleted\n"
       else
-        out << red("\n  No action taken\n")
+        output! "No action taken\n"
       end
     else
       result = system("rm -rf #{files.join(' ')}")
-      out << red("\n  Deleted:\n")
-      files.each {|f| out << "    #{f}\n" }
-      raise "Problem mass-deleting file(s)" unless result
+      error_cant_delete(files) unless result
+      output! "Deleted:\n"
+      files.each {|f| output "    #{f}\n" }
     end
-    out
+    @out
+  rescue ArgumentError => err
+    puts err
+  rescue CantDelete => err
+    puts err
   rescue => err
     error(err)
   end
@@ -219,7 +217,8 @@ module RuneBlog::REPL
   #-- FIXME affects linking, building, deployment...
 
   def cmd_edit_post(arg)
-    id = Integer(arg) rescue raise("'#{arg}' is not an integer")
+    reset_output
+    id = get_integer(arg)
     tag = "#{'%04d' % id}"
     files = Find.find(@root+"/src").to_a
     files = files.grep(/#{tag}-/)
@@ -238,51 +237,56 @@ module RuneBlog::REPL
   end
 
   def cmd_list_posts(arg)
-    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
-    out = ""
+    check_empty(arg)
+    reset_output
     @view = @blog.view
     dir = @blog.viewdir(@view)
     Dir.chdir(dir) do
       posts = Dir.entries(".").grep(/^0.*/)
+      output @view + ":\n"
       if posts.empty?
-        out << ("\n  " + @view + ":" + red("  No posts\n"))
+        output! "No posts\n"
       else
-        out << ("\n  " + @view + ":\n ")
-        posts.each {|post| out << "  #{colored_slug(post)}\n" }
+        posts.each {|post| outstr "  #{colored_slug(post)}\n" }
       end
     end
-    out
+    @out
   rescue => err
     error(err)
   end
 
   def cmd_list_drafts(arg)
-    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
-    out = ""
+    check_empty(arg)
+    reset_output
     dir = "#@root/src"
     Dir.chdir(dir) do
       posts = Dir.entries(".").grep(/^0.*.lt3/)
-      out << "\n"
+      output_newline
       if posts.empty?
-        return red("  No posts")
+        output! "No posts"
+        return @out
       else
-        posts.each {|post| out << "  #{colored_slug(post.sub(/.lt3$/, ""))}\n" }
+        posts.each do |post| 
+          str = "  #{colored_slug(post.sub(/.lt3$/, ""))}\n" 
+          outstr str
+        end
       end
     end
-    out
+    @out
   rescue => err
     error(err)
   end
 
   def cmd_INVALID(arg)
-    return "\n  Command '#{red(arg)}' was not understood."
+    reset_output "\n  Command '#{red(arg)}' was not understood."
+    return @out
   end
 
   def cmd_help(arg)
-    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
-    out = <<-EOS
-  
-    Commands:
+    reset_output 
+    check_empty(arg)
+    output(<<-EOS)
+  Commands:
   
        #{red('h, help       ')}    This message
        #{red('q, quit        ')}   Exit the program
@@ -308,7 +312,28 @@ module RuneBlog::REPL
        #{red('rebuild          ')} Regenerate all posts and relink
        #{red('deploy           ')} Deploy (current view)
     EOS
-    out
+    @out
+  end
+
+  ## Funky stuff -- needs to move?
+
+  def new_blog!(arg)   # FIXME weird?
+    check_empty(arg)
+    return if RuneBlog.exist?
+    yn = yesno(red("  No .blog found. Create new blog? "))
+    RuneBlog.create_new_blog if yn
+  rescue => err
+    error(err)
+  end 
+
+  def open_blog # Crude - FIXME later
+    @blog = RuneBlog.new
+    @view = @blog.view     # current view
+    @sequence = @blog.sequence
+    @root = @blog.root
+    @blog
+  rescue => err
+    error(err)
   end
 
 end

data/lib/runeblog.rb

@@ -3,7 +3,7 @@ require 'yaml'
 require 'livetext'
 
 class RuneBlog
-  VERSION = "0.0.57"
+  VERSION = "0.0.58"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
   DefaultData = Path + "/../data"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.57
+  version: 0.0.58
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext