runeblog 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d272238c762b72c9ba74c352a35a08e67a2798dce78765a7a7ab026faa2530a7
-  data.tar.gz: d7c789ccf2b890f908672d735a7cf9d753ac2cac6f3ad3e3a7706caadc850889
+  metadata.gz: 37a61dd4695c47ded548fbb1f3aecf99a644eb63331a0f21df3e573a4ce1c23a
+  data.tar.gz: 8f6aa0e0ad310368a032db1d77f1110611f0f0b05ca01bb6341e4cf3be94ca5b
 SHA512:
-  metadata.gz: 82485c5e3efff0b30855979c9c7a8f9b18059e13ba2a0b1ba15972a10fb746a71722ff94e9263b86807fdd9fe392317b84b984b55224dfbc0057c799dd558144
-  data.tar.gz: 40e3575de330a8418d8fe5b39b0eaae911b09936ff91b53649148771e0f8ee3e872816809f97475c2f3da0d8352b548b29c662c0794abb890d10986f788862ab
+  metadata.gz: f8d304963d27109c3bda13d780d414233a2e1d94547ab1b906cb9c818df68521960dcb2fa06756de9b6b90ebab08d5d85185ca6a6a055855980a4688a75d9389
+  data.tar.gz: eb0e1805f3b02bd08a4e670f05a833cd68fd2492565414d493e93b6d29482c4fac52ec7d0f902c16b33e0c4916217c423511c32a0b133427d39fd65cd1d455ef

data/bin/blog

@@ -39,12 +39,9 @@ end
 
 ###########
 
-RubyText.start(log: "blogcmd.txt", fg: Blue, bg: White)
-RubyText.set(:_echo)
+RubyText.start(:_echo, :keypad, scroll: true, log: "blogcmd.txt", fg: Blue, bg: White)
 
-X.stdscr.keypad(true)
-
-STDOUT.sync = true
+# STDOUT.sync = true
 
 cmd, arg = get_argv
 

data/lib/helpers-blog.rb

@@ -19,7 +19,7 @@ module RuneBlog::Helpers
     return vals
   rescue => err
     puts "Something hit the fan: #{err}"  # CHANGE_FOR_CURSES?
-    puts err.backtrace  # CHANGE_FOR_CURSES?
+    puts err.backtrace.join("\n")  # CHANGE_FOR_CURSES?
     exit
   end
 
@@ -82,7 +82,7 @@ module RuneBlog::Helpers
   def error(err)  # Hmm, this is duplicated
     str = "\n  Error: #{err}"
     puts str  # CHANGE_FOR_CURSES?
-    puts err.backtrace  # CHANGE_FOR_CURSES?
+    puts err.backtrace.join("\n")  # CHANGE_FOR_CURSES?
   end
 
   def dump(obj, name)
@@ -90,3 +90,8 @@ module RuneBlog::Helpers
   end
 
 end
+
+def dump(obj, name)      # FIXME scope
+  File.write(name, obj)
+end
+

data/lib/post.rb

@@ -73,7 +73,7 @@ class RuneBlog::Post
     end
   rescue => err
     p err  # CHANGE_FOR_CURSES?
-    puts err.backtrace  # CHANGE_FOR_CURSES?
+    puts err.backtrace.join("\n")  # CHANGE_FOR_CURSES?
   end
 
   private

data/lib/publish.rb

@@ -30,12 +30,14 @@ class RuneBlog::Publishing
   end
  
   def publish(files)
+    debug "files = #{files.inspect}"
     reset_output
     dir = "#@docroot/#@path"
     result = system("ssh #@user@#@server -x mkdir #{dir}") 
     list = files.join(' ')
     cmd = "scp -r #{list} #@user@#@server:#{dir} >/dev/null 2>/tmp/wtf"
     output! "Publishing #{files.size} files...\n"
+    debug "cmd = #{cmd.inspect}  - see /tmp/wtf"
     result = system(cmd)
     raise PublishError unless result
 

data/lib/repl.rb

@@ -8,7 +8,7 @@ make_exception(:PublishError,  "Error during publishing")
 module RuneBlog::REPL
 
   def edit_file(file)
-    result = system("#{blog.editor} #{file}")
+    result = system("#{@blog.editor} #{file}")
     raise EditorProblem(file) unless result
     STDSCR.clear
   end
@@ -119,15 +119,20 @@ module RuneBlog::REPL
     reset_output
     # Simplify this
     if arg.nil?
+      viewnames = @blog.views.map {|x| x.name }
+      n = viewnames.find_index(@blog.view.name)
+      k, name = RubyText.menu(c: 30, items: viewnames, curr: n)
+      @blog.view = name
       output bold(@blog.view)
-      return [true, @out]
+      puts "\n  ", fx(name, :bold), "\n"
+      return [false, @out]
     else
       if @blog.view?(arg)
         @blog.view = arg  # reads config
         output red("View: ") + bold(@blog.view.name.to_s)  # FIXME?
       end
     end
-    return [true, @out]
+    return [false, @out]
   end
 
   def cmd_new_view(arg)
@@ -196,6 +201,7 @@ module RuneBlog::REPL
     check_empty(arg)
     puts
     @blog.views.each do |v| 
+      debug "v = #{v.inspect}"
       v = v.to_s
       v = fx(v, :bold) if v == @blog.view.name
       print "  "

data/lib/runeblog.rb

@@ -52,7 +52,7 @@ class RuneBlog
     blog.create_view("test_view")
   rescue => err
     puts "Can't create blog: '#{dir}' - #{err}"  # CHANGE_FOR_CURSES?
-    puts err.backtrace  # CHANGE_FOR_CURSES?
+    puts err.backtrace.join("\n")  # CHANGE_FOR_CURSES?
   end
 
   def initialize   # assumes existing blog
@@ -85,12 +85,12 @@ class RuneBlog
     case arg
       when RuneBlog::View
         @view = arg
-        @view.publisher = read_config(@view.dir + "/publish")
+        @view.publisher = RuneBlog::Publishing.new(read_config(@view.dir + "/publish"))
       when String
         new_view = str2view(arg)
         raise NoSuchView(arg) if new_view.nil?
         @view = new_view
-        @view.publisher = read_config(@view.dir + "/publish")
+        @view.publisher = RuneBlog::Publishing.new(read_config(@view.dir + "/publish"))
       else 
         raise CantAssignView(arg.class.to_s)
     end
@@ -174,6 +174,7 @@ class RuneBlog
     post.num
   rescue => err
     puts err # error(err)  # CHANGE_FOR_CURSES?
+    puts err.backtrace.join("\n")  # CHANGE_FOR_CURSES?
   end
 
   def edit_initial_post(file, testing = false)

data/lib/version.rb

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

data/lib/view.rb

@@ -34,9 +34,12 @@ class RuneBlog::View
   def files(recent = false)
     vdir = dir()
     files = [index()]
+debug "Looking in #{vdir}"
     others = Dir.entries(vdir).grep(/^\d\d\d\d/)
     files += others.map {|x| "#{vdir}/#{x}" }
-    files.reject! {|f| recent?(f) } if recent
+debug "Found #{files.inspect}"
+#   files.reject! {|f| recent?(f) } if recent
+debug "Now files = #{files.inspect}"
     files
   end
 

metadata

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