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/conf.rb | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

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

diff --git a/lib/sisu/v3/conf.rb b/lib/sisu/v3/conf.rb
index 197a04b3..3bae2179 100644
--- a/lib/sisu/v3/conf.rb
+++ b/lib/sisu/v3/conf.rb
@@ -78,9 +78,7 @@ module SiSU_Initialize
     end
   end
   class SiSU_Config #config files such as css are not updated if they already exist unless forced using the --init=site modifier
-    require 'fileutils'
     require_relative 'sysenv'                           # sysenv.rb
-      include FileUtils #::Verbose
     def initialize(opt)
       @opt=opt
       @env=SiSU_Env::Info_env.new(@opt.fns)
@@ -120,7 +118,7 @@ module SiSU_Initialize
     def dtd
       SiSU_Screen::Ansi.new(@opt.cmd,'invert','Configuring DTDs','').colorize unless @opt.cmd =~/q/
       @rxng=SiSU_relaxng::RelaxNG.new
-      @path.each { |d| mkdir_p(d[1]) unless FileTest.directory?(d[1]) }
+      @path.each { |d| FileUtils::mkdir_p(d[1]) unless FileTest.directory?(d[1]) }
       #ugly code, sort later
       if @rxng.methods.join =~/[^_]dtd_sax\b/
         if @rxng.dtd_sax.length > 200
@@ -175,8 +173,8 @@ module SiSU_Initialize
       schema=SiSU_Env::System_call.new(rnc_src,rng_file)
       schema.relaxng(@opt.cmd)
       #rnc
-      cp(rnc_src,rnc_file)
-      chmod(0644,rnc_file)
+      FileUtils::cp(rnc_src,rnc_file)
+      FileUtils::chmod(0644,rnc_file)
     end
     def trang_rnc_model_output_dom
       s=@suffix
@@ -194,8 +192,8 @@ module SiSU_Initialize
       schema=SiSU_Env::System_call.new(rnc_src,rng_file)
       schema.relaxng(@opt.cmd)
       #rnc
-      cp(rnc_src,rnc_file)
-      chmod(0644,rnc_file)
+      FileUtils::cp(rnc_src,rnc_file)
+      FileUtils::chmod(0644,rnc_file)
     end
     def trang_rnc_model_output_xhtml
       s=@suffix
@@ -213,8 +211,8 @@ module SiSU_Initialize
       schema=SiSU_Env::System_call.new(rnc_src,rng_file)
       schema.relaxng(@opt.cmd)
       #rnc
-      cp(rnc_src,rnc_file)
-      chmod(0644,rnc_file)
+      FileUtils::cp(rnc_src,rnc_file)
+      FileUtils::chmod(0644,rnc_file)
     end
     def trang_rnc_model_input_sax
       rnc_file=@env.processing_path.dal + '/sax.rnc'
-- 
cgit v1.2.3