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/help.rb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/lib/sisu/v3/help.rb b/lib/sisu/v3/help.rb
index 9dc26aec..35a96170 100644
--- a/lib/sisu/v3/help.rb
+++ b/lib/sisu/v3/help.rb
@@ -68,8 +68,8 @@ module SiSU_Help
       else                    @cX=SiSU_Screen::Ansi.new('yes').cX
       end
       fns='help_example_dummy_file_name.sst'
-      @env=SiSU_Env::Info_env.new(fns)
-      @db=SiSU_Env::Info_db.new
+      @env=SiSU_Env::InfoEnv.new(fns)
+      @db=SiSU_Env::InfoDb.new
       m=/.+\/(?:src\/)?(\S+)/im # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m
       @output_stub=Dir.pwd[m,1]
     end
@@ -337,7 +337,7 @@ WOK
 WOK
     end
     def shortcuts
-      cf_defaults=SiSU_Env::Info_processing_flag.new
+      cf_defaults=SiSU_Env::InfoProcessingFlag.new
       print <<WOK
 
  #{@cX.ruby}Shorthand for multiple flags#{@cX.off}
@@ -898,14 +898,14 @@ WOK
     end
     def program_found?(program)
       if program
-        rc=if SiSU_Env::Info_settings.new.program?(program)
-          SiSU_Env::Info_settings.new.program?(program)
+        rc=if SiSU_Env::InfoSettings.new.program?(program)
+          SiSU_Env::InfoSettings.new.program?(program)
         else ''
         end
         if program =='rmagick'; program='identify' #rmagick is ruby lib uses imagemagick's identify
         end
-        bin=if SiSU_Env::System_call.new.program_found?(program)
-          SiSU_Env::System_call.new.program_found?(program)
+        bin=if SiSU_Env::SystemCall.new.program_found?(program)
+          SiSU_Env::SystemCall.new.program_found?(program)
         else 'false'
         end
       else bin,rc='false','false'
@@ -915,8 +915,8 @@ WOK
       end
     end
     def sisu_version
-      version=SiSU_Env::Info_version.instance.get_version
-      rb_ver=SiSU_Env::Info_version.instance.rbversion
+      version=SiSU_Env::InfoVersion.instance.get_version
+      rb_ver=SiSU_Env::InfoVersion.instance.rbversion
       if version[:version]
         SiSU_Screen::Ansi.new('-v',version[:project],version[:version],version[:date_stamp],version[:date],rb_ver).version
       else puts 'SiSU version information not available'
@@ -924,7 +924,7 @@ WOK
     end
     def rhost
       @ls=leading_spaces=' '*49
-      @rhost=SiSU_Env::Info_remote_host.new.rhost
+      @rhost=SiSU_Env::InfoRemoteHost.new.rhost
       def r1
         if @rhost.r1; @rhost.r1 + "\n"
         else ''
@@ -964,7 +964,7 @@ WOK
       self
     end
     def environment
-      cf_defaults=SiSU_Env::Info_processing_flag.new
+      cf_defaults=SiSU_Env::InfoProcessingFlag.new
       sisu_version
       x =<<WOK
   #{@cX.green}current and output directories#{@cX.off}
@@ -1023,8 +1023,8 @@ WOK
   sisu -5                                        #{@cX.blue}#{cf_defaults.cf_5}#{@cX.off}
                                                   (defaults may be changed in active sisurc.yml file under flag:)
   #{@cX.green}special powers, risky operations set:#{@cX.off}
-  zap (delete output directories)                #{@cX.blue}#{SiSU_Env::Info_settings.new.permission?('zap')}#{@cX.off}
-  css copy (copy over css files)                 #{@cX.blue}#{SiSU_Env::Info_settings.new.permission?('css_modify')}#{@cX.off}
+  zap (delete output directories)                #{@cX.blue}#{SiSU_Env::InfoSettings.new.permission?('zap')}#{@cX.off}
+  css copy (copy over css files)                 #{@cX.blue}#{SiSU_Env::InfoSettings.new.permission?('css_modify')}#{@cX.off}
                                                   (true/false defaults may be changed in active sisurc.yml file under permissions_set:)
 
 NOTE: for HELP type 'sisu --help', 'sisu --help [help request]', 'man sisu', (or see the system or online documentation)
-- 
cgit v1.2.3