runeblog 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0b51fb60fbf5219684fc0eb45ccf6d600780fa2addd0beea7f01a54f87b44b5
-  data.tar.gz: 62b44992b9a5031c788fe42b8e77c646b6c4b57dad113f776407388b88872185
+  metadata.gz: 8716711a8c779931fdca8f00224df63537d6adbf41be3acfbf12d60beb20e831
+  data.tar.gz: ca233f3853ffffac5abecaf290e80af0adaef2a8068db829082b3a0370cd5ada
 SHA512:
-  metadata.gz: 967c83ccf90ffd8a9227c4f63567a5f8ad8d4b47dac4b11a22db133aa611751f2cb023547b68b1a47ff03e950f8cd9a6bcf6452d4dcf119104b882f0bf9eb832
-  data.tar.gz: 471bf1ef0519b5f854a2b2beca701b54ba29d3993f07f634c8c9126a524ef08fde20f57c16d7c4c45ba3d3d5e0af809f02b8b9348850b0082eef6bfbc1b11b81
+  metadata.gz: c89faa0f8256de692605395c248cbace8a51726737949123792b89af330711919c0e7112d794abca51fa2307157ba39d38e315a79371eeff88a610885841765c
+  data.tar.gz: 3fce62a85c37ed183caa3d3bb734a706f9dd691c004243bf970a2ed3bb419c1b16aa0a521b70e213126b35e7cd6c24f8a086cac7985098ce3673c2749001214e

data/lib/global.rb

@@ -39,7 +39,6 @@ def check_meta(meta, where = "")
   str << "  num missing!\n" unless meta.num
   if str =~ /missing!/
     debug str
-exit
     raise str 
   end
 end

data/lib/helpers-blog.rb

@@ -40,7 +40,7 @@ module RuneBlog::Helpers
     dirs.map {|name| RuneBlog::View.new(name) }
   end
 
-  def new_dotfile(root: "data", current_view: "no_default", editor: "vi")
+  def new_dotfile(root: "./.blog/data", current_view: "no_default", editor: "vi")
     raise BlogAlreadyExists if Dir.exist?(".blog")
     Dir.mkdir(".blog")
     x = OpenStruct.new

data/lib/post.rb

@@ -33,16 +33,15 @@ class RuneBlog::Post
   end
 
   def create_post_subtree(viewname = nil) 
-    viewname ||= @blog.view.dir
-    post_dir = viewname + "/" + @meta.slug
-    create_dir(post_dir) rescue nil # FIXME?
-    Dir.chdir(post_dir) do
-      create_dir("assets") rescue nil
-      system("cp body.txt index.html")  # gahhh FIXME
-    end
+    debug "=== create_post_subtree #{viewname.inspect}  pwd = #{Dir.pwd}"
+    # We are INSIDE views/myview/000n-mytitle dir now - FIXME later? how did that happen?
+    create_dir("assets")
+    system("cp body.txt index.html")  # gahhh FIXME
   end
 
   def write_metadata(meta)
+    debug "=== write_metadata:"
+    debug "-----\n#{meta.inspect}\n-----"
     fname2 = "metadata.txt"
     hash = meta.to_h
 
@@ -62,10 +61,12 @@ class RuneBlog::Post
   end
 
   def initialize
+    debug "=== Post#initialize"
     @blog = RuneBlog.blog || raise(NoBlogAccessor)
   end
 
   def self.create(title)
+    debug "=== Post.create #{title.inspect}   pwd = #{Dir.pwd}"
     post = self.new
     post.new_metadata(title)
     post.create_draft
@@ -121,6 +122,7 @@ class RuneBlog::Post
   end 
 
   def build
+    debug "=== build"
     views = @meta.views
     text = File.read(@draft)
     Livetext.parameters = [@blog, @meta]
@@ -135,9 +137,9 @@ class RuneBlog::Post
     meta.views.each do |view_name|   # Create dir using slug (index.html, metadata?)
       vdir = "#{@blog.root}/views/#{view_name}/"
       dir = vdir + meta.slug + "/"
-      create_dir(dir) rescue nil
+      create_dir(dir) unless Dir.exist?(dir)
       Dir.chdir(dir) do
-        create_post_subtree
+        create_post_subtree(view_name)  # unless existing??
         @blog.generate_index(view_name)
       end
     end

data/lib/publish.rb

@@ -32,7 +32,7 @@ class RuneBlog::Publishing
   def no_files?(files)
     if files.empty?
       STDSCR.up
-      puts "\n  No files to publish"
+      puts fx("\n  No files to publish", :bold)
       true
     else
       false

