runeblog 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aef7d403afc6196d75ad2f03efd4cd17f20e9e3afe553719caf8ea9417d27470
-  data.tar.gz: ee65d44e639ff13c4817fec44df9899d0f38fb234fbcc6d4e8e19bfbb25f5284
+  metadata.gz: 38afc33e9e97a55dccd711b54044be6c46b6362435d8c25e7a69940c29d77c47
+  data.tar.gz: 387e5a9df5fdc890e39113e41e12d8b61b463861915b0b54fa6a26313746fb45
 SHA512:
-  metadata.gz: 6dd26d351a24e5b558fb897fb7cc818d370a01688c7eba89e9296bf763e31c6faa57ab42342306bb5ddbb349b0744460f590fd7ba74c4da3b830aeab5d861785
-  data.tar.gz: 255a1a568efaf58bd4ebe8f8ed47a58244d59cc0d5d5c849c240698ca048a4265688322360f16ef158de5c6ec5fc5f0f43d5066e72fff88414244207813c8087
+  metadata.gz: 1b62e82c4f925b410c1a7042b2b37cb668bc6304b324019379742c02bdefba45f322f5e39cbee9f3d1625f4374ecf02c6976a2a3dd8d47f28659578ca2d8edaf
+  data.tar.gz: 828618444b225d1030e85d677292878138323734147077770e9158664145185bfb4179c67e27961443662324a6bee2c618f813048b121037b6ae0006c5c03d65

data/bin/blog

@@ -19,25 +19,9 @@ def get_argv
   [cmd, arg]
 end
 
-###########
-
-STDOUT.sync = true
-
-cmd, arg = get_argv
-
-if ! RuneBlog.exist?
-  print "No blog found. Create new one? (y/n) "
-  resp = gets.chomp
-  if resp == "y"
-    RuneBlog.create_new_blog
-  else
-    exit
-  end
-end
-
 def mainloop
   if curses?
-    print red("blog> ")
+    print :red, "\nblog> "
     cmd = gets
   else
     cmd = Readline.readline(red("\nblog> "), true)
@@ -53,17 +37,30 @@ rescue => err
 end
 
 
-puts curses?
-sleep 6
+###########
+
+RubyText.start(:echo, :_raw, log: "debug.out", fg: :blue, bg: :white)
+
+STDOUT.sync = true
 
-if curses?
-  RubyText.start(:echo, :noraw, log: "debug.out")
+cmd, arg = get_argv
+
+if ! RuneBlog.exist?
+  print "No blog found. Create new one? (y/n) "
+  resp = gets.chomp
+  if resp == "y"
+    RuneBlog.create_new_blog
+  else
+    exit
+  end
 end
 
 @blog = RuneBlog.new
 
+# STDSCR.clear if curses?
+
 if cmd.nil?   # REPL
-  system("tput smcup")  # see: tput rmcup in cmd_quit
+# system("tput smcup")  # see: tput rmcup in cmd_quit
 
   puts red("\n  RuneBlog v #{RuneBlog::VERSION}")
   loop { mainloop }

data/lib/global.rb

@@ -18,7 +18,7 @@ class RuneBlog
 end
 
 def curses?
-  false
+  true
 end
 
 def make_exception(sym, str)

data/lib/helpers-repl.rb

@@ -32,7 +32,7 @@ module NoANSI
     loop do
       ch = ::STDSCR.getch
       if ch == 10
-#       puts "\n\n "
+        STDSCR.crlf
         break 
       end
       str << ch
@@ -172,17 +172,17 @@ module RuneBlog::REPL
 
   def output(str)  # \n and indent
     @out ||= ""
-    @out << "\n  " + str
+    @out << "  " + str.to_s
   end
 
-  def outstr(str)  # \n and indent
+  def outstr(str)  # indent
     @out ||= ""
     @out << str
   end
 
   def output!(str)  # red, \n and indent
     @out ||= ""
-    @out << "\n  " + red(str)
+    @out << "  " + red(str)
   end
 
   def output_newline(n = 1)

data/lib/publish.rb

@@ -34,7 +34,7 @@ class RuneBlog::Publishing
     dir = "#@docroot/#@path"
     result = system("ssh #@user@#@server -x mkdir #{dir}") 
     list = files.join(' ')
