runeblog 0.2.69 → 0.2.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cac83d9c4f6850081ed2e007400c08c0a45e0515384e1eab36deb24ff8f269f1
-  data.tar.gz: 77164031eeee9f02d96d8b966831c4e04544def4973affad48b3f1f43acd702f
+  metadata.gz: e0d49c8d62c0c29650322fcff89f90294b364bd631ab2c678e6fe79a5db478c3
+  data.tar.gz: e6c772a8d7cdb0a5032fee2a3ed09179a1eb6acc60278c443e40b96e8cb8d7f2
 SHA512:
-  metadata.gz: 292cdd9ee19c4b7c290c0a41a7c2966758f3f89fdd0453ec8e58a827501d95b2761491f9799a0f009ae1a0ef99ac78e489ded615bc496121919ecfd613184737
-  data.tar.gz: 4128e54f173bc9edb46dea6ca62abb815bb1c4e50320879517f7e01d8ec1e1579d439431bcbc183d0bfdd6e627a025f7b2b2bd27f7819ca06e7ff725eae1dba1
+  metadata.gz: ecaacf45f6a89e49204df2ca539f17bd1635cf9cd346d2212c73de6e35aa459cbde02dfb6a1376b491e9290730af11e962e7f5c120b4d7f23cc8aa36f2a08fe9
+  data.tar.gz: c14a8482023fa93f8efa06d1f728f8d314028176f1ea003191a547a5795338fc6e4c4e232d0109e165dadf0ce50c329847d166e83d1dadba4d8d9d15f4680120

data/data/EDITOR

@@ -0,0 +1 @@
+/usr/local/bin/vim

data/data/ROOT

@@ -0,0 +1 @@
+/FULL/PATH/.blogs

data/data/VIEW

@@ -0,0 +1 @@
+[no view]

data/lib/helpers-blog.rb

@@ -1,6 +1,7 @@
 require 'runeblog_version'
 require 'fileutils'
 
+require 'pathmagic'
 require 'xlate'
 
 module RuneBlog::Helpers
@@ -19,46 +20,26 @@ module RuneBlog::Helpers
     puts "    Failed: #{cmd} - from #{caller[0]}" unless rc
   end
 
-  def read_config(file, *syms)
-    log!(enter: __method__, args: [file, *syms], level: 3)
-    lines = File.readlines(file).map(&:chomp)
-    obj = ::OpenStruct.new
-    lines.each do |line|
-      next if line == "\n" || line[0] == "#"
-      key, val = line.split(/: +/, 2)
-      obj.send(key+"=", val)
+  def copy_data(tag, dest)
+    data = RuneBlog::Path/"../data"  # files kept inside gem
+    case tag
+      when :config; files = %w[ROOT VIEW EDITOR]
     end
-    return obj if syms.empty?
+    files.each {|file| copy(data/file, dest) }
+  end
 
-    vals = []
-    if syms.empty?
-      vals = obj.to_hash.values
-    else
-      syms.each {|sym| vals << obj.send(sym) }
-    end
-    return vals
+  def read_config
+    log!(enter: __method__, level: 3)
+    @editor = File.read("data/EDITOR").chomp
+    @current_view = File.read("data/VIEW").chomp
+    @root = File.read("data/EDITOR").chomp
   rescue => err
-    puts "Can't read config file '#{file}': #{err}"
+    puts "Can't read config: #{err}"
     puts err.backtrace.join("\n")
     puts "dir = #{Dir.pwd}"
     exit
   end
 
-  def try_read_config(file, hash)
-    log!(enter: __method__, args: [file, hash], level: 3)
-    return hash.values unless File.exist?(file)
-    vals = read_config(file, *hash.keys)
-    vals
-  end
-
-  def write_config(obj, file)
-    log!(enter: __method__, args: [obj, file], level: 2)
-    hash = obj.to_h
-    File.open(file, "w") do |out|
-      hash.each_pair {|key, val| out.puts "#{key}: #{val}" }
-    end
-  end
-
   def get_views   # read from filesystem
     log!(enter: __method__, level: 3)
     dirs = subdirs("#@root/views/").sort

data/lib/liveblog.rb

@@ -11,7 +11,7 @@ require 'xlate'
 def init_liveblog    # FIXME - a lot of this logic sucks
   here = Dir.pwd
   dir = here
-  loop { dir = Dir.pwd; break if File.exist?("config"); Dir.chdir("..") }
+  loop { dir = Dir.pwd; break if File.exist?("data/ROOT"); Dir.chdir("..") }
   Dir.chdir(here)     #  here??? or dir??
   @blog = RuneBlog.new(dir)
   @root = @blog.root

data/lib/repl.rb

@@ -255,7 +255,7 @@ module RuneBlog::REPL
       return @out
     else
       if @blog.view?(arg)