data/lib/runeblog.rb

@@ -37,22 +37,16 @@ class RuneBlog
   include Helpers
 
   def self.create_new_blog(dir = ".blog/data")
-# puts "--- create_new_blog"
     raise ArgumentError unless dir.is_a?(String) && ! dir.empty?
     root_dir = Dir.pwd + "/" + dir
-# puts "--- create: dir = #{dir}  pwd = #{Dir.pwd} DotDir = #{DotDir} root_dir = #{root_dir}"
     raise BlogAlreadyExists if Dir.exist?(root_dir)
-# puts "--- new dotfile"
-    new_dotfile(root: dir, current_view: "test_view")
-# puts "--- create #{dir}"
+    new_dotfile(root: root_dir, current_view: "test_view")
     create_dir(dir)
     Dir.chdir(dir) do
-# puts "--- in chdir: pwd = #{Dir.pwd}"
       create_dir("views")
       create_dir("assets")
       create_dir("src")
       new_sequence
-# puts "==== CREATED BLOG ==="
     end
     blog = self.new
     blog.create_view("test_view")
@@ -67,7 +61,6 @@ class RuneBlog
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     @root, @view_name, @editor = 
       read_config(ConfigFile, :root, :current_view, :editor)
-# puts "=== init root = #@root"
     @views = get_views
     @view = str2view(@view_name)
     @sequence = get_sequence
@@ -109,7 +102,6 @@ class RuneBlog
 
   def next_sequence
     @sequence += 1
-#   debug "seq = #@sequence  caller = #{caller.join("\n")}"
     dump(@sequence, "#@root/sequence")
     @sequence
   end
@@ -126,6 +118,7 @@ class RuneBlog
   end
 
   def create_view(arg)
+    debug "=== create_view #{arg.inspect}"
     raise ArgumentError unless arg.is_a?(String) && ! arg.empty?
     names = self.views.map(&:to_s)
     raise ViewAlreadyExists(arg) if names.include?(arg)
@@ -137,14 +130,12 @@ class RuneBlog
     Dir.chdir(dir)
     x = RuneBlog::Default
     create_dir('custom')
-puts "=== create_view - created 'custom'"
     create_dir('assets')
     # FIXME dump method??
     pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
     dump(pub, "publish")  # FIXME publish
     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_published")
     Dir.chdir(up)
     @views << RuneBlog::View.new(arg)
@@ -175,9 +166,12 @@ puts "=== create_view - created 'custom'"
   end
 
   def create_new_post(title, testing = false)
+    save = Dir.pwd
+    Dir.chdir(self.view.dir)
     post = Post.create(title)
     post.edit unless testing
     meta = post.build
+    Dir.chdir(save)
     meta.num
   rescue => err
     puts err
@@ -185,6 +179,7 @@ puts "=== create_view - created 'custom'"
   end
 
   def edit_initial_post(file, testing = false)
+    debug "=== edit_initial_post #{file.inspect}  => #{sourcefile}"
     sourcefile = "#@root/src/#{file}"
     result = system("#@editor #{sourcefile} +8") unless testing
     raise EditorProblem(sourcefile) unless result
@@ -213,6 +208,7 @@ puts "=== create_view - created 'custom'"
   end
 
   def process_post(file)
+    debug "=== process_post #{file.inspect}"
     raise ArgumentError unless file.is_a?(String)
     path = @root + "/src/#{file}"
     raise FileNotFound(path) unless File.exist?(path)
@@ -231,6 +227,7 @@ puts "=== create_view - created 'custom'"
   end
 
   def generate_index(view)
+    debug "=== generate_index view = #{view.inspect}"
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     # Gather all posts, create list
     vdir = "#@root/views/#{view}"
@@ -259,6 +256,7 @@ puts "=== create_view - created 'custom'"
       end
       meta  # block return
     end
+
     File.open("#{vdir}/index.html", "w") do |f|
       f.puts @bloghead
       posts.each {|post| f.puts index_entry(view, post) }
@@ -274,8 +272,8 @@ puts "=== create_view - created 'custom'"
   end
 
   def index_entry(view, meta)
+    debug "=== index_entry #{view.to_s.inspect}  #{meta.num} #{meta.title.inspect}"
     check_meta(meta, "index_entry1")
-#   debug "\nindex_entry: meta = #{meta.inspect}"
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     check_meta(meta, "index_entry2")
     self.make_slug(meta)    # RuneBlog#index_entry

data/lib/runeblog_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-28 00:00:00.000000000 Z
+date: 2018-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext