runeblog 0.1.69 → 0.1.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01a59a40806ea47e4c1050698e94fe48047c853357b2dd8dcc7519973d7969ed
-  data.tar.gz: f63c02e9da788ef463339a9cf9f0e0a3502975e7a1eaedd3bda935f53f9ab2fd
+  metadata.gz: d56c583d5c56cb0677103fb74bfa9a88b5bba7a20ecee2ac759ae2eac2eaae2d
+  data.tar.gz: 8a13ccf8eb72166107b7432cf6f738110310f6dfddfc0a3303bc88c7d5362fd6
 SHA512:
-  metadata.gz: 71bf1ca60168bcb5297271eacd173f3f70e1447ac575c0d3e034ae0a3884024fdca117c4780cc401f48a5c73095864b15616253c1d8d4b0453aeac4a2d8a9875
-  data.tar.gz: 2034c163ca26b8215d9f9e5fa9debf3024924fdc506791868615ff791446ccb10fbbfb48b264ad277c4b2f3d6ed0116c30dd32a5dd84191e093592ee5d9ca1a4
+  metadata.gz: 5ef2c59f399c79478050fcf181e18dfce27d46c546ec0510b674416e9f103f2a67b104c20ac64870aff1e79131d472ebadb6a64aa29fa4c0c004ea3ba3728872
+  data.tar.gz: 7ba1d1ae569d9075e44b1dbec69e53ef29ca6a42971e3b16f560f2563f012f1ecdb9686ebeb343b1f5212e61392f3a1ca34eec863487e0b6eb0dc2735650a56a

data/lib/helpers-repl.rb

@@ -102,6 +102,7 @@ module RuneBlog::REPL
     Regexes.each_pair do |rx, meth|
       m = cmd.match(rx)
       result = m ? m.to_a : nil
+p [result, rx, meth]
       next unless result
       found = meth
       params = m[1]

data/lib/post.rb

@@ -121,11 +121,10 @@ class RuneBlog::Post
   end 
 
   def build
-STDERR.puts "BUILD: #{RuneBlog.constants.sort.inspect}"
     debug "=== build"
     views = @meta.views
     text = File.read(@draft)
-    livetext = Livetext::Livetext.new(STDOUT)
+    livetext = Livetext.new(STDOUT)
     Livetext.parameters = [@blog, @meta.num, livetext]
     meta = livetext.process_text(text)
     raise RuneBlog::LivetextError(@draft) if meta.nil?

data/lib/runeblog.rb

@@ -159,22 +159,26 @@ class RuneBlog
     names = self.views.map(&:to_s)
     raise ViewAlreadyExists(arg) if names.include?(arg)
 
-    dir = "#@root/views/#{arg}/"
-    raise DirAlreadyExists(dir) if Dir.exist?(dir)
-    create_dir(dir)
+    vdir = "#@root/views/#{arg}/"
+    raise DirAlreadyExists(vdir) if Dir.exist?(vdir)
+    create_dir(vdir)
     up = Dir.pwd
-    Dir.chdir(dir)
+
+    Dir.chdir(vdir)
     x = RuneBlog::Default
     create_dir('themes')
-    create_dir("local")
+#   create_dir("local")
     create_dir("generated")
-
-    Dir.chdir("themes")  { system("tar zxvf #{GemData}/standard.tgz 2>/dev/null") }
+    create_dir("generated/blog")
     create_dir('assets')
+
+    Dir.chdir("themes") { system("tar zxvf #{GemData}/standard.tgz 2>/dev/null") }
     pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
     dump(pub, "publish")
+
     view = RuneBlog::View.new(arg)
     self.view = view
+p "---- pwd = #{Dir.pwd}"
     system("livetext themes/standard/generate.lt3 >generated/blog/index.html 2>generated/blog/index.err")
     dump("Initial creation", "last_published")
     Dir.chdir(up)
@@ -265,41 +269,17 @@ class RuneBlog
   end
 
   def generate_index(view)
+# FIXME This is currently very wrong.
+
 #   puts "  generate_index view = #{view.to_s}"
     debug "=== generate_index view = #{view.to_s}"
     raise ArgumentError unless view.is_a?(String) || view.is_a?(RuneBlog::View)
-    # Gather all posts, create list
-    vdir = "#@root/views/#{view}"
-    posts = Dir.entries(vdir).grep /^\d{4}/
-    posts = posts.sort.reverse
-
-    # Add view header/trailer
-    head = tail = nil
-    @blogview = nil
-    Dir.chdir(vdir) do 
-      @blogview = File.read("themes/standard/blogview.lt3")
-    end
 
-    # Output view
-    posts.map! do |post|
-      meta = nil
-      pdir = vdir + "/" + post
-      Dir.chdir(pdir) do
-        meta = read_config("metadata.txt")
-        meta.num = post.to_i  # first 4 digits
-        check_meta(meta, "gen_index")
-        meta.teaser = File.read("teaser.txt")
-        meta.body = File.read("body.txt")
-      end
-      meta  # block return
-    end
+    vdir = self.view.dir
+    up = Dir.pwd
+    Dir.chdir(vdir)
 
-    File.open("#{vdir}/index.html", "w") do |f|
-      teasers = ""
-      posts.each {|post| teasers << index_entry(view, post) }
-      text = @blogview.sub(/TEASERS/, teasers)
-      f.puts text
-    end
+    system("livetext themes/standard/generate.lt3 >generated/blog/index.html 2>generated/blog/index.err")
   rescue => err
     error(err)
     exit

data/lib/runeblog_version.rb

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

data/test/make_blog.rb

@@ -5,7 +5,6 @@ ver = major.to_i*10 + minor.to_i
 abort "Need Ruby 2.4 or greater" unless ver >= 24
 
 require 'global'
-# require 'rubytext'
 require 'repl'
 
 def getch
@@ -29,8 +28,6 @@ def show_lines(text)
   str
 end
 
-STDERR.puts :cp01
-
 system("rm -rf .blogs")
 RuneBlog.create_new_blog_repo('test_view', ".blogs/data")
 x = RuneBlog.new
@@ -40,8 +37,6 @@ x.create_view("alpha_view")
 if File.exist?("publish")
   system("cp publish .blogs/data/views/alpha_view/publish")
 end
-# puts "inside make_blog: pwd = #{Dir.pwd}"
-system("cp test/fakeimage.jpg .blogs/data/assets/")
 system("cp test/fakeimage.jpg .blogs/data/views/alpha_view/assets/")
 
 x.create_view("beta_view")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.1.69
+  version: 0.1.70
 platform: ruby
 authors:
 - Hal Fulton