-        @blog.view = arg  # reads config
+        @blog.view = arg
         output "View: " + @blog.view.name.to_s
         puts "\n  ", fx(arg, :bold), "\n" unless testing
       end

data/lib/runeblog.rb

@@ -19,7 +19,6 @@ require 'pathmagic'
 class RuneBlog
  
   DotDir     = ".blogs"
-  ConfigFile = "config"
   Themes     = RuneBlog::Path/"../themes"
 
   make_exception(:FileNotFound,          "File $1 was not found")
@@ -53,34 +52,25 @@ class RuneBlog
     puts "Error: See #{out}"
   end
 
-  def self.create_new_blog_repo(dir = ".blogs")
-    log!(enter: __method__, args: [dir])
-    raise ArgumentError unless dir.is_a?(String) && ! dir.empty?
-    root_dir = Dir.pwd/dir
-    self.create(dir)
-  rescue => err
-    puts "Can't create blog repo: '#{dir}' - #{err}"
-    puts err.backtrace.join("\n")
-  end
-
-  def self.create(root = ".blogs")
-    log!(enter: __method__, args: [root], level: 1)
+  def self.create_new_blog_repo(root = ".blogs")
+    log!(enter: __method__, args: [root])
+    raise ArgumentError unless root.is_a?(String) && ! root.empty?
+    root_dir = Dir.pwd/root
     # Crude - FIXME later -  # What views are there? Publishing, etc.
     self.blog = self   # Weird. Like a singleton - dumbass circular dependency?
     root = Dir.pwd/root
     raise BlogRepoAlreadyExists if Dir.exist?(root)
     create_dirs(root)
     Dir.chdir(root) do
-      create_dirs(:drafts, :views, :posts)
+      create_dirs(:data, :drafts, :views, :posts)
+      copy_data(:config, "./data/")
       new_sequence
     end
-    x = OpenStruct.new
-    x.root, x.current_view, x.editor = root, "test_view", "/usr/bin/vim "   # dumb - FIXME later
-    write_config(x, root/ConfigFile)
     @blog = self.new(root)
     @blog
   rescue => err
-    _tmp_error(err)
+    puts "Can't create blog repo: '#{root}' - #{err}"
+    puts err.backtrace.join("\n")
   end
 
   def self.open(root = ".blogs")
@@ -99,11 +89,7 @@ class RuneBlog
     self.class.blog = self   # Weird. Like a singleton - dumbass circular dependency?
 
     @root = root_dir
-    file = @root/ConfigFile
-    errmsg = "No config file! file = #{file.inspect}  dir = #{Dir.pwd}" 
-    raise errmsg unless File.exist?(file)
-
-    @root, @view_name, @editor = read_config(file, :root, :current_view, :editor)
+    read_config
     md = Dir.pwd.match(%r[.*/views/(.*?)/])
     @view_name = md[1] if md
     @views = get_views
@@ -204,6 +190,7 @@ class RuneBlog
 
   def view=(arg)
     log!(enter: __method__, args: [arg], level: 2)
+    # FIXME should write VIEW file?
     case arg
       when RuneBlog::View
         @view = arg
@@ -429,8 +416,7 @@ class RuneBlog
     log!(enter: __method__, args: [view], level: 3)
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
     x = OpenStruct.new
-    x.root, x.current_view, x.editor = @root, view.to_s, @editor   # dumb - FIXME later
-    write_config(x, @root/ConfigFile)
+    File.write(@root/"data/VIEW", view.to_s)
     self.view = view   # error checking?
   end
 

data/lib/runeblog_version.rb

@@ -2,7 +2,7 @@
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.69"
+  VERSION = "0.2.70"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

data/runeblog.gemspec

@@ -28,11 +28,12 @@ spec = Gem::Specification.new do |s|
   # Files...
   main = Find.find("bin").to_a + 
          Find.find("lib").to_a
+  data = Find.find("data").to_a
   test = Find.find("test").to_a
   misc = %w[./README.lt3 ./README.md ./runeblog.gemspec]
   empty_view = Find.find("empty_view").to_a
 
-  s.files       =  main + misc + test + empty_view
+  s.files       =  main + misc + data + test + empty_view
   s.homepage    = 'https://github.com/Hal9000/runeblog'
   s.license     = "Ruby"
   s.post_install_message = "\n  Success! Run 'blog' command and type h for help.\n "

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.69
+  version: 0.2.70
 platform: ruby
 authors:
 - Hal Fulton
@@ -76,6 +76,9 @@ files:
 - "./runeblog.gemspec"
 - bin/blog
 - bin/mkwidget
+- data/EDITOR
+- data/ROOT
+- data/VIEW
 - empty_view/assets/austin-pano.jpg
 - empty_view/assets/sky2.jpg
 - empty_view/remote/assets/GIT_IS_DUMB