runeblog 0.1.67 → 0.1.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e379a5432ce586048ca4eda566293a5f3b9e86ae1be6f72e2991ac43728a4c2
-  data.tar.gz: 386f1bce77b5e574b001bb9e62947cf1870c6178e539d36f032b76adb905e571
+  metadata.gz: bb2582c242a2e3130d14dad7b484d96b7703258fbdd0d59212b993df72c3c55c
+  data.tar.gz: 0fcac65738ecc1dec58168ddf348292cc091d4408bf8a6590e2a76c984c4bef9
 SHA512:
-  metadata.gz: d204d850ced19b424eed4969237281a48647f4defa444161a42eaa7563aced5645e1a0859896fd9a3887dcc53dbd852362b7bb4ea4256181cd6821b5e15e1720
-  data.tar.gz: 3e42a0af03312cdc6981af7f90771f42a94358ffd6db88a1b1cd8cf69b01fbfef29a81e21d8e1e0df8ffcee41594cff44d8f3330fcd8ada870a65522b65410bc
+  metadata.gz: a519a50fb120971d3fb2115b43d1857657f63fc8617894d3589c810ecb0a9b6c9d838e91fb09d09724669d518672fef9b27964d57b34b368cdbd0cabe4a83cc3
+  data.tar.gz: 44be5e4a8c726655c634817f171fc73a759ac8bf0dc5aaf95d452a6df7efc9c9868635cd137ef66551182b76e5363f9bcd13388b2cacf0adbc514aef4479b0f5

data/README.lt3

@@ -1,6 +1,9 @@
 .mixin markdown
+<div float="left" align="left">
 
-<div float="left"><image src="raido.png"></div>
+
+<img src="raido.png" width="196" height="275" align="left"></img>
+</div>
 
 .h1 runeblog
 
@@ -43,7 +46,7 @@ Each view can be hosted in a different location and/or a different server and do
 Any post can be in more than one view
 .end
 
-.h2 The `blog environment
+.h2 The `[blog] environment
 
 There is a command-line tool called `blog which is a REPL (read-eval-print loop). 
 Note that this tool is a curses-based environment (mainly so it can display menus
@@ -80,10 +83,10 @@ The help message looks like this:
 
 .h2 Getting started
 
-But when you first run the REPL, it checks for an existing blog under the `.blog
-directory. If it doesn't find one, it asks whether you want to create a new blog.
-If you enter `y for yes, it creates a sort of "skeleton" with a single view
-called ``test_view.
+But when you first run the REPL, it checks for an existing blog repository under 
+the `[.blog] directory. If it doesn't find one, it asks whether you want to create 
+a new blog repo. If you enter `y for yes, it creates a sort of "skeleton" with a 
+single view called `[test_view].
 
 The next thing you should do is to create at least one view of your own. Use the
 `[new view] command for this.  

data/README.md

@@ -1,4 +1,10 @@
-<div float="left"><image src="raido.png"></div>
+<div float="left" align="left">
+<p>
+
+<p>
+
+<img src="raido.png" width="196" height="275" align="left"></img>
+</div>
 <p>
 
 # runeblog
@@ -39,7 +45,7 @@ But the important points are these:
  * Each view can have its own look and feel, and it can be linked/published separately from the others.
  * Each view can be hosted in a different location and/or a different server and domain
  * Any post can be in more than one view
-## The `blog environment
+## The `[blog] environment
 There is a command-line tool called <font size=+1><tt>blog</tt></font>  which is a REPL (read-eval-print loop). 
 Note that this tool is a curses-based environment (mainly so it can display menus
 and such to the user).
@@ -75,10 +81,10 @@ The help message looks like this:
      deploy            Deploy (current view)
 </pre>
 ## Getting started
-But when you first run the REPL, it checks for an existing blog under the <font size=+1><tt>.blog</tt></font>
-directory. If it doesn't find one, it asks whether you want to create a new blog.
-If you enter <font size=+1><tt>y</tt></font>  for yes, it creates a sort of "skeleton" with a single view
-called <font size=+1><tt>est_view</tt></font>.
+But when you first run the REPL, it checks for an existing blog repository under 
+the <font size=+1><tt>.blog</tt></font> directory. If it doesn't find one, it asks whether you want to create 
+a new blog repo. If you enter <font size=+1><tt>y</tt></font>  for yes, it creates a sort of "skeleton" with a 
+single view called <font size=+1><tt>test_view</tt></font>.
 <p>
 
 The next thing you should do is to create at least one view of your own. Use the

data/lib/helpers-blog.rb

