runeblog 0.1.84 → 0.1.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b18c3d8c6c7a36be892a6ad4f5d1343839da39d8a151ac2a9600cb29389a855d
-  data.tar.gz: e18259284be9484e35e800c60ee531b4678ea9ad9c1ce85994d36362d92d7f66
+  metadata.gz: cb6100ad69994f06dcb9d75dcef71d5f485f56119725efb419607c3ca5521b89
+  data.tar.gz: 025a5cc03d7203cd32db22c2bb283c3db7ad6aa1eb4b110ec5f1613bb5740fe9
 SHA512:
-  metadata.gz: 19bcba26366d495a4c879f79b5fcc0b068cbca46f1a40e1f2959864bd7ed9b9d5a5c80cf07d5aeeb0fde5d72ce146d63b6aff99df81d5e1b62b5a8689357da91
-  data.tar.gz: 947861e8132ac5fa801398e81fed3e0fad60d1a10f210478e8a248583e57a40b6000b7b7940cfc56fadd11d73c2328f21bca137168a81b96d1855ca4a8ecf519
+  metadata.gz: b89cca81ab11b4a2b7ea4694cb0f9c6f875f0691629a7eb14daa4ce3dc6b77b167db71eb5be3abc4777da3940ccc62a250d513119cebe775f6af09bea50c781d
+  data.tar.gz: 7b495793aeb39e03d7ca07002c66fcf309d330fe877b712ceaa524cd7e09d8da25dae2d9fcfd64ba014aa291fc177981b254fc0d5063047142b38d65741ad43c

data/lib/helpers-blog.rb

@@ -65,6 +65,17 @@ module RuneBlog::Helpers
     vals
   end
 
+def put_config(root:, view:"test_view", editor: "/bin/vim")
+  Dir.mkdir(root) unless Dir.exist?(root)
+  Dir.chdir(root) do 
+    File.open("config", "w") do |cfg|
+      cfg.puts "root: #{root}"
+      cfg.puts "current_view: #{view}"
+      cfg.puts "editor: #{editor}"
+    end
+  end
+end 
+
   def write_config(obj, file)
     hash = obj.to_h
 # Dir.chdir(::Home)
@@ -86,9 +97,10 @@ module RuneBlog::Helpers
 #   end
   end
 
-  def new_dotfile(root: "./.blogs/data", current_view: "no_default", editor: "vi")
-    raise BlogAlreadyExists if Dir.exist?(".blogs")
-    Dir.mkdir(".blogs")
+  def new_dotfile(root: ".blogs", current_view: "test_view", editor: "vi")
+#   raise BlogAlreadyExists if Dir.exist?(".blogs")
+#   Dir.mkdir(".blogs")
+    root = Dir.pwd + "/" + root
     x = OpenStruct.new
     x.root, x.current_view, x.editor = root, current_view, editor
     write_config(x, ".blogs/" + RuneBlog::ConfigFile)
@@ -101,8 +113,10 @@ module RuneBlog::Helpers
   end
 
   def subdirs(dir)
+STDERR.puts "== SUB dir = #{dir}"
     verify(Dir.exist?(dir) => "Directory #{dir} not found")
     dirs = Dir.entries(dir) - %w[. ..]
+STDERR.puts "== SUB   dirs = #{dirs.inspect}"
     dirs.reject! {|x| ! File.directory?("#@root/views/#{x}") }
     dirs
   end

data/lib/liveblog.rb

@@ -20,7 +20,11 @@ STDERR.reopen(errfile)
 =end
 
 def init_liveblog    # FIXME - a lot of this logic sucks
-  @blog = $_blog = RuneBlog.new(false)
+  here = Dir.pwd
+  dir = here
+  loop { dir = Dir.pwd; break if File.exist?("config"); Dir.chdir("..") }
+  Dir.chdir(here)
+  @blog = $_blog = RuneBlog.new(dir)
   @root = @blog.root
   @view = @blog.view
   @view_name = @blog.view.name
@@ -236,6 +240,7 @@ def finalize
   @slug = @blog.make_slug(@meta)
   slug_dir = @slug
   @postdir = @blog.view.dir + "/posts/#{slug_dir}"
+  STDERR.puts "--- finalize: pwd = #{Dir.pwd} postdir = #@postdir"
   write_post
   @meta
 end

data/lib/post.rb

@@ -139,6 +139,7 @@ end
 class RuneBlog::ViewPost
   attr_reader :path, :nslug, :aslug, :title, :date,
               :teaser_text
