runeblog 0.0.73 → 0.0.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df36ffbf2e13e9b19e379adc0fe5fc9f8f0fdc94
-  data.tar.gz: b5d337e0d026cb90207b9b3964e5810096a4162a
+  metadata.gz: 17a13b9ee6fc708cd9ff07fb2a47c0766f3c9480
+  data.tar.gz: 5f44f9d028f5d9c1a6d17e3a91df6108a50c97ec
 SHA512:
-  metadata.gz: 66ad68e17c7567b0d96cf5165085e8dd033e05d6ca76911f3347fd6c06b6a9cf9579e6209c4e4e7e3a848a31f8523b64118d08f1ae8a95a22d0d0b4386339e30
-  data.tar.gz: 4a81d99c13294445924017eadd958a1c25d95408a065c8a850597b12384eec33e34917f6b260bd1577d0cf5508195f1ffa5003f503690dba451c668bd60378e4
+  metadata.gz: d0c8fc2fa446cb59168bbbc5dfbf632169a2324ead513603abd810ae7985843853c8a14422803073e868bc4bf0909023199264617fe54fbc9ec273f6c7ed618d
+  data.tar.gz: c4a0bb0d1d47a4bd67801755544af8d1b85701793119957c920f3170746a1f5a0397228d90168c95a894010bae6f69e6426183a9eb3fb89eee563cc514091e51

data/bin/blog

@@ -2,6 +2,8 @@
 
 $: << "./lib"
 
+require 'readline'
+
 require 'repl'
 
 trap("INT") { }
@@ -28,9 +30,11 @@ print red("\n  RuneBlog v #{RuneBlog::VERSION}")
 if cmd.nil?   # REPL
   puts
   loop do
-    print red("\nblog> ")
-    cmd = gets
-    cmd_quit([]) if cmd.nil?   # ^D
+#   print red("\nblog> ")
+#   cmd = gets
+    cmd = Readline.readline(red("\nblog> "), true)
+
+    cmd_quit(nil) if cmd.nil?   # ^D
     cmd.chomp!
     next if cmd.empty?   # CR does nothing
     meth, params = RuneBlog::REPL.choose_method(cmd)

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.73   2018-10-02
+RuneBlog v 0.0.74   2018-10-02

data/lib/post.rb

@@ -11,26 +11,25 @@ class RuneBlog::Post
     result
   end
   
-  def initialize(title, view_name, 
-                 teaser = "Teaser goes here.",
-                 remainder = "Remainder of post goes here.")
+  def initialize(meta, view_name)
+    # FIXME weird logic here
     raise "RuneBlog.blog is not set!" if RuneBlog.blog.nil?
     @blog = RuneBlog.blog
-    @title = title
+    @title = meta.title
     @view = @blog.str2view(view_name)
     @num, @slug = make_slug
     date = Time.now.strftime("%Y-%m-%d")
     template = <<-EOS.gsub(/^ */, "")
       .mixin liveblog
  
-      .title #{title}
+      .title #@title
       .pubdate #{date}
       .views #@view
  
       .teaser
-      #{teaser}
+      #{meta.teaser}
       .end
-      #{remainder}
+      #{meta.remainder}
     EOS
  
     @draft = "#{@blog.root}/src/#@slug.lt3"
@@ -71,6 +70,8 @@ class RuneBlog::Post
   def create_post_subtree(vdir)
     create_dir("assets") 
     File.write("metadata.yaml", @meta.to_yaml)
+    File.write("teaser.txt", @meta.teaser)
+    File.write("remainder.txt", @meta.remainder)
     template = File.read(vdir + "/custom/post_template.html")
     text = interpolate(template)
     File.write("index.html", text)

data/lib/repl.rb

@@ -137,12 +137,12 @@ module RuneBlog::REPL
     reset_output
     # Simplify this
     if arg.nil?
-      output "#{@blog.view}"
+      output bold(@blog.view)
       return @out
     else
       if @blog.view?(arg)
         @blog.view = arg
-        output! "View: #{@blog.view}"
+        output red("View: ") + bold(@blog.view)
       end
     end
     @out
@@ -163,7 +163,9 @@ module RuneBlog::REPL
     reset_output
     check_empty(arg)
     title = ask("\nTitle: ")
-    @blog.create_new_post(title)
+    meta = OpenStruct.new
+    meta.title = title
+    @blog.create_new_post(meta)
     nil
   rescue => err
     error(err)
