runeblog 0.0.64 → 0.0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 257ad84648e005ad01f71886994183bd9f98ecb5
-  data.tar.gz: 06bfe5ebcdfdabc497bd47c9d6191c4a460f7e1f
+  metadata.gz: 337899305625d6e47d1651fc7f5c74cbe01d9dac
+  data.tar.gz: c115cf315621933d753bfdb663e7030506354df5
 SHA512:
-  metadata.gz: 7aa6da6a32b8fe50b20c7b9ef64a28f5ff325c16a7eed7582ff08d9b116a0dd265961c00a1bd2745c8001bc07645a63ee02d01337b5766e36c6293d85933ec8e
-  data.tar.gz: 663840e9aa0f0b4a53a885ad8b460f9a7a18ba2dfae752ae03d90acd5dc58061fb79add1ae3787f31130baa09a2d1b66d85c2aa7ec29752d69230dabc8de5c90
+  metadata.gz: f653637ca0fbbc59f34faf72b263546befc886a3bb10ec3569de9c4209bee45a30c7e267af30f297d5701b76e201955d48827cb87258e9695cd91012ddb348d2
+  data.tar.gz: f56f552eb2475dd785d00b3ec2cb16b3bfa166a5bdc46adfcbbd3d19e908d8412d6db09a5a8322b6062c3519409c79f52e3f8801fee1236072dc0cddafa9abde

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.64   2018-09-21
+RuneBlog v 0.0.65   2018-09-27

data/lib/repl.rb

@@ -4,8 +4,6 @@ require 'helpers-repl'  # FIXME structure
 
 module RuneBlog::REPL
 
-# @blog = open_blog
-
   def cmd_quit(arg)
     check_empty(arg)
     abort "\n "
@@ -33,8 +31,9 @@ module RuneBlog::REPL
     error(err)
   end
 
-  def cmd_open_local
+  def cmd_preview(arg)
     reset_output
+    check_empty(arg)
     local = @blog.viewdir(@blog.view) + "/index.html"
     result = system("open #{local}")
     raise CantOpen, local unless result
@@ -77,7 +76,7 @@ module RuneBlog::REPL
     check_empty(arg)
     puts
     files = @blog.find_src_slugs
-    files.each {|file| rebuild_post(file) }
+    files.each {|file| @blog.rebuild_post(file) }
     nil
   rescue => err
     error(err)
@@ -210,7 +209,7 @@ module RuneBlog::REPL
     result = system("vi #{@blog.root}/src/#{file}")
     raise "Problem editing #{file}" unless result
 
-    rebuild_post(file)
+    @blog.rebuild_post(file)
     nil
   rescue => err
     error(err)
@@ -292,32 +291,4 @@ module RuneBlog::REPL
     @out
   end
 
-  ## Funky stuff -- needs to move?
-
-#  def new_blog!(arg)   # FIXME weird?
-#    check_empty(arg)
-#    return if RuneBlog.exist?
-#    yes = yesno(red("  No .blog found. Create new blog? "))
-#    RuneBlog.create_new_blog if yes
-#  rescue => err
-#    error(err)
-#  end 
-
-#  def open_blog # Crude - FIXME later
-#    @blog = RuneBlog.new
-#    @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)
-#  end
-
 end

data/lib/runeblog.rb

@@ -2,19 +2,36 @@ require 'find'
 require 'yaml'
 require 'livetext'
 
+def create_dir(dir)   # FIXME move later
+  cmd = "mkdir -p #{dir} >/dev/null 2>&1"
+  result = system(cmd) 
+  raise "Can't create #{dir}" unless result
+end
+
+def interpolate(str)
+  wrap = "<<-EOS\n#{str}\nEOS"
+  eval wrap
+end
+
+def error(err)  # FIXME - this is duplicated
+  str = "\n  Error: #{err}"
+  puts str
+  puts err.backtrace  # [0]
+end
+
 class RuneBlog
-  VERSION = "0.0.64"
+  VERSION = "0.0.65"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
-  DefaultData = Path + "/../data"
+  DefaultData = Path + "/../data/views/_default"
 
-  BlogHeaderPath  = DefaultData + "/custom/blog_header.html"
-  BlogTrailerPath = DefaultData + "/custom/blog_trailer.html"
-  BlogTemplatePath = DefaultData + "/custom/blog_trailer.html"
+  BlogHeaderPath   = DefaultData + "/custom/blog_header.html"
+  BlogTrailerPath  = DefaultData + "/custom/blog_trailer.html"
+  PostTemplatePath = DefaultData + "/custom/post_template.html"
 
-  BlogHeader  = File.read(BlogHeaderPath)  rescue "not found"
-  BlogTrailer = File.read(BlogTrailerPath) rescue "not found"
-  BlogTemplate = File.read(BlogTemplatePath) rescue "not found"
+  BlogHeader   = File.read(BlogHeaderPath)  rescue "not found"
+  BlogTrailer  = File.read(BlogTrailerPath) rescue "not found"
+  PostTemplate = File.read(PostTemplatePath) rescue "not found"
 
   attr_reader :root, :views, :sequence
   attr_accessor :view  # FIXME
@@ -68,7 +85,7 @@ class RuneBlog
 
     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 + "custom/post_template.html", RuneBlog::PostTemplate)
     File.write(dir + "last_deployed", "Initial creation")
     self.views << arg
   end
@@ -103,28 +120,10 @@ class RuneBlog
   end
 
   def create_new_post(title, testing = false)
-    view = @view
-    date = Time.now.strftime("%Y-%m-%d")
-    @template = <<-EOS
-.mixin liveblog
- 
-.title #{title}
-.pubdate #{date}
-.views #{view}
- 
-.teaser
-Teaser goes here.
-.end
-Remainder of post goes here.
-EOS
- 
-    num, @slug = make_slug(title)
-    @fname = @slug + ".lt3"
-    File.open("#@root/src/#@fname", "w") {|f| f.puts @template }
-    edit_initial_post(@fname) unless testing
-    process_post(@fname) #- FIXME handle each view
-    publish_post(@meta)
-    num
+    post = RuneBlog::Post.new(title, @view)
+    post.edit unless testing
+    post.publish
+    post.num
   rescue => err
     puts err # error(err)
   end
@@ -152,10 +151,9 @@ EOS
   end
 
   def process_post(file)
-    @main ||= Livetext.new
-    @main.main.output = File.new("/tmp/WHOA","w")  # FIXME srsly?
     path = @root + "/src/#{file}"
-    @meta = @main.process_file(path, binding)
+    livetext = Livetext.new(STDOUT) # (nil)
+    @meta = livetext.process_file(path, binding)
     raise "process_file returned nil" if @meta.nil?
 
     num, slug = self.make_slug(@meta.title, self.sequence)
@@ -215,16 +213,6 @@ EOS
     self.views.each {|view| generate_index(view) }
   end
 
-  def reload_post(file)
-    @main ||= Livetext.new
-    @main.main.output = File.new("/tmp/WHOA","w")  # FIXME srsly?
-    @meta = process_post(file)
-    @meta.slug = file.sub(/.lt3$/, "")
-    @meta
-  rescue => err
-    error(err)
-  end
-
   def posting(view, meta)
     # FIXME clean up and generalize
     ref = "#{view}/#{meta.slug}/index.html"
@@ -238,10 +226,12 @@ EOS
       <br><br>
       <hr>
     HTML
+    text = File.read(self.viewdir(view) + "custom/post_template.html")
+    interpolate(text)
   end
 
   def rebuild_post(file)
-    reload_post(file)
+    @meta = process_post(file)
     publish_post(@meta)       # FIXME ??
   rescue => err
     error(err)
@@ -272,23 +262,6 @@ EOS
     dirs
   end
 
-  def create_dir(dir)
-    cmd = "mkdir -p #{dir} >/dev/null 2>&1"
-    result = system(cmd) 
-    raise "Can't create #{dir}" unless result
-  end
-
-  def error(err)  # FIXME - this is duplicated
-    str = "\n  Error: #{err}"
-    puts str
-    puts err.backtrace  # [0]
-  end
-
-  def interpolate(str)
-    wrap = "<<-EOS\n#{str}\nEOS"
-    eval wrap
-  end
-
   def find_src_slugs
     files = Dir.entries("#@root/src/").grep /\d\d\d\d.*.lt3$/
     files.map! {|f| File.basename(f) }
@@ -302,6 +275,10 @@ end
 
 class RuneBlog::Post
 
+  class << self
+    attr_accessor :blog
+  end
+
   attr_reader :id, :title, :date, :views, :num, :slug
 
   def self.files(num, root)
@@ -311,15 +288,70 @@ class RuneBlog::Post
   end
   
   def initialize(title, view)
+    raise "Post.blog is not set!" if RuneBlog::Post.blog.nil?
+    @blog = RuneBlog::Post.blog
     @title = title
     @view = view
     @num, @slug = make_slug
+##
+    date = Time.now.strftime("%Y-%m-%d")
+    template = <<-EOS.gsub(/^ */, "")
+      .mixin liveblog
+ 
+      .title #{title}
+      .pubdate #{date}
+      .views #{view}
+ 
+      .teaser
+      Teaser goes here.
+      .end
+      Remainder of post goes here.
+    EOS
+ 
+    @draft = "#{@blog.root}/src/#@slug.lt3"
+    File.write(@draft, template)
+  end
+
+  def edit
+    result = system("vi #@draft +8")
+    raise "Problem editing #@draft" unless result
+    nil
+  rescue => err
+    error(err)
+  end 
+
+  def publish
+    livetext = Livetext.new(STDOUT)
+    @meta = livetext.process_file(@draft, binding)
+    raise "process_file returned nil" if @meta.nil?
+
+    @meta.views.each do |view|   # Create dir using slug (index.html, metadata?)
+      vdir = @blog.viewdir(view)
+      dir = vdir + @slug + "/"
+      Dir.mkdir(dir)
+      Dir.chdir(dir) do
+        create_post_subtree(vdir)
+        @blog.generate_index(view)
+      end
+    end
+  rescue => err
+    p err
+    err.backtrace.each {|x| puts x }
+    # error(err)
   end
 
   private
 
+  def create_post_subtree(vdir)
+    create_dir("assets") 
+    File.write("metadata.yaml", @meta.to_yaml)
+    template = File.read(vdir + "/custom/post_template.html")
+    text = interpolate(template)
+    File.write("index.html", text)
+  end
+
   def make_slug(postnum = nil)
-    postnum ||= RuneBlog.next_sequence
+    postnum ||= @blog.next_sequence
     num = tag(postnum)   # FIXME can do better
     slug = @title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
     [postnum, "#{num}-#{slug}"]

data/test/repl.rb

@@ -9,6 +9,7 @@ class TestREPL < Minitest::Test
 
   def setup
     @blog = RuneBlog.new
+    RuneBlog::Post.blog = @blog
   end
 
   def test_001_cmd_help

metadata

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