runeblog 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 21d34358a671bd5d76eb77221154ff63e0097f92
-  data.tar.gz: 6585054baeba0918d35409a3eb138762ab6ab670
+SHA256:
+  metadata.gz: c8624c0cbf8355cc824d03ff97e2b60cd04e871bde7394731535e32504aa05ee
+  data.tar.gz: 0f5323f78c46f801000269eff914eb024d2f8539b44531822d779c1549581f95
 SHA512:
-  metadata.gz: 62d64be14fb9b1eef47120d1c06c410eb97a3d4ee7c44c8ca70a3bb2424f84367312886e0b6cd100286e23a84089ce52968b43f2ab470bb686f508f909963d12
-  data.tar.gz: 87a791aa34b235ebe3220a0f0d57950ddde4dfda73b14e937afff644b96d7e6dbb514c009bda2676176bf6731630a52a7aa96e2611104354f91728176efa0224
+  metadata.gz: 5cae9b867b30214856bb457b9cfc7d434691dc24aaeda63505d96c2377251e2280f28638dbd33360c762b41eb9d9ab8f6997170b9cea8db5921e8580e46347a9
+  data.tar.gz: 824f8c428bed47e17bd373f63c4a69644d80d13277083a738ec635bf7ace2b836d7d96beac1b6119e46c0a70e27d929a5c4e197699687f603794c5beab048c58

data/bin/blog

@@ -20,7 +20,7 @@ end
 
 def mainloop
   print fx("blog> ", Red)
-  cmd = STDSCR.gets
+  cmd = STDSCR.gets(history: @cmdhist)
   cmd_quit(nil) if cmd.nil?   # ^D
   cmd.chomp!
   return if cmd.empty?   # CR does nothing
@@ -56,6 +56,7 @@ end
 
 if cmd.nil?   # REPL
   puts fx("\n  RuneBlog", :bold), fx(" v #{RuneBlog::VERSION}\n", Red)
+  @cmdhist = []
   loop { mainloop }
   sleep 0.2
   system("tput clear")

data/lib/helpers-blog.rb

@@ -20,6 +20,7 @@ module RuneBlog::Helpers
   rescue => err
     puts "Something hit the fan: #{err}"  # CHANGE_FOR_CURSES?
     puts err.backtrace.join("\n")  # CHANGE_FOR_CURSES?
+    puts "dir = #{Dir.pwd}"
     exit
   end
 

data/lib/helpers-repl.rb

@@ -272,36 +272,25 @@ module RuneBlog::REPL
 
   ### find_asset
 
-#   def find_asset(asset)    # , views)
-# # STDERR.puts "repl find_asset: @meta = #{@meta.inspect}"
-#     views = @meta.views
-#     views.each do |view| 
-#       vdir = @config.viewdir(view)
-#       post_dir = "#{vdir}#{@meta.slug}/assets/"
-#       path = post_dir + asset
-#       STDERR.puts "          Seeking #{path}"
-#       return path if File.exist?(path)
-#     end
-#     views.each do |view| 
-#       dir = @config.viewdir(view) + "/assets/"
-#       path = dir + asset
-#       STDERR.puts "          Seeking #{path}"
-#       return path if File.exist?(path)
-#     end
-#     top = @root + "/assets/"
-#     path = top + asset
-#     STDERR.puts "          Seeking #{path}"
-#     return path if File.exist?(path)
-# 
-#     return nil
-#   end
-# 
-#   ### find_all_assets
-# 
-#   def find_all_assets(list, views)
-# #   STDERR.puts "\n  Called find_all_assets with #{list.inspect}"
-#     list ||= []
-#     list.each {|asset| puts "#{asset} => #{find_asset(asset, views)}" }
-#   end
+  # FIXME is this per-post?
 
+  def find_asset(asset_name)    # , views)
+    search_path = proc do |path| 
+      full_path = path + asset_name
+      return full_path if File.exist?(full_path)
+    end
+    views = @meta.views
+    views.each do |view| search_path.call("#{view.dir}/#{@meta.slug}/assets/") end
+    views.each do |view| search_path.call(view.dir + "/assets/") end
+    search_path.call(@root + "/assets/", asset_name)
+    # If all fail... return nil
+    return nil
+  end
+
+  ### find_all_assets
+
+  def find_all_assets(list, views)
+    list ||= []
+    list.each {|asset| puts "#{asset} => #{find_asset(asset, views)}" }
+  end
 end

data/lib/publish.rb

@@ -26,7 +26,7 @@ class RuneBlog::Publishing
   end
 
   def url
-    url = "#{protocol}://#{@server}/#{@path}"
+    url = "#@proto://#@server/#@path"
   end
  
   def publish(files)

data/lib/repl.rb

@@ -69,37 +69,41 @@ module RuneBlog::REPL
   end
 
   def cmd_publish(arg)  # FIXME non-string return expected in caller?
+    puts
     reset_output
     check_empty(arg)
     unless @blog.view.can_publish?
+      puts "Can't publish without entries in #{@blog.view.name}/publish"
       output! "Can't publish without entries in #{@blog.view.name}/publish"
-      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 [true, @out]
+      return [false, @out]
     end
-
-    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 -p #{dir}") 
-
-    cmd = "scp -r #{files.join(' ')} root@#{server}:#{dir} >/dev/null 2>&1"
-    output! "Publishing #{files.size} files...\n"
-    result = system(cmd)
-    raise PublishError unless result
+    RubyText.spinner { @blog.view.publish }
+#     user, server, sroot, spath = *@publish[@blog.view]
+#     if files.empty?    # FIXME  baloney
+#       output! "No files to publish"
+#       return [true, @out]
+#     end
+
+#     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 -p #{dir}") 
+# 
+#     cmd = "scp -r #{files.join(' ')} root@#{server}:#{dir} >/dev/null 2>&1"
+#     output! "Publishing #{files.size} files...\n"
+#     result = system(cmd)
+#     raise PublishError unless result
 
     dump(files, "#{vdir}/last_published")
+    puts "  ...finished" 
     output! "...finished.\n"
-    return [true, @out]
+    return [false, @out]
   end
 
   def cmd_rebuild(arg)
+    debug "Starting cmd_rebuild..."
     reset_output
     check_empty(arg)
     puts  # CHANGE_FOR_CURSES?
@@ -201,7 +205,6 @@ 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

@@ -298,6 +298,7 @@ class RuneBlog
   end
 
   def rebuild_post(file)
+    debug "Called rebuild_post(#{file.inspect})"
     raise ArgumentError unless file.is_a?(String)
     @meta = process_post(file)
     @meta.views.each do |view| 
@@ -350,6 +351,7 @@ class RuneBlog
   end
 
   def make_slug(title, postnum = nil)
+    debug "title = #{title.inspect} (#{title.class})"
     raise ArgumentError unless title.is_a?(String)
     postnum ||= self.next_sequence
     num = '%04d' % postnum   # FIXME can do better

data/lib/version.rb

@@ -1,6 +1,6 @@
 
 class RuneBlog
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 
   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.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A command-line blogging system