lib/runeblog.rb in runeblog-0.2.94 vs lib/runeblog.rb in runeblog-0.2.95

@@ -90,14 +90,17 @@
     self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     repo_root = Dir.pwd/root_rel
     raise BlogRepoAlreadyExists if Dir.exist?(repo_root)
     create_dirs(repo_root)
     Dir.chdir(repo_root) do
-      create_dirs(:data, :drafts, :views, :posts)
+      create_dirs(:data, :config, :drafts, :views, :posts)
       new_sequence
     end
-    copy_data(:config, repo_root/:data) unless File.exist?(repo_root/"data/VIEW")
+    unless File.exist?(repo_root/"data/VIEW")
+      copy_data(:config, repo_root/:data)   
+    end
+    copy_data(:extra,  repo_root/:config)
     write_repo_config(root: repo_root)
     @blog = self.new
     @blog
   rescue => err
     puts "Can't create blog repo: '#{repo_root}' - #{err}"
@@ -115,11 +118,10 @@
   def initialize(root_rel = ".blogs")   # always assumes existing blog
     log!(enter: "initialize", args: [root_rel])
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
 
     @root = Dir.pwd/root_rel
-#   copy_data(:config, @root/:data) unless File.exist?(@root/"data/VIEW")
     write_repo_config(root: @root)
     get_repo_config
     @views = retrieve_views
     self.view = File.read(@root/"data/VIEW").chomp
     md = Dir.pwd.match(%r[.*/views/(.*?)/])
@@ -189,11 +191,11 @@
     log!(enter: __method__, args: [sourcefile], level: 2)
     nslug = sourcefile.sub(/.lt3/, "")
     dir = @root/:posts/nslug
     create_dirs(dir)
     # FIXME dependencies?
-    preprocess cwd: dir, src: @root/:drafts/sourcefile, 
+    preprocess cwd: dir, src: @root/:drafts/sourcefile, dst: @root/:posts/sourcefile.sub(/.lt3/, ",html"),  # ZZZ
                mix: "liveblog"  # , debug: true
     _deploy_local(dir)
   rescue => err
     _tmp_error(err)
   end
@@ -255,17 +257,17 @@
     _tmp_error(err)
   end
 
   def get_sequence
     log!(enter: __method__, level: 3)
-    File.read(@root/:sequence).to_i
+    File.read(@root/"data/sequence").to_i
   end
 
   def next_sequence
     log!(enter: __method__, level: 3)
     @sequence += 1
-    dump(@sequence, @root/:sequence)
+    dump(@sequence, @root/"data/sequence")
     @sequence
   end
 
   def viewdir(v = nil)   # delete?
     log!(enter: __method__, args: [v], level: 3)
@@ -624,20 +626,15 @@
     # Step 4...
     # FIXME dependencies?
     preprocess cwd: @theme/:post, src: "generate.lt3", force: true, 
                dst: remote/ahtml, copy: @theme/:post,
                call: ".nopara"    # , debug: true
-#   copy(remote/ahtml, remote/permalink/ahtml)
-    # FIXME dependencies?
-#   preprocess cwd: @theme/:post, src: "permalink.lt3", 
-#              dst: remote/:permalink/ahtml,
-#              mix: "liveblog"  # , debug: true
     copy_widget_html(view_name)
   rescue => err
     _tmp_error(err)
   end
 
-  def generate_post(draft)
+  def generate_post(draft, force = false)
     log!(enter: __method__, args: [draft], level: 1)
     views = _get_views(draft)
     views.each do |view| 
       unless self.view?(view)
         puts "Warning: '#{view}' is not a view"