runeblog 0.0.84 → 0.0.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c8bcdac0cac7185eae4df854af9578b88068e70
-  data.tar.gz: 45499a0fa575d8f2e491300e77ea9108f7eb5ca6
+  metadata.gz: 08c941c930b749a00a51599199cf83f8d072d736
+  data.tar.gz: 341352d2e1678bc543a502b7b8abce7d32e7b0cd
 SHA512:
-  metadata.gz: 66ea3cf6ee070ce80f94e7ab99b4d55640394cfd57712c787fbd2409de44a0e74597d440e1cb3d91182188fcca0bffa9a519a2f8820ac668b8dba3beae2b37b7
-  data.tar.gz: edfabd8f929c33f09f2ea86a99e859db2d46e6ee72214fa43268ff0559049c94873ee6967f91fc65a317bd74a57911543d6b55a75907f230775ad60a7ee5f2e6
+  metadata.gz: 9faa908cc4cda8fc8c5371378d44ddae7e0d71ba978f2cb392130763e688d3c0c5c73fc4f51a513e236edcb168fcd3124b3b25ba28c34a3372cd945a01a5fa14
+  data.tar.gz: 6422b5a0347c8ed089a20af0987a963f34221d738e6cf01f7d8be12c0733cdc08bd258f368c42c4d8345f0aa74de548f379dd28cf9e1d30a4d555217c18b5baa

data/lib/deploy.rb

@@ -39,7 +39,7 @@ class RuneBlog::Deployment
     result = system(cmd)
     raise "Problem occurred in deployment" unless result
 
-    File.write("#{@blog.view.dir}/last_deployed", files)
+    dump(files, "#{@blog.view.dir}/last_deployed")
     output! "...finished.\n"
     @out
   end

data/lib/helpers-blog.rb

@@ -46,9 +46,9 @@ module RuneBlog::Helpers
   end
 
   def new_sequence
-    File.write("sequence", 0)
-    File.write("VERSION", "#{RuneBlog::VERSION}\n" + 
-                          "Blog created: " + Time.now.to_s)
+    dump(0, "sequence")
+    version_info = "#{RuneBlog::VERSION}\nBlog created: #{Time.now.to_s}"
+    dump(version_info, "VERSION")
   end
 
   def subdirs(dir)
@@ -85,4 +85,8 @@ module RuneBlog::Helpers
     puts err.backtrace
   end
 
+  def dump(obj, name)
+    File.write(name, obj)
+  end
+
 end

data/lib/post.rb

@@ -25,7 +25,7 @@ class RuneBlog::Post
     @meta = meta
     html = interpolate(template)
     @draft = "#{@blog.root}/src/#@slug.lt3"
-    File.write(@draft, html)
+    dump(html, @draft)
   end
 
   def edit
@@ -61,12 +61,12 @@ 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 = RuneBlog::Default::TeaserTemplate
+    dump(@meta.to_yaml, "metadata.yaml")
+    dump(@meta.teaser, "teaser.txt")
+    dump(@meta.remainder, "remainder.txt")
+    template = RuneBlog::Default::TeaserTemplate   # FIXME template into custom dir?
     text = interpolate(template)
-    File.write("index.html", text)
+    dump(text, "index.html")   # FIXME write_index ?
   end
 
   def make_slug(postnum = nil)

data/lib/repl.rb

@@ -66,7 +66,7 @@ module RuneBlog::REPL
     result = system(cmd)
     raise "Problem occurred in deployment" unless result
 
-    File.write("#{vdir}/last_deployed", files)
+    dump(files, "#{vdir}/last_deployed")
     output! "...finished.\n"
     @out
   rescue => err

data/lib/runeblog.rb

@@ -14,6 +14,7 @@ require 'version'
 class RuneBlog
  
   DotDir = ".blog"
+  ConfigFile = "#{DotDir}/config"
 
   class << self
     attr_accessor :blog
@@ -44,7 +45,7 @@ class RuneBlog
     # What views are there? Deployment, etc.
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     @root, @view_name, @editor = 
-      read_config(DotDir + "/config", :root, :current_view, :editor)
+      read_config(ConfigFile, :root, :current_view, :editor)
     @views = get_views
     @view = str2view(@view_name)
     @sequence = get_sequence
@@ -82,18 +83,17 @@ class RuneBlog
   end
 
   def next_sequence
-    File.write("#@root/sequence", @sequence += 1)
+    dump(@sequence += 1, "#@root/sequence")
     @sequence
   end
 
-  def viewdir(v)
+  def viewdir(v = nil)
+    v ||= @view
     @root + "/views/#{v}/"
   end
 
   def self.exist?
-    File.exist?(DotDir) && 
-    File.directory?(DotDir) &&
-    File.exist?(DotDir + "/config")
+    Dir.exist?(DotDir) && File.exist?(ConfigFile)
   end
 
   def create_view(arg)
@@ -104,17 +104,15 @@ class RuneBlog
     create_dir(dir)
     up = Dir.pwd
     Dir.chdir(dir)
+    x = RuneBlog::Default
     create_dir('custom')
     create_dir('assets')
-    File.write("deploy", "")
-    File.write("custom/blog_header.html",  
-               RuneBlog::Default::BlogHeader)
-    File.write("custom/blog_trailer.html", 
-               RuneBlog::Default::BlogTrailer)
-    File.write("custom/post_template.html", 
-               RuneBlog::Default::PostTemplate)
-    File.write("last_deployed", 
-               "Initial creation")
+    # FIXME dump method??
+    dump("", "deploy")
+    dump(x::BlogHeader, "custom/blog_header.html")
+    dump(x::BlogTrailer, "custom/blog_trailer.html")
+    dump(x::PostTemplate, "custom/post_template.html")
+    dump("Initial creation", "last_deployed")
     Dir.chdir(up)
     @views << RuneBlog::View.new(arg)
   end
@@ -127,10 +125,9 @@ class RuneBlog
   end
 
   def view_files
-    vdir = @blog.viewdir(@view)
-    # meh
+    vdir = @blog.viewdir
     files = ["#{vdir}/index.html"]
-    files += Dir.entries(vdir).grep(/^\d{4}/).map {|x| "#{vdir}/#{x}" }
+    files += posts.map {|x| "#{vdir}/#{x}" }
     # Huh? 
     files.reject! {|f| File.mtime(f) < File.mtime("#{vdir}/last_deployed") }
   end
@@ -207,10 +204,13 @@ class RuneBlog
     vdir = self.viewdir(view)
     dir = vdir + @meta.slug + "/"
     create_dir(dir + "assets") 
-    File.write("#{dir}/metadata.yaml", @meta.to_yaml)
-    template = File.read(vdir + "custom/post_template.html")
-    post = interpolate(template)
-    File.write(dir + "index.html", post)
+    Dir.chdir(dir) do
+      dump(@meta.to_yaml, "metadata.yaml")
+      # FIXME make get_post_template method
+      template = File.read("#{vdir}/custom/post_template.html")
+      post = interpolate(template)
+      dump(post, "index.html")
+    end
     generate_index(view)
   rescue => err
     error(err)

data/lib/version.rb

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

metadata

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