diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-03-02 22:54:28 -0500 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-03-02 22:54:28 -0500 |
commit | 0569fd776ab4ce33689ca3337acd62f2415b6348 (patch) | |
tree | 4644037b28d876d8637a610f5df1a29535a4ef9a /lib/sisu/v3/composite.rb | |
parent | debian/changelog (3.0.1-1) (diff) | |
parent | CHANGELOG_v{1,2,3}, syslink, avoid duplication (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v3/composite.rb')
-rw-r--r-- | lib/sisu/v3/composite.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/sisu/v3/composite.rb b/lib/sisu/v3/composite.rb index 174d0a81..674618f9 100644 --- a/lib/sisu/v3/composite.rb +++ b/lib/sisu/v3/composite.rb @@ -1,4 +1,4 @@ -# coding: utf-8 +# encoding: utf-8 =begin * Name: SiSU @@ -59,7 +59,7 @@ =end module SiSU_Assemble require 'fileutils' - require "#{SiSU_lib}/sysenv" # sysenv.rb + require_relative 'sysenv' # sysenv.rb class Remote_image include FileUtils def initialize @@ -71,7 +71,7 @@ module SiSU_Assemble images end def download_images(download_from,images_array) - path="#{@env.path.processing}/external_document/image" + path="#{@env.processing_path.processing}/external_document/image" mkdir_p(path) unless FileTest.directory?(path) images_array.each do |i| image="#{path}/#{i}" @@ -86,7 +86,7 @@ module SiSU_Assemble 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.path.processing}/external_document/skin/doc" + path="#{@env.processing_path.processing}/external_document/skin/doc" mkdir_p(path) unless FileTest.directory?(path) download_from=doc_skin.shift doc_skin.each do |i| @@ -117,12 +117,12 @@ module SiSU_Assemble end end def write(assembled) - assembled_file=File.new("#{@env.path.composite_file}/#{@opt.fnb}.ssm.sst",'w+') - assembled.each{|a| assembled_file << a } + assembled_file=File.new("#{@env.processing_path.composite_file}/#{@opt.fnb}.ssm.sst",'w+') + assembled.each {|a| assembled_file << a } assembled_file.close end def download_images(download_from,images_array) - path="#{@env.path.processing}/external_document/image" + path="#{@env.processing_path.processing}/external_document/image" mkdir_p(path) unless FileTest.directory?(path) images_array.each do |i| image="#{path}/#{i}" @@ -136,7 +136,7 @@ module SiSU_Assemble end end def download_doc_skin(doc_skin) #first element in array is source url - path="#{@env.path.processing}/external_document/skin/doc" + path="#{@env.processing_path.processing}/external_document/skin/doc" mkdir_p(path) unless FileTest.directory?(path) download_from=doc_skin.shift doc_skin.each do |i| @@ -151,7 +151,7 @@ module SiSU_Assemble end end def insertion(fni,insert_array) - file={ :prepared=>[],:images=>[] } + file={ prepared: [], images: [] } rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/ file[:prepared] << "\n% |#{fni}|@|^|>>ok\n" @code_flag=false |