runeblog 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfed05ef1c5eb502d0f6769c95388f1f5b1b01e222c49fa6f57fd63e85303e82
-  data.tar.gz: 298cb71465d7fd9e180846f907834d613823fad2483e24283c795ef9f0d74485
+  metadata.gz: 52ebaa843a818ec3dce17752ed00138eb70815de1d6682575f03b7f1439fd257
+  data.tar.gz: 5fd897754f908d1743941bde6d481cdcd6b3b076f0e1f2ff764c72e762dc1dc9
 SHA512:
-  metadata.gz: 56c51aab79afdd45313fc5f1e15940372bb2465409eba613b5e8f57115e61cea280efe888f18e85a0e8d9040a225868ac1e04c4d8a32a37b1c5c7f3d4ff583eb
-  data.tar.gz: 24be0b1d1a612de9a5c226cb4bd3256271437e975223309358a542c33e3dff34912dd197751691e38775f45010b77e088f8aea8367db2b8fe0c96a0c500ac778
+  metadata.gz: 27556932f85692ca16dd0b2121eac9a564361cf0224d6a285b00c6b15e2e8af8df8572a979dd876a2395259cee780b93784216e0e0c41c932092150295b7f50d
+  data.tar.gz: d38d93b97e66cec00907b910b660fb1abf08ab1398879269a52f39218df106dde7ecda20d528f242b53566cc8b560f2e38f83cfd07aa388bb70af5bda5ab15e1

data/bin/blog

@@ -11,7 +11,7 @@ include RuneBlog::REPL
 
 def mainloop
   print fx("blog> ", Red, :bold)
-  cmd = STDSCR.gets(history: @cmdhist)
+  cmd = STDSCR.gets(history: @cmdhist, tab: @tabcom)
   cmd_quit(nil) if cmd.nil?   # ^D
   cmd.chomp!
   return if cmd.empty?   # CR does nothing
@@ -43,6 +43,8 @@ end
 
 puts fx("\n  RuneBlog", :bold), fx(" v #{RuneBlog::VERSION}\n", Red)
 @cmdhist = []
+@tabcom = RuneBlog::REPL::Patterns.keys
+@tabcom.map! {|x| x.sub(/ \$.*/, " ") }
 loop { mainloop }
 sleep 0.2
 system("tput clear")

data/lib/helpers-repl.rb

@@ -18,6 +18,8 @@ module RuneBlog::REPL
 
      "new view $name"    => :cmd_new_view,
 
+     "customize"         => :cmd_customize,
+
      "new post"          => :cmd_new_post,
      "p"                 => :cmd_new_post,
      "post"              => :cmd_new_post,

data/lib/post.rb

@@ -16,8 +16,8 @@ class RuneBlog::Post
   end
   
   def self.load(post)
-    # FIXME weird logic here
     raise NoBlogAccessor if RuneBlog.blog.nil?
+    # "post" is a slug
     pdir = RuneBlog.blog.view.dir + "/" + post
     verify(Dir.exist?(pdir) => "Directory #{pdir} not found")
     meta = nil
@@ -128,7 +128,8 @@ class RuneBlog::Post
     # FIXME what if title changes? slug should change?
     meta.views = views  # FIXME
 
-    meta.views.each do |view_name|   # Create dir using slug (index.html, metadata?)
+    meta.views.each do |view_name|   
+      # Create dir using slug (index.html, metadata?)
       vdir = "#{@blog.root}/views/#{view_name}/"
       dir = vdir + meta.slug + "/"
       create_dir(dir) unless Dir.exist?(dir)

data/lib/publish.rb

@@ -26,7 +26,7 @@ class RuneBlog::Publishing
   end
 
   def url
-    url = "#@proto://#@server/#@path"
+    url = "#@proto://#@server/#@path/#{@blog.view.name}"
   end
 
   def system!(str)
@@ -38,10 +38,11 @@ debug "Failed!\n " if ! rc
 
   def publish(files, assets=[])
     dir = "#@docroot/#@path"
-    result = system!("ssh #@user@#@server -x mkdir -p #{dir}") 
+    view_name = @blog.view.name
+    result = system!("ssh #@user@#@server -x mkdir -p #{dir}/#{view_name}") 
     result = system!("ssh #@user@#@server -x mkdir -p #{dir}/assets") 
     files.each do |file|
-      dest = "#@user@#@server:#{dir}"
+      dest = "#@user@#@server:#{dir}/#{view_name}"
       file.gsub!(/\/\//, "/")  # weird... :-/
       dest.gsub!(/\/\//, "/")  # weird... :-/
       cmd = "scp -r #{file} #{dest} >/dev/null 2>/tmp/wtf"

data/lib/repl.rb

@@ -47,6 +47,19 @@ module RuneBlog::REPL
     edit_file("#{dir}/#{fname}")
   end
 
+  def cmd_customize(arg, testing = false)
+    # add extra views? add tags?
+    Dir.chdir(@blog.root + "/views/" + @blog.view.name)
+    others = @blog.views - [@blog.view]
+    others.map!(&:name)
+    viewlist = STDSCR.multimenu(items: others)
+    puts "\n  #{viewlist.inspect}\n "
+    tags = File.readlines("tagpool").map(&:chomp)
+    tags << "[NEW TAG]"
+    taglist = STDSCR.multimenu(items: tags)
+    puts "\n  #{taglist.inspect}\n "
+  end
+
   def cmd_browse(arg, testing = false)
     reset_output
     check_empty(arg)
@@ -308,6 +321,8 @@ module RuneBlog::REPL
 
        list views        List all views available
        lsv               Same as: list views
+
+       customize         Change set of tags, extra views
   
        p, post           Create a new post
        new post          Same as post (create a post)

data/lib/runeblog.rb

@@ -131,9 +131,9 @@ class RuneBlog
     x = RuneBlog::Default
     create_dir('custom')
     create_dir('assets')
-    # FIXME dump method??
     pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
-    dump(pub, "publish")  # FIXME publish
+    dump(pub, "publish")
+    dump("", "tagpool")
     dump(x::BlogHeader, "custom/blog_header.html")
     dump(x::BlogTrailer, "custom/blog_trailer.html")
     dump("Initial creation", "last_published")
@@ -294,8 +294,8 @@ class RuneBlog
     process_post(file)
     # FIXME this is broken now
     self.views.each do |view| 
-      p view.inspect
-      getch
+#     p view.inspect
+#     getch
       generate_index(view)
     end
   rescue => err

data/lib/runeblog_version.rb

@@ -1,6 +1,6 @@
 
 class RuneBlog
-  VERSION = "0.1.30"
+  VERSION = "0.1.31"
 
   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.30
+  version: 0.1.31
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-20 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext