diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-11-11 00:09:50 -0500 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-11-11 00:09:50 -0500 |
commit | 0b8450d62806e2e852f9b71b7a94d7830aca1c66 (patch) | |
tree | 44e4fb075e4e83169321b674c5ded7ba5fafa1c9 /lib/sisu/v3/composite.rb | |
parent | debian/changelog (3.1.3-1) (diff) | |
parent | v3: FileUtils, replace system calls (diff) |
Merge commit 'sisu_3.1.4' into debian/sid
Diffstat (limited to 'lib/sisu/v3/composite.rb')
-rw-r--r-- | lib/sisu/v3/composite.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/sisu/v3/composite.rb b/lib/sisu/v3/composite.rb index b269cc39..6dfcf0b2 100644 --- a/lib/sisu/v3/composite.rb +++ b/lib/sisu/v3/composite.rb @@ -58,10 +58,8 @@ =end module SiSU_Assemble - require 'fileutils' require_relative 'sysenv' # sysenv.rb class Remote_image - include FileUtils def initialize @env=SiSU_Env::Info_env.new end @@ -72,7 +70,7 @@ module SiSU_Assemble end def download_images(images_info) path="#{@env.processing_path.processing}/external_document/image" - mkdir_p(path) unless FileTest.directory?(path) + FileUtils::mkdir_p(path) unless FileTest.directory?(path) download_from=images_info.shift images_info.each do |i| image="#{path}/#{i}" @@ -83,12 +81,12 @@ module SiSU_Assemble imagefile.close end output_path="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_external" - mkdir_p(output_path) unless FileTest.directory?(output_path) + FileUtils::mkdir_p(output_path) unless FileTest.directory?(output_path) SiSU_Env::System_call.new("#{path}/*",output_path,'q').rsync end def download_doc_skin(doc_skin) #first element in array is source url path="#{@env.processing_path.processing}/external_document/skin/doc" - mkdir_p(path) unless FileTest.directory?(path) + FileUtils::mkdir_p(path) unless FileTest.directory?(path) download_from=doc_skin.shift doc_skin.each do |i| skin="#{path}/#{i}.rb" @@ -124,7 +122,7 @@ module SiSU_Assemble end def download_images(download_from,images_array) path="#{@env.processing_path.processing}/external_document/image" - mkdir_p(path) unless FileTest.directory?(path) + FileUtils::mkdir_p(path) unless FileTest.directory?(path) images_array.each do |i| image="#{path}/#{i}" unless FileTest.exists?(image) @@ -138,7 +136,7 @@ module SiSU_Assemble end def download_doc_skin(doc_skin) #first element in array is source url path="#{@env.processing_path.processing}/external_document/skin/doc" - mkdir_p(path) unless FileTest.directory?(path) + FileUtils::mkdir_p(path) unless FileTest.directory?(path) download_from=doc_skin.shift doc_skin.each do |i| skin="#{path}/#{i}.rb" |