From d17e7245922a9bdc9233ccfa0137dfdab5747356 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 11 Nov 2011 00:08:04 -0500
Subject: v3: FileUtils, make explicit calls (more verbose, easier to find)

---
 lib/sisu/v3/git.rb | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

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

diff --git a/lib/sisu/v3/git.rb b/lib/sisu/v3/git.rb
index 2e76fa4a..a0e70a97 100644
--- a/lib/sisu/v3/git.rb
+++ b/lib/sisu/v3/git.rb
@@ -61,7 +61,6 @@ module SiSU_Git
   require_relative 'sysenv'                             # sysenv.rb
   require_relative 'dal'                                # dal.rb
   class Source
-    include FileUtils #::Verbose
     def initialize(opt)
       @opt=opt
       @env=SiSU_Env::Info_env.new
@@ -124,15 +123,15 @@ module SiSU_Git
       (found =~/bin\/git\b/) ? true : false
     end
     def make_dir_fnb
-      mkdir_p(@git_path[:fnb]) unless FileTest.directory?(@git_path[:fnb])
-      mkdir_p(@git_path[:src]) unless FileTest.directory?(@git_path[:src])
-      mkdir_p(@git_path[:po]) unless FileTest.directory?(@git_path[:po])
-      mkdir_p(@git_path[:pot]) unless FileTest.directory?(@git_path[:pot])
-      mkdir_p(@git_path[:conf]) unless FileTest.directory?(@git_path[:conf])
-      mkdir_p(@git_path[:skin]) unless FileTest.directory?(@git_path[:skin])
-      mkdir_p(@git_path[:image]) unless FileTest.directory?(@git_path[:image])
-      #mkdir_p(@git_path[:audio]) unless FileTest.directory?(@git_path[:audio])
-      #mkdir_p(@git_path[:video]) unless FileTest.directory?(@git_path[:video])
+      FileUtils::mkdir_p(@git_path[:fnb]) unless FileTest.directory?(@git_path[:fnb])
+      FileUtils::mkdir_p(@git_path[:src]) unless FileTest.directory?(@git_path[:src])
+      FileUtils::mkdir_p(@git_path[:po]) unless FileTest.directory?(@git_path[:po])
+      FileUtils::mkdir_p(@git_path[:pot]) unless FileTest.directory?(@git_path[:pot])
+      FileUtils::mkdir_p(@git_path[:conf]) unless FileTest.directory?(@git_path[:conf])
+      FileUtils::mkdir_p(@git_path[:skin]) unless FileTest.directory?(@git_path[:skin])
+      FileUtils::mkdir_p(@git_path[:image]) unless FileTest.directory?(@git_path[:image])
+      #FileUtils::mkdir_p(@git_path[:audio]) unless FileTest.directory?(@git_path[:audio])
+      #FileUtils::mkdir_p(@git_path[:video]) unless FileTest.directory?(@git_path[:video])
     end
     def git_init
       unless FileTest.directory?("#{@git_path[:fnb]}/.git")
@@ -160,12 +159,12 @@ module SiSU_Git
       end
       def copy_src_head
         if @opt.f_pth[:lng]
-          cp_r("#{@env.path.pwd}/#{@opt.f_pth[:lng]}/#{@opt.fns}",@git_path[:src])
+          FileUtils::cp_r("#{@env.path.pwd}/#{@opt.f_pth[:lng]}/#{@opt.fns}",@git_path[:src])
         elsif @opt.fns =~/\.ssm\.sst/
           ssm=@opt.fns.gsub(/\.ssm\.sst/,'.ssm')
-          cp_r("#{@env.path.pwd}/#{ssm}",@git_path[:src])
+          FileUtils::cp_r("#{@env.path.pwd}/#{ssm}",@git_path[:src])
         else
-          cp_r("#{@env.path.pwd}/#{@opt.fns}",@git_path[:src])
+          FileUtils::cp_r("#{@env.path.pwd}/#{@opt.fns}",@git_path[:src])
         end
       end
       def copy_related_sst_ssi
@@ -179,9 +178,9 @@ module SiSU_Git
         end
         doc_import.each do |f|
           if @opt.f_pth[:lng]
-            cp_r("#{@env.path.pwd}/#{@opt.f_pth[:lng]}/#{f}",@git_path[:src])
+            FileUtils::cp_r("#{@env.path.pwd}/#{@opt.f_pth[:lng]}/#{f}",@git_path[:src])
           else
-            cp_r("#{@env.path.pwd}/#{f}",@git_path[:src])
+            FileUtils::cp_r("#{@env.path.pwd}/#{f}",@git_path[:src])
           end
         end
       end
@@ -239,18 +238,18 @@ module SiSU_Git
         image_path="#{@env.path.pwd}/_sisu/image"
         images.flatten.each do |i|
           if FileTest.file?("#{image_path}/#{i}")
-            cp_r("#{image_path}/#{i}",@git_path[:image])
+            FileUtils::cp_r("#{image_path}/#{i}",@git_path[:image])
           end
         end
         if FileTest.file?(skin)
-          cp_r(skin,"#{@git_path[:conf]}/skin")
+          FileUtils::cp_r(skin,"#{@git_path[:conf]}/skin")
         end
         { skin: skin, images: images }
       end
       def sisuyaml_rc
         sisurc=@env.path.sisurc_path
         if FileTest.file?(sisurc)
-          cp_r(sisurc,@git_path[:conf])
+          FileUtils::cp_r(sisurc,@git_path[:conf])
         end
       end
       def read_src
-- 
cgit v1.2.3