runeblog 0.2.92 → 0.2.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a01afc10ad3439db402e06d8c0d5674d247485fe82c63c29160ca70d8e43a6d
-  data.tar.gz: 50df27f119a4df78b1c366dc119e4b84c8fb45a9707a02d43e1e20e8caa32e01
+  metadata.gz: 51a1371a11eb69a62ff435090be403f586c0bddfd8c62ef7dc3e4f97020fee12
+  data.tar.gz: 4d1e82de93ebb0d408964b5d06e6dc4a42f450e064b7174eecd4cb8328054f4a
 SHA512:
-  metadata.gz: 8f3ffe63bab275d26f14c516f24b48c127fc8bd4a661c32b17528a9d0bd399a85294fbb33af24436984a0dfe749d7a7651acc37b096819a71dbb763375d2ef3f
-  data.tar.gz: 6ee5c12a07c7f493b71352ca0aa0bd633810222efda55e19925ed8dc71b4ee42a27b58a352bfce2d1bd815768513c9e9c6216178278995f26cf2188aae8bca93
+  metadata.gz: 8e27ae9cb582a3a84746db31ce664b1ed3a5ed8c47fff9178de4ff5a55e9c41687390b655a13b8df533e498edfe5ffb16af2f3f832c9d9c082353409e2dd17bb
+  data.tar.gz: 73e512eb67281d74c141ecda0de9f75aec04e64402b5ef23a3552d0798e681b3b43aefa2a88fdb9b23bfda95f00b37938a6455599be11a665bcf182ff2b60659

data/empty_view/themes/standard/widgets/pages/pages.rb

@@ -4,7 +4,7 @@
 
 class ::RuneBlog::Widget
   class Pages
-    Type, Title = "pages", "Pages"
+    Type, Title = "pages", "My Pages"
 
     def initialize(repo)
       @blog = repo

data/lib/liveblog.rb

@@ -7,6 +7,9 @@ require 'runeblog'
 require 'pathmagic'
 require 'processing'
 
+# top = Livetext::Path + "/../plugin/liveblog/"
+# eval(File.read("#{top}/testing.rb"))
+
 
 def init_liveblog    # FIXME - a lot of this logic sucks
   dir = Dir.pwd.sub(/\.blogs.*/, "")
@@ -44,7 +47,7 @@ end
 
 def post_trailer
   perma = _var("publish.proto") + "://" + _var("publish.server") +
-          "/" + _var("publish.path") + "/permalink/" + _var("post.aslug") + 
+          "/" + _var("publish.path") + "/" + _var("post.aslug") + 
           ".html"
   tags = _var("post.tags")
   if tags.empty?
@@ -100,9 +103,6 @@ def banner
   navbar = nil
   vdir = @blog.root/:views/@blog.view
   lines = _body.to_a
-TTY.puts "-"*30
-lines.each {|x| TTY.puts x }
-TTY.puts "-"*30
 
   lines.each do |line|
     count += 1

data/lib/publish.rb

@@ -43,24 +43,14 @@ class RuneBlog::Publishing
     rc
   end
 
-  def publish(files, assets=[])
-    log!(enter: __method__, args: [files, assets], level: 1)
+  def publish
+    log!(enter: __method__, level: 1)
     dir = @docroot/@path
     view_name = @blog.view.name
     viewpath = dir # /view_name
-    result = system!("ssh #@user@#@server -x mkdir -p #{viewpath}/assets") 
-    files.each do |file|
-      dest = "#@user@#@server:" + dir  # /view_name
-      file.gsub!(/\/\//, "/")  # weird... :-/
-      cmd = "scp -r #{file} #{dest} >/dev/null 2>/tmp/wtf"
-      debug "cmd = #{cmd.inspect}  - see /tmp/wtf"
-      result = system!(cmd) || puts("\n  Could not copy #{file} to #{dest}")
-    end
-    unless assets.empty?
-      cmd = "scp #{assets.join(' ')} #@user@#@server:#{viewpath}/assets >/dev/null 2>/tmp/wtf2"
-      result = system!(cmd)
-      raise PublishError if !result
-    end
+    # FIXME rsync doesn't work
+    cmd = "rsync -a -r -z #{@blog.root}/views/#{@blog.view}/remote/ #@user@#@server:#{viewpath}/"
+    system!(cmd)
     dump(files, "#{@blog.view.dir}/last_published")
     true
   end

data/lib/repl.rb

@@ -193,17 +193,6 @@ module RuneBlog::REPL
       return @out
     end
 
-    # Need to check dirty/clean status first
-    dirty, all, assets = @blog.view.publishable_files
-    files = dirty
-    if dirty.empty?
-      puts fx("\n  No files are out of date." + " "*20, :bold)
-      print "  Publish anyway? "
-      yn = RubyText.gets.chomp
-      files = all if yn == "y"
-    end
-    return @out if files.empty?
-
     ret = RubyText.spinner(label: " Publishing... ") do
       @blog.view.publisher.publish(files, assets)  # FIXME weird?
     end
@@ -229,7 +218,6 @@ module RuneBlog::REPL
     debug "Starting cmd_rebuild..."
     reset_output
     puts unless testing
-TTY.puts "rebuilding #{@blog.view.inspect}"
     @blog.generate_view(@blog.view)
     @blog.generate_index(@blog.view)
     @out

data/lib/runeblog.rb

@@ -94,8 +94,6 @@ class RuneBlog
     write_repo_config(root: @root)
     get_repo_config
     @views = retrieve_views
-puts @views.inspect
-system("cat #@root/data/VIEW")
     self.view = File.read(@root/"data/VIEW").chomp
     md = Dir.pwd.match(%r[.*/views/(.*?)/])
     if md
@@ -463,7 +461,6 @@ system("cat #@root/data/VIEW")
 
   def generate_view(view)  # huh?
     log!(enter: __method__, args: [view])
-puts "gv: view = #{view}"
     vdir = @root/:views/view
     @theme = @root/:views/view/:themes/:standard
     depend = [vdir/"remote/etc/blog.css.lt3", @theme/"global.lt3", 
@@ -478,6 +475,7 @@ puts "gv: view = #{view}"
                call: ".nopara"
     copy!("#{vdir}/themes/standard/banner/*", "#{vdir}/remote/banner/")  # includes navbar/
     copy("#{vdir}/assets/*", "#{vdir}/remote/assets/")
+# rebuild widgets
     copy_widget_html(view)
   rescue => err
     STDERR.puts err
@@ -598,10 +596,11 @@ puts "gv: view = #{view}"
     preprocess cwd: @theme/:post, src: "generate.lt3", force: true, 
                dst: remote/ahtml, copy: @theme/:post,
                call: ".nopara"    # , debug: true
+#   copy(remote/ahtml, remote/permalink/ahtml)
     # FIXME dependencies?
-    preprocess cwd: @theme/:post, src: "permalink.lt3", 
-               dst: remote/:permalink/ahtml,
-               mix: "liveblog"  # , debug: true
+#   preprocess cwd: @theme/:post, src: "permalink.lt3", 
+#              dst: remote/:permalink/ahtml,
+#              mix: "liveblog"  # , debug: true
     copy_widget_html(view_name)
   rescue => err
     _tmp_error(err)

data/lib/runeblog_version.rb

@@ -3,7 +3,7 @@ if !defined?(RuneBlog::Path)
 # if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.92"
+  VERSION = "0.2.93"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

metadata

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