runeblog 0.2.42 → 0.2.47

data/lib/publish.rb

@@ -21,29 +21,28 @@ class RuneBlog::Publishing
   end
 
   def to_h
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     {user: @user, server: @server, docroot: @docroot,
      path: @path, proto: @proto}
   end
 
   def url
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     vname = @blog.view.name # .gsub(/_/, "\\_")
     url = "#@proto://#@server/#@path"  # /#{vname}"
   end
 
   def system!(str)
-    log!(enter: __method__, args: [str])
+    log!(enter: __method__, args: [str], level: 1)
     rc = system(str)
     rc
   end
 
   def publish(files, assets=[])
-    log!(enter: __method__, args: [files, assets])
+    log!(enter: __method__, args: [files, assets], level: 1)
     dir = @docroot/@path
     view_name = @blog.view.name
     viewpath = dir # /view_name
-#   result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}") 
     result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}/assets") 
     files.each do |file|
       dest = "#@user@#@server:" + dir  # /view_name

data/lib/repl.rb

@@ -7,7 +7,6 @@ make_exception(:PublishError,  "Error during publishing")
 make_exception(:EditorProblem, "Could not edit $1")
 
 module RuneBlog::REPL
-
   def edit_file(file)
     result = system!("#{@blog.editor} #{file}")
     raise EditorProblem(file) unless result
@@ -144,6 +143,7 @@ module RuneBlog::REPL
     check_empty(arg)
     puts unless testing
     @blog.generate_view(@blog.view)
+    @blog.generate_index(@blog.view)
     @out
   end
 
@@ -199,7 +199,6 @@ module RuneBlog::REPL
   end
 
   def cmd_remove_post(arg, testing = false)
-puts "arg = #{arg.inspect} is a #{arg.class}"
     reset_output
     args = arg.split
     args.each do |x| 
@@ -211,14 +210,12 @@ puts "arg = #{arg.inspect} is a #{arg.class}"
     @out
   end
 
-  #-- FIXME affects linking, building, publishing...
-
   def cmd_edit_post(arg, testing = false)
     reset_output
     id = get_integer(arg)
     # Simplify this
     tag = "#{'%04d' % id}"
