runeblog 0.0.45 → 0.0.48

data/lib/oldruneblog.rb

@@ -0,0 +1,106 @@
+require 'find'
+require 'yaml'
+require 'livetext'
+
+class RuneBlog
+  VERSION = "0.0.45"
+
+  Path  = File.expand_path(File.join(File.dirname(__FILE__)))
+  DefaultData = Path + "/../data"
+
+  BlogHeaderPath  = DefaultData + "/custom/blog_header.html"
+  BlogTrailerPath = DefaultData + "/custom/blog_trailer.html"
+
+  BlogHeader  = File.read(BlogHeaderPath)  rescue "not found"
+  BlogTrailer = File.read(BlogTrailerPath) rescue "not found"
+end
+
+# Continued below...
+
+class RuneBlog::Config
+  attr_reader :root, :views, :view, :sequence
+  attr_writer :view  # FIXME
+
+  def self.create(cfg_file = ".blog")
+    RuneBlog.create_new_blog
+  end
+
+  def initialize(cfg_file = ".blog")
+    # What views are there? Deployment, etc.
+    # Crude - FIXME later
+
+    lines = File.readlines(cfg_file).map {|x| x.chomp }
+    @root = lines[0]
+    @view = lines[1]
+    dirs = Dir.entries("#@root/views/") - %w[. ..]
+    dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
+    @root = root
+    @views = dirs
+    @sequence = File.read(root + "/sequence").to_i
+  end
+
+  def next_sequence
+    @sequence += 1
+    File.open("#@root/sequence", "w") {|f| f.puts @sequence }
+    @sequence
+  end
+
+  def viewdir(v)
+    @root + "/views/#{v}/"
+  end
+
+end
+
+# Reopening...
+
+class RuneBlog
+
+  def self.exist?
+    File.exist?(".blog")
+  end
+
+  def get_config
+  end
+
+# def initialize
+#   # ?
+# end
+
+  def self.create_new_blog
+    #-- what if data already exists?
+    result = system("cp -r #{RuneBlog::DefaultData} .")
+    raise "Error copying default data" unless result
+
+    File.open(".blog", "w") do |f| 
+      f.puts "data" 
+      f.puts "no_default"
+    end
+    File.open("data/VERSION", "a") {|f| f.puts "\nBlog created: " + Time.now.to_s }
+  end
+
+# def self.open_blog
+# end
+
+#   def self.create_new_post(title, date, view)
+#     @template = <<-EOS
+# .mixin liveblog
+# 
+# .title #{title}
+# .pubdate #{date}
+# .views #{view}
+# 
+# .teaser
+# Teaser goes here.
+# .end
+# Remainder of post goes here.
+#   EOS
+# 
+#     @slug = make_slug(title)
+#     @fname = @slug + ".lt3"
+#     File.open("#@root/src/#@fname", "w") {|f| f.puts @template }
+#     @fname
+#   rescue => err
+#     error(err, __LINE__, __FILE__)
+#   end
+
+end

data/lib/repl.rb

@@ -2,39 +2,31 @@ require 'runeblog'
 
 require 'ostruct'
 
-module RuneBlog::REPL
-
-  def clear
-    puts "\e[H\e[2J"  # clear screen
-  end
-
-  def red(text)
-    "\e[31m#{text}\e[0m"
-  end
-
-  def blue(text)
-    "\e[34m#{text}\e[0m"
-  end
-
-  def bold(str)
-    "\e[1m#{str}\e[22m"
-  end
-
-  def interpolate(str)
-    wrap = "<<-EOS\n#{str}\nEOS"
-    eval wrap
-  end
+=begin
+  Instance vars in original code:
+    @bloghead
+    @blogtail
+    @config
+    @date
+    @deploy
+    @fname
+    @main
+    @meta
+    @root
+    @sequence
+    @slug
+    @template
+    @title
+    @today
+    @view
+=end
 
-  def colored_slug(slug)
-    red(slug[0..3])+blue(slug[4..-1])
-  end
+module RuneBlog::REPL
 
   ### error
 
-  def error(err, line, file)
-    str = "\n  Error: (line #{line} of #{File.basename(file)})  " 
-    str << err.to_s
-    puts red(str)
+  def error(err)
+    str = "\n  Error: #{red(err)}"
     puts err.backtrace
   end
 
@@ -46,11 +38,17 @@ module RuneBlog::REPL
     STDIN.gets.chomp.send(meth)
   end
 
+  def yesno(prompt, meth = :to_s)
+    print prompt
+    STDOUT.flush
+    STDIN.gets.chomp.upcase[0] == "Y"
+  end
+
   ### quit
 
   def cmd_quit(arg)
     raise "Glitch: Got an argument" if arg != []
-    puts
+    puts "\n "
     exit
   end
 
@@ -63,48 +61,36 @@ module RuneBlog::REPL
 
   ### new_blog!
 
-  def cmd_new_blog!(arg)
+  def new_blog!(arg)
     raise "Glitch: Got an argument" if arg != []
-    unless File.exist?(".blog")
-      yn = ask(red("  No .blog found. Create new blog? "))
-      if yn.upcase == "Y"
-        #-- what if data already exists?
-        result = system("cp -r #{RuneBlog::DefaultData} .")
-        raise "Error copying default data" unless result
-
-        File.open(".blog", "w") do |f| 
-          f.puts "data" 
-          f.puts "no_default"
-        end
-        File.open("data/VERSION", "a") {|f| f.puts "\nBlog created: " + Time.now.to_s }
-      end
-    end
+    return if RuneBlog.exist?
+    yn = yesno(red("  No .blog found. Create new blog? "))
+    RuneBlog.create_new_blog if yn
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end 
 
   ### make_slug
 
+  # What to do with this?
+
   def make_slug(title, seq=nil)
-    num = '%04d' % (seq || @config.next_sequence)   # FIXME can do better
+    num = '%04d' % (seq || @blog.next_sequence)   # FIXME can do better
     slug = title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
     "#{num}-#{slug}"
   end
 
-  ### read_config
-
-  def read_config
-    # Crude - FIXME later
-    cfg_file = ".blog"
-    new_blog! unless File.exist?(cfg_file)
-    @config = RuneBlog::Config.new(cfg_file)
+  ### open_blog
 
-    @view = @config.view           # current view
-    @sequence = @config.sequence
-    @root = @config.root
-    @config
+  def open_blog # Crude - FIXME later
+#   new_blog!([]) unless RuneBlog.exist?
+    @blog = RuneBlog.new
+    @view = @blog.view     # current view
+    @sequence = @blog.sequence
+    @root = @blog.root
+    @blog
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### create_empty_post
@@ -128,7 +114,7 @@ Remainder of post goes here.
     File.open("#@root/src/#@fname", "w") {|f| f.puts @template }
     @fname
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### edit_initial_post
@@ -152,29 +138,29 @@ Remainder of post goes here.
     result = system("open 'http://#{server}/#{spath}'")
     raise "Problem opening http://#{server}/#{spath}" unless result
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### open_local
 
   def open_local
-    result = system("open #{@config.viewdir(@view)}/index.html")
-    raise "Problem opening #{@config.viewdir(@view)}/index.html" unless result
+    result = system("open #{@blog.viewdir(@view)}/index.html")
+    raise "Problem opening #{@blog.viewdir(@view)}/index.html" unless result
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   def cmd_deploy(arg)
     # TBD clunky FIXME 
     raise "Glitch: Got an argument" if arg != []
     @deploy ||= {}
-    deployment = @config.viewdir(@view) + "deploy"
+    deployment = @blog.viewdir(@view) + "deploy"
     raise "File '#{deployment}' not found" unless File.exist?(deployment)
 
     lines = File.readlines(deployment).map {|x| x.chomp }
     @deploy[@view] = lines
     user, server, sroot, spath = *lines
-    vdir = @config.viewdir(@view)
+    vdir = @blog.viewdir(@view)
     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") }
@@ -195,7 +181,7 @@ Remainder of post goes here.
     File.write("#{vdir}/last_deployed", files)
     puts red("finished.")
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### process_post
@@ -207,11 +193,11 @@ Remainder of post goes here.
     @meta = @main.process_file(path, binding)
     raise "process_file returned nil" if @meta.nil?
 
-    @meta.slug = make_slug(@meta.title, @config.sequence)
+    @meta.slug = make_slug(@meta.title, @blog.sequence)
     @meta.slug = file.sub(/.lt3$/, "")
     @meta
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### reload_post
@@ -223,7 +209,7 @@ Remainder of post goes here.
     @meta.slug = file.sub(/.lt3$/, "")
     @meta
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### posting
@@ -264,7 +250,7 @@ Remainder of post goes here.
       f.puts @blogtail
     end
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### create_dir
@@ -279,7 +265,7 @@ Remainder of post goes here.
 
   def link_post_view(view)
     # Create dir using slug (index.html, metadata?)
-    vdir = @config.viewdir(view)
+    vdir = @blog.viewdir(view)
     dir = vdir + @meta.slug + "/"
     create_dir(dir + "assets") 
     File.write("#{dir}/metadata.yaml", @meta.to_yaml)
@@ -288,7 +274,7 @@ Remainder of post goes here.
     File.write(dir + "index.html", post)
     generate_index(view)
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### find_asset
@@ -339,7 +325,7 @@ Remainder of post goes here.
 #   assets = find_all_assets(@meta.assets, views)
     puts
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### rebuild_post
@@ -348,7 +334,7 @@ Remainder of post goes here.
     reload_post(file)
     publish_post(@meta)       # FIXME ??
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### rebuild
@@ -361,16 +347,16 @@ Remainder of post goes here.
     files = files.sort.reverse
     files.each {|file| rebuild_post(file) }
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### relink
 
   def cmd_relink(arg)
     raise "Glitch: Got an argument" if arg != []
-    @config.views.each {|view| generate_index(view) }
+    @blog.views.each {|view| generate_index(view) }
   rescue => err
-    error(err, __LINE__, __FILE__)
+   error(err)
   end
 
 #  ### publish?
@@ -383,12 +369,12 @@ Remainder of post goes here.
   ### list_views
 
   def cmd_list_views(arg)
-    abort "Config file not read"  unless @config
+    abort "Config file not read"  unless @blog
     raise "Glitch: Got an argument" if arg != []
     puts
-    @config.views.each {|v| puts "  #{v}" }
+    @blog.views.each {|v| puts "  #{v}" }
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### change_view
@@ -398,25 +384,25 @@ Remainder of post goes here.
       puts "\n  #@view"
     else
       arg = arg.first
-      list = @config.views.grep /^#{arg}/
+      list = @blog.views.grep /^#{arg}/
       if list.size == 1
-        @view = @config.view = list.first
+        @view = @blog.view = list.first
         puts red("\n  View: #{@view}") if arg != @view
       else
         puts "view #{arg.inspect} does not exist"
       end
     end
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### new_view
 
   def cmd_new_view(arg)
     arg = arg.first
-    read_config unless @config
+    @blog ||= open_blog
     arg ||= ask("New view: ")  # check validity later
-    raise "view #{arg} already exists" if @config.views.include?(arg)
+    raise "view #{arg} already exists" if @blog.views.include?(arg)
 
     dir = @root + "/views/" + arg + "/"
     create_dir(dir + 'custom')
@@ -426,15 +412,16 @@ Remainder of post goes here.
     File.write(dir + "custom/blog_header.html",  RuneBlog::BlogHeader)
     File.write(dir + "custom/blog_trailer.html", RuneBlog::BlogTrailer)
     File.write(dir + "last_deployed", "Initial creation")
-    @config.views << arg
+    @blog.views << arg
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### import
 
   def import(arg = nil)
-    read_config unless @config
+    open_blog unless @blog
+
     arg = nil if arg == ""
     arg ||= ask("Filename: ")  # check validity later
     name = arg
@@ -449,14 +436,14 @@ Remainder of post goes here.
     process_post(@fname)
     publish_post(@meta) # if publish?
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### new_post
 
   def cmd_new_post(arg)
     raise "Glitch: Got an argument" if arg != []
-    read_config unless @config
+    open_blog unless @blog
     @title = ask("Title: ")
     @today = Time.now.strftime("%Y%m%d")
     @date = Time.now.strftime("%Y-%m-%d")
@@ -467,7 +454,7 @@ Remainder of post goes here.
     process_post(file)  #- FIXME handle each view
     publish_post(@meta) # if publish?
   rescue => err
-    error(err, __LINE__, __FILE__)
+    error(err)
   end
 
   ### remove_multiple_posts
@@ -484,10 +471,10 @@ Remainder of post goes here.
   def cmd_remove_post(arg, safe=true)
     arg = arg.first
     id = Integer(arg) rescue raise("'#{arg}' is not an integer")
-    tag = "#{'%04d' % id}-"
+    tag = "#{'%04d' % id}"
     files = Find.find(@root).to_a
-    files = files.grep(/#{tag}/)
-    return puts red("\n  No such post found (#{tag})") if files.empty?
+    files = files.grep(/#{tag}-/)
+    return puts red("\n  No such post found (#{id})") if files.empty?
 
     if safe
       puts
@@ -520,12 +507,12 @@ Remainder of post goes here.
   def cmd_edit_post(arg)
     arg = arg.first
     id = Integer(arg) rescue raise("'#{arg}' is not an integer")
-    tag = "#{'%04d' % id}-"
+    tag = "#{'%04d' % id}"
     files = Find.find(@root+"/src").to_a
-    files = files.grep(/#{tag}/)
+    files = files.grep(/#{tag}-/)
     files = files.map {|f| File.basename(f) }
     return puts red("Multiple files: #{files}") if files.size > 1
-    return puts red("\n  No such post found (#{tag})") if files.empty?
+    return puts red("\n  No such post found (#{id})") if files.empty?
 
     file = files.first
     result = system("vi #@root/src/#{file}")
@@ -542,7 +529,7 @@ Remainder of post goes here.
 
   def cmd_list_posts(arg)
     raise "Glitch: Got an argument" if arg != []
-    dir = @config.viewdir(@view)
+    dir = @blog.viewdir(@view)
     Dir.chdir(dir) do
       posts = Dir.entries(".").grep(/^0.*/)
       if posts.empty?
@@ -579,7 +566,7 @@ Remainder of post goes here.
   end
 
   def cmd_INVALID(arg)
-    puts "\n  Command '#{red(arg)}' not understood.\n "
+    puts "\n  Command '#{red(arg)}' was not understood."
   end
 
   def cmd_help(arg)
@@ -588,29 +575,55 @@ Remainder of post goes here.
   
     Commands:
   
-       h, help           This message
-       q, quit           Exit the program
+       #{red('h, help       ')}    This message
+       #{red('q, quit        ')}   Exit the program
+       #{red('v, version    ')}    Print version information
   
-       change view VIEW  Change current view
-       cv VIEW           Change current view
-       new view          Create a new view
-       list views        List all views available
-       lsv               Same as: list views
+       #{red('change view VIEW ')} Change current view
+       #{red('cv VIEW          ')} Change current view
+       #{red('new view         ')} Create a new view
+       #{red('list views       ')} List all views available
+       #{red('lsv              ')} Same as: list views
   
-       p, post           Create a new post
-       new post          Same as post (create a post)
-       lsp, list posts   List posts in current view
-       lsd, list drafts  List all posts regardless of view
+       #{red('p, post          ')} Create a new post
+       #{red('new post         ')} Same as post (create a post)
+       #{red('lsp, list posts  ')} List posts in current view
+       #{red('lsd, list drafts ')} List all posts regardless of view
   
-       rm ID             Remove a post
-       edit ID           Edit a post
+       #{red('rm ID            ')} Remove a post
+       #{red('edit ID          ')} Edit a post
   
-       preview           Look at current (local) view in browser
-       browse            Look at current (deployed) view in browser
-       relink            Regenerate index for all views
-       rebuild           Regenerate all posts and relink
-       deploy            Deploy (current view)
+       #{red('preview          ')} Look at current (local) view in browser
+       #{red('browse           ')} Look at current (deployed) view in browser
+       #{red('relink           ')} Regenerate index for all views
+       #{red('rebuild          ')} Regenerate all posts and relink
+       #{red('deploy           ')} Deploy (current view)
     EOS
   end
 
+  def clear
+    puts "\e[H\e[2J"  # clear screen
+  end
+
+  def red(text)
+    "\e[31m#{text}\e[0m"
+  end
+
+  def blue(text)
+    "\e[34m#{text}\e[0m"
+  end
+
+  def bold(str)
+    "\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
+
 end