runeblog 0.0.62 → 0.0.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 853cc1fbf7aa876a9b64fd5610ed7ded80605015
-  data.tar.gz: 37eac8d1a538f3b2b8f960adf8e42528e9ca998c
+  metadata.gz: be9dde18efd8f52b1115c2c07337c594207c64c3
+  data.tar.gz: 1c36e3cdf18c43de3dbb0867f60b9abdc0de8a09
 SHA512:
-  metadata.gz: 877f1dc5b92237f4e3064652917643a0360857bf449c818717ece811b7c94ae025a5a62798eb48391b90f48cf17510184c992d142350469fe2dcad6e643b073c
-  data.tar.gz: eadaa9244ba181f48aa50d28db84145b5eeba71c6c4ddbe028d3cca38c6ab998b853a107b93a71975d10ca78b6d490599839de38cf6b1a9d93d4dac8cb158b94
+  metadata.gz: 97b396fc32bb61ce2d7e174cf9a65194d8222ecae94bb98a4fd7d15ca3a3c43ece1babe7e71d2f0cfc4451a33d3ad4b885bfe76ebbb2c79cee3d69773b718674
+  data.tar.gz: 2b34bbd321ca613ae0cf1100ceed94998a284c553fd1128c73ea0a96451840f709a91d48fdcf22875680b1ab27dc4b95b2f73a9f3e2cd718917c8406e425a822

data/bin/blog

@@ -21,7 +21,7 @@ STDOUT.sync = true
 
 cmd, arg = get_argv
 
-@blog = open_blog
+@blog = RuneBlog.new
 
 puts red("\n  RuneBlog v #{RuneBlog::VERSION}")
 

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.62   2018-09-18
+RuneBlog v 0.0.63   2018-09-20

data/lib/helpers-repl.rb

@@ -173,23 +173,10 @@ module RuneBlog::REPL
     "\e[1m#{str}\e[22m"
   end
 
-  def interpolate(str)
-    wrap = "<<-EOS\n#{str}\nEOS"
-    eval wrap
-  end
-
   def colored_slug(slug)
     red(slug[0..3])+blue(slug[4..-1])
   end
 
-  ### create_dir
-
-  def create_dir(dir)
-    cmd = "mkdir -p #{dir} >/dev/null 2>&1"
-    result = system(cmd) 
-    raise "Can't create #{dir}" unless result
-  end
-
   def import(arg = nil)
 #   open_blog unless @blog
 

data/lib/repl.rb

@@ -35,7 +35,7 @@ module RuneBlog::REPL
 
   def cmd_open_local
     reset_output
-    local = @blog.viewdir(@view) + "/index.html"
+    local = @blog.viewdir(@blog.view) + "/index.html"
     result = system("open #{local}")
     raise CantOpen, local unless result
   rescue => err
@@ -46,8 +46,8 @@ module RuneBlog::REPL
     # TBD clunky FIXME 
     reset_output
     check_empty(arg)
-    user, server, sroot, spath = *@deploy[@view]
-    if files.empty?
+    user, server, sroot, spath = *@deploy[@blog.view]
+    if files.empty?    # FIXME  baloney
       output! "No files to deploy"
       return @out
     end
@@ -76,10 +76,7 @@ module RuneBlog::REPL
     reset_output
     check_empty(arg)
     puts
-    # Simplify this
-    files = Dir.entries("#@root/src/").grep /\d\d\d\d.*.lt3$/
-    files.map! {|f| File.basename(f) }
-    files = files.sort.reverse
+    files = @blog.find_src_slugs
     files.each {|file| rebuild_post(file) }
     nil
   rescue => err
@@ -89,7 +86,7 @@ module RuneBlog::REPL
   def cmd_relink(arg)
     reset_output
     check_empty(arg)
-    @blog.views.each {|view| generate_index(view) }
+    @blog.relink
     nil
   rescue => err
    error(err)
@@ -98,7 +95,6 @@ module RuneBlog::REPL
   def cmd_list_views(arg)
     reset_output("\n")
     check_empty(arg)
-    abort "Config file not read"  unless @blog
     @blog.views.each do |v| 
       v = bold(v) if v == @blog.view
       outstr "  #{v}\n"
@@ -110,15 +106,15 @@ module RuneBlog::REPL
 
   def cmd_change_view(arg)
     reset_output
-    # Simlify this
+    # Simplify this
     if arg.nil?
       output "#{@blog.view}"
       return @out
     else
       list = @blog.views.grep /^#{arg}/
       if list.size == 1
-        @view = @blog.view = list.first
-        output! "View: #{@view}\n" if arg != @view
+        @blog.view = list.first
+        output! "View: #{@blog.view}\n" if arg != @blog.view
       else
         output! "view #{arg.inspect} does not exist\n"
       end
@@ -130,9 +126,8 @@ module RuneBlog::REPL
 
   def cmd_new_view(arg)
     reset_output
-    arg ||= ask("New view: ")  # check validity later
     @blog.create_view(arg)
-    return nil
+    nil
   rescue => err
     error(err)
   end
@@ -140,9 +135,9 @@ module RuneBlog::REPL
   def cmd_new_post(arg)
     reset_output
     check_empty(arg)
-    @title = ask("Title: ")
-    @blog.create_new_post(@title)
-    return nil
+    title = ask("Title: ")
+    @blog.create_new_post(title)
+    nil
   rescue => err
     error(err)
   end
@@ -150,10 +145,11 @@ module RuneBlog::REPL
   def cmd_kill(arg)
     reset_output
     args = arg.split
-    args.each {|x| cmd_remove_post([x], false) }
-    return nil
+    args.each {|x| cmd_remove_post(x, false) }
+    nil
   rescue => err
     error(err)
+    puts err.backtrace
   end
 
   #-- FIXME affects linking, building, deployment...
@@ -161,8 +157,8 @@ module RuneBlog::REPL
   def cmd_remove_post(arg, safe=true)
     reset_output
     id = get_integer(arg)
-    files = @blog.files_by_id(id)
-    if files.empty?
+    files = @blog.post_exists?(id)
+    if files.nil?
       output! "No such post found (#{id})"
       return @out
     end
@@ -175,25 +171,26 @@ module RuneBlog::REPL
       ques.sub!(/\?/, " all these?") if files.size > 1
       yes = yesno red(ques)
       if yes
-        result = system("rm -rf #{files.join(' ')}")
-        error_cant_delete(files) unless result
+        @blog.remove_post(id)
         output! "Deleted\n"
       else
         output! "No action taken\n"
       end
     else
-      result = system("rm -rf #{files.join(' ')}")
-      error_cant_delete(files) unless result
+      @blog.remove_post(id)
       output! "Deleted:\n"
       files.each {|f| output "    #{f}\n" }
     end
     @out
   rescue ArgumentError => err
     puts err
+    puts err.backtrace
   rescue CantDelete => err
     puts err
+    puts err.backtrace
   rescue => err
     error(err)
+    puts err.backtrace
   end
 
   #-- FIXME affects linking, building, deployment...
@@ -201,16 +198,16 @@ module RuneBlog::REPL
   def cmd_edit_post(arg)
     reset_output
     id = get_integer(arg)
-    # Simlify this
+    # Simplify this
     tag = "#{'%04d' % id}"
