runeblog 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9aa3949ffe64a27b284103eb9cd968ce4d6353a24db6b8b812b84ae934d80a9
-  data.tar.gz: a1facc32a0e2f1c18c4679df5243c669d3a7491157ce795e9461383428a8285d
+  metadata.gz: d272238c762b72c9ba74c352a35a08e67a2798dce78765a7a7ab026faa2530a7
+  data.tar.gz: d7c789ccf2b890f908672d735a7cf9d753ac2cac6f3ad3e3a7706caadc850889
 SHA512:
-  metadata.gz: b1ce2fb7692cf799413f9cbb4820e23d566c02707abd7537f659ec4d7999ef854178c41a343c6afa8153183168143345d7c6d961dcaea096934e6e05c8011313
-  data.tar.gz: 340f345a6d3c93887294fe9e1914eadc365701586ac61b18c6c0ca0fdcb8281c3abf5cacea0638e39d613a58aa58be27dc3111d7179fd982e4d7862483c20ae0
+  metadata.gz: 82485c5e3efff0b30855979c9c7a8f9b18059e13ba2a0b1ba15972a10fb746a71722ff94e9263b86807fdd9fe392317b84b984b55224dfbc0057c799dd558144
+  data.tar.gz: 40e3575de330a8418d8fe5b39b0eaae911b09936ff91b53649148771e0f8ee3e872816809f97475c2f3da0d8352b548b29c662c0794abb890d10986f788862ab

data/bin/blog

@@ -30,8 +30,8 @@ def mainloop
   cmd.chomp!
   return if cmd.empty?   # CR does nothing
   meth, params = RuneBlog::REPL.choose_method(cmd)
-  str = send(meth, params)
-  puts str unless str.nil?
+  old, str = send(meth, params)
+  puts str if old && ! str.nil?
 rescue => err
   puts err
 end
@@ -39,7 +39,7 @@ end
 
 ###########
 
-RubyText.start(log: "blogcmd.txt", scroll: true, fg: Blue, bg: White)
+RubyText.start(log: "blogcmd.txt", fg: Blue, bg: White)
 RubyText.set(:_echo)
 
 X.stdscr.keypad(true)
@@ -66,8 +66,11 @@ if cmd.nil?   # REPL
 # system("tput smcup")  # see: tput rmcup in cmd_quit
 
   puts fx("\n  RuneBlog", :bold), fx(" v #{RuneBlog::VERSION}", Red)
-  puts
   loop { mainloop }
+# STDSCR.clear
+  RubyText.stop
+  system("tput clear")
+  puts
 else  # one command
   file = File.open("/dev/tty")
   STDIN.reopen(file)    # avoid ARGF dumbness

data/lib/helpers-repl.rb

@@ -149,14 +149,12 @@ module RuneBlog::REPL
 
   def ask(prompt, meth = :to_s)
     print prompt
-    STDOUT.flush
-    STDIN.gets.chomp.send(meth)
+    gets.chomp.send(meth)
   end
 
   def yesno(prompt, meth = :to_s)
     print prompt
-    STDOUT.flush
-    STDIN.gets.chomp.upcase[0] == "Y"
+    gets.chomp.upcase[0] == "Y"
   end
 
   def reset_output(initial = "")

data/lib/repl.rb

@@ -2,22 +2,35 @@ require 'runeblog'
 require 'ostruct'
 require 'helpers-repl'  # FIXME structure
 
-make_exception(:PublishError, "Error during publishing")
-make_exception(:EditorProblem,   "Could not edit $1")
+make_exception(:PublishError,  "Error during publishing")
+# make_exception(:EditorProblem, "Could not edit $1")
 
 module RuneBlog::REPL
 
+  def edit_file(file)
+    result = system("#{blog.editor} #{file}")
+    raise EditorProblem(file) unless result
+    STDSCR.clear
+  end
+
   def cmd_quit(arg)
     check_empty(arg)
-    system("tput rmcup")
+#   system("tput rmcup")
+    RubyText.stop
     abort "\n "
   end
 
+  def cmd_clear(arg)
+    check_empty(arg)
+    STDSCR.cwin.clear
+    STDSCR.cwin.refresh
+  end
+
   def cmd_version(arg)
     reset_output
     check_empty(arg)
     output RuneBlog::VERSION
-    return @out
+    [true, @out]
   end
 
   def cmd_config(arg)
