remote_conn, accepting multiple remote hosts, sysenv also beginning of rearrangement of conditionals

1 files changed, 30 insertions, 21 deletions

diff --git a/lib/sisu/v0/embedded.rb b/lib/sisu/v0/embedded.rb
index 22835e8f..b5d33ac2 100644
--- a/lib/sisu/v0/embedded.rb
+++ b/lib/sisu/v0/embedded.rb
@@ -83,13 +83,16 @@ module SiSU_Embedded
     def images
       src="#{Dir.pwd}/_sisu/image"
       ldest="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image"
-      rdest="#@rhost/#{@env.path.stub_pwd}/_sisu/image"
-      if @md.cmd.inspect =~/[vVMR]/ and FileTest.directory?(src)
-        File.mkpath(ldest) unless FileTest.directory?(ldest)
-        src_ec="#{src}/" + @md.ec[:image].join(" #{src}/")
-        SiSU_Env::System_call.new(src_ec,"#{ldest}/.",'q').rsync
-        if @md.cmd.inspect =~/R/ #rsync to remote image directory
-          SiSU_Env::System_call.new(src_ec,"#{rdest}/.",'q').rsync
+      @rhost.each do |remote_conn|
+        rdest="#{remote_conn[:name]}/#{@env.path.stub_pwd}/_sisu/image"
+        if @md.cmd.inspect =~/[vVMR]/ \
+        and FileTest.directory?(src)
+          File.mkpath(ldest) unless FileTest.directory?(ldest)
+          src_ec="#{src}/" + @md.ec[:image].join(" #{src}/")
+          SiSU_Env::System_call.new(src_ec,"#{ldest}/.",'q').rsync
+          if @md.cmd.inspect =~/R/ #rsync to remote image directory
+            SiSU_Env::System_call.new(src_ec,"#{rdest}/.",'q').rsync
+          end
         end
       end
     end
@@ -97,13 +100,16 @@ module SiSU_Embedded
       #p @md.ec[:audio]
       src="#{Dir.pwd}/_sisu/mm/audio"
       ldest="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/mm/audio"
-      rdest="#@rhost/#{@env.path.stub_pwd}/_sisu/mm/audio"
-      if @md.cmd.inspect =~/[vVMR]/ and FileTest.directory?(src)
-        File.mkpath(ldest) unless FileTest.directory?(ldest)
-        src_ec="#{src}/" + @md.ec[:audio].join(" #{src}/")
-        SiSU_Env::System_call.new(src_ec,"#{ldest}/.",'q').rsync
-        if @md.cmd.inspect =~/R/ #rsync to remote audio directory
-          SiSU_Env::System_call.new(src_ec,"#{rdest}/.",'q').rsync
+      @rhost.each do |remote_conn|
+        rdest="#{remote_conn[:name]}/#{@env.path.stub_pwd}/_sisu/mm/audio"
+        if @md.cmd.inspect =~/[vVMR]/ \
+        and FileTest.directory?(src)
+          File.mkpath(ldest) unless FileTest.directory?(ldest)
+          src_ec="#{src}/" + @md.ec[:audio].join(" #{src}/")
+          SiSU_Env::System_call.new(src_ec,"#{ldest}/.",'q').rsync
+          if @md.cmd.inspect =~/R/ #rsync to remote audio directory
+            SiSU_Env::System_call.new(src_ec,"#{rdest}/.",'q').rsync
+          end
         end
       end
     end
@@ -111,13 +117,16 @@ module SiSU_Embedded
       #p @md.ec[:multimedia]
       src="#{Dir.pwd}/_sisu/mm/video"
       ldest="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/mm/video"
-      rdest="#@rhost/#{@env.path.stub_pwd}/_sisu/mm/video"
-      if @md.cmd.inspect =~/[vVMR]/ and FileTest.directory?(src)
-        File.mkpath(ldest) unless FileTest.directory?(ldest)
-        src_ec="#{src}/" + @md.ec[:multimedia].join(" #{src}/")
-        SiSU_Env::System_call.new(src_ec,"#{ldest}/.",'q').rsync
-        if @md.cmd.inspect =~/R/ #rsync to remote video directory
-          SiSU_Env::System_call.new(src_ec,"#{rdest}/.",'q').rsync
+      @rhost.each do |remote_conn|
+        rdest="#{remote_conn[:name]}/#{@env.path.stub_pwd}/_sisu/mm/video"
+        if @md.cmd.inspect =~/[vVMR]/ \
+        and FileTest.directory?(src)
+          File.mkpath(ldest) unless FileTest.directory?(ldest)
+          src_ec="#{src}/" + @md.ec[:multimedia].join(" #{src}/")
+          SiSU_Env::System_call.new(src_ec,"#{ldest}/.",'q').rsync
+          if @md.cmd.inspect =~/R/ #rsync to remote video directory
+            SiSU_Env::System_call.new(src_ec,"#{rdest}/.",'q').rsync
+          end
         end
       end
     end