-    files = Find.find(@root+"/src").to_a
+    files = Find.find(@blog.root+"/src").to_a
     files = files.grep(/#{tag}-/)
     files = files.map {|f| File.basename(f) }
     return red("Multiple files: #{files}") if files.size > 1
     return red("\n  No such post found (#{id})") if files.empty?
 
     file = files.first
-    result = system("vi #@root/src/#{file}")
+    result = system("vi #{@blog.root}/src/#{file}")
     raise "Problem editing #{file}" unless result
 
     rebuild_post(file)
@@ -223,7 +220,7 @@ module RuneBlog::REPL
     check_empty(arg)
     reset_output
     posts = @blog.posts  # current view
-    output @view + ":\n"
+    output @blog.view + ":\n"
     if posts.empty?
       output! "No posts\n"
     else
@@ -297,30 +294,30 @@ module RuneBlog::REPL
 
   ## 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
+#  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

@@ -3,7 +3,7 @@ require 'yaml'
 require 'livetext'
 
 class RuneBlog
-  VERSION = "0.0.62"
+  VERSION = "0.0.63"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
   DefaultData = Path + "/../data"
@@ -16,8 +16,8 @@ class RuneBlog
   BlogTrailer = File.read(BlogTrailerPath) rescue "not found"
   BlogTemplate = File.read(BlogTemplatePath) rescue "not found"
 
-  attr_reader :root, :views, :view, :sequence
-  attr_writer :view  # FIXME
+  attr_reader :root, :views, :sequence
+  attr_accessor :view  # FIXME
 
   def self.create_new_blog
     #-- what if data already exists?
@@ -73,6 +73,13 @@ class RuneBlog
     self.views << arg
   end
 
+  def delete_view(name, force = false)
+    if force
+      system("rm -rf #@root/views/#{name}") 
+      @views -= [name]
+    end
+  end
+
   def deployment_url
     return nil unless @deploy[@view]
     lines = @deploy[@view]
@@ -89,13 +96,14 @@ class RuneBlog
   end
 
   def files_by_id(id)
-    files = Find.find(@root).to_a
+    files = Find.find(self.root).to_a
     tag = "#{'%04d' % id}"
-    files.grep(/#{tag}-/)
+    result = files.grep(/#{tag}-/)
+    result
   end
 
-  def create_new_post(title, view=nil)
-    view ||= @view
+  def create_new_post(title, testing = false)
+    view = @view
     date = Time.now.strftime("%Y-%m-%d")
     @template = <<-EOS
 .mixin liveblog
@@ -110,14 +118,15 @@ Teaser goes here.
 Remainder of post goes here.
 EOS
  
-    @slug = make_slug(title)
+    num, @slug = make_slug(title)
     @fname = @slug + ".lt3"
     File.open("#@root/src/#@fname", "w") {|f| f.puts @template }
-    edit_initial_post(@fname)  # How eliminate for testing?
-    process_post(@fname)  #- FIXME handle each view
+    edit_initial_post(@fname) unless testing
+    process_post(@fname) #- FIXME handle each view
     publish_post(@meta)
+    num
   rescue => err
-    error(err)
+    puts err # error(err)
   end
 
   def edit_initial_post(file)
@@ -149,7 +158,7 @@ EOS
     @meta = @main.process_file(path, binding)
     raise "process_file returned nil" if @meta.nil?
 
-    slug = self.make_slug(@meta.title, self.sequence)
+    num, slug = self.make_slug(@meta.title, self.sequence)
     slug = file.sub(/.lt3$/, "")
     @meta.slug = slug
     @meta
@@ -158,16 +167,12 @@ EOS
   end
 
   def publish_post(meta)
-    puts "  #{colored_slug(meta.slug)}"
+    puts "  #{colored_slug(meta.slug)}" rescue nil  # puts(meta.slug)  # FIXME
     # First gather the views
     views = meta.views
-    print "       Views: "
-    views.each do |view| 
-      print "#{view} "
-      link_post_view(view)
-    end
+    views.each {|view| link_post_view(view) }
 #   assets = find_all_assets(@meta.assets, views)
-    puts
+    nil
   rescue => err
     error(err)
   end
@@ -209,6 +214,10 @@ EOS
     error(err)
   end
 
+  def relink
+    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?
@@ -241,10 +250,22 @@ EOS
     error(err)
   end
 
-  def make_slug(title, seq=nil)
-    num = '%04d' % (seq || self.next_sequence)   # FIXME can do better
+  def remove_post(num)
+    list = files_by_id(num)
+    result = system("rm -rf #{list.join(' ')}")
+    error_cant_delete(files) unless result
+  end
+
+  def post_exists?(num)
+    list = files_by_id(num)
+    list.empty? ? nil : list
+  end
+
+  def make_slug(title, postnum = nil)
+    postnum ||= self.next_sequence
+    num = '%04d' % postnum   # FIXME can do better
     slug = title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
-    "#{num}-#{slug}"
+    [postnum, "#{num}-#{slug}"]
   end
 
   def subdirs(dir)
@@ -252,4 +273,29 @@ EOS
     dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
     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) }
+    files = files.sort.reverse
+    files
+  end
+
 end

data/test/repl.rb

@@ -8,7 +8,7 @@ class TestREPL < Minitest::Test
   include RuneBlog::REPL
 
   def setup
-    @blog = open_blog
+    @blog = RuneBlog.new
   end
 
   def test_001_cmd_help
@@ -112,5 +112,21 @@ class TestREPL < Minitest::Test
     assert @blog.views.sort == ["view1", "view2"]
   end
 
+  def test_011_create_delete_view
+    @blog.create_view("anotherview")
+    assert @blog.views.sort == ["anotherview", "view1", "view2"], "After create: #{@blog.views.sort.inspect}"
+    @blog.delete_view("anotherview", true)
+    assert @blog.views.sort == ["view1", "view2"], "After delete: #{@blog.views.sort.inspect}"
+  end
+
+  def test_012_create_remove_post   # FIXME - several problems here
+    @blog.change_view("view2")
+    assert @blog.view == "view2"
+    before = @blog.posts.size 
+    num = @blog.create_new_post("Uninteresting title", 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
 end
 

metadata

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