v4 (v3): utils (debug renamed), SiSU_Utils::CodeMarker (from Debug::Mark)

8 files changed, 23 insertions, 19 deletions

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 8379f677..9cd95b77 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -35,6 +35,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.9.orig.tar.xz
   sisu_3.3.9.orig.tar.xz
   sisu_3.3.9-1.dsc
 
+* v3: utils (debug renamed), Utils::CodeMarker (from Debug::Mark)
+
 %% 3.3.8.orig.tar.xz (2013-02-03:04/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.8
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.8.orig.tar.xz
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 1b51330a..c79ebe1a 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -26,6 +26,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.6.orig.tar.xz
 
 * v4: html, screen reporting for --html-scroll, correctly identify output file
 
+* v4: utils (debug renamed) SiSU_Utils::CodeMarker (from Debug::Mark)
+
 %% 4.0.5.orig.tar.xz (2013-02-03:04/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.5
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.5-1
diff --git a/lib/sisu/v3/hub.rb b/lib/sisu/v3/hub.rb
index eeba4cb1..73155047 100644
--- a/lib/sisu/v3/hub.rb
+++ b/lib/sisu/v3/hub.rb
@@ -68,7 +68,7 @@ module SiSU
     include SiSU_Viz
   require_relative 'help'                              # help.rb
     include SiSU_Help
-  require_relative 'debug'                             # debug.rb
+  require_relative 'utils'                             # utils.rb
   require 'uri'
   class HubMaster
     def initialize(argv)
diff --git a/lib/sisu/v3/debug.rb b/lib/sisu/v3/utils.rb
index a49cecb7..ade6132a 100644
--- a/lib/sisu/v3/debug.rb
+++ b/lib/sisu/v3/utils.rb
@@ -101,9 +101,9 @@ module SiSU_Debug
   end
 end
 __END__
-puts SiSU_Debug::Mark.new(__LINE__,__FILE__).set(:red)
-puts SiSU_Debug::Mark.new(__LINE__,__FILE__).set(:green)
-puts SiSU_Debug::Mark.new(__LINE__,__FILE__).set(:inv_red)
-puts SiSU_Debug::Mark.new(__LINE__,__FILE__,:red).set
-puts SiSU_Debug::Mark.new(__LINE__,__FILE__,:green).set
-puts SiSU_Debug::Mark.new(__LINE__,__FILE__,:inv_red).set
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:red)
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:green)
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:inv_red)
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:red).set
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:green).set
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:inv_red).set
diff --git a/lib/sisu/v4/constants.rb b/lib/sisu/v4/constants.rb
index 65b17796..d774be25 100644
--- a/lib/sisu/v4/constants.rb
+++ b/lib/sisu/v4/constants.rb
@@ -289,8 +289,8 @@ DEVELOPER={
   maintenance:               :false,
 }
 __END__
-puts SiSU_Debug::Mark.new(__LINE__,__FILE__,:red).set
-puts SiSU_Debug::Mark.new(__LINE__,__FILE__).set(:green)
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:red).set
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:green)
 puts ANSI_C[:red] + __LINE__.to_s + ANSI_C[:off] + ' ' + __FILE__
 puts "#{ANSI_C[:red]} #{__LINE__.to_s} #{ANSI_C[:off]} #{__FILE__}"
 puts ANSI_C[:fuchsia] + __LINE__.to_s + ANSI_C[:off] + ' ' + __FILE__.gsub(/([^\/]+$)/,"#{ANSI_C[:fuchsia]}\\1#{ANSI_C[:off]}")
diff --git a/lib/sisu/v4/hub.rb b/lib/sisu/v4/hub.rb
index 2cfcee57..0cfa0d6e 100644
--- a/lib/sisu/v4/hub.rb
+++ b/lib/sisu/v4/hub.rb
@@ -68,7 +68,7 @@ module SiSU
     include SiSU_Viz
   require_relative 'help'                              # help.rb
     include SiSU_Help
-  require_relative 'debug'                             # debug.rb
+  require_relative 'utils'                             # utils.rb
   require 'uri'
   class HubMaster
     def initialize(argv)
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb
index d8b6f4fd..c5a1cebb 100644
--- a/lib/sisu/v4/sysenv.rb
+++ b/lib/sisu/v4/sysenv.rb
@@ -1067,7 +1067,7 @@ module SiSU_Env
       elsif  output_dir_structure.by_filename?
         ''
       else
-        puts SiSU_Debug::Mark.new(__LINE__,__FILE__).set(:fuschia)
+        puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:fuschia)
         puts 'set output type, by: language, filetype or filename'
       end
       @stub_set_manifest=stub + '/manifest'
diff --git a/lib/sisu/v4/debug.rb b/lib/sisu/v4/utils.rb
index a49cecb7..7567d26a 100644
--- a/lib/sisu/v4/debug.rb
+++ b/lib/sisu/v4/utils.rb
@@ -55,8 +55,8 @@
  ** Description: system environment, debug related
 
 =end
-module SiSU_Debug
-  class Mark
+module SiSU_Utils
+  class CodeMarker
     def initialize(line,file,color=:red)
       @line,@file,@color=line.to_s,file,color
     end
@@ -101,9 +101,9 @@ module SiSU_Debug
   end
 end
 __END__
-puts SiSU_Debug::Mark.new(__LINE__,__FILE__).set(:red)
-puts SiSU_Debug::Mark.new(__LINE__,__FILE__).set(:green)
-puts SiSU_Debug::Mark.new(__LINE__,__FILE__).set(:inv_red)
-puts SiSU_Debug::Mark.new(__LINE__,__FILE__,:red).set
-puts SiSU_Debug::Mark.new(__LINE__,__FILE__,:green).set
-puts SiSU_Debug::Mark.new(__LINE__,__FILE__,:inv_red).set
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:red)
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:green)
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:inv_red)
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:red).set
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:green).set
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:inv_red).set