runeblog 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f04213603ad7442242abfeeff05336fe1c3c47599c1228c1536454a3e15506b7
-  data.tar.gz: 334d6df9b57edf8e8c0c23cb0c74a12623cd152127e6ef5cfde696f54a27946d
+  metadata.gz: c0fcd07e427eb105db2a6dcad6fdd340570b031bbf9bf4c2a07e69d92ec4fcf7
+  data.tar.gz: 8d4b005099a777e60819439a0e34270dccdb2adbc284e5d8092dfea470a4be58
 SHA512:
-  metadata.gz: d9729e32ff5d6001992bd1ef136f44a6ab9efcdade913862b08b22aaee1b97e87796647b1e6fb425b60fad68af8ee091c1b2aa17019f2f91ad224efbc5dfb7e8
-  data.tar.gz: 2cc280923f48d76cf89cc54ae62089bb047dfdcf1114464f2c6eefe714a2656868c5fcfed0098ccbb7f7ab5ca71dfa56ff08efe42a109554e5f6267d374270d6
+  metadata.gz: f31952b35035981bf3f7a8a6166da37b4c227ece9388d4ccdb6efa02a3415e0b22dd5e01fcbf7c8e5ce1c2e8616b573c2d9211c7bcd61ebc22f2bda720be0ebe
+  data.tar.gz: b3a3d44b0b14f20d8e87ff74f91ff5c858d2460942755cc8000b9598725db2ff8b80b26b1791fe7ce3ac0c47ed8382af0894fc3c5e582dbbf70490d010cbe2ef

data/bin/blog

@@ -16,8 +16,7 @@ def mainloop
   cmd.chomp!
   return if cmd.empty?   # CR does nothing
   meth, params = RuneBlog::REPL.choose_method(cmd)
-  old, str = send(meth, params)
-  puts str if old && ! str.nil?
+  ret, str = send(meth, params)
 rescue => err
   puts err
 end

data/lib/global.rb

@@ -43,3 +43,14 @@ def check_meta(meta, where = "")
   end
 end
 
+def verify(hash)
+  hash.each_pair do |expr, msg|
+    puts "<< #{msg}" unless expr
+  end
+end
+
+def assure(hash)  # really the same as verify for now...
+  hash.each_pair do |expr, msg|
+    puts "<< #{msg}" unless expr
+  end
+end

data/lib/helpers-blog.rb

@@ -3,6 +3,7 @@ require 'runeblog_version'
 module RuneBlog::Helpers
 
   def read_config(file, *syms)
+    verify(File.exist?(file) => "File #{file} doesn't exist")
     lines = File.readlines(file).map(&:chomp)
     obj = OpenStruct.new
     lines.each do |line|
@@ -36,6 +37,7 @@ module RuneBlog::Helpers
   end
 
   def get_views   # read from filesystem
+    verify(Dir.exist?("#@root/views") => "#{@root/views} doesn't exist")
     dirs = subdirs("#@root/views/").sort
     dirs.map {|name| RuneBlog::View.new(name) }
   end

data/lib/repl.rb

@@ -33,7 +33,7 @@ module RuneBlog::REPL
     check_empty(arg)
     output RuneBlog::VERSION
     puts fx("\n  RuneBlog", :bold), fx(" v #{RuneBlog::VERSION}\n", Red) unless testing
-    [false, @out]
+    [true, @out]
   end
 
   def cmd_config(arg, testing = false)
@@ -51,7 +51,6 @@ module RuneBlog::REPL
     reset_output
     check_empty(arg)
     url = @blog.view.publisher.url
-    # FIXME Bad logic here.
     if url.nil?   
       output! "Publish first."
       puts "\n  Publish first."
@@ -59,7 +58,7 @@ module RuneBlog::REPL
     end
     result = system("open '#{url}'")
     raise CantOpen(url) unless result
-    return [false, @out]
+    return [true, @out]
   end
 
   def cmd_preview(arg, testing = false)
@@ -68,9 +67,10 @@ module RuneBlog::REPL
     local = @blog.view.index
     result = system("open #{local}")
     raise CantOpen(local) unless result
+    [true, @out]
   end
 
-  def cmd_publish(arg, testing = false)  # FIXME non-string return expected in caller?
+  def cmd_publish(arg, testing = false)
     puts unless testing
     reset_output
     check_empty(arg)
@@ -88,7 +88,7 @@ module RuneBlog::REPL
       yn = RubyText.gets.chomp
       files = all if yn == "y"
     end
-    return if files.empty?
+    return [false, @out] if files.empty?
 
     ret = RubyText.spinner(label: " Publishing... ") do
       @blog.view.publisher.publish(files, assets)  # FIXME weird?
@@ -100,7 +100,7 @@ module RuneBlog::REPL
       puts "  ...finished.\n " 
       output! "...finished.\n"
     end
-    return [false, @out]
+    return [true, @out]
   end
 
   def cmd_rebuild(arg, testing = false)
@@ -110,14 +110,14 @@ module RuneBlog::REPL
     puts unless testing
     files = @blog.find_src_slugs
     files.each {|file| @blog.rebuild_post(file) }
-    nil
+    [true, @out]
   end
 
   def cmd_relink(arg, testing = false)
     reset_output
     check_empty(arg)
     @blog.relink
-    nil
+    [true, @out]
   end
 
   def cmd_change_view(arg, testing = false)
@@ -139,7 +139,7 @@ module RuneBlog::REPL
         puts "\n  ", fx(arg, :bold), "\n" unless testing
       end
     end
-    return [false, @out]
+    return [true, @out]
   end
 
   def cmd_new_view(arg, testing = false)
@@ -148,7 +148,7 @@ module RuneBlog::REPL
     resp = yesno("Add publishing info now? ")
     @blog.view.publisher = ask_publishing_info
     write_config(@blog.view.publisher,  @blog.view.dir + "/publish")  # change this?
-    nil
+    [true, @out]
   end
 
   def cmd_new_post(arg, testing = false)
@@ -157,7 +157,7 @@ module RuneBlog::REPL
     title = ask("\nTitle: ")
     @blog.create_new_post(title)
     STDSCR.clear
-    nil
+    [true, @out]
   rescue => err
     puts err
     puts err.backtrace.join("\n")
@@ -172,7 +172,7 @@ module RuneBlog::REPL
       puts ret
       output ret
     end
-    return [false, @out]
+    [true, @out]
   end
 
   #-- FIXME affects linking, building, publishing...
@@ -184,7 +184,7 @@ module RuneBlog::REPL
     result = @blog.remove_post(id)
     output! "Post #{id} not found" if result.nil?
 #   puts "Post #{id} not found" if result.nil?
-    return [false, @out]
+    [true, @out]
   end
 
   #-- FIXME affects linking, building, publishing...
@@ -213,7 +213,7 @@ module RuneBlog::REPL
     file = files.first
     result = edit_file("#{@blog.root}/src/#{file}")
     @blog.rebuild_post(file)
-    return [false, @out]
+    [true, @out]
   end
 
   def cmd_list_views(arg, testing = false)
@@ -227,7 +227,7 @@ module RuneBlog::REPL
       puts "  ", v unless testing
     end
     puts unless testing
-    return [false, @out]
+    [true, @out]
   end
 
   def cmd_list_posts(arg, testing = false)
@@ -250,7 +250,7 @@ module RuneBlog::REPL
       end
     end
     puts unless testing
-    return [false, @out]
+    [true, @out]
   end
 
   def cmd_list_drafts(arg, testing = false)
@@ -271,7 +271,7 @@ module RuneBlog::REPL
       end
     end
     puts unless testing
-    return [false, @out]
+    [true, @out]
   end
 
   def cmd_INVALID(arg, testing = false)
@@ -279,7 +279,7 @@ module RuneBlog::REPL
     print fx("\n  Command ", :bold)
     print fx(arg, Red, :bold)
     puts fx(" was not understood.\n ", :bold)
-    return [false, @out]
+    [true, @out]
   end
 
   def cmd_help(arg, testing = false)
@@ -328,7 +328,7 @@ module RuneBlog::REPL
       puts s2
     end
     puts unless testing
-    return [false, @out]
+    [true, @out]
   end
 
 end

data/lib/runeblog_version.rb

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

metadata

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