runeblog 0.1.74 → 0.1.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8887f24789a03d99de20f8b9494ba5a63f13c1a66fab44c6d8e45c7b8ca194ed
-  data.tar.gz: 6a61b3fd742b4136e9782d1a5b00f47d5b1651bf25a732d0c9214e97682e669c
+  metadata.gz: 0470ad7c94aa5cb9de8da34f2939c4dcab2f763da6c2dafb21ef2cf7e736b4c2
+  data.tar.gz: e254ba0ab1d45cea175e1e74e2d00c2dde7889f407c544f41d226342e8a6411f
 SHA512:
-  metadata.gz: 5d3f15071f792b4704730516f5f643b2d1fc3924ce9fdd1f7435d80b91a20517bcad6f858227839d73b7dced3bf1a54aefe946983d21d2f6213af597930c1b47
-  data.tar.gz: f1e6d968e46a0386148746df2f7410262bdcea0701842b81060c6cd286da386d97d6f2b552d22cadfa3510d4efebc7dd3601a5f86918995a75d1b611c659db86
+  metadata.gz: 99fe9e5f8b55e3fa7831adc49ca9a32ea26ea842a927fa497cc70c611f80c8c8cd60f83d83dcfaa5501d392cdedd528d16a5b018b342ef33009f9a621399b1d8
+  data.tar.gz: 89109d824983f4f2d342ac1e1f5a29d233776f38a68387045053f86a4dcef2217740818daa448cfe6fef8389285307c2c196a8347dce55581a58f7b49a9e9861

data/lib/helpers-blog.rb

@@ -3,16 +3,17 @@ require 'runeblog_version'
 module RuneBlog::Helpers
 
   def read_config(file, *syms)
-    verify(File.exist?(file) => "File #{file} doesn't exist")
+#   verify(File.exist?(file) => "File #{file} doesn't exist")
     lines = File.readlines(file).map(&:chomp)
-    obj = OpenStruct.new
+    obj = ::OpenStruct.new
     lines.each do |line|
       next if line == "\n" || line[0] == "#"
-      key, val = line.split(" ", 2)
-      key = key[0..-2] # remove colon
+      key, val = line.split(/: +/, 2)
+# STDERR.puts [key, val].inspect
       obj.send(key+"=", val)
     end
     return obj if syms.empty?
+
     vals = []
     if syms.empty?
       vals = obj.to_hash.values
@@ -30,6 +31,7 @@ module RuneBlog::Helpers
   def try_read_config(file, hash)
     return hash.values unless File.exist?(file)
     vals = read_config(file, *hash.keys)
+# STDERR.puts vals.inspect
     vals
   end
 

data/lib/publish.rb

@@ -42,11 +42,12 @@ debug "Failed!\n " if ! rc
 #   root@rubyhacker.com:/var/www/testblog/alpha_view
 
   def publish(files, assets=[])
+STDERR.puts "-- publish: files = #{files.inspect}   assets = #{assets.inspect}"
     dir = "#@docroot/#@path"
     view_name = @blog.view.name
     viewpath = "#{dir}/#{view_name}"
     result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}") 
-#   result = system!("ssh #@user@#@server -x mkdir -p #{dir}/assets") 
+    result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}/assets") 
     files.each do |file|
       dest = "#@user@#@server:#{dir}/#{view_name}"
       file.gsub!(/\/\//, "/")  # weird... :-/

data/lib/repl.rb

@@ -91,6 +91,7 @@ module RuneBlog::REPL
   end
 
   def cmd_publish(arg, testing = false)
+# Future Hal says please refactor this
     puts unless testing
     reset_output
     check_empty(arg)
@@ -99,6 +100,7 @@ module RuneBlog::REPL
       output! "Can't publish without entries in #{@blog.view.name}/publish"
       return @out
     end
+
     # Need to check dirty/clean status first
     dirty, all, assets = @blog.view.publishable_files
     files = dirty
@@ -114,6 +116,7 @@ module RuneBlog::REPL
       @blog.view.publisher.publish(files, assets)  # FIXME weird?
     end
     return @out unless ret
+
     vdir = @blog.view.dir
     dump("fix this later", "#{vdir}/last_published")
     if ! testing || ! ret

data/lib/runeblog.rb

@@ -166,11 +166,12 @@ class RuneBlog
     Dir.chdir(vdir)
     x = RuneBlog::Default
     create_dir('themes')
-#   create_dir("local")
     create_dir("generated")
     create_dir('assets')
 
     Dir.chdir("themes") { system("tar zxvf #{GemData}/standard.tgz 2>/dev/null") }
+    system("cp themes/standard/blog/assets/* assets/")
+    
     pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
     dump(pub, "publish")
 
@@ -180,7 +181,7 @@ class RuneBlog
     self.view = view
     vdir = self.view.dir
     dir0 = "#{vdir}/themes/standard/blog"
-    dir1 = "#{vdir}/generated/blog"
+    dir1 = "#{vdir}/generated"
     system("livetext #{dir0}/generate.lt3 >#{dir1}/index.html 2>#{dir1}/index.err")
     dump("Initial creation", "last_published")
     Dir.chdir(up)
@@ -277,7 +278,7 @@ class RuneBlog
 
     vdir = self.view.dir
     dir0 = "#{vdir}/themes/standard/blog"
-    dir1 = "#{vdir}/generated/blog"
+    dir1 = "#{vdir}/generated"
     system("livetext #{dir0}/generate.lt3 >#{dir1}/index.html 2>#{dir1}/index.err")
   rescue => err
     error(err)

data/lib/runeblog_version.rb

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

data/lib/view.rb

@@ -24,7 +24,7 @@ class RuneBlog::View
   end
 
   def local_index
-    dir + "/generated/blog/index.html"
+    dir + "/generated/index.html"
   end
 
   def index
@@ -38,9 +38,18 @@ class RuneBlog::View
   def publishable_files
     vdir = dir()
     files = [local_index()]
-    others = Dir.entries(vdir).grep(/^\d\d\d\d/).map {|x| "#{vdir}/#{x}" }
+    others = Dir.entries(vdir + "/generated").grep(/^\d\d\d\d/).map {|x| "#{vdir}/generated/#{x}" }
+STDERR.puts "-- publishable:  others = #{others.inspect}"
+    deep_assets = Dir["#{vdir}/themes/standard/assets/*"]
+# Do this at view creation
+    deep_assets.each do |file| 
+      cmd = "cp #{file} #{vdir}/assets"
+STDERR.puts "-- cmd = #{cmd}"
+      system(cmd)
+    end
     assets = Dir.entries("#{vdir}/assets") - %w[. ..]
     assets.map! {|x| "#{vdir}/assets/#{x}" }
+STDERR.puts "-- publishable: assets = #{assets.inspect}"
     assets.reject! {|x| File.directory?(x) }
 #   assets.reject! {|x| ! recent?(x) }
     files = files + others

data/test/make_blog.rb

@@ -39,7 +39,6 @@ x.create_view("around_austin")   # FIXME remember view title!
 if File.exist?("publish")
   system("cp publish .blogs/data/views/around_austin/publish")
 end
-system("cp test/fakeimage.jpg .blogs/data/views/around_austin/assets/")
 
 x.create_view("computing")
 

metadata

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