From 6811ac91f21a434fc7d967c11e1b20f33918c6ea Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 19 Mar 2012 22:07:29 -0400
Subject: v3: 3.2 branch is main (v3dv --> v3); dev (v3dv) branch directories
 removed

* v3dv (3.2) "merged" into v3 (previously 3.1) (& removed)
  * conf/sisu/v3dv --> conf/sisu/v3
  * data/sisu/v3dv --> data/sisu/v3
  * lib/sisu/v3dv  --> lib/sisu/v3
  * bin/sisu* (v3dv references changed to v3)
  * (--dev modifier (superfluous for the time being) runs main v3 branch)
---
 lib/sisu/v3/embedded.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'lib/sisu/v3/embedded.rb')

diff --git a/lib/sisu/v3/embedded.rb b/lib/sisu/v3/embedded.rb
index 1dcc4fac..0c73e9e3 100644
--- a/lib/sisu/v3/embedded.rb
+++ b/lib/sisu/v3/embedded.rb
@@ -65,10 +65,10 @@ module SiSU_Embedded
     def initialize(opt)
       @opt=opt
       @md=SiSU_Param::Parameters.new(@opt).get
-      @env=SiSU_Env::Info_env.new(@md.fns)
-      @rhost=SiSU_Env::Info_remote.new(@opt).remote_host_base
+      @env=SiSU_Env::InfoEnv.new(@md.fns)
+      @rhost=SiSU_Env::InfoRemote.new(@opt).remote_host_base
       @base_src_dir=@opt.f_pth[:pth].sub(/\/#{@opt.f_pth[:lng]}$/,'')
-      @f=SiSU_Env::SiSU_file.new(@md)
+      @f=SiSU_Env::FileOp.new(@md)
     end
     def read
       songsheet
@@ -78,7 +78,7 @@ module SiSU_Embedded
       audio
       multimedia
       begin
-      rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
+      rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
       ensure
       end
     end
@@ -95,9 +95,9 @@ module SiSU_Embedded
           FileUtils::mkdir_p(img_dir) unless FileTest.directory?(img_dir)
           src_ec=@f.place_file.images.rel + '/' + @md.ec[:image].join(" #{@f.output_path.images.rel}/")
           unless @opt.fns =~/\.-sst$/
-            SiSU_Env::System_call.new(src_ec,ldest,'q').rsync('--relative',@opt.base_path)
+            SiSU_Env::SystemCall.new(src_ec,ldest,'q').rsync('--relative',@opt.base_path)
             #if @md.opt.cmd.inspect =~/R/ #rsync to remote image directory
-            #  SiSU_Env::System_call.new(src_ec,remote_rel,'q').rsync('--relative')
+            #  SiSU_Env::SystemCall.new(src_ec,remote_rel,'q').rsync('--relative')
             #end
           end
         end
@@ -113,9 +113,9 @@ module SiSU_Embedded
         and FileTest.directory?(src)
           FileUtils::mkdir_p(ldest) unless FileTest.directory?(ldest)
           src_ec="#{src}/" + @md.ec[:audio].join(" #{src}/")
-          SiSU_Env::System_call.new(src_ec,"#{ldest}/.",'q').rsync
+          SiSU_Env::SystemCall.new(src_ec,"#{ldest}/.",'q').rsync
           if @md.opt.cmd.inspect =~/R/ #rsync to remote audio directory
-            SiSU_Env::System_call.new(src_ec,"#{rdest}/.",'q').rsync
+            SiSU_Env::SystemCall.new(src_ec,"#{rdest}/.",'q').rsync
           end
         end
       end
@@ -130,9 +130,9 @@ module SiSU_Embedded
         and FileTest.directory?(src)
           FileUtils::mkdir_p(ldest) unless FileTest.directory?(ldest)
           src_ec="#{src}/" + @md.ec[:multimedia].join(" #{src}/")
-          SiSU_Env::System_call.new(src_ec,"#{ldest}/.",'q').rsync
+          SiSU_Env::SystemCall.new(src_ec,"#{ldest}/.",'q').rsync
           if @md.opt.cmd.inspect =~/R/ #rsync to remote video directory
-            SiSU_Env::System_call.new(src_ec,"#{rdest}/.",'q').rsync
+            SiSU_Env::SystemCall.new(src_ec,"#{rdest}/.",'q').rsync
           end
         end
       end
-- 
cgit v1.2.3