From ee4968f54c669bf69182a10ff7fc4991b835f6a4 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 20 Jan 2014 18:47:20 -0500
Subject: v4 v5: bin/sisu & some related lib changes

* good time to consider rollover: closing v4 branch, replacing it with v5 &
  introducing v6 for development, proposed for this release + 1
---
 lib/sisu/v4/sysenv.rb | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

(limited to 'lib/sisu/v4/sysenv.rb')

diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb
index 341a29f7..bcd7c09d 100644
--- a/lib/sisu/v4/sysenv.rb
+++ b/lib/sisu/v4/sysenv.rb
@@ -104,7 +104,7 @@ module SiSU_Env
     data=Config::CONFIG['datadir'] + '/doc/sisu'
     m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m
     @stub_pwd ||=@@pwd[m,1]
-    prcss_dir='_sisu_processing_' + '.' + SiSU_version_dir
+    prcss_dir='_sisu_processing_' + '.' + SiSU_is[:version_dir]
     prcss_dir_tmp_root="/tmp/#{prcss_dir}"
     prcss_dir_stub="#{prcss_dir}/#{@stub_pwd}"
     if @@user
@@ -282,13 +282,13 @@ module SiSU_Env
     end
     def rc_path_options
       [
-        "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_version_dir}",
+        "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_is[:version_dir]}",
         "#{$sisu_document_markup_directory_base_fixed_path}/.sisu",
-        "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_version_dir}",
+        "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_is[:version_dir]}",
         "#{$sisu_document_markup_directory_base_fixed_path}/_sisu",
-        "#{@@home}/.sisu/#{SiSU_version_dir}",
+        "#{@@home}/.sisu/#{SiSU_is[:version_dir]}",
         "#{@@home}/.sisu",
-        "#{@@sisu_etc}/#{SiSU_version_dir}",
+        "#{@@sisu_etc}/#{SiSU_is[:version_dir]}",
         "#{@@sisu_etc}",
       ]
     end
@@ -359,13 +359,13 @@ module SiSU_Env
       tell_no_yaml='WARNING - YAML loading switched off, to enable delete the file:'
       if @markup_dir_changed_
         @ad_path=[
-          "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_version_dir}/skin/yml",
+          "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_is[:version_dir]}/skin/yml",
           "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/skin/yml",
-          "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_version_dir}/skin/yml",
+          "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_is[:version_dir]}/skin/yml",
           "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/skin/yml",
-          "#{@@home}/.sisu/#{SiSU_version_dir}/skin/yml",
+          "#{@@home}/.sisu/#{SiSU_is[:version_dir]}/skin/yml",
           "#{@@home}/.sisu/skin/yml",
-          "#{@@sisu_etc}/#{SiSU_version_dir}/skin/yml",
+          "#{@@sisu_etc}/#{SiSU_is[:version_dir]}/skin/yml",
           "#{@@sisu_etc}/skin/yml",
         ]
         @ad_path.each do |v|
@@ -2849,7 +2849,7 @@ WOK
     def odf_structure
       FileUtils::rm_rf(processing_path.processing_path.odf_pth)
       FileUtils::mkdir_p(processing_path.processing_path.odf_pth)
-      system("unzip -q #{path.share}/#{SiSU_version_dir}/odf/odt.zip -d      #{processing_path.odf_pth}")
+      system("unzip -q #{path.share}/#{SiSU_is[:version_dir]}/odf/odt.zip -d      #{processing_path.odf_pth}")
     end
     def sisupod_gen(fns_pod)
       sisupod_gen_v3(fns_pod)
@@ -3591,18 +3591,18 @@ WOK
     def get_version
       @version={}
       @pwd=ENV['PWD']
-      yst_ver=SiSU_path_specified_Version_ \
-      ? SiSU_path_specified_Version_
-      : "#{defaults[:sisu_share]}/#{SiSU_version_dir}/v/version.yml"
+      yst_ver=SiSU_is[:version_info_path] \
+      ? SiSU_is[:version_info_path]
+      : "#{defaults[:sisu_share]}/#{SiSU_is[:version_dir]}/v/version.yml"
       lib_path=@@lib_path ? @@lib_path : `echo $RUBYLIB`.split(':')
       @@lib_path ||=lib_path
       if File.exist?(yst_ver)
         @version=YAML::load(File::open(yst_ver)) #unless @@noyaml
       end
-      @version[:install_method]=if SiSU_is==:gem_install
+      @version[:install_method]=if SiSU_is[:run_from]==:gem_install
         spec = Gem::Specification.find_by_name("sisu")
         gem_root = spec.gem_dir
-        (File.dirname(__FILE__.gsub(/\/lib\/sisu\/#{SiSU_version_dir}/,'')) == gem_root) \
+        (File.dirname(__FILE__.gsub(/\/lib\/sisu\/#{SiSU_is[:version_dir]}/,'')) == gem_root) \
         ? ' (ruby gem install)' : ''
       else ''
       end
@@ -6322,12 +6322,7 @@ WOK
       cp_images(src,dest) if FileTest.directory?(src)
     end
     def cp_base_images #fix images
-      src=if SiSU_path_base == :system_default \
-      or  SiSU_path_base == nil
-        @env.path.share + '/image'
-      else
-        SiSU_path_base + '/data/sisu/image'
-      end
+      src=SiSU_is[:path_base_system_data] + '/image'
       dest_arr=[
         "#{@env.path.webserv}/_sisu/image_sys",
         "#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_sys"
-- 
cgit v1.2.3