From 0f85875f703ae722ba0ebebcd755dd13911df5a8 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 13 Mar 2013 21:43:14 -0400
Subject: v4: hub, sysenv, remote, work on rsync of document/site build

---
 lib/sisu/v4/hub.rb | 81 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 43 insertions(+), 38 deletions(-)

(limited to 'lib/sisu/v4/hub.rb')

diff --git a/lib/sisu/v4/hub.rb b/lib/sisu/v4/hub.rb
index dee13bc1..cf821246 100644
--- a/lib/sisu/v4/hub.rb
+++ b/lib/sisu/v4/hub.rb
@@ -191,22 +191,22 @@ module SiSU
       @@n_do=0
     end
     def remote_put_base_site_rsync                         # -CR
-p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
+      puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:cyan) if @opt.act[:maintenance][:set] ==:on
       require_relative 'remote'                        # remote.rb
       SiSU_Remote::Put.new(@opt).rsync_base
     end
     def remote_put_base_site_rsync_match                   # -CCRZ
-p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
+      puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:cyan) if @opt.act[:maintenance][:set] ==:on
       require_relative 'remote'                        # remote.rb
       SiSU_Remote::Put.new(@opt).rsync_base_sync
     end
     def remote_put_base_site                               # -Cr
-p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
+      puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:cyan) if @opt.act[:maintenance][:set] ==:on
       require_relative 'remote'                        # remote.rb
       SiSU_Remote::Put.new(@opt).scp_base
     end
     def remote_put_base_site_all                           # -CCr
-p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
+      puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:cyan) if @opt.act[:maintenance][:set] ==:on
       require_relative 'remote'                        # remote.rb
       SiSU_Remote::Put.new(@opt).scp_base_all
     end
@@ -629,45 +629,50 @@ p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
         ensure
         end
       end
-      if @opt.act[:site_init][:set]==:on               #% -C
-        require_relative 'conf'                        # -s     conf.rb
-        SiSU_Initialize::Source.new(@opt).read
-      end
     end
     def actions
       if @opt.act[:profile][:set]==:on
         require 'profile'
       end
-      action_on_file_ =(@opt.act[:dal][:set]==:on \
-      || @opt.act[:manpage][:set]==:on \
-      || @opt.act[:texinfo][:set]==:on \
-      || @opt.act[:txt][:set]==:on \
-      || @opt.act[:html][:set]==:on \
-      || @opt.act[:html_scroll][:set]==:on \
-      || @opt.act[:html_seg][:set]==:on \
-      || @opt.act[:concordance][:set]==:on \
-      || @opt.act[:xhtml][:set]==:on \
-      || @opt.act[:epub][:set]==:on \
-      || @opt.act[:odt][:set]==:on \
-      || @opt.act[:xml_sax][:set]==:on \
-      || @opt.act[:xml_dom][:set]==:on \
-      || @opt.act[:pdf][:set]==:on \
-      || @opt.act[:pdf_p][:set]==:on \
-      || @opt.act[:pdf_l][:set]==:on \
-      || @opt.act[:psql][:set]==:on \
-      || @opt.act[:sqlite][:set]==:on \
-      || @opt.act[:sqlite_discrete][:set]==:on \
-      || @opt.act[:share_source][:set]==:on \
-      || @opt.act[:sisupod][:set]==:on \
-      || @opt.act[:qrcode][:set]==:on \
-      || @opt.act[:hash_digests][:set]==:on \
-      || @opt.act[:manifest][:set]==:on \
-      || @opt.act[:rsync][:set]==:on \
-      || @opt.act[:scp][:set]==:on \
-      || @opt.act[:webrick][:set]==:on \
-      || @opt.act[:zap][:set]==:on) \
-      ? (:true)
-      : (:false)
+      action_on_file_ =if @opt.act[:rsync][:set]==:on \
+      && @opt.act[:site_init][:set]==:on #\
+      #|| @opt.act[:harvest][:set]==:on)
+        :false
+      elsif @opt.act[:rsync][:set]==:on \
+      && @opt.act[:site_init][:set] !=:on #\
+      #&& @opt.act[:harvest][:set] !=:on
+        :true
+      else
+        action_on_file_ =(@opt.act[:dal][:set]==:on \
+        || @opt.act[:manpage][:set]==:on \
+        || @opt.act[:texinfo][:set]==:on \
+        || @opt.act[:txt][:set]==:on \
+        || @opt.act[:html][:set]==:on \
+        || @opt.act[:html_scroll][:set]==:on \
+        || @opt.act[:html_seg][:set]==:on \
+        || @opt.act[:concordance][:set]==:on \
+        || @opt.act[:xhtml][:set]==:on \
+        || @opt.act[:epub][:set]==:on \
+        || @opt.act[:odt][:set]==:on \
+        || @opt.act[:xml_sax][:set]==:on \
+        || @opt.act[:xml_dom][:set]==:on \
+        || @opt.act[:pdf][:set]==:on \
+        || @opt.act[:pdf_p][:set]==:on \
+        || @opt.act[:pdf_l][:set]==:on \
+        || @opt.act[:psql][:set]==:on \
+        || @opt.act[:sqlite][:set]==:on \
+        || @opt.act[:sqlite_discrete][:set]==:on \
+        || @opt.act[:share_source][:set]==:on \
+        || @opt.act[:sisupod][:set]==:on \
+        || @opt.act[:qrcode][:set]==:on \
+        || @opt.act[:hash_digests][:set]==:on \
+        || @opt.act[:manifest][:set]==:on \
+        || @opt.act[:scp][:set]==:on \
+        || @opt.act[:webrick][:set]==:on \
+        || @opt.act[:zap][:set]==:on) \
+        ? (:true)
+        : (:false)
+      end
       if @opt.act[:harvest][:set]==:on
         require_relative 'harvest'                     # harvest.rb
         SiSU_Harvest::Source.new(@opt).read            # -h -H  html.rb
-- 
cgit v1.2.3