-    cmd = "scp -r #{list} #@user@##server:#{dir} >/dev/null 2>&1"
+    cmd = "scp -r #{list} #@user@#@server:#{dir} >/dev/null 2>/tmp/wtf"
     output! "Publishing #{files.size} files...\n"
     result = system(cmd)
     raise PublishError unless result

data/lib/repl.rb

@@ -58,7 +58,7 @@ module RuneBlog::REPL
     reset_output
     check_empty(arg)
     unless @blog.view.can_publish?
-      output! "Can't publish without entries in #{@blog.view}/publish"
+      output! "Can't publish without entries in #{@blog.view.name}/publish"
       return @out
     end
     @blog.view.publish
@@ -102,16 +102,6 @@ module RuneBlog::REPL
     nil
   end
 
-  def cmd_list_views(arg)
-    reset_output("\n")
-    check_empty(arg)
-    @blog.views.each do |v| 
-      v = bold(v) if v == @blog.view
-      outstr "  #{v}\n"
-    end
-    @out
-  end
-
   def cmd_change_view(arg)
     reset_output
     # Simplify this
@@ -121,7 +111,7 @@ module RuneBlog::REPL
     else
       if @blog.view?(arg)
         @blog.view = arg  # reads config
-        output red("View: ") + bold(@blog.view)
+        output red("View: ") + bold(@blog.view.name.to_s)  # FIXME?
       end
     end
     @out
@@ -147,7 +137,7 @@ module RuneBlog::REPL
   end
 
   def cmd_kill(arg)
-    reset_output "\n"
+    reset_output
     args = arg.split
     args.each do |x| 
       # FIXME
@@ -192,29 +182,40 @@ module RuneBlog::REPL
     nil
   end
 
-  def cmd_list_posts(arg)
+  def cmd_list_views(arg)
+    reset_output
     check_empty(arg)
+    @blog.views.each do |v| 
+      v = bold(v) if v == @blog.view.name
+      outstr "  #{v}\n"
+    end
+    @out
+  end
+
+  def cmd_list_posts(arg)
     reset_output
+    check_empty(arg)
     posts = @blog.posts  # current view
-    output bold(@blog.view.name) + ":"
+    str = @blog.view.name + ":\n"
+    output str
     if posts.empty?
       output! bold("No posts")
     else
-      output_newline
-      posts.each {|post| outstr "  #{colored_slug(post)}\n" }
+      posts.each do |post| 
+        outstr "  #{colored_slug(post)}\n" 
+      end
     end
     @out
   end
 
   def cmd_list_drafts(arg)
-    check_empty(arg)
     reset_output
+    check_empty(arg)
     drafts = @blog.drafts  # current view
     if drafts.empty?
       output! "No drafts"
       return @out
     else
-      output_newline
       drafts.each do |draft| 
         outstr "  #{colored_slug(draft.sub(/.lt3$/, ""))}\n" 
       end

data/lib/version.rb

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

data/test/general.rb

@@ -32,9 +32,9 @@ class TestREPL < Minitest::Test
   def test_002_cmd_version
     out = cmd_version(nil)
     assert out.is_a?(String), "Expected a string returned"
-    lines = out.split("\n")[1]
+    lines = out
     assert lines =~ /\d+\.\d+\.\d+/m,
-           "Couldn't find version number"
+           "Couldn't find version number; found #{out.inspect}"
   end
 
   def test_003_list_views!
@@ -54,14 +54,14 @@ class TestREPL < Minitest::Test
     out = cmd_list_drafts(nil)
     assert out.is_a?(String), "Expected a string returned"
     lines = out.split("\n").length 
-    assert lines == 11, "Expecting 11 lines; got #{show_lines(out)}"
+    assert lines == 10, "Expecting 10 lines; got #{show_lines(out)}"
   end
 
   def test_006_lsp!
     out = cmd_list_posts(nil)
     assert out.is_a?(String), "Expected a string returned; got: #{out.inspect}"
     lines = out.split("\n").length 
-    assert lines == 7, "Expecting 7 lines; got #{show_lines(out)}"
+    assert lines == 6, "Expecting 6 lines; got #{show_lines(out)}"
   end
 
   def test_007_parser

metadata

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