runeblog 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d9171829fd979d20f5c366136624319a3f550a3
-  data.tar.gz: feb35cf18015255fbe582a774ef8864013ff0156
+  metadata.gz: cf6ffaa36c7cdc9f9f49eabc32a276911e06564f
+  data.tar.gz: 62daf126e9eda16f40fee3085fa035b71eaf38cd
 SHA512:
-  metadata.gz: b8fb906e311d32a4d30647c48c2464187b282d67de2c6de58aaa6ee9a827cd9f4505d1da930cccc345b60cfb9669959369bf5255eaa786661c3f2067b774c303
-  data.tar.gz: 5b040b814070f9e49f9e03f6700b0b5f0422eb1cd8ae436105cafabb89f6fa168ead4b89b3cf02fc3f1f7bd9409d198e0197ca9c24bbfb53a941107b6dcd68f5
+  metadata.gz: 2c830d2bea8e9e68408f7afe5b4e5b70e9638c4dacadec86803eff0e46e765aeb90ef59d3e8a2841f4363045b4fe2097f1abb851d0f2cfe8c65b17cf0956ca76
+  data.tar.gz: 35c2713ecc18a9303fc6727efa97a1a91f74d0e39e6eeacdc82000ad575917b64121e99d43de4ed4a0701fbf73b7c8442d24892697db01b763fb11a9694c4f53

data/data/VERSION

@@ -1 +1 @@
-RuneBlog v 0.0.23   2017-05-08
+RuneBlog v 0.0.24   2017-05-09

data/lib/runeblog.rb

@@ -1,6 +1,6 @@
 
 class RuneBlog
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
   DefaultData = Path + "/../data"
@@ -11,6 +11,36 @@ class RuneBlog
   PostTrailer = File.read(DefaultData + "/post_trailer.html") rescue "not found"
 end
 
+class RuneBlog::Config
+  attr_reader :root, :views, :view, :sequence
+
+  def initialize(cfg_file = ".blog")
+    # What views are there? Deployment, etc.
+    # Crude - FIXME later
+    new_blog! unless File.exist?(cfg_file)
+
+    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
+
 require 'find'
 require 'yaml'
 require 'rubygems'
@@ -38,6 +68,10 @@ def interpolate(str)
   eval wrap
 end
 
+def colored_slug(slug)
+  red(slug[0..3])+blue(slug[4..-1])
+end
+
 
 ### ask
 
@@ -77,18 +111,10 @@ def new_blog!
   end
 end
 
-### next_sequence
-
-def next_sequence
-  @config.sequence += 1
-  File.open("#{@config.root}/sequence", "w") {|f| f.puts @config.sequence }
-  @config.sequence
-end
-
 ### make_slug
 
 def make_slug(title, seq=nil)
-  num = '%04d' % (seq || next_sequence)   # FIXME can do better
+  num = '%04d' % (seq || @config.next_sequence)   # FIXME can do better
   slug = title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
   "#{num}-#{slug}"
 end
@@ -96,20 +122,14 @@ end
 ### read_config
 
 def read_config
-  cfg_file = ".blog"
-  @config = OpenStruct.new
-  # What views are there? Deployment, etc.
   # Crude - FIXME later
+  cfg_file = ".blog"
   new_blog! unless File.exist?(cfg_file)
+  @config = RuneBlog::Config.new(".blog")
 
-  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}") }
-  @config.root = root
-  @config.views = dirs
-  @config.sequence = File.read(root + "/sequence").to_i
+  @view = @config.view           # current view
+  @sequence = @config.sequence
+  @root = @config.root
 end
 
 ### create_empty_post
@@ -131,14 +151,23 @@ EOS
 
   @slug = make_slug(@title)
   @fname = @slug + ".lt3"
-  File.open("#{@config.root}/src/#{@fname}", "w") {|f| f.puts @template }
+  File.open("#@root/src/#@fname", "w") {|f| f.puts @template }
   @fname
 end
 
 ### edit_post
 
 def edit_post(file)
-  system("vi #{@config.root}/src/#{file}")
+  system("vi #@root/src/#{file} +8 ")
+end
+
+def deploy(view)
+  # TBD clunky FIXME 
+  deployment = @config.viewdir(view) + "deploy"
+  lines = File.readlines(deployment)
+  user, server, dir = *lines
+  files = 
+  cmd = "scp #{files.join(' ')} root@#{server}:#{dir}"
 end
 
 ### process_post
@@ -146,8 +175,8 @@ end
 def process_post(file)
   @main ||= Livetext.new
   @main.main.output = File.new("/tmp/WHOA","w")
-  puts "  Processing: #{Dir.pwd} :: #{file}"
-path = @config.root + "/src/#{file}"
+# puts "  Processing: #{Dir.pwd} :: #{file}"
+  path = @root + "/src/#{file}"
   @meta = @main.process_file(path)
   @meta.slug = make_slug(@meta.title, @config.sequence)
   @meta.slug = file.sub(/.lt3$/, "")
@@ -184,7 +213,7 @@ end
 
 def generate_index(view)
   # Gather all posts, create list
-  vdir = "#{@config.root}/views/#{view}"
+  vdir = "#@root/views/#{view}"
   posts = Dir.entries(vdir).grep /^\d\d\d\d/
   posts = posts.sort.reverse
 
@@ -207,18 +236,18 @@ end
 
 def link_post_view(view)
   # Create dir using slug (index.html, metadata?)
-  vdir = "#{@config.root}/views/#{view}"
-  dir = "#{vdir}/#{@meta.slug}"
+  vdir = @config.viewdir(view)
+  dir = vdir + @meta.slug + "/"
   cmd = "mkdir -p #{dir}"    #-- FIXME what if this exists??
-  puts "    Running: #{cmd}"
+# puts "    Running: #{cmd}"
   system(cmd)
   File.write("#{dir}/metadata.yaml", @meta.to_yaml)
   # Add header/trailer to post index
-  head = File.read("#{vdir}/custom/post_header.html") rescue RuneBlog::PostHeader
-  tail = File.read("#{vdir}/custom/post_trailer.html") rescue RuneBlog::PostTrailer
+  head = File.read(vdir + "custom/post_header.html") rescue RuneBlog::PostHeader
+  tail = File.read(vdir + "custom/post_trailer.html") rescue RuneBlog::PostTrailer
   @posthead = interpolate(head)
   @posttail = interpolate(tail)
-  File.open("#{dir}/index.html", "w") do |f|
+  File.open(dir + "index.html", "w") do |f|
     f.puts @posthead
     f.puts @meta.body
     f.puts @posttail
@@ -229,17 +258,23 @@ end
 ### link_post
 
 def link_post(meta)
+  puts "  #{colored_slug(meta.slug)}"
   # First gather the views
   views = meta.views
-  views.each {|view| puts "Handling view '#{view}'"; link_post_view(view) }
+  print "       Views: "
+  views.each do |view| 
+    print "#{view} "
+    link_post_view(view)
+  end
+  puts
 end
 
 ### rebuild
 
 def rebuild
-  files = Dir.entries("#{@config.root}/src/").grep /\d\d\d\d.*.lt3$/
+  puts
+  files = Dir.entries("#@root/src/").grep /\d\d\d\d.*.lt3$/
   files.map! {|f| File.basename(f) }
-  files.each {|f| p f }
   files = files.sort.reverse
   files.each do |file|
     reload_post(file)
@@ -268,13 +303,13 @@ end
 def publish_post
   # Grab destination data
   # scp changed files over
-  puts "    Publish: Not implemented yet"
+# puts "    Publish: Not implemented yet"
 end
 
 ### list_views
 
 def list_views
-  read_config unless @config
+  abort "Config file not read"  unless @config
   puts
   @config.views.each {|v| puts "  #{v}" }
 end
@@ -299,13 +334,13 @@ def new_view(arg = nil)
   arg ||= ask("New view: ")  # check validity later
   raise "view #{arg} already exists" if @config.views.include?(arg)
 
-  dir = @config.root + "/views/" + arg
-  cmd = "mkdir -p #{dir}/custom"
+  dir = @root + "/views/" + arg + "/"
+  cmd = "mkdir -p #{dir + 'custom'}"
   system(cmd)
-  File.write("#{dir}/custom/blog_header.html",  RuneBlog::BlogHeader)
-  File.write("#{dir}/custom/blog_trailer.html", RuneBlog::BlogTrailer)
-  File.write("#{dir}/custom/post_header.html",  RuneBlog::PostHeader)
-  File.write("#{dir}/custom/post_trailer.html", RuneBlog::PostTrailer)
+  File.write(dir + "custom/blog_header.html",  RuneBlog::BlogHeader)
+  File.write(dir + "custom/blog_trailer.html", RuneBlog::BlogTrailer)
+  File.write(dir + "custom/post_header.html",  RuneBlog::PostHeader)
+  File.write(dir + "custom/post_trailer.html", RuneBlog::PostTrailer)
   @config.views << arg
 end
 
@@ -320,7 +355,7 @@ def import(arg = nil)
   @title = grep.sub(/^.title /, "")
   @slug = make_slug(@title)
   @fname = @slug + ".lt3"
-  system("cp #{name} #{@config.root}/src/#@fname")
+  system("cp #{name} #@root/src/#@fname")
   edit_post(@fname)
   process_post(@fname)
   if publish?
@@ -339,7 +374,7 @@ def new_post
 
   file = create_empty_post
   edit_post(file)
-# file = @config.root + "/src/" + file
+# file = @root + "/src/" + file
   process_post(file)  #- FIXME handle each view
   if publish?
     link_post(@meta)
@@ -354,7 +389,7 @@ end
 def remove_post(arg)
   id = Integer(arg) rescue raise("'#{arg}' is not an integer")
   tag = "#{'%04d' % id}-"
-  files = Find.find("#{@config.root}").to_a
+  files = Find.find(@root).to_a
   files = files.grep(/#{tag}/)
   if files.empty?
     puts red("\n  No such post found")
@@ -378,7 +413,7 @@ end
 ### list_posts
 
 def list_posts
-  dir = "#{@config.root}/views/#@view/"
+  dir = @config.viewdir(@view)
   Dir.chdir(dir) do
     posts = Dir.entries(".").grep(/^0.*/)
     puts
@@ -396,7 +431,7 @@ end
 ### list_drafts
 
 def list_drafts
-  dir = "#{@config.root}/src"
+  dir = "#@root/src"
   Dir.chdir(dir) do
     posts = Dir.entries(".").grep(/^0.*.lt3/)
     puts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies: []
 description: A blog system based on Ruby and Livetext
 email: rubyhacker@gmail.com