@@ -50,9 +50,9 @@ module RuneBlog::Helpers
     dirs.map {|name| RuneBlog::View.new(name) }
   end
 
-  def new_dotfile(root: "./.blog/data", current_view: "no_default", editor: "vi")
-    raise BlogAlreadyExists if Dir.exist?(".blog")
-    Dir.mkdir(".blog")
+  def new_dotfile(root: "./.blogs/data", current_view: "no_default", editor: "vi")
+    raise BlogAlreadyExists if Dir.exist?(".blogs")
+    Dir.mkdir(".blogs")
     x = OpenStruct.new
     x.root, x.current_view, x.editor = root, current_view, editor
     write_config(x, RuneBlog::ConfigFile)
@@ -71,12 +71,12 @@ module RuneBlog::Helpers
     dirs
   end
 
-  def find_src_slugs
+  def find_draft_slugs
     verify(@root => "#@root is nil",
            Dir.exist?(@root) => "#@root doesn't exist",
-           Dir.exist?("#@root/src") => "#@root/src doesn't exist")
-    files = Dir["#@root/src/**"].grep /\d{4}.*.lt3$/
-    flagfile = "#@root/src/last_rebuild"
+           Dir.exist?("#@root/drafts") => "#@root/drafts doesn't exist")
+    files = Dir["#@root/drafts/**"].grep /\d{4}.*.lt3$/
+    flagfile = "#@root/drafts/last_rebuild"
     last = File.exist?(flagfile) ? File.mtime(flagfile) : (Time.now - 86_400)
     files.reject! {|f| File.mtime(f) > last }
     files.map! {|f| File.basename(f) }

data/lib/helpers-repl.rb

@@ -197,8 +197,8 @@ module RuneBlog::REPL
     @title = grep.sub(/^.title /, "")
     @slug = @blog.make_slug(@title) # import (not impl)
     @fname = @slug + ".lt3"
-    result = system("cp #{name} #@root/src/#@fname")
-    raise CantCopy(name, "#@root/src/#@fname") unless result
+    result = system("cp #{name} #@root/drafts/#@fname")
+    raise CantCopy(name, "#@root/drafts/#@fname") unless result
 
     edit_initial_post(@fname)
     process_post(@fname)

data/lib/liveblog.rb

@@ -130,7 +130,7 @@ end
 def image   # primitive so far
   _debug "img: huh? <img src=#{_args.first}></img>"
   fname = _args.first
-  path = "../assets/#{fname}"
+  path = "assets/#{fname}"
   _out "<img src=#{path}></img>"
   _optional_blank_line
 end

data/lib/post.rb

@@ -103,7 +103,7 @@ class RuneBlog::Post
     html = RuneBlog.post_template(title: @meta.title, date: @meta.pubdate, 
                view: @meta.view, teaser: @meta.teaser, body: @meta.body,
                views: @meta.views, tags: @meta.tags, home: viewhome)
-    srcdir = "#{@blog.root}/src/"
+    srcdir = "#{@blog.root}/drafts/"
     verify(Dir.exist?(srcdir) => "#{srcdir} not found",
            @meta.slug.is_a?(String) => "slug #{@meta.slug.inspect} is invalid")
     fname  = @meta.slug + ".lt3"
@@ -121,13 +121,14 @@ class RuneBlog::Post
   end 
 
   def build
+STDERR.puts "BUILD: #{RuneBlog.constants.sort.inspect}"
     debug "=== build"
     views = @meta.views
     text = File.read(@draft)
-    livetext = Livetext.new(STDOUT)
+    livetext = Livetext::Livetext.new(STDOUT)
     Livetext.parameters = [@blog, @meta.num, livetext]
     meta = livetext.process_text(text)
-    raise LivetextError(@draft) if meta.nil?
+    raise RuneBlog::LivetextError(@draft) if meta.nil?
 
     meta.num = File.basename(@draft).to_i
     # FIXME what if title changes? slug should change?

data/lib/publish.rb

@@ -26,7 +26,7 @@ class RuneBlog::Publishing
   end
 
   def url
-    vname = @blog.view.name.gsub(/_/, "\\_")
+    vname = @blog.view.name # .gsub(/_/, "\\_")
     url = "#@proto://#@server/#@path/#{vname}"
   end
 
@@ -40,8 +40,9 @@ debug "Failed!\n " if ! rc
   def publish(files, assets=[])
     dir = "#@docroot/#@path"
     view_name = @blog.view.name
-    result = system!("ssh #@user@#@server -x mkdir -p #{dir}/#{view_name}") 
-    result = system!("ssh #@user@#@server -x mkdir -p #{dir}/assets") 
+    viewpath = "#{dir}/#{view_name}"
+    result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}") 
+#   result = system!("ssh #@user@#@server -x mkdir -p #{dir}/assets") 
     files.each do |file|
       dest = "#@user@#@server:#{dir}/#{view_name}"
       file.gsub!(/\/\//, "/")  # weird... :-/
@@ -51,7 +52,7 @@ debug "Failed!\n " if ! rc
       result = system!(cmd) || puts("\n  Could not copy #{file} to #{dest}")
     end
     unless assets.empty?
-      cmd = "scp #{assets.join(' ')} #@user@#@server:#{dir}/assets >/dev/null 2>/tmp/wtf2"
+      cmd = "scp #{assets.join(' ')} #@user@#@server:#{viewpath}/assets >/dev/null 2>/tmp/wtf2"
       result = system!(cmd)
       raise PublishError if !result
     end

data/lib/repl.rb

@@ -39,8 +39,8 @@ module RuneBlog::REPL
     check_empty(arg)
     dir = @blog.view.dir
     items = ["publish", 
-             "templates/blogview.lt3", 
-             "templates/post_template.html"] 
+             "themes/standard/blogview.lt3", 
+             "themes/standard/post/index.lt3"] 
     num, fname = STDSCR.menu(title: "Edit file:", items: items)
     edit_file("#{dir}/#{fname}")
   end
@@ -128,7 +128,7 @@ module RuneBlog::REPL
     reset_output
     check_empty(arg)
     puts unless testing
-    files = @blog.find_src_slugs
+    files = @blog.find_draft_slugs
     if files.empty? 
       msg = "No files changed"
       output! msg
@@ -137,7 +137,7 @@ module RuneBlog::REPL
     end
     files.each {|file| @blog.rebuild_post(file) }
     @blog.dirty_views.each {|view| generate_index(view) }  # All views for now?
-    File.write("#{@blog.root}/src/last_rebuild", Time.now)
+    File.write("#{@blog.root}/drafts/last_rebuild", Time.now)
     @out
   end
 
@@ -227,7 +227,7 @@ module RuneBlog::REPL
     id = get_integer(arg)
     # Simplify this
     tag = "#{'%04d' % id}"
-    files = Find.find(@blog.root+"/src").to_a
+    files = Find.find(@blog.root+"/drafts").to_a
     files = files.grep(/#{tag}-/)
     files = files.map {|f| File.basename(f) }
     if files.size > 1
@@ -244,7 +244,7 @@ module RuneBlog::REPL
     end
 
     file = files.first
-    result = edit_file("#{@blog.root}/src/#{file}")
+    result = edit_file("#{@blog.root}/drafts/#{file}")
     @blog.rebuild_post(file)
 sleep 5
     @out

data/lib/runeblog.rb

@@ -13,11 +13,12 @@ require 'post'
 
 class RuneBlog
  
-  DotDir = ".blog"
+  DotDir     = ".blogs"
   ConfigFile = "#{DotDir}/config"
+  GemData    = RuneBlog::Path + "/../data"
 
   make_exception(:FileNotFound,      "File $1 was not found")
-  make_exception(:BlogAlreadyExists, "Blog $1 already exists")
+  make_exception(:BlogRepoAlreadyExists, "Blog repo $1 already exists")
   make_exception(:CantAssignView,    "$1 is not a view")
   make_exception(:ViewAlreadyExists, "View $1 already exists")
   make_exception(:DirAlreadyExists,  "Directory $1 already exists")
@@ -38,22 +39,53 @@ class RuneBlog
 
   include Helpers
 
-  def self.create_new_blog(blog_name, dir = ".blog/data")
+=begin
+  timestamps
+	  filename (cf with real file)
+		
+	themes
+	  standard
+		  head.lt3
+	  	meta.lt3
+    	global.lt3
+	  	assets/
+	  	blog/
+			  [kill assets?]
+				sidebar/
+				  ad.lt3
+					calendar.lt3
+					news.lt3
+					tag_cloud.lt3
+				_postentry
+				generate.lt3
+				index.lt3
+				meta.lt3
+				navbar.lt3
+	  	post/
+			  generate.lt3
+				head.lt3
+				index.lt3
+=end
+
+  def self.create_new_blog_repo(repo_filename, dir = ".blogs/data")
     raise ArgumentError unless dir.is_a?(String) && ! dir.empty?
     root_dir = Dir.pwd + "/" + dir
-    raise BlogAlreadyExists if Dir.exist?(root_dir)
-    new_dotfile(root: root_dir, current_view: blog_name)
+    raise BlogRepoAlreadyExists if Dir.exist?(root_dir)
+    new_dotfile(root: root_dir, current_view: repo_filename)
     create_dir(dir)
+# New code goes here! 
     Dir.chdir(dir) do
+      create_dir("drafts")
       create_dir("views")
-      create_dir("assets")
-      create_dir("src")
+#???  create_dir("generated")
+#?    create_dir("assets")
       new_sequence
     end
     blog = self.new
-    blog.create_view(blog_name)
+STDERR.puts :cp021
+    blog.create_view(repo_filename)
   rescue => err
-    puts "Can't create blog: '#{dir}' - #{err}"
+    puts "Can't create blog repo: '#{dir}' - #{err}"
     puts err.backtrace.join("\n")
   end
 
@@ -122,32 +154,60 @@ class RuneBlog
   end
 
   def create_view(arg)
+STDERR.puts :cp029
     debug "=== create_view #{arg.inspect}"
+STDERR.puts :cp029a
     raise ArgumentError unless arg.is_a?(String) && ! arg.empty?
 
+STDERR.puts :cp029b
     names = self.views.map(&:to_s)
+STDERR.puts :cp029c
     raise ViewAlreadyExists(arg) if names.include?(arg)
 
+STDERR.puts :cp029d
     dir = "#@root/views/#{arg}/"
+STDERR.puts :cp029e
     raise DirAlreadyExists(dir) if Dir.exist?(dir)
+STDERR.puts :cp029f
     create_dir(dir)
+STDERR.puts :cp029g
     up = Dir.pwd
+STDERR.puts :cp029h
     Dir.chdir(dir)
+STDERR.puts :cp029i
     x = RuneBlog::Default
-    create_dir('templates')
+STDERR.puts :cp029j
+    create_dir('themes')
+STDERR.puts :cp029k
+    create_dir("local")
+STDERR.puts :cp029l
+    create_dir("generated")
+STDERR.puts :cp029m
+## new code...
+    Dir.chdir("themes")  { system("tar zxvf #{GemData}/standard.tgz 2>/dev/null") }
+STDERR.puts :cp029n
     create_dir('assets')
+STDERR.puts :cp029o
+## add default stuff to assets?
     pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
     dump(pub, "publish")
-    dump("", "tagpool")
+#?  dump("", "tagpool")
     view = RuneBlog::View.new(arg)
     self.view = view
+# Rewrite this! think: livetext themes/standard/generate.lt3
+#  (output goes elsewhere)
+    # This is just all wrong now?
+STDERR.puts :cp029p
     live = Livetext.new(nil)
+STDERR.puts :cp029q
     Livetext.parameters = [RuneBlog.blog, 0, live]
+STDERR.puts :cp029r
     meta = live.transform(x::BlogTemplate)
-    dump(meta, "templates/blogview.lt3")
-#   dump(x::BlogHeader, "templates/blog_header.html")
-#   dump(x::BlogTrailer, "templates/blog_trailer.html")
+STDERR.puts :cp029s
+    dump(meta, "themes/standard/blogview.lt3")
+STDERR.puts :cp029t
     dump("Initial creation", "last_published")
+STDERR.puts :cp029u
     Dir.chdir(up)
     @views << view
     @views
@@ -192,7 +252,7 @@ class RuneBlog
 
   def edit_initial_post(file, testing = false)
     debug "=== edit_initial_post #{file.inspect}  => #{sourcefile}"
-    sourcefile = "#@root/src/#{file}"
+    sourcefile = "#@root/drafts/#{file}"
     result = system("#@editor #{sourcefile} +8") unless testing
     raise EditorProblem(sourcefile) unless result
     nil
@@ -207,7 +267,7 @@ class RuneBlog
   end
 
   def drafts
-    dir = "#@root/src"
+    dir = "#@root/drafts"
     drafts = Dir.entries(dir).grep(/^\d{4}.*/)
   end
 
@@ -223,7 +283,7 @@ class RuneBlog
 #   puts "    process_post #{file.inspect}   pwd = #{Dir.pwd}"
     debug "=== process_post #{file.inspect}   pwd = #{Dir.pwd}"
     raise ArgumentError unless file.is_a?(String)
-    path = @root + "/src/#{file}"
+    path = @root + "/drafts/#{file}"
     raise FileNotFound(path) unless File.exist?(path)
     num = file.to_i       # e.g. 0098-this-is-a-title
     live = Livetext.new # (STDOUT) # (nil)
@@ -248,12 +308,8 @@ class RuneBlog
     head = tail = nil
     @blogview = nil
     Dir.chdir(vdir) do 
-      @blogview = File.read("templates/blogview.lt3")
-#     head = File.read("templates/blog_header.html")
-#     tail = File.read("templates/blog_trailer.html")
+      @blogview = File.read("themes/standard/blogview.lt3")
     end
-#   @bloghead = interpolate(head)
-#   @blogtail = interpolate(tail)
 
     # Output view
     posts.map! do |post|
@@ -352,7 +408,7 @@ class RuneBlog
   def delete_draft(num)
     raise ArgumentError unless num.is_a?(Integer)
     tag = prefix(num)
-    system("rm -rf #@root/src/#{tag}-*")
+    system("rm -rf #@root/drafts/#{tag}-*")
   end
 
   def post_exists?(num)

data/lib/runeblog_version.rb

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

data/lib/view.rb

@@ -35,8 +35,8 @@ class RuneBlog::View
     vdir = dir()
     files = [index()]
     others = Dir.entries(vdir).grep(/^\d\d\d\d/).map {|x| "#{vdir}/#{x}" }
-    assets = Dir.entries("#{@blog.root}/assets") - %w[. ..]
-    assets.map! {|x| "#{@blog.root}/assets/#{x}" }
+    assets = Dir.entries("#{vdir}/assets") - %w[. ..]
+    assets.map! {|x| "#{vdir}/assets/#{x}" }
     assets.reject! {|x| File.directory?(x) }
 #   assets.reject! {|x| ! recent?(x) }
     files = files + others

data/runeblog.gemspec

@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.authors     = ["Hal Fulton"]
   s.email       = 'rubyhacker@gmail.com'
   s.executables << "blog"
-  s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.83'
+  s.add_runtime_dependency 'livetext', '~> 0.8', '>= 0.8.84'
   s.add_runtime_dependency 'rubytext', '~> 0.1', '>= 0.1.16'
 
   # Files...

data/test/general_test.rb

@@ -32,7 +32,7 @@ class TestREPL < Minitest::Test
     @blog = RuneBlog.new
   end
 
-  # Note: "Bang" methods depend on the data_test subtree
+  # Note: "Bang" methods depend on the data subtree
 
   def test_001_cmd_help
 #   puts __method__
@@ -286,7 +286,7 @@ end  # conditional tests
   def xtest_024_exception_livetext_error   # FIXME Doesn't work! Change Livetext
 #   puts __method__
     testfile = "testfile.lt3"
-    path = @blog.root + "/src/" + testfile
+    path = @blog.root + "/drafts/" + testfile
     cmd = "echo .no_such_command > #{path}"
     system(cmd)
 #   system("ls -l #{path}")

data/test/make_blog.rb

@@ -29,18 +29,24 @@ def show_lines(text)
   str
 end
 
-system("rm -rf .blog")
-RuneBlog.create_new_blog('test_view', ".blog/data_test")
+STDERR.puts :cp01
+
+system("rm -rf .blogs")
+STDERR.puts :cp02
+RuneBlog.create_new_blog_repo('test_view', ".blogs/data")
+STDERR.puts :cp03
 x = RuneBlog.new
+STDERR.puts :cp04
 x.create_view("alpha_view")
+STDERR.puts :cp05
 
 # Hack:
 if File.exist?("publish")
-  system("cp publish .blog/data_test/views/alpha_view/publish")
+  system("cp publish .blogs/data/views/alpha_view/publish")
 end
 # puts "inside make_blog: pwd = #{Dir.pwd}"
-system("cp test/fakeimage.jpg .blog/data_test/assets/")
-system("cp test/fakeimage.jpg .blog/data_test/views/alpha_view/assets/")
+system("cp test/fakeimage.jpg .blogs/data/assets/")
+system("cp test/fakeimage.jpg .blogs/data/views/alpha_view/assets/")
 
 x.create_view("beta_view")
 x.create_view("gamma_view")

data/test/test

@@ -1,3 +1,3 @@
-rm -rf data_test
+rm -rf data
 ruby test/make_blog.rb
 ruby test/general.rb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.67
+  version: 0.1.68
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-13 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: livetext
@@ -19,7 +19,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.83
+        version: 0.8.84
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.83
+        version: 0.8.84
 - !ruby/object:Gem::Dependency
   name: rubytext
   requirement: !ruby/object:Gem::Requirement