runeblog 0.0.60 → 0.0.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d6b3da20e1b95cba305221ed0663dc6d9f609ff
-  data.tar.gz: 9baf807dca0a68940b7222ef4ad856e36b18d9f3
+  metadata.gz: ca2648e3bcca270f74671363c314ad6fad4b9807
+  data.tar.gz: 36f7b4d7cb14e872848fb3348ee33f477718708c
 SHA512:
-  metadata.gz: 9f695ac8508c5419e55326fc403192cb6f677212d988a39ce96c10e79f6913ae5d05504a6c089ed8684578372f93db385af708a8ebcc68cec66ff97f8302cfe1
-  data.tar.gz: 5d2126e6ae125f9afa1dbce47ba0979302e49568561a3815d751d04e04a33ef256722a9f5a2c7cd75421617bd0cf4c4d0a8db8065dbf311ebd7a362ef7a74a72
+  metadata.gz: fdfe7950cd8d63d055216891a7dd4f260f92230af319bacb65b7483707750219cd603300a5ce990869c7d1a7f2ad0c0728970ae86b0276a481d62c2aeb0d5b4d
+  data.tar.gz: e6f3d5e7d4b31c059a835c4d52c9e73a5f83222f8cdbaa83d8203164cef576b2dc9a47f1f9c965e8e5f266ca2fe1585f0b2a117fb7837879a311669692bf0e10

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.60   2018-09-16
+RuneBlog v 0.0.61   2018-09-17

data/lib/repl.rb

@@ -21,13 +21,11 @@ module RuneBlog::REPL
   def cmd_browse
     reset_output
     check_empty(arg)
-    @deploy ||= {}
-    return puts red("\n  Deploy first.") unless @deploy[@view]
-
-    # Simlify this
-    lines = @deploy[@view]
-    user, server, sroot, spath = *lines
-    url = "http://#{server}/#{spath}"
+    url = @blog.deployment_url
+    if url.nil?
+      output! "Deploy first."
+      return @out
+    end
     result = system("open '#{url}'")
     raise CantOpen, url unless result
     nil
@@ -48,20 +46,10 @@ module RuneBlog::REPL
     # TBD clunky FIXME 
     reset_output
     check_empty(arg)
-    @deploy ||= {}
-    deployment = @blog.viewdir(@view) + "deploy"
-    check_file_exists(deployment)
-
-    lines = File.readlines(deployment).map {|x| x.chomp }
-    @deploy[@view] = lines
-    user, server, sroot, spath = *lines
-    vdir = @blog.viewdir(@view)
-    files = ["#{vdir}/index.html"]
-    files += Dir.entries(vdir).grep(/^\d\d\d\d/).map {|x| "#{vdir}/#{x}" }
-    files.reject! {|f| File.mtime(f) < File.mtime("#{vdir}/last_deployed") }
+    user, server, sroot, spath = *@deploy[@view]
     if files.empty?
-      puts red("\n  No files to deploy") 
-      return nil
+      output! "No files to deploy"
+      return @out
     end
 
     output "Files:"
@@ -70,6 +58,7 @@ module RuneBlog::REPL
     dir = "#{sroot}/#{spath}"
     # FIXME - may or may not already exist
     result = system("ssh root@#{server} mkdir #{dir}") 
+    # ^ needs -c?? 
 
     cmd = "scp -r #{files.join(' ')} root@#{server}:#{dir} >/dev/null 2>&1"
     output! "Deploying #{files.size} files...\n"
@@ -87,7 +76,7 @@ module RuneBlog::REPL
     reset_output
     check_empty(arg)
     puts
-    # Simlify this
+    # Simplify this
     files = Dir.entries("#@root/src/").grep /\d\d\d\d.*.lt3$/
     files.map! {|f| File.basename(f) }
     files = files.sort.reverse
@@ -142,7 +131,7 @@ module RuneBlog::REPL
   def cmd_new_view(arg)
     reset_output
     arg ||= ask("New view: ")  # check validity later
-    RuneBlog.create_view(arg)
+    @blog.create_view(arg)
     return nil
   rescue => err
     error(err)
@@ -171,11 +160,8 @@ module RuneBlog::REPL
 
   def cmd_remove_post(arg, safe=true)
     reset_output
-#   err = "'#{arg}' is not an integer"
     id = get_integer(arg)
-    tag = "#{'%04d' % id}"
-    files = Find.find(@root).to_a
-    files = files.grep(/#{tag}-/)
+    files = @blog.files_by_id(id)
     if files.empty?
       output! "No such post found (#{id})"
       return @out
@@ -184,7 +170,7 @@ module RuneBlog::REPL
     if safe
       output_newline
       files.each {|f| outstr "  #{f}\n" }
-      puts @out   # ??
+#     puts @out   # ??
       reset_output
       ques = "\n  Delete?\n "
       ques.sub!(/\?/, " all these?") if files.size > 1
@@ -321,6 +307,13 @@ module RuneBlog::REPL
     @view = @blog.view     # current view
     @sequence = @blog.sequence
     @root = @blog.root
+    @deploy ||= {}
+    @blog.views.each do |view|
+      deployment = @blog.viewdir(@view) + "deploy"
+      check_file_exists(deployment)
+      lines = File.readlines(deployment).map {|x| x.chomp }
+      @deploy[@view] = lines
+    end
     @blog
   rescue => err
     error(err)

data/lib/runeblog.rb

@@ -3,16 +3,18 @@ require 'yaml'
 require 'livetext'
 
 class RuneBlog
-  VERSION = "0.0.60"
+  VERSION = "0.0.61"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
   DefaultData = Path + "/../data"
 
   BlogHeaderPath  = DefaultData + "/custom/blog_header.html"
   BlogTrailerPath = DefaultData + "/custom/blog_trailer.html"
+  BlogTemplatePath = DefaultData + "/custom/blog_trailer.html"
 
   BlogHeader  = File.read(BlogHeaderPath)  rescue "not found"
   BlogTrailer = File.read(BlogTrailerPath) rescue "not found"
+  BlogTemplate = File.read(BlogTemplatePath) rescue "not found"
 
   attr_reader :root, :views, :view, :sequence
   attr_writer :view  # FIXME
@@ -56,7 +58,7 @@ class RuneBlog
     File.exist?(".blog")
   end
 
-  def create_view(name)
+  def create_view(arg)
     raise "view #{arg} already exists" if self.views.include?(arg)
 
     dir = @root + "/views/" + arg + "/"
@@ -64,13 +66,34 @@ class RuneBlog
     create_dir(dir + 'assets')
     File.open(dir + "deploy", "w") { }  # FIXME
 
-    # Something more like this?  RuneBlog.new_view(arg)
     File.write(dir + "custom/blog_header.html",  RuneBlog::BlogHeader)
     File.write(dir + "custom/blog_trailer.html", RuneBlog::BlogTrailer)
+    File.write(dir + "custom/post_template.html", RuneBlog::BlogTemplate)
     File.write(dir + "last_deployed", "Initial creation")
     self.views << arg
   end
 
+  def deployment_url
+    return nil unless @deploy[@view]
+    lines = @deploy[@view]
+    user, server, sroot, spath = *@deploy[@view]
+    url = "http://#{server}/#{spath}"
+  end
+
+  def view_files
+    vdir = @blog.viewdir(@view)
+    # meh
+    files = ["#{vdir}/index.html"]
+    files += Dir.entries(vdir).grep(/^\d\d\d\d/).map {|x| "#{vdir}/#{x}" }
+    files.reject! {|f| File.mtime(f) < File.mtime("#{vdir}/last_deployed") }
+  end
+
+  def files_by_id(id)
+    files = Find.find(@root).to_a
+    tag = "#{'%04d' % id}"
+    files.grep(/#{tag}-/)
+  end
+
   def create_new_post(title, view=nil)
     view ||= @view
     date = Time.now.strftime("%Y-%m-%d")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.60
+  version: 0.0.61
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-16 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext