runeblog 0.0.55 → 0.0.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3230f2f1ce1ac7d38765560c832a5acb40189b47
-  data.tar.gz: c6692b68329296918053f618ff0efc909cd33c8e
+  metadata.gz: b0591507ef7d41996c99c71b941f0c19db8b5367
+  data.tar.gz: 72f6b28977828e4ad7817517559b957254f9ccf5
 SHA512:
-  metadata.gz: 4934899d445ad1064a16e4e8c60c7122721b58b9d838dbee718c41c3680a0305f8b0ee5d34731d4e7a98d4cceb839fcb9fc87f0d006d8842dd15947e9966e53c
-  data.tar.gz: 3cc0e19544bb1ebb3907096182c10af03c75322057813a03e9cd993644542af26ab14da6152c00af72561a146590c78c5522ade8d904fe39b7314b219ad7c111
+  metadata.gz: 0a3e0557200eb79f38b34a92172b4bcc33b62f633f6fed4e6865d0c466331614f6e4d50c34327f8310ff4fdc8c60715d21de2e9068c71221320907c8f407f33c
+  data.tar.gz: 03bb6bf9cf326e75e406ea698ddb48e08d2b58a5f27c8d2c40d7b50ba9a641ab93115f4afbd4371ec14f94e0c4cd1c7be9f69513ab37ed77f64abbd5bd7960a6

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.55   2018-09-10
+RuneBlog v 0.0.56   2018-09-10

data/lib/helpers-repl.rb

@@ -74,17 +74,17 @@ module RuneBlog::REPL
       result = m ? m.to_a : nil
       next unless result
       found = meth
-      params = m[1..-1]
+      params = m[1]
     end
     meth = found || :cmd_INVALID
     params = cmd if meth == :cmd_INVALID
-    [meth, params.first]
+    [meth, params]
   end
 
   def error(err)
     str = "\n  Error: #{red(err)}"
     puts str
-    puts err.backtrace
+    puts err.backtrace[0]
   end
 
   def ask(prompt, meth = :to_s)
@@ -124,23 +124,6 @@ module RuneBlog::REPL
     red(slug[0..3])+blue(slug[4..-1])
   end
 
-  ### process_post
-
-  def process_post(file)
-    @main ||= Livetext.new
-    @main.main.output = File.new("/tmp/WHOA","w")
-    path = @root + "/src/#{file}"
-    @meta = @main.process_file(path, binding)
-    raise "process_file returned nil" if @meta.nil?
-
-    slug = @blog.make_slug(@meta.title, @blog.sequence)
-    slug = file.sub(/.lt3$/, "")
-    @meta.slug = slug
-    @meta
-  rescue => err
-    error(err)
-  end
-
   ### reload_post
 
   def reload_post(file)
@@ -153,7 +136,7 @@ module RuneBlog::REPL
     error(err)
   end
 
-  ### posting
+  ## posting
 
   def posting(view, meta)
     # FIXME clean up and generalize
@@ -170,31 +153,6 @@ module RuneBlog::REPL
     HTML
   end
 
-  ### generate_index
-
-  def generate_index(view)
-    # Gather all posts, create list
-    vdir = "#@root/views/#{view}"
-    posts = Dir.entries(vdir).grep /^\d\d\d\d/
-    posts = posts.sort.reverse
-
-    # Add view header/trailer
-    head = File.read("#{vdir}/custom/blog_header.html") rescue RuneBlog::BlogHeader
-    tail = File.read("#{vdir}/custom/blog_trailer.html") rescue RuneBlog::BlogTrailer
-    @bloghead = interpolate(head)
-    @blogtail = interpolate(tail)
-
-    # Output view
-    posts.map! {|post| YAML.load(File.read("#{vdir}/#{post}/metadata.yaml")) }
-    File.open("#{vdir}/index.html", "w") do |f|
-      f.puts @bloghead
-      posts.each {|post| f.puts posting(view, post) }
-      f.puts @blogtail
-    end
-  rescue => err
-    error(err)
-  end
-
   ### create_dir
 
   def create_dir(dir)
@@ -203,22 +161,6 @@ module RuneBlog::REPL
     raise "Can't create #{dir}" unless result
   end
 
-  ### link_post_view
-
-  def link_post_view(view)
-    # Create dir using slug (index.html, metadata?)
-    vdir = @blog.viewdir(view)
-    dir = vdir + @meta.slug + "/"
-    create_dir(dir + "assets") 
-    File.write("#{dir}/metadata.yaml", @meta.to_yaml)
-    template = File.read(vdir + "custom/post_template.html")
-    post = interpolate(template)
-    File.write(dir + "index.html", post)
-    generate_index(view)
-  rescue => err
-    error(err)
-  end
-
   ### find_asset
 
 #   def find_asset(asset)    # , views)
@@ -253,23 +195,6 @@ module RuneBlog::REPL
 #     list.each {|asset| puts "#{asset} => #{find_asset(asset, views)}" }
 #   end
 
-  ### publish_post
-
-  def publish_post(meta)
-    puts "  #{colored_slug(meta.slug)}"
-    # First gather the views
-    views = meta.views
-    print "       Views: "
-    views.each do |view| 
-      print "#{view} "
-      link_post_view(view)
-    end
-#   assets = find_all_assets(@meta.assets, views)
-    puts
-  rescue => err
-    error(err)
-  end
-
   ### rebuild_post
   
   def rebuild_post(file)

data/lib/repl.rb

@@ -1,43 +1,22 @@
 require 'runeblog'
-
 require 'ostruct'
-
-=begin
-  Instance vars in original code:
-    @bloghead
-    @blogtail
-    @config
-    @date
-    @deploy
-    @fname
-    @main
-    @meta
-    @root
-    @sequence
-    @slug
-    @template
-    @title
-    @today
-    @view
-=end
-
 require 'helpers-repl'  # FIXME structure
 
 module RuneBlog::REPL
 
   def cmd_quit(arg)
-    raise "Glitch: #{__callee__} Got an argument" if arg != []
+    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
     puts "\n "
     exit
   end
 
   def cmd_version(arg)
-    raise "Glitch: #{__callee__} Got an argument" if arg != []
+    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
     return "\n  " + RuneBlog::VERSION
   end
 
   def new_blog!(arg)   # FIXME weird?
-    raise "Glitch: #{__callee__} Got an argument" if arg != []
+    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
     return if RuneBlog.exist?
     yn = yesno(red("  No .blog found. Create new blog? "))
     RuneBlog.create_new_blog if yn
@@ -46,7 +25,6 @@ module RuneBlog::REPL
   end 
 
   def open_blog # Crude - FIXME later
-#   new_blog!([]) unless RuneBlog.exist?
     @blog = RuneBlog.new
     @view = @blog.view     # current view
     @sequence = @blog.sequence
@@ -56,16 +34,8 @@ module RuneBlog::REPL
     error(err)
   end
 
-  def edit_initial_post(file)
-    result = system("vi #@root/src/#{file} +8 ")
-    raise "Problem editing #@root/src/#{file}" unless result
-    nil
-  rescue => err
-    error(err)
-  end
-
   def cmd_browse
-    raise "Glitch: #{__callee__} Got an argument" if arg != []
+    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
     @deploy ||= {}
     return puts red("\n  Deploy first.") unless @deploy[@view]
 
@@ -88,7 +58,7 @@ module RuneBlog::REPL
 
   def cmd_deploy(arg)  # FIXME non-string return expected in caller?
     # TBD clunky FIXME 
-    raise "Glitch: #{__callee__} Got an argument" if arg != []
+    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
     @deploy ||= {}
     deployment = @blog.viewdir(@view) + "deploy"
     raise "File '#{deployment}' not found" unless File.exist?(deployment)
@@ -125,7 +95,7 @@ module RuneBlog::REPL
   end
 
   def cmd_rebuild(arg)
-    raise "Glitch: #{__callee__} Got an argument" if arg != []
+    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
     puts
     files = Dir.entries("#@root/src/").grep /\d\d\d\d.*.lt3$/
     files.map! {|f| File.basename(f) }
@@ -137,7 +107,7 @@ module RuneBlog::REPL
   end
 
   def cmd_relink(arg)
-    raise "Glitch: #{__callee__} Got an argument" if arg != []
+    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
     @blog.views.each {|view| generate_index(view) }
     nil
   rescue => err
@@ -146,7 +116,7 @@ module RuneBlog::REPL
 
   def cmd_list_views(arg)
     abort "Config file not read"  unless @blog
-    raise "Glitch: #{__callee__} Got an argument" if arg != []
+    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
     out = "\n"
     @blog.views.each {|v| out << "  #{v}\n" }
     out
@@ -155,11 +125,10 @@ module RuneBlog::REPL
   end
 
   def cmd_change_view(arg)
-    if arg.empty?
+    if arg.nil?
       return "\n  #{@blog.view}"
     else
       out = ""
-      arg = arg.first
       list = @blog.views.grep /^#{arg}/
       if list.size == 1
         @view = @blog.view = list.first
@@ -174,7 +143,6 @@ module RuneBlog::REPL
   end
 
   def cmd_new_view(arg)
-    arg = arg.first
     @blog ||= open_blog
     arg ||= ask("New view: ")  # check validity later
     raise "view #{arg} already exists" if @blog.views.include?(arg)
@@ -182,6 +150,7 @@ module RuneBlog::REPL
     dir = @root + "/views/" + arg + "/"
     create_dir(dir + 'custom')
     create_dir(dir + 'assets')
+    File.open(dir + "deploy") { }  # FIXME
 
     # Something more like this?  RuneBlog.new_view(arg)
     File.write(dir + "custom/blog_header.html",  RuneBlog::BlogHeader)
@@ -193,23 +162,16 @@ module RuneBlog::REPL
   end
 
   def cmd_new_post(arg)
-    raise "Glitch: #{__callee__} Got an argument" if arg != []
-    open_blog unless @blog
+    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
+    open_blog unless @blog   # duh?
     @title = ask("Title: ")
-    @today = Time.now.strftime("%Y%m%d")
-    @date = Time.now.strftime("%Y-%m-%d")
-
-    file = @blog.create_new_post(@title, @date, @view)
-    edit_initial_post(file)
-    process_post(file)  #- FIXME handle each view
-    publish_post(@meta)
-    nil
+    @blog.create_new_post(@title)
   rescue => err
     error(err)
   end
 
   def cmd_kill(arg)
-    args = arg.first.split
+    args = arg.split
     args.each {|x| cmd_remove_post([x], false) }
     nil
   rescue => err
@@ -220,7 +182,6 @@ module RuneBlog::REPL
 
   def cmd_remove_post(arg, safe=true)
     out = ""
-    arg = arg.first
     id = Integer(arg) rescue raise("'#{arg}' is not an integer")
     tag = "#{'%04d' % id}"
     files = Find.find(@root).to_a
@@ -258,7 +219,6 @@ module RuneBlog::REPL
   #-- FIXME affects linking, building, deployment...
 
   def cmd_edit_post(arg)
-    arg = arg.first
     id = Integer(arg) rescue raise("'#{arg}' is not an integer")
     tag = "#{'%04d' % id}"
     files = Find.find(@root+"/src").to_a
@@ -278,7 +238,7 @@ module RuneBlog::REPL
   end
 
   def cmd_list_posts(arg)
-    raise "Glitch: #{__callee__} Got an argument" if arg != []
+    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
     out = ""
     @view = @blog.view
     dir = @blog.viewdir(@view)
@@ -297,7 +257,7 @@ module RuneBlog::REPL
   end
 
   def cmd_list_drafts(arg)
-    raise "Glitch: #{__callee__} Got an argument" if arg != []
+    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
     out = ""
     dir = "#@root/src"
     Dir.chdir(dir) do
@@ -319,7 +279,7 @@ module RuneBlog::REPL
   end
 
   def cmd_help(arg)
-    raise "Glitch: #{__callee__} Got an argument" if arg != []
+    raise "Glitch: #{__callee__} got arg #{arg.inspect}" unless arg.nil?
     out = <<-EOS
   
     Commands:

data/lib/runeblog.rb

@@ -3,7 +3,7 @@ require 'yaml'
 require 'livetext'
 
 class RuneBlog
-  VERSION = "0.0.55"
+  VERSION = "0.0.56"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
   DefaultData = Path + "/../data"
@@ -56,7 +56,9 @@ class RuneBlog
     File.exist?(".blog")
   end
 
-  def create_new_post(title, date, view)
+  def create_new_post(title, view=nil)
+    view ||= @view
+    date = Time.now.strftime("%Y-%m-%d")
     @template = <<-EOS
 .mixin liveblog
  
@@ -73,7 +75,84 @@ EOS
     @slug = make_slug(title)
     @fname = @slug + ".lt3"
     File.open("#@root/src/#@fname", "w") {|f| f.puts @template }
-    @fname
+    edit_initial_post(@fname)  # How eliminate for testing?
+    process_post(@fname)  #- FIXME handle each view
+    publish_post(@meta)
+  rescue => err
+    error(err)
+  end
+
+  def edit_initial_post(file)
+    result = system("vi #@root/src/#{file} +8 ")
+    raise "Problem editing #@root/src/#{file}" unless result
+    nil
+  rescue => err
+    error(err)
+  end
+
+  def process_post(file)
+    @main ||= Livetext.new
+    @main.main.output = File.new("/tmp/WHOA","w")
+    path = @root + "/src/#{file}"
+    @meta = @main.process_file(path, binding)
+    raise "process_file returned nil" if @meta.nil?
+
+    slug = self.make_slug(@meta.title, self.sequence)
+    slug = file.sub(/.lt3$/, "")
+    @meta.slug = slug
+    @meta
+  rescue => err
+    error(err)
+  end
+
+  def publish_post(meta)
+    puts "  #{colored_slug(meta.slug)}"
+    # First gather the views
+    views = meta.views
+    print "       Views: "
+    views.each do |view| 
+      print "#{view} "
+      link_post_view(view)
+    end
+#   assets = find_all_assets(@meta.assets, views)
+    puts
+  rescue => err
+    error(err)
+  end
+
+  def link_post_view(view)
+    # Create dir using slug (index.html, metadata?)
+    vdir = self.viewdir(view)
+    dir = vdir + @meta.slug + "/"
+    create_dir(dir + "assets") 
+    File.write("#{dir}/metadata.yaml", @meta.to_yaml)
+    template = File.read(vdir + "custom/post_template.html")
+    post = interpolate(template)
+    File.write(dir + "index.html", post)
+    generate_index(view)
+  rescue => err
+    error(err)
+  end
+
+  def generate_index(view)
+    # Gather all posts, create list
+    vdir = "#@root/views/#{view}"
+    posts = Dir.entries(vdir).grep /^\d\d\d\d/
+    posts = posts.sort.reverse
+
+    # Add view header/trailer
+    head = File.read("#{vdir}/custom/blog_header.html") rescue RuneBlog::BlogHeader
+    tail = File.read("#{vdir}/custom/blog_trailer.html") rescue RuneBlog::BlogTrailer
+    @bloghead = interpolate(head)
+    @blogtail = interpolate(tail)
+
+    # Output view
+    posts.map! {|post| YAML.load(File.read("#{vdir}/#{post}/metadata.yaml")) }
+    File.open("#{vdir}/index.html", "w") do |f|
+      f.puts @bloghead
+      posts.each {|post| f.puts posting(view, post) }
+      f.puts @blogtail
+    end
   rescue => err
     error(err)
   end

data/test/repl.rb

@@ -13,14 +13,14 @@ class TestREPL < Minitest::Test
   end
 
   def test_001_cmd_help
-    out = cmd_help([])
+    out = cmd_help(nil)
     assert out.is_a?(String), "Expected a string returned"
     lines = out.split("\n").length 
     assert lines > 25, "Expecting lengthy help message"
   end
 
   def test_002_cmd_version
-    out = cmd_version([])
+    out = cmd_version(nil)
     assert out.is_a?(String), "Expected a string returned"
     lines = out.split("\n")[1]
     assert lines =~ /\d+\.\d+\.\d+/m,
@@ -28,27 +28,27 @@ class TestREPL < Minitest::Test
   end
 
   def test_003_list_views
-    out = cmd_list_views([])
+    out = cmd_list_views(nil)
     assert out.is_a?(String), "Expected a string returned"
     lines = out.split("\n").length 
     assert lines >= 2, "Expecting at least 2 lines"
   end
 
   def test_004_change_view
-    out = cmd_change_view([])  # no param
-    assert out.is_a?(String), "Expected a string returned"
+    out = cmd_change_view(nil)  # no param
+    assert out.is_a?(String), "Expected a string; got: #{out.inspect}"
     assert out =~ /computing/m, "Expecting 'computing' as default; got: #{out.inspect}"
   end
 
   def test_005_lsd
-    out = cmd_list_drafts([])
+    out = cmd_list_drafts(nil)
     assert out.is_a?(String), "Expected a string returned"
     lines = out.split("\n").length 
     assert lines >= 15, "Expecting more lines; got: #{out.inspect}"
   end
 
   def test_006_lsp
-    out = cmd_list_posts([])
+    out = cmd_list_posts(nil)
     assert out.is_a?(String), "Expected a string returned; got: #{out.inspect}"
     lines = out.split("\n").length 
     assert lines >= 20, "Expecting more lines; got: #{out.inspect}"
@@ -56,10 +56,42 @@ class TestREPL < Minitest::Test
 
   def test_007_parser
     parse_tests = {
-      "kill 81 82 83"   => [:cmd_kill, "81 82 83"],
-      " kill 81 82 83"  => [:cmd_kill, "81 82 83"],
-      "kill 81 82 83 "  => [:cmd_kill, "81 82 83"],
-      " kill 81 82 83 " => [:cmd_kill, "81 82 83"]
+      # Loading/trailing blanks as well
+      "kill 81 82 83"     => [:cmd_kill, "81 82 83"],
+      "  kill 81 82 83"   => [:cmd_kill, "81 82 83"],
+      "kill 81 82 83  "   => [:cmd_kill, "81 82 83"],
+      "  kill 81 82 83  " => [:cmd_kill, "81 82 83"],
+      "help"              => [:cmd_help, nil],
+      "h"                 => [:cmd_help, nil],
+      "version"           => [:cmd_version, nil],
+      "v"                 => [:cmd_version, nil],
+      "list views"        => [:cmd_list_views, nil],
+      "lsv"               => [:cmd_list_views, nil],
+      "new view foobar"   => [:cmd_new_view, "foobar"],
+      "new post"          => [:cmd_new_post, nil],
+      "p"                 => [:cmd_new_post, nil],
+      "post"              => [:cmd_new_post, nil],
+      "change view view2" => [:cmd_change_view, "view2"],
+      "cv"                => [:cmd_change_view, nil], # 0-arity 
+      "cv myview"         => [:cmd_change_view, "myview"],
+      "list posts"        => [:cmd_list_posts, nil],
+      "lsp"               => [:cmd_list_posts, nil],
+      "list drafts"       => [:cmd_list_drafts, nil],
+      "lsd"               => [:cmd_list_drafts, nil],
+      "rm 999"            => [:cmd_remove_post, "999"],
+      "kill 101 102 103"  => [:cmd_kill, "101 102 103"],
+      "edit 104"          => [:cmd_edit_post, "104"],
+      "ed 105"            => [:cmd_edit_post, "105"],
+      "e 106"             => [:cmd_edit_post, "106"],
+      "preview"           => [:cmd_preview, nil],
+      "pre"               => [:cmd_preview, nil],
+      "browse"            => [:cmd_browse, nil],
+      "relink"            => [:cmd_relink, nil],
+      "rebuild"           => [:cmd_rebuild, nil],
+      "deploy"            => [:cmd_deploy, nil],
+      "q"                 => [:cmd_quit, nil],
+      "quit"              => [:cmd_quit, nil]
+      # Later: too many/few params
     }
 
     parse_tests.each_pair do |cmd, expected|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.55
+  version: 0.0.56
 platform: ruby
 authors:
 - Hal Fulton