From 6811ac91f21a434fc7d967c11e1b20f33918c6ea Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 19 Mar 2012 22:07:29 -0400
Subject: v3: 3.2 branch is main (v3dv --> v3); dev (v3dv) branch directories
 removed

* v3dv (3.2) "merged" into v3 (previously 3.1) (& removed)
  * conf/sisu/v3dv --> conf/sisu/v3
  * data/sisu/v3dv --> data/sisu/v3
  * lib/sisu/v3dv  --> lib/sisu/v3
  * bin/sisu* (v3dv references changed to v3)
  * (--dev modifier (superfluous for the time being) runs main v3 branch)
---
 lib/sisu/v3/sisupod_make.rb | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

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

diff --git a/lib/sisu/v3/sisupod_make.rb b/lib/sisu/v3/sisupod_make.rb
index 7a3b4727..ac584925 100644
--- a/lib/sisu/v3/sisupod_make.rb
+++ b/lib/sisu/v3/sisupod_make.rb
@@ -65,13 +65,13 @@ module SiSU_Doc
     def initialize(opt)
       @opt=opt
       m=/.+\/(?:src\/)?(\S+)/im
-      @date=SiSU_Env::Info_date.new.dt
-      @env=SiSU_Env::Info_env.new(@opt.fns)
-      @ver=SiSU_Env::Info_version.instance.get_version
+      @date=SiSU_Env::InfoDate.new.dt
+      @env=SiSU_Env::InfoEnv.new(@opt.fns)
+      @ver=SiSU_Env::InfoVersion.instance.get_version
       @ans=SiSU_Response::Response.new
       pod_path="#{@env.processing_path.processing}/sisupod"
       @v=(@opt.cmd =~/[VM]/) ? 'v' : ''
-      @particulars=SiSU_Particulars::Combined_singleton.instance.get_all(opt)
+      @particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt)
       @file=@particulars.file
       @local_path="#{@file.output_path.sisupod.dir}"
       @zipfile=(@opt.fns =~/\.ssm\.sst$/) \
@@ -132,7 +132,7 @@ module SiSU_Doc
       end
     end
     def directories
-      SiSU_Env::Info_env.new.sisupod_v3(@opt)
+      SiSU_Env::InfoEnv.new.sisupod_v3(@opt)
     end
     def select_skin(skin='')                                                   #skin loading logic here
       load "#{SiSU_lib}/defaults.rb"
@@ -183,7 +183,7 @@ module SiSU_Doc
       file_array.each do |f|                                                   #% work area
         if f !~/^%+\s/
           skin << f.scan(@rgx_skin).uniq.flatten if f =~@rgx_skin
-          f.gsub!(/<:=(\S+?)>/,'{ c_\1.png 14x14 }image')                                                           # embedded symbol (image)
+          f=f.gsub(/<:=(\S+?)>/,'{ c_\1.png 14x14 }image')                                                           # embedded symbol (image)
           if f !~/^%+\s/ \
           and f =~@rgx_image
             images=images_extract(f,images)
@@ -238,10 +238,9 @@ module SiSU_Doc
       #2. need images used by skin, scan skin??
       if images \
       and images.length > 1
-        images.flatten!
-        images.uniq!
+        images=images.flatten.uniq
         images.delete_if {|x| x =~/https?:\/\// }
-        #images.sort!
+        #images=images.sort
         path_pod="#{@env.processing_path.processing}/sisupod"
         path_pod_conf="#{@env.processing_path.processing}/sisupod/_sisu"
         images_path_pod="#{path_pod}/image"
@@ -284,7 +283,7 @@ module SiSU_Doc
     def sisupod_xz
       FileUtils::mkdir_p(@file.output_path.sisupod.dir) unless FileTest.directory?(@file.output_path.sisupod.dir)
       tree=(@opt.cmd =~/[vVM]/ \
-      && SiSU_Env::System_call.new.program_found?('tree')) \
+      && SiSU_Env::SystemCall.new.program_found?('tree')) \
       ? 'tree sisupod'
       : ''
       if FileTest.directory?(@env.processing_path.processing)
@@ -294,7 +293,7 @@ module SiSU_Doc
           tar -cJf #{@zipfile}.txz sisupod
           #echo "#{@file.place_file.sisupod.dir}"
         })
-        FileUtils::mv("#{@zipfile}.txz", @file.place_file.sisupod.dir)
+        FileUtils::mv("#{@zipfile}.txz",@file.place_file.sisupod.dir)
         FileUtils::rm_r(Dir.glob("sisupod/*"))
         Dir.chdir(@env.path.pwd)
         SiSU_Screen::Ansi.new('',"#{@opt.fns}.txz").blue_tab unless @opt.cmd =~/q/
-- 
cgit v1.2.3