@@ -29,7 +42,7 @@ module RuneBlog::REPL
              "custom/post_template.html"] 
     puts "\nEdit which file?"  # FIXME use @out for testing later
     fname = dumb_menu(items)
-    system("#{@blog.editor} #{dir}/#{fname}")
+    edit_file("#{dir}/#{fname}")
   end
 
   def cmd_browse(arg)
@@ -39,7 +52,7 @@ module RuneBlog::REPL
     # FIXME Bad logic here.
     if url.nil?   
       output! "Publish first."
-      return @out
+      return [true, @out]
     end
     result = system("open '#{url}'")
     raise CantOpen(url) unless result
@@ -59,13 +72,13 @@ module RuneBlog::REPL
     check_empty(arg)
     unless @blog.view.can_publish?
       output! "Can't publish without entries in #{@blog.view.name}/publish"
-      return @out
+      return [true, @out]
     end
     @blog.view.publish
     user, server, sroot, spath = *@publish[@blog.view]
     if files.empty?    # FIXME  baloney
       output! "No files to publish"
-      return @out
+      return [true, @out]
     end
 
     output "Files:"
@@ -83,7 +96,7 @@ module RuneBlog::REPL
 
     dump(files, "#{vdir}/last_published")
     output! "...finished.\n"
-    @out
+    return [true, @out]
   end
 
   def cmd_rebuild(arg)
@@ -107,14 +120,14 @@ module RuneBlog::REPL
     # Simplify this
     if arg.nil?
       output bold(@blog.view)
-      return @out
+      return [true, @out]
     else
       if @blog.view?(arg)
         @blog.view = arg  # reads config
         output red("View: ") + bold(@blog.view.name.to_s)  # FIXME?
       end
     end
-    @out
+    return [true, @out]
   end
 
   def cmd_new_view(arg)
@@ -133,6 +146,7 @@ module RuneBlog::REPL
     meta = OpenStruct.new
     meta.title = title
     @blog.create_new_post(meta)
+    STDSCR.clear
     nil
   end
 
@@ -144,7 +158,7 @@ module RuneBlog::REPL
       ret = cmd_remove_post(x.to_i, false)
       output ret
     end
-    @out
+    return [true, @out]
   end
 
   #-- FIXME affects linking, building, publishing...
@@ -154,11 +168,8 @@ module RuneBlog::REPL
     reset_output
     id = get_integer(arg)
     result = @blog.remove_post(id)
-    if result.nil?
-      output! "Post #{id} not found"
-      return @out
-    end
-    @out
+    output! "Post #{id} not found" if result.nil?
+    return [true, @out]
   end
 
   #-- FIXME affects linking, building, publishing...