-    files = Find.find(@blog.root+"/drafts").to_a
+    files = ::Find.find(@blog.root+"/drafts").to_a
     files = files.grep(/#{tag}-.*lt3/)
     files = files.map {|f| File.basename(f) }
     if files.size > 1
@@ -384,6 +381,5 @@ puts "arg = #{arg.inspect} is a #{arg.class}"
     puts unless testing
     @out
   end
-
 end
 

data/lib/runeblog.rb

@@ -1,4 +1,5 @@
 require 'date'
+require 'find'
 
 require 'logging'
 
@@ -53,7 +54,7 @@ class RuneBlog
   end
 
   def self.create(root = ".blogs")
-    log!(enter: __method__, args: [root])
+    log!(enter: __method__, args: [root], level: 1)
     # Crude - FIXME later -  # What views are there? Publishing, etc.
     self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     root = Dir.pwd/root
@@ -63,7 +64,6 @@ class RuneBlog
       create_dirs(:drafts, :views, :posts)
       new_sequence
     end
-#   put_config(root: root)
     x = OpenStruct.new
     x.root, x.current_view, x.editor = root, "test_view", "/usr/bin/vim "   # dumb - FIXME later
     write_config(x, root/ConfigFile)
@@ -101,7 +101,7 @@ class RuneBlog
   end
 
   def _deploy_local(dir)
-    log!(enter: __method__, args: [dir])
+    log!(enter: __method__, args: [dir], level: 1)
     Dir.chdir(dir) do
       views = _retrieve_metadata(:views)
       views.each {|v| system!("cp *html #@root/views/#{v}/remote") }
@@ -132,7 +132,7 @@ class RuneBlog
   end
 
   def process_post(sourcefile)
-    log!(enter: __method__, args: [dir])
+    log!(enter: __method__, args: [dir], level: 2)
     nslug = sourcefile.sub(/.lt3/, "")
     dir = @root/:posts/nslug
     create_dir(dir)
@@ -141,7 +141,7 @@ class RuneBlog
   end
 
   def inspect
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     str = "blog: "
     ivars = ["@root", "@sequence"]   # self.instance_variables
     ivars.each do |iv| 
@@ -152,30 +152,30 @@ class RuneBlog
   end
 
   def view?(name)
-    log!(enter: __method__, args: [name])
+    log!(enter: __method__, args: [name], level: 3)
     raise ArgumentError unless name.is_a?(String) && ! name.empty?
     views.any? {|x| x.name == name }
   end
 
   def view(name = nil)
-    log!(enter: __method__, args: [name])
+    log!(enter: __method__, args: [name], level: 3)
     raise ArgumentError unless name.nil? || (name.is_a?(String) && ! name.empty?)
     name.nil? ? @view : str2view(name)
   end
 
   def str2view(str)
-    log!(enter: __method__, args: [str])
+    log!(enter: __method__, args: [str], level: 3)
     raise ArgumentError unless str.is_a?(String) && ! str.empty?
     @views.find {|x| x.name == str }
   end
 
   def _set_publisher
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     @view.publisher = RuneBlog::Publishing.new(@view.to_s)  # FIXME refactor
   end
 
   def view=(arg)
-    log!(enter: __method__, args: [arg])
+    log!(enter: __method__, args: [arg], level: 2)
     case arg
       when RuneBlog::View
         @view = arg
@@ -191,19 +191,19 @@ class RuneBlog
   end
 
   def get_sequence
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     File.read(@root/:sequence).to_i
   end
 
   def next_sequence
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     @sequence += 1
     dump(@sequence, @root/:sequence)
     @sequence
   end
 
   def viewdir(v = nil)   # delete?
-    log!(enter: __method__, args: [v])
+    log!(enter: __method__, args: [v], level: 3)
     v = str2view(v) if v.is_a?(String)
     raise ArgumentError unless v.nil? || v.is_a?(RuneBlog::View)
     v ||= @view
@@ -211,17 +211,17 @@ class RuneBlog
   end
 
   def self.exist?
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     Dir.exist?(DotDir) && File.exist?(DotDir/ConfigFile)
   end
 
   def mark_last_published(str)
-    log!(enter: __method__, args: [str])
+    log!(enter: __method__, args: [str], level: 2)
     dump(str, "#{self.view.dir}/last_published")
   end
 
   def add_view(view_name)
-    log!(enter: __method__, args: [view_name])
+    log!(enter: __method__, args: [view_name], level: 2)
     view = RuneBlog::View.new(view_name)
     @view = view    # current view
     @views << view  # all views
@@ -229,7 +229,7 @@ class RuneBlog
   end
 
   def make_empty_view_tree(view_name)
-    log!(enter: __method__, args: [view_name])
+    log!(enter: __method__, args: [view_name], level: 2)
     Dir.chdir(@root) do
       cmd = "cp -r #{RuneBlog::Path}/../empty_view views/#{view_name}"
       system!(cmd)
@@ -237,7 +237,7 @@ class RuneBlog
   end
 
   def check_valid_new_view(view_name)
-    log!(enter: __method__, args: [view_name])
+    log!(enter: __method__, args: [view_name], level: 3)
     raise ArgumentError unless view_name.is_a?(String)
     raise ArgumentError if view_name.empty?
     names = self.views.map(&:to_s)
@@ -249,7 +249,7 @@ class RuneBlog
   end
 
   def create_view(view_name)
-    log!(enter: __method__, args: [view_name])
+    log!(enter: __method__, args: [view_name], level: 2)
     check_valid_new_view(view_name)
     make_empty_view_tree(view_name)
     add_view(view_name)
@@ -267,7 +267,7 @@ class RuneBlog
   end
 
   def view_files
-    log!(enter: __method__)
+    log!(enter: __method__, level: 2)
     vdir = self.view.dir
     files = [vdir/"index.html"]
     files += posts.map {|x| vdir/x }
@@ -275,7 +275,7 @@ class RuneBlog
   end
 
   def post_lookup(postid)    # side-effect?
-    log!(enter: __method__, args: [postid])
+    log!(enter: __method__, args: [postid], level: 2)
     slug = title = date = teaser_text = nil
 
     dir_posts = @vdir/:posts
@@ -290,7 +290,7 @@ class RuneBlog
   end
 
   def index_entry(slug)
-    log!(enter: __method__, args: [slug])
+    log!(enter: __method__, args: [slug], level: 2)
     id = slug.to_i
     text = nil
     @theme = @view.dir/"themes/standard"
@@ -309,7 +309,7 @@ class RuneBlog
   end
 
   def collect_recent_posts(file)
-    log!(enter: __method__, args: [file])
+    log!(enter: __method__, args: [file], level: 3)
     posts = nil
     dir_posts = @vdir/:posts
     entries = Dir.entries(dir_posts)
@@ -334,12 +334,13 @@ class RuneBlog
     File.write(@vdir/:remote/file, text)
   end
 
-  def create_new_post(title, testing = false, teaser: nil, body: nil, views: [])
-    log!(enter: __method__, args: [title, testing, teaser, body, views])
+  def create_new_post(title, testing = false, teaser: nil, body: nil, 
+                      pubdate: Time.now.strftime("%Y-%m-%d"), views: [])
+    log!(enter: __method__, args: [title, testing, teaser, body, views], level: 1)
     meta = nil
     views = views + [self.view.to_s]
     Dir.chdir(@root/:posts) do
-      post = Post.create(title: title, teaser: teaser, body: body, views: views)
+      post = Post.create(title: title, teaser: teaser, body: body, pubdate: pubdate, views: views)
       post.edit unless testing
       post.build
       meta = post.meta
@@ -351,7 +352,7 @@ class RuneBlog
   end
 
   def edit_initial_post(file, testing = false)
-    log!(enter: __method__, args: [file, testing])
+    log!(enter: __method__, args: [file, testing], level: 3)
     debug "=== edit_initial_post #{file.inspect}  => #{sourcefile}"
     sourcefile = @root/:drafts/file
     result = system!("#@editor #{sourcefile} +8") unless testing
@@ -363,20 +364,20 @@ class RuneBlog
   end
 
   def posts
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     dir = self.view.dir/:posts
     posts = Dir.entries(dir).grep(/^\d{4}/)
     posts
   end
 
   def drafts
-    log!(enter: __method__)
+    log!(enter: __method__, level: 3)
     dir = @root/:drafts
     drafts = Dir.entries(dir).grep(/^\d{4}.*/)
   end
 
   def change_view(view)
-    log!(enter: __method__, args: [view])
+    log!(enter: __method__, args: [view], level: 3)
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     x = OpenStruct.new
     x.root, x.current_view, x.editor = @root, view.to_s, @editor   # dumb - FIXME later
@@ -393,15 +394,12 @@ class RuneBlog
 
   def generate_view(view)  # huh?
     log!(enter: __method__, args: [view])
-#   generate_index(view)   # recent posts (recent.html)
     vdir = @root/:views/view
     @theme = @root/:views/view/:themes/:standard
     xlate cwd: vdir/"themes/standard/etc",
           src: "blog.css.lt3", copy: vdir/"remote/etc/blog.css" # , debug: true
     xlate cwd: vdir/"themes/standard",
           src: "blog/generate.lt3", dst: vdir/:remote/"index.html"
-    generate_index(view)   # recent posts (recent.html)
-#   ^ HERE
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
   rescue => err
     puts err
@@ -411,7 +409,7 @@ class RuneBlog
   end
 
   def _get_views(draft)
-    log!(enter: __method__, args: [draft])
+    log!(enter: __method__, args: [draft], level: 2)
     # FIXME dumb code
     view_line = File.readlines(draft).grep(/^.views /)
     raise "More than one .views call!" if view_line.size > 1
@@ -422,7 +420,7 @@ class RuneBlog
   end
 
   def _copy_get_dirs(draft, view)
-    log!(enter: __method__, args: [draft, view])
+    log!(enter: __method__, args: [draft, view], level: 2)
     fname = File.basename(draft)
     noext = fname.sub(/.lt3$/, "")
     vdir = @root/:views/view
@@ -435,16 +433,30 @@ class RuneBlog
   end
 
   def _post_metadata(draft, pdraft)
-    log!(enter: __method__, args: [draft, pdraft])
+    log!(enter: __method__, args: [draft, pdraft], level: 2)
+    # FIXME store this somewhere
+    fname = File.basename(draft)       # 0001-this-is-a-post.lt3
+    nslug = fname.sub(/.lt3$/, "")     # 0001-this-is-a-post
+    aslug = nslug.sub(/\d\d\d\d-/, "") # this-is-a-post
+    pnum = nslug[0..3]                 # 0001
     Dir.chdir(pdraft) do 
       excerpt = File.read("teaser.txt")
       date = _retrieve_metadata(:date)
       longdate = ::Date.parse(date).strftime("%B %e, %Y")
       title = _retrieve_metadata(:title)
+      tags = _retrieve_metadata(:tags)
+      # FIXME simplify
       vars = <<~LIVE
+        .set post.num = #{pnum}
+        .heredoc post.aslug
+        #{aslug}
+        .end
         .heredoc title
         #{title.chomp}
         .end
+        .heredoc post.tags
+        #{tags.join(" ")}
+        .end
         .heredoc teaser
         #{excerpt.chomp}
         .end
@@ -457,7 +469,7 @@ class RuneBlog
   end
 
   def copy_widget_html(view)
-    log!(enter: __method__)
+    log!(enter: __method__, level: 2)
     vdir = @root/:views/view
     remote = vdir/:remote
     wdir = vdir/:themes/:standard/:widgets
@@ -468,12 +480,13 @@ class RuneBlog
       create_dirs(rem)
       files = Dir[w/"*"]
       files = files.select {|x| x =~ /(html|css)$/ }
-      files.each {|file| system!("cp #{file} #{rem}") }
+      tag = File.basename(w)
+      files.each {|file| system!("cp #{file} #{rem}", show: (tag == "zzz")) }
     end
   end
 
   def _handle_post(draft, view)
-    log!(enter: __method__, args: [draft, view])
+    log!(enter: __method__, args: [draft, view], level: 2)
     # break into separate methods?
 
     fname = File.basename(draft)       # 0001-this-is-a-post.lt3
@@ -502,34 +515,9 @@ class RuneBlog
   end
 
   def generate_post(draft)
-    log!(enter: __method__, args: [draft])
+    log!(enter: __method__, args: [draft], level: 1)
     views = _get_views(draft)
-    views.each do |view| 
-      _handle_post(draft, view)
-#     generate_view(view)  # FIXME leads to inefficiency?
-#     ^ HERE
-    end
-  end
-
-  def OLD_index_entry(view, meta)
-    log!(enter: __method__, args: [view, meta])
-    debug "=== index_entry #{view.to_s.inspect}  #{meta.num} #{meta.title.inspect}"
-    check_meta(meta, "index_entry1")
-    raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
-    check_meta(meta, "index_entry2")
-    self.make_slug(meta)
-    check_meta(meta, "index_entry3")
-    # FIXME clean up and generalize
-    ref = view/meta.slug/"index.html"
-    <<-HTML
-      <font size=-1>#{meta.date}&nbsp;&nbsp;</font> <br>
-      <font size=+2 color=blue><a href=../#{ref} style="text-decoration: none">#{meta.title}</font></a>
-      <br>
-      <font size=+1>#{meta.teaser}&nbsp;&nbsp;</font>
-      <a href=../#{ref} style="text-decoration: none">Read more...</a>
-      <br>
-      <hr>
-    HTML
+    views.each {|view| _handle_post(draft, view) }
   end
 
   def rebuild_post(file)
@@ -548,7 +536,7 @@ class RuneBlog
   end
 
   def remove_post(num)
-    log!(enter: __method__, args: [num])
+    log!(enter: __method__, args: [num], level: 1)
     raise ArgumentError unless num.is_a?(Integer)
     # FIXME update original draft .views
     tag = prefix(num)
@@ -565,7 +553,7 @@ class RuneBlog
   end
 
   def undelete_post(num)
-    log!(enter: __method__, args: [num])
+    log!(enter: __method__, args: [num], level: 1)
     raise ArgumentError unless num.is_a?(Integer)
     files = Find.find(@root/:views).to_a
     tag = prefix(num)
@@ -581,14 +569,14 @@ class RuneBlog
   end
 
   def delete_draft(num)
-    log!(enter: __method__, args: [num])
+    log!(enter: __method__, args: [num], level: 1)
     raise ArgumentError unless num.is_a?(Integer)
     tag = prefix(num)
     system!("rm -rf #@root/drafts/#{tag}-*")
   end
 
   def make_slug(meta)
-    log!(enter: __method__, args: [meta])
+    log!(enter: __method__, args: [meta], level: 3)
     raise ArgumentError unless meta.title.is_a?(String)
     label = '%04d' % meta.num   # FIXME can do better
     slug0 = meta.title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
@@ -596,6 +584,5 @@ class RuneBlog
     meta.slug = str
     str
   end
-
 end