+              
   def initialize(view, postdir)
     # Assumes already parsed/processed
     @blog = RuneBlog.blog || raise(NoBlogAccessor)

data/lib/runeblog.rb

@@ -41,40 +41,54 @@ class RuneBlog
 
   include Helpers
 
-  def self.create_new_blog_repo(first_view, dir = ".blogs/data")
+  def self.create_new_blog_repo(dir = ".blogs")
     raise ArgumentError unless dir.is_a?(String) && ! dir.empty?
     root_dir = Dir.pwd + "/" + dir
-    raise BlogRepoAlreadyExists if Dir.exist?(root_dir)
-    new_dotfile(root: root_dir, current_view: first_view)
-    create_dir(dir)
-    Dir.chdir(dir) do
+    self.create(dir)
+  rescue => err
+    puts "Can't create blog repo: '#{dir}' - #{err}"
+    puts err.backtrace.join("\n")
+  end
+
+  def self.create(root = ".blogs")
+    # Crude - FIXME later -  # What views are there? Publishing, etc.
+    self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
+    $_blog = self            # Dumber still?
+    root = Dir.pwd + "/" + root
+    raise BlogRepoAlreadyExists if Dir.exist?(root)
+    create_dir(root)
+    Dir.chdir(root) do
       create_dir("drafts")
       create_dir("views")
 #?    create_dir("assets")
       new_sequence
     end
-    blog = self.new
-    blog.create_view(first_view)
-  rescue => err
-    puts "Can't create blog repo: '#{dir}' - #{err}"
-    puts err.backtrace.join("\n")
+    put_config(root: root)
+    @blog = self.new(root)
+    @blog.create_view("test_view")
+    @blog
+  end
+
+  def self.open(root = ".blogs")
+    # Crude - FIXME later -  # What views are there? Publishing, etc.
+    self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
+    $_blog = self            # Dumber still?
+    root = Dir.pwd + "/" + root
+    blog = self.new(root)
   end
 
-  def initialize(top = true)   # at top? always assumes existing blog
+  def initialize(root_dir = ".blogs")   # always assumes existing blog
     # Crude - FIXME later -  # What views are there? Publishing, etc.
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     $_blog = self            # Dumber still?
-    dir = ""
-    unless top
-      md = Dir.pwd.match(%r[.*.blogs])
-      dir = md[0]
-    end
-    file = dir.empty? ? ConfigFile : dir + "/" + ConfigFile
+
+    @root = root_dir
+    file = @root + "/" + ConfigFile
+STDERR.puts "--- init: file = #{file}"
     errmsg = "No config file! file = #{file.inspect}  dir = #{Dir.pwd}" 
     raise errmsg unless File.exist?(file)
-    # Hmm. current_view doesn't belong?
-    @root, @view_name, @editor = read_config(file, :root, :current_view, :editor)
 
+    @root, @view_name, @editor = read_config(file, :root, :current_view, :editor)
     md = Dir.pwd.match(%r[.*/views/(.*?)/])
     @view_name = md[1] if md
     @views = get_views
@@ -348,6 +362,8 @@ class RuneBlog
     raise "No .views call!" if view_line.size < 1
     view_line = view_line.first
     views = view_line[7..-1].split
+STDERR.puts "--- gv: #{views.inspect}"
+    views 
   end
 
   # Remember: A post in multiple views will trigger multiple
@@ -393,6 +409,7 @@ class RuneBlog
         copy(lt3, staging)
         html = noext[5..-1]
         Dir.chdir(staging) do 
+          STDERR.puts "--- gp: pwd = #{Dir.pwd}  draft = #{draft}  html = #{html}"
           livetext draft, html
           # link to POST??
           copy html, "../remote"

data/lib/runeblog_version.rb

@@ -2,7 +2,7 @@
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.1.84"
+  VERSION = "0.1.85"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end

data/test/make_blog.rb

@@ -38,14 +38,14 @@ end
 puts
 
 system("rm -rf .blogs")
-RuneBlog.create_new_blog_repo('test_view', ".blogs/data")
-x = RuneBlog.new
+RuneBlog.create_new_blog_repo(".blogs")
+x = RuneBlog.new(".blogs")
 
 x.create_view("around_austin")   # FIXME remember view title!
 
 # Hack:
 if File.exist?("publish")
-  system("cp publish .blogs/data/views/around_austin/publish")
+  system("cp publish .blogs/views/around_austin/publish")
 end
 
 x.create_view("computing")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.84
+  version: 0.1.85
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-07 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext