runeblog 0.1.90 → 0.1.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9687bddcc20a39a654a99603151b884aac19cd4e6eded49c8353168fa38f388d
-  data.tar.gz: 61fdab92aa959e73840ae5021864fe700642ddc705c9ca118b6ce318c5e3876a
+  metadata.gz: d0ecc0207a215d6ecb745fc93ef707d330990f287637f0e6838ea996ef8a3922
+  data.tar.gz: f00e1ab6255ae818b30d345408e44a3735dc907b9d16cf9ab51fc473bd6bedeb
 SHA512:
-  metadata.gz: 9dca839400cbae673b05ec03128c15cbab360ff445e56de78d51aac4a1441e139fd3f13357bf13c75500bd0cad6010d9b3276262ae9011c08bd2d15787e4285b
-  data.tar.gz: 237b98bcdbc8d784a64668db6e7ff6488531f36d2f23f94847ba8fdccb9564473f133c3bdabbd7f868a5b2c626fb9c65046e9d251890851aad12e6aef9f50abe
+  metadata.gz: 9e13e2828c71f69a5fd40dc4da1c1cf604e2222ad8d1c919e4402a662e7224aa488512f6c2107d48336a96049cf61d830fe93d4247e278c7ac755e511ef7b03b
+  data.tar.gz: 26aac596e6e68e5b37bd36c1aacb193f22da135a5e299a68437f46b34d52e74f343e5e22960b6d879a132d772febb66049876dd5f4a1ba969dccdfd9f942d7f7

data/lib/helpers-blog.rb

@@ -133,11 +133,14 @@ end
     files
   end
 
-  def create_dir(dir)
-    return if Dir.exist?(dir)  #  && File.directory?(dir)
-    cmd = "mkdir -p #{dir} >/dev/null"  #  2>&1"
-    result = system(cmd) 
-    raise CantCreateDir(dir) unless result
+  def create_dirs(*dirs)
+    dirs.each do |dir|
+      dir = dir.to_s  # symbols allowed
+      next if Dir.exist?(dir)
+      cmd = "mkdir -p #{dir} >/dev/null"
+      result = system(cmd) 
+      raise CantCreateDir(dir) unless result
+    end
   end
 
   def interpolate(str, binding)

data/lib/liveblog.rb

@@ -8,15 +8,6 @@ require 'runeblog'
 errfile = File.new("liveblog.out", "w")
 STDERR.reopen(errfile)
 
-# def title                   # side-effect
-# def pubdate                 # side-effect
-# def tags                    # side-effect
-# def views                   # side-effect
-# def pin                     # side-effect
-# def write_post              # side-effect
-# def main                    # side-effect
-# def _post_lookup(postid)    # side-effect
-
 def init_liveblog    # FIXME - a lot of this logic sucks
   here = Dir.pwd
   dir = here
@@ -122,7 +113,7 @@ def _passthru_noline(line)
   _out "<p>" if line.empty? && ! @_nopara
 end
 
-def title    # side-effect
+def title
   raise "'post' was not called" unless @meta
   title = @_data.chomp
   @meta.title = title
@@ -131,7 +122,7 @@ def title    # side-effect
   _optional_blank_line
 end
 
-def pubdate    # side-effect 
+def pubdate
   raise "'post' was not called" unless @meta
   _debug "data = #@_data"
   # Check for discrepancy?
@@ -151,21 +142,21 @@ def image   # primitive so far
   _optional_blank_line
 end
 
-def tags    # side-effect
+def tags
   raise "'post' was not called" unless @meta
   _debug "args = #{_args}"
   @meta.tags = _args.dup || []
   _optional_blank_line
 end
 
-def views    # side-effect
+def views
   raise "'post' was not called" unless @meta
   _debug "data = #{_args}"
-  @meta.views = _args.dup # + ["main"]
+  @meta.views = _args.dup
   _optional_blank_line
 end
 
-def pin    # side-effect  
+def pin
   raise "'post' was not called" unless @meta
   _debug "data = #{_args}"
   # verify only already-specified views?
@@ -196,7 +187,7 @@ def list!
   _optional_blank_line
 end
 
-def write_post    # side-effect
+def write_post
   raise "'post' was not called" unless @meta
   save = Dir.pwd
   @postdir.gsub!(/\/\//, "/")  # FIXME unneeded?
@@ -231,7 +222,7 @@ def finalize
     return
   end
   if @blog.nil?
-    return @meta  # @live.body
+    return @meta
   end
 
   @slug = @blog.make_slug(@meta)
@@ -361,15 +352,16 @@ def meta
   _out str
 end
 
-def main    # side-effect
+def recent_posts    # side-effect
   _out %[<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12">]
-  which = _args[0]
-  case which
-    when "recent_posts"
-      all_teasers
-    when "post"   # No longer needed??
-      _out %[<iframe style="width: 100vw;height: 100vh;position: relative;" src='whats-at-stubbs.html' width=100% frameborder="0" allowfullscreen></iframe>]
-  end
+  all_teasers
+  ## which = _args[0]
+  ## case which
+  ##   when "recent_posts"
+  ##     all_teasers
+  ##   when "post"   # No longer needed??
+  ##     _out %[<iframe style="width: 100vw;height: 100vh;position: relative;" src='whats-at-stubbs.html' width=100% frameborder="0" allowfullscreen></iframe>]
+  ## end
   _out %[</div>]
 end
 

data/lib/runeblog.rb

@@ -54,11 +54,9 @@ class RuneBlog
     $_blog = self            # Dumber still?
     root = Dir.pwd + "/" + root
     raise BlogRepoAlreadyExists if Dir.exist?(root)
-    create_dir(root)
+    create_dirs(root)
     Dir.chdir(root) do
-      create_dir("drafts")
-      create_dir("views")
-#?    create_dir("assets")
+      create_dirs(:drafts, :views)
       new_sequence
     end
     put_config(root: root)
@@ -172,36 +170,27 @@ class RuneBlog
 
     vdir = "#@root/views/#{arg}/"
     raise DirAlreadyExists(vdir) if Dir.exist?(vdir)
-    create_dir(vdir)
+    create_dirs(vdir)
     up = Dir.pwd
 
-    Dir.chdir(vdir)
-    x = RuneBlog::Default
-#   create_dir('themes')
-    copy!("#{Themes}", "themes")
-    create_dir('assets')
-    create_dir('posts')
+    Dir.chdir(vdir) do
+      x = RuneBlog::Default
+      copy!("#{Themes}", "themes")
+      create_dirs(:assets, :posts)
+      create_dirs(:staging, :remote)
+      copy!("themes/standard/*", "staging/")
+      copy!("themes/standard/*", "remote/")
 
-    create_dir('staging')
-#   create_dir('staging/assets')
-#   create_dir('staging/blog')
-    create_dir('remote')
-#   create_dir('remote/assets')
+      pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
+      dump(pub, "publish")
 
-    copy!("themes/standard/*", "staging/")
-#   copy!("themes/standard/blog/*", "staging/blog/")
-    copy!("themes/standard/*", "remote/")
+      # Add to global.lt3 here?  FIXME
 
-    pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
-    dump(pub, "publish")
-
-    # Add to global.lt3 here?  FIXME
-
-    view = RuneBlog::View.new(arg)
-    self.view = view
-    vdir = self.view.dir
-    dump("Initial creation", "last_published")
-    Dir.chdir(up)
+      view = RuneBlog::View.new(arg)
+      self.view = view
+      vdir = self.view.dir
+      dump("Initial creation", "last_published")
+    end  
     @views << view
     @views
   end

data/lib/runeblog_version.rb

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

data/themes/standard/blog/generate.lt3

@@ -7,10 +7,10 @@
 .include global.lt3
 .include blog/head.lt3
   <body>
-    $.include navbar.lt3
+    $.include navbar/navbar.lt3
     <div class="content container-fluid mt-4">
       <div class="row">
-        $.include blog-index.lt3
+        $.include blog/index.lt3
       </div>
     </div>
   </body>

data/themes/standard/blog/index.lt3

@@ -0,0 +1,4 @@
+.recent_posts
+
+.sidebar! ad news calendar tag-cloud
+

data/themes/standard/liveblog.out

@@ -0,0 +1,27 @@
+In /Users/Hal/Dropbox/files/runeblog/themes/standard
+     - about to process global.lt3
+    ...finished
+In /Users/Hal/Dropbox/files/runeblog/themes/standard
+     - about to process blog/head.lt3
+In /Users/Hal/Dropbox/files/runeblog/themes/standard
+     - about to process meta.lt3
+    ...finished
+In /Users/Hal/Dropbox/files/runeblog/themes/standard
+     - about to process navbar.lt3
+    ...finished
+In /Users/Hal/Dropbox/files/runeblog/themes/standard
+     - about to process blog-index.lt3
+In /Users/Hal/Dropbox/files/runeblog/themes/standard
+     - about to process sidebar/ad.lt3
+    ...finished
+In /Users/Hal/Dropbox/files/runeblog/themes/standard
+     - about to process sidebar/news.lt3
+    ...finished
+In /Users/Hal/Dropbox/files/runeblog/themes/standard
+     - about to process sidebar/calendar.lt3
+    ...finished
+In /Users/Hal/Dropbox/files/runeblog/themes/standard
+     - about to process sidebar/tag-cloud.lt3
+    ...finished
+    ...finished
+    ...finished

data/themes/standard/{post-generate.lt3 → post/generate.lt3}

@@ -8,9 +8,13 @@
 
 .include global.lt3
 .include blog/head.lt3
+. post head stuff...
+
+. html/body mismatch?
+
 <section class="post">
   <div class="entry-content">
-    $.include post-index.lt3
+    $.include post/index.lt3
   </div>
 </section>
 </body>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.90
+  version: 0.1.91
 platform: ruby
 authors:
 - Hal Fulton
@@ -78,22 +78,21 @@ files:
 - test/make_blog.rb
 - test/test
 - themes/standard/README
-- themes/standard/about.html
 - themes/standard/assets/blog.css
 - themes/standard/assets/favicon.ico
-- themes/standard/blog-index.lt3
-- themes/standard/blog-meta.lt3
-- themes/standard/blog-navbar.lt3
 - themes/standard/blog/generate.lt3
 - themes/standard/blog/head.lt3
+- themes/standard/blog/index.lt3
 - themes/standard/blog/post_entry.lt3
 - themes/standard/global.lt3
 - themes/standard/head.lt3
+- themes/standard/liveblog.out
 - themes/standard/meta.lt3
-- themes/standard/navbar.lt3
-- themes/standard/post-generate.lt3
-- themes/standard/post-head.lt3
-- themes/standard/post-index.lt3
+- themes/standard/navbar/about.html
+- themes/standard/navbar/navbar.lt3
+- themes/standard/post/generate.lt3
+- themes/standard/post/head.lt3
+- themes/standard/post/index.lt3
 - themes/standard/sidebar/ad.lt3
 - themes/standard/sidebar/calendar.lt3
 - themes/standard/sidebar/news.lt3

data/themes/standard/blog-index.lt3

@@ -1,6 +0,0 @@
-.main recent_posts
-
-. Should sidebar just stick items on its command line?
-
-.sidebar! ad news calendar tag-cloud
-

data/themes/standard/blog-meta.lt3

@@ -1,3 +0,0 @@
-.meta charset: utf-8
-.meta http-equiv: X-UA-Compatible content: IE=edge,chrome=1
-.meta name: viewport content: width=device-width,initial-scale=1

data/themes/standard/blog-navbar.lt3

@@ -1,6 +0,0 @@
-.navbar
-  index.html   Home
-  about.html   About
-  contact.html Contact
-.end
-