From d17e7245922a9bdc9233ccfa0137dfdab5747356 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 11 Nov 2011 00:08:04 -0500 Subject: v3: FileUtils, make explicit calls (more verbose, easier to find) --- lib/sisu/v3/epub.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'lib/sisu/v3/epub.rb') diff --git a/lib/sisu/v3/epub.rb b/lib/sisu/v3/epub.rb index c1dcacec..80482984 100644 --- a/lib/sisu/v3/epub.rb +++ b/lib/sisu/v3/epub.rb @@ -601,8 +601,6 @@ module SiSU_EPUB class Seg < SiSU_EPUB_seg::Seg end class Epub_output - require 'fileutils' - include FileUtils #::Verbose def initialize(md,output='') @md,@output=md,output @epub_doc="#{@md.fnb}.epub" @@ -661,10 +659,10 @@ module SiSU_EPUB @md.ec[:image].each do |x| if FileTest.directory?("#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image") \ && FileTest.file?("#{@md.file.output_path.epub.rel_image}/#{x}") - cp("#{@md.file.output_path.epub.rel_image}/#{x}","#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image") + FileUtils::cp("#{@md.file.output_path.epub.rel_image}/#{x}","#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image") elsif FileTest.directory?("#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image") \ && FileTest.file?("#{img_pth}/#{x}") - cp("#{img_pth}/#{x}","#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image") + FileUtils::cp("#{img_pth}/#{x}","#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image") end end end @@ -672,7 +670,7 @@ module SiSU_EPUB SiSU_EPUB_Concordance::Source.new(@md.opt).read end def output_zip - mkdir_p(@md.file.output_path.epub.dir) unless FileTest.directory?(@md.file.output_path.epub.dir) + FileUtils::mkdir_p(@md.file.output_path.epub.dir) unless FileTest.directory?(@md.file.output_path.epub.dir) if FileTest.directory?(@md.env.processing_path.epub) pwd=Dir.pwd Dir.chdir(@md.env.processing_path.epub) -- cgit v1.2.3