@@ -172,7 +174,10 @@ module RuneBlog::REPL
   def cmd_kill(arg)
     reset_output
     args = arg.split
-    args.each {|x| cmd_remove_post(x, false) }
+    args.each do |x| 
+      # FIXME
+      cmd_remove_post(x, false)
+    end
     nil
   rescue => err
     error(err)
@@ -182,32 +187,14 @@ module RuneBlog::REPL
   #-- FIXME affects linking, building, deployment...
 
   def cmd_remove_post(arg, safe=true)
+    # FIXME - 'safe' is no longer a thing
     reset_output
     id = get_integer(arg)
-    files = @blog.post_exists?(id)
-    if files.nil?
+    result = @blog.remove_post(id)
+    if result.nil?
       output! "No such post found (#{id})"
       return @out
     end
-
-    if safe
-      output_newline
-      files.each {|f| outstr "  #{f}\n" }
-      reset_output
-      ques = "\n  Delete?\n "
-      ques.sub!(/\?/, " all these?") if files.size > 1
-      yes = yesno red(ques)
-      if yes
-        @blog.remove_post(id)
-        output! "Deleted\n"
-      else
-        output! "No action taken\n"
-      end
-    else
-      @blog.remove_post(id)
-      output! "Deleted:\n"
-      files.each {|f| output "    #{f}\n" }
-    end
     @out
   rescue ArgumentError => err
     puts err

data/lib/runeblog.rb

@@ -136,16 +136,17 @@ class RuneBlog
   end
 
   def files_by_id(id)
-    files = Find.find(self.root).to_a
+    files = Find.find(self.view.dir).to_a
     tag = "#{'%04d' % id}"
     result = files.grep(/#{tag}-/)
     result
   end
 
-  def create_new_post(title, testing = false, teaser = nil, remainder = nil)
-    teaser ||= "Teaser goes here."
-    remainder ||= "Remainder of post goes here."
-    post = RuneBlog::Post.new(title, @view.to_s, teaser, remainder)
+# def create_new_post(title, testing = false, teaser = nil, remainder = nil)
+  def create_new_post(meta, testing = false)
+    meta.teaser ||= "Teaser goes here."
+    meta.remainder ||= "Remainder of post goes here."
+    post = RuneBlog::Post.new(meta, @view.to_s)
     post.edit unless testing
     post.publish
     post.num
@@ -263,6 +264,7 @@ class RuneBlog
 
   def remove_post(num)
     list = files_by_id(num)
+    return nil if list.empty?
     result = system("rm -rf #{list.join(' ')}")
     error_cant_delete(files) unless result
     # FIXME - update index/etc

data/lib/version.rb

@@ -1,6 +1,6 @@
 
 class RuneBlog
-  VERSION = "0.0.73"
+  VERSION = "0.0.74"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end

data/test/repl.rb

@@ -47,14 +47,14 @@ class TestREPL < Minitest::Test
     out = cmd_list_drafts(nil)
     assert out.is_a?(String), "Expected a string returned"
     lines = out.split("\n").length 
-    assert lines >= 2, "Expecting more lines; got: #{out.inspect}"
+    assert lines == 7, "Expecting more lines; got: #{out.inspect}"
   end
 
   def test_006_lsp!
     out = cmd_list_posts(nil)
     assert out.is_a?(String), "Expected a string returned; got: #{out.inspect}"
     lines = out.split("\n").length 
-    assert lines >= 2, "Expecting more lines; got: #{out.inspect}"
+    assert lines == 6, "Expecting more lines; got: #{out.inspect}"
   end
 
   def test_007_parser
@@ -129,14 +129,19 @@ class TestREPL < Minitest::Test
            "After delete: #{sorted_views.inspect}"
   end
 
-  def test_012_create_remove_post!   # FIXME - several problems here
+  def test_012_create_remove_post!
     @blog.change_view("beta_view")
     assert @blog.view.to_s == "beta_view", "Expected beta_view"
     before = @blog.posts.size 
-    num = @blog.create_new_post("Uninteresting title", true)
+    meta = OpenStruct.new
+    meta.title = "Uninteresting title"
+    num = @blog.create_new_post(meta, true)
     assert @blog.posts.size == before + 1, "Don't see new post"
     @blog.remove_post(num)
     assert @blog.posts.size == before, "Failed to delete post"
   end
+
+  def test_013_kill_posts!
+  end
 end
 

metadata

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