runeblog 0.0.82 → 0.0.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2691b40f636554604986a978b477b1696171cf2
-  data.tar.gz: 2cef5f6ebc60afc93e125453b6614589e3f6a420
+  metadata.gz: 91e43d12b26a11fa3a918c8770f677a5f22f744e
+  data.tar.gz: ed5d4b517cb59294fc4a632d686f5c8e71a0d06f
 SHA512:
-  metadata.gz: 6e2850ad2ae3f999e155214e9bfd76ad83d5dd814f23cbb711a5aafb5d08524453da8bdacba4f0d747f6a1a35249f57c5467633a89351dcee47fd6381eeaf58e
-  data.tar.gz: 50fc4ef26de135a92fa08f860be97fb04999fe2bbe15ef21ba44683a4de9fa853fa6bfb54c4410cfc04b6483acca62748e9bfb4804d8babd04057464c666e89d
+  metadata.gz: 6ad7d9bb119e863f66c786a3e06152c9eb2b64725670d7d2f90e27b8ce3a3a86301e0e4020903ac24fd2124241234f49044db1003b062ef4dd41cc10657bfb63
+  data.tar.gz: e517a33878737d6ae901423a9869f5b5cbd13089e01d2f7c313aeb16c9f2e35174376e1eb5780429b7893f3af969c0fecf1529b3e6494516f236c98b5f6974e8

data/lib/helpers-blog.rb

@@ -1,42 +1,94 @@
-def create_dir(dir)   # FIXME move later
-  cmd = "mkdir -p #{dir} >/dev/null 2>&1"
-  result = system(cmd) 
-  raise "Can't create #{dir}" unless result
-end
-
-def interpolate(str)
-  wrap = "<<-EOS\n#{str}\nEOS"
-  eval wrap
-end
+module RuneBlog::Helpers
 
-def error(err)  # FIXME - this is duplicated
-  str = "\n  Error: #{err}"
-  puts str
-  puts err.backtrace  # [0]
-end
+  def read_config(file, *syms)
+    lines = File.readlines(file).map(&:chomp)
+    obj = OpenStruct.new
+    lines.each do |line|
+      key, val = line.split(" ", 2)
+      key = key[0..-2] # remove colon
+      obj.send(key+"=", val)
+    end
+    return obj if syms.empty?
+    vals = []
+    syms.each {|sym| vals << obj.send(sym) }
+    return vals
+  rescue => err
+    puts "Something hit the fan: #{err}"
+    puts err.backtrace
+    exit
+  end
 
-def read_config(file, *syms)
-  lines = File.readlines(file).map(&:chomp)
-  obj = OpenStruct.new
-  lines.each do |line|
-    key, val = line.split(" ", 2)
-    key = key[0..-2] # remove colon
-    obj.send(key+"=", val)
-  end
-  @deployer = RuneBlog::Deployment.new(obj)
-  obj
-rescue => err
-  puts "Something hit the fan: #{err}"
-  puts err.backtrace
-  exit
-end
+  def huh_read_config(file, *syms)
+    lines = File.readlines(file).map(&:chomp)
+    obj = OpenStruct.new
+    lines.each do |line|
+      key, val = line.split(" ", 2)
+      key = key[0..-2] # remove colon
+      obj.send(key+"=", val)
+    end
+    @deployer = RuneBlog::Deployment.new(obj)
+    obj
+  rescue => err
+    puts "Something hit the fan: #{err}"
+    puts err.backtrace
+    exit
+  end
 
-def write_config(obj, file)
-  hash = obj.to_h
-  File.open(file, "w") do |f| 
-    hash.each_pair do |key, val|
-      f.puts "#{key}: #{val}"
+  def write_config(obj, file)
+    hash = obj.to_h
+    File.open(file, "w") do |f| 
+      hash.each_pair do |key, val|
+        f.puts "#{key}: #{val}"
+      end
     end
   end
-end
 
+  def get_views   # read from filesystem
+    dirs = subdirs("#@root/views/").sort
+    dirs.map {|name| RuneBlog::View.new(name) }
+  end
+
+  def new_dotfile(root: "data", current_view: "no_default", editor: "vi")
+    x = OpenStruct.new
+    x.root, x.current_view, x.editor = root, current_view, editor
+    write_config(x, RuneBlog::DotFile)
+  end
+
+  def new_sequence
+    File.write("sequence", 0)
+    File.write("VERSION", "#{RuneBlog::VERSION}\n" + 
+                          "Blog created: " + Time.now.to_s)
+  end
+
+  def subdirs(dir)
+    dirs = Dir.entries(dir) - %w[. ..]
+    dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
+    dirs
+  end
+
+  def find_src_slugs
+    files = Dir.entries("#@root/src/").grep /\d{4}.*.lt3$/
+    files.map! {|f| File.basename(f) }
+    files = files.sort.reverse
+    files
+  end
+
+  def create_dir(dir)
+    return if File.exist?(dir) && File.directory?(dir)
+    cmd = "mkdir -p #{dir} >/dev/null 2>&1"
+    result = system(cmd) 
+    raise "Can't create #{dir}" unless result
+  end
+
+  def interpolate(str)
+    wrap = "<<-EOS\n#{str}\nEOS"
+    eval wrap
+  end
+
+  def error(err)  # Hmm, this is duplicated
+    str = "\n  Error: #{err}"
+    puts str
+    puts err.backtrace
+  end
+
+end

data/lib/post.rb

@@ -5,6 +5,8 @@ class RuneBlog::Post
 
   attr_reader :id, :title, :date, :views, :num, :slug
 
+  include RuneBlog::Helpers
+
   def self.files(num, root)
     files = Find.find(root).to_a
     result = files.grep(/#{tag(num)}-/)

data/lib/runeblog.rb

@@ -1,5 +1,3 @@
-require 'pp'
-
 require 'find'
 require 'yaml'   # get rid of YAML later
 require 'livetext'
@@ -14,36 +12,38 @@ require 'version'
 ###
 
 class RuneBlog
+ 
+  DotFile = ".blog"
 
   class << self
     attr_accessor :blog
+    include Helpers
   end
 
   attr_reader :root, :views, :sequence
   attr_accessor :view  # overridden
 
+  include Helpers
+
   def self.create_new_blog(dir = "data")
-    x = OpenStruct.new
-    x.root, x.current_view, x.editor = dir, "no_default", "vi"
-    write_config(x, ".blog")
+    new_dotfile(root: dir)
     create_dir(dir)
     Dir.chdir(dir) do
       create_dir("views")
       create_dir("assets")
       create_dir("src")
-      File.write("sequence", 0)
-      File.write("VERSION", "#{RuneBlog::VERSION}\nBlog created: " + Time.now.to_s )
+      new_sequence
     end
   end
 
-  def initialize(cfg_file = ".blog")   # assumes existing blog
-    # Crude - FIXME later - What views are there? Deployment, etc.
+  def initialize   # assumes existing blog
+    # Crude - FIXME later - 
+    # What views are there? Deployment, etc.
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
-    obj = read_config(cfg_file)
-    vals = obj.to_h.values_at(:root, :current_view, :editor)
-    @root, view_name, @editor = *vals
-    @views = subdirs("#@root/views/").sort.map {|name| RuneBlog::View.new(name) }
-    @view = str2view(view_name)
+    @root, @view_name, @editor = 
+      read_config(DotFile, :root, :current_view, :editor)
+    @views = get_views
+    @view = str2view(@view_name)
     @sequence = get_sequence
   end
 
@@ -89,7 +89,7 @@ class RuneBlog
   end
 
   def self.exist?
-    File.exist?(".blog")
+    File.exist?(DotFile)
   end
 
   def create_view(arg)
@@ -172,7 +172,7 @@ class RuneBlog
   def change_view(view)
     x = OpenStruct.new
     x.root, x.current_view, x.editor = @root, view, @editor   # dumb - FIXME later
-    write_config(x, ".blog")
+    write_config(x, DotFile)
     self.view = view   # error checking?
   end
 
@@ -295,39 +295,5 @@ class RuneBlog
 
   private
 
-  def subdirs(dir)
-raise Exception.new("hell") if dir == "/views/"
-    dirs = Dir.entries(dir) - %w[. ..]
-    dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
-    dirs
-  rescue => err
-    p err
-  end
-
-  def find_src_slugs
-    files = Dir.entries("#@root/src/").grep /\d{4}.*.lt3$/
-    files.map! {|f| File.basename(f) }
-    files = files.sort.reverse
-    files
-  end
-
-  def create_dir(dir)
-    return if File.exist?(dir) && File.directory?(dir)
-    cmd = "mkdir -p #{dir} >/dev/null 2>&1"
-    result = system(cmd) 
-    raise "Can't create #{dir}" unless result
-  end
-
-  def interpolate(str)
-    wrap = "<<-EOS\n#{str}\nEOS"
-    eval wrap
-  end
-
-  def error(err)  # Hmm, this is duplicated
-    str = "\n  Error: #{err}"
-    puts str
-    puts err.backtrace
-  end
-
 end
 

data/lib/skeleton.rb

@@ -1,6 +1,9 @@
 # skeleton
 
 class RuneBlog
+  module Helpers
+  end
+
   class Default
   end
 

data/lib/version.rb

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

data/lib/view.rb

@@ -5,6 +5,8 @@ class RuneBlog::View
   attr_reader :name, :state
   attr_accessor :deployer
 
+  include RuneBlog::Helpers
+
   def initialize(name)
     raise "RuneBlog.blog is not set!" if RuneBlog.blog.nil?
     @blog = RuneBlog.blog

metadata

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