runeblog 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 547f18b29a540d3c7dab31ac0ffc3dc1a5aac9b8
-  data.tar.gz: 1296071d218746ea5001eaf3264fa7e339c75441
+  metadata.gz: 2c82a9c5e7df6b702d233dfb00327811b395e010
+  data.tar.gz: 18512ccba91d2c1edf35dd66cdd74ea2518b8a7e
 SHA512:
-  metadata.gz: 5a4bf4fcd77a8f1b861814e219386d1d294c128e33556de5b1c25bd3a82771caad57b0c67e096d0b9cf4d0345815623e14150304e1feb6ae69a2510335d13b9f
-  data.tar.gz: b39cc9d2648300e5d3d3f9b6ef8116d9a95f451b60d68e543dcc299ab6440a83a9980b845f0ca946a1601c35df1d1b0f820d755377ca39aa0ead8d4266a4c941
+  metadata.gz: 4386f8ec0aa09faeda0649193e7af2e9e514b50b124446d459a66dec4aef542b6515df95d7475401e7a99c947b02e9ae72efeef21a5a488233e99712207618b5
+  data.tar.gz: 3717b99dfbd2eb7352912f5f5b72eead0ccd7a76e6c4f7a8eada1a57b16745d698c6c6f03c62d50394c188ed729d2b5164f4e1b1964f26176b0ee4af01e70902

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.28   2017-05-10
+RuneBlog v 0.0.29   2017-05-10

data/data/views/_default/{post_header.html → custom/post_template.html}

@@ -63,3 +63,9 @@
 
 <hr>
 
+#{@meta.body}
+
+
+<hr>
+<a href="http://rubyhacker.com/blog2" style="text-decoration: none">Back</a> 
+<a href="http://rubyhacker.com" style="text-decoration: none">Home</a>

data/lib/runeblog.rb

@@ -1,14 +1,12 @@
 
 class RuneBlog
-  VERSION = "0.0.28"
+  VERSION = "0.0.29"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
   DefaultData = Path + "/../data"
 
-  BlogHeader  = File.read(DefaultData + "/blog_header.html")  rescue "not found"
-  BlogTrailer = File.read(DefaultData + "/blog_trailer.html") rescue "not found"
-  PostHeader  = File.read(DefaultData + "/post_header.html")  rescue "not found"
-  PostTrailer = File.read(DefaultData + "/post_trailer.html") rescue "not found"
+  BlogHeader  = File.read(DefaultData + "/custom/blog_header.html")  rescue "not found"
+  BlogTrailer = File.read(DefaultData + "/custom/blog_trailer.html") rescue "not found"
 end
 
 class RuneBlog::Config
@@ -191,8 +189,8 @@ def deploy
   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") }
-  puts "Files:"
-  files.each {|f| puts "  " + f }
+  puts "\n  Files:"
+  files.each {|f| puts "    " + f }
   puts
   dir = "#{sroot}/#{spath}"
   cmd = "scp -r #{files.join(' ')} root@#{server}:#{dir} >/dev/null 2>&1"
@@ -272,20 +270,11 @@ def link_post_view(view)
   vdir = @config.viewdir(view)
   dir = vdir + @meta.slug + "/"
   cmd = "mkdir -p #{dir}"    #-- FIXME what if this exists??
-# puts "    Running: #{cmd}"
   system(cmd)
   File.write("#{dir}/metadata.yaml", @meta.to_yaml)
-  # Add header/trailer to post index
-  head = File.read(vdir + "custom/post_header.html") rescue RuneBlog::PostHeader
-  tail = File.read(vdir + "custom/post_trailer.html") rescue RuneBlog::PostTrailer
-# STDERR.puts "lpv: meta = #{@meta.teaser.inspect}"
-  @posthead = interpolate(head)
-  @posttail = interpolate(tail)
-  File.open(dir + "index.html", "w") do |f|
-    f.puts @posthead
-    f.puts @meta.body
-    f.puts @posttail
-  end
+  template = File.read(vdir + "custom/post_template.html")
+  post = interpolate(template)
+  File.write(dir + "index.html", post)
   generate_index(view)
 end
 
@@ -373,8 +362,6 @@ def new_view(arg = nil)
   system(cmd)
   File.write(dir + "custom/blog_header.html",  RuneBlog::BlogHeader)
   File.write(dir + "custom/blog_trailer.html", RuneBlog::BlogTrailer)
-  File.write(dir + "custom/post_header.html",  RuneBlog::PostHeader)
-  File.write(dir + "custom/post_trailer.html", RuneBlog::PostTrailer)
   File.write(dir + "last_deployed", "Initial creation")
   @config.views << arg
 end

data/runeblog.gemspec

@@ -25,6 +25,4 @@ Gem::Specification.new do |s|
   s.files       =  main + misc + test
   s.homepage    = 'https://github.com/Hal9000/runeblog'
   s.license     = "Ruby's license"
-  puts "Files:"
-  puts s.files
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Hal Fulton
@@ -22,11 +22,10 @@ files:
 - bin/blog
 - data/VERSION
 - data/sequence
-- data/views/_default/blog_header.html
-- data/views/_default/blog_trailer.html
+- data/views/_default/custom/blog_header.html
+- data/views/_default/custom/blog_trailer.html
+- data/views/_default/custom/post_template.html
 - data/views/_default/last_deployed
-- data/views/_default/post_header.html
-- data/views/_default/post_trailer.html
 - lib/runeblog.rb
 - runeblog.gemspec
 homepage: https://github.com/Hal9000/runeblog

data/data/views/_default/post_trailer.html

@@ -1,3 +0,0 @@
-<hr>
-<a href="http://rubyhacker.com/blog2" style="text-decoration: none">Back</a> 
-<a href="http://rubyhacker.com" style="text-decoration: none">Home</a>