@@ -171,13 +182,11 @@ module RuneBlog::REPL
     files = Find.find(@blog.root+"/src").to_a
     files = files.grep(/#{tag}-/)
     files = files.map {|f| File.basename(f) }
-    return red("Multiple files: #{files}") if files.size > 1
-    return red("\n  Can't edit post #{id}") if files.empty?
+    return [true, "Multiple files: #{files}"] if files.size > 1
+    return [true, "\n  Can't edit post #{id}"] if files.empty?
 
     file = files.first
-    result = system("vi #{@blog.root}/src/#{file}")
-    raise EditorProblem(file) unless result
-
+    result = edit_file("#{@blog.root}/src/#{file}")
     @blog.rebuild_post(file)
     nil
   end
@@ -185,18 +194,15 @@ module RuneBlog::REPL
   def cmd_list_views(arg)
     reset_output("\n")
     check_empty(arg)
-    debug "curr view = #{@blog.view.name.inspect}"
     puts
     @blog.views.each do |v| 
       v = v.to_s
       v = fx(v, :bold) if v == @blog.view.name
-      debug "v = #{v.inspect} - #{v.fx.inspect rescue 'no fx'}"
       print "  "
       puts v
     end
-    debug "out = #{@out.inspect}"
-    @out
-    ""
+    puts
+    return [false, @out]
   end
 
   def cmd_list_posts(arg)
@@ -205,14 +211,23 @@ module RuneBlog::REPL
     posts = @blog.posts  # current view
     str = @blog.view.name + ":\n"
     output str
+    puts
+    print "  "
+    puts fx(str, :bold)
     if posts.empty?
       output! bold("No posts")
+      puts fx("  No posts", :bold)
     else
       posts.each do |post| 
         outstr "  #{colored_slug(post)}\n" 
+        base = post.sub(/.lt3$/, "")
+        num, rest = base[0..3], base[4..-1]
+        print "  "
+        puts fx(num, Red), fx(rest, Blue)
       end
     end
-    @out
+    puts
+    return [false, @out]
   end
 
   def cmd_list_drafts(arg)
@@ -221,18 +236,25 @@ module RuneBlog::REPL
     drafts = @blog.drafts  # current view
     if drafts.empty?
       output! "No drafts"
-      return @out
+      puts "  No drafts"
+      return [true, @out]
     else
+      puts
       drafts.each do |draft| 
         outstr "  #{colored_slug(draft.sub(/.lt3$/, ""))}\n" 
+        base = draft.sub(/.lt3$/, "")
+        num, rest = base[0..3], base[4..-1]
+        print "  "
+        puts fx(num, Red), fx(rest, Blue)
       end
     end
-    @out
+    puts
+    return [false, @out]
   end
 
   def cmd_INVALID(arg)
     reset_output "\n  Command '#{red(arg)}' was not understood."
-    return @out
+    return [true, @out]
   end
 
   def cmd_help(arg)
@@ -271,7 +293,7 @@ module RuneBlog::REPL
        #{red('rebuild          ')} Regenerate all posts and relink
        #{red('publish          ')} Publish (current view)
     EOS
-    @out
+    return [true, @out]
   end
 
 end

data/lib/version.rb

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

data/test/general.rb

@@ -3,6 +3,7 @@ $LOAD_PATH << "."
 require "minitest/autorun"
 
 require 'lib/repl'
+require 'rubytext'
 
 class TestREPL < Minitest::Test
   include RuneBlog::REPL
@@ -23,14 +24,14 @@ class TestREPL < Minitest::Test
   # Note: "Bang" methods depend on the data_test subtree
 
   def test_001_cmd_help
-    out = cmd_help(nil)
+    flag, out = cmd_help(nil)
     assert out.is_a?(String), "Expected a string returned"
     lines = out.split("\n").length 
     assert lines > 25, "Expecting lengthy help message"
   end
 
   def test_002_cmd_version
-    out = cmd_version(nil)
+    flag, out = cmd_version(nil)
     assert out.is_a?(String), "Expected a string returned"
     lines = out
     assert lines =~ /\d+\.\d+\.\d+/m,
@@ -38,27 +39,27 @@ class TestREPL < Minitest::Test
   end
 
   def test_003_list_views!
-    out = cmd_list_views(nil)
+    flag, out = cmd_list_views(nil)
     assert out.is_a?(String), "Expected a string returned"
     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
+    flag, out = cmd_change_view(nil)  # no param
     assert out.is_a?(String), "Expected a string; got: #{out.inspect}"
     assert out =~ /alpha_view/m, "Expecting 'alpha_view' as default; got: #{out.inspect}"
   end
 
   def test_005_lsd!
-    out = cmd_list_drafts(nil)
+    flag, out = cmd_list_drafts(nil)
     assert out.is_a?(String), "Expected a string returned"
     lines = out.split("\n").length 
     assert lines == 10, "Expecting 10 lines; got #{show_lines(out)}"
   end
 
   def test_006_lsp!
-    out = cmd_list_posts(nil)
+    flag, out = cmd_list_posts(nil)
     assert out.is_a?(String), "Expected a string returned; got: #{out.inspect}"
     lines = out.split("\n").length 
     assert lines == 6, "Expecting 6 lines; got #{show_lines(out)}"
@@ -175,16 +176,16 @@ class TestREPL < Minitest::Test
 
   def test_014_remove_nonexistent_post!
     @blog.change_view("alpha_view")
-    out = cmd_remove_post(99)
+    flag, out = cmd_remove_post(99)
     assert out =~ /Post 99 not found/, "Expected error about nonexistent post, got: #{out}"
   end
 
   def test_015_kill_multiple_posts!
     @blog.change_view("alpha_view")
-    out = cmd_list_posts(nil)
+    flag, out = cmd_list_posts(nil)
     before = out.split("\n").length 
-    out = cmd_kill("1  2 7")
-    out = cmd_list_posts(nil)
+    flag, out = cmd_kill("1  2 7")
+    flag, out = cmd_list_posts(nil)
     after = out.split("\n").length 
     expecting = before - 2
     assert after == expecting, "list_posts saw #{before} posts, now #{after} (not #{expecting})"
@@ -253,7 +254,6 @@ end  # conditional tests
     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) }

metadata

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