v5 v6: hub, sisu version info, when & what to report
authorRalph Amissah <ralph@amissah.com>
Fri, 29 Aug 2014 23:34:45 +0000 (19:34 -0400)
committerRalph Amissah <ralph@amissah.com>
Fri, 29 Aug 2014 23:46:09 +0000 (19:46 -0400)
data/doc/sisu/CHANGELOG_v5
data/doc/sisu/CHANGELOG_v6
lib/sisu/v5/hub.rb
lib/sisu/v5/hub_actions.rb
lib/sisu/v5/hub_options.rb
lib/sisu/v6/hub.rb
lib/sisu/v6/hub_actions.rb
lib/sisu/v6/hub_options.rb

index bd5de4023c23db95feea3e1882f381aa6766146f..eb487b46637fc48b24bdd706b8aa2422f916707f 100644 (file)
@@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.3.orig.tar.xz
   sisu_5.6.3.orig.tar.xz
   sisu_5.6.3-1.dsc
 
+* hub, sisu version info, when & what to report
+
 %% 5.6.2.orig.tar.xz (2014-08-20:33/3)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.2
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.2-1
index a969bc34b2bedfa6384ee5c94bb6f97e8ce4d4b2..43045b90058b3771ae05c5a4286be130b685d78b 100644 (file)
@@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.4.orig.tar.xz
   sisu_6.2.4.orig.tar.xz
   sisu_6.2.4-1.dsc
 
+* hub, sisu version info, when & what to report
+
 %% 6.2.3.orig.tar.xz (2014-08-20:33/3)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.3
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.3-1
index 68db1f1324a69a0b4177b079d259e73ac791439d..eda98084db98f3a8748232549939fe8965620b2a 100644 (file)
@@ -207,6 +207,7 @@ module SiSU
     def actions_without_files
       actions=SiSU_Hub_Actions::HubActions.new(@opt)
       actions.report.version_info?
+      actions.report.version_dir?
       actions.prepare.site?
       actions.prepare.sql?
     end
index 785f507e83e601e3556ccc8b884c9fb2f94dcc80..5f99f444f61c4ec93bf782b8b618fceca9025e43 100644 (file)
@@ -72,6 +72,17 @@ module SiSU_Hub_Actions
           SiSU_Env::InfoAbout.new(@opt).sisu_version
         end
       end
+      def version_dir?
+        if @opt.act[:version_info][:set]==:on \
+        || @opt.act[:verbose][:set]==:on \
+        || @opt.act[:verbose_plus][:set]==:on \
+        || @opt.act[:maintenance][:set]==:on
+          SiSU_Screen::Ansi.new(
+            @opt.act[:color_state][:set],
+            ' ' + File.dirname(__FILE__)
+          ).grey
+        end
+      end
       self
     end
     def prepare
@@ -853,14 +864,6 @@ module SiSU_Hub_Actions
       end
       def init?
         SiSU_Env::InfoProcessingFlag.new
-        if (@opt.act[:verbose][:set]==:on \
-        || @opt.act[:verbose_plus][:set]==:on \
-        || @opt.act[:maintenance][:set]==:on)
-          SiSU_Screen::Ansi.new(
-            @opt.act[:color_state][:set],
-            ' ' + File.dirname(__FILE__)
-          ).grey
-        end
         if @opt.act[:ao][:set]==:on \
         or @opt.act[:maintenance][:set]==:on             #% --maintenance, -M
           env=SiSU_Env::InfoEnv.new(@opt.fns)
index bc96b87850141f2e6640ee873db668f5c6a23ed0..d871c9c3df98a1e51acf3fca90e2628369def5f6 100644 (file)
@@ -316,7 +316,9 @@ module SiSU_Commandline
       c,w='',''
       m,f,pth,lng,lngs=[],[],[],[],[]
       lng_is=''
-      a=s.split(/\s+/)
+      a=(s.nil?) \
+      ? ['-v']
+      : s.split(/\s+/)
       r_l=Px[:lng_lst].join('|')
       a.uniq.each do |x|
         if x =~/^-[a-z0-5]+/i \
index cd66bc170c2dde03761423906da2e1a9e594592f..2558a9dbc3f291695cb75257f3c0a53c6ffae4d8 100644 (file)
@@ -207,6 +207,7 @@ module SiSU
     def actions_without_files
       actions=SiSU_Hub_Actions::HubActions.new(@opt)
       actions.report.version_info?
+      actions.report.version_dir?
       actions.prepare.site?
       actions.prepare.sql?
     end
index 2be0304b4b539c7e67a1229d8c4c100f742a7e76..54d0ccd28a0a0009cd577d410b3edf57d6db0c14 100644 (file)
@@ -72,6 +72,17 @@ module SiSU_Hub_Actions
           SiSU_Env::InfoAbout.new(@opt).sisu_version
         end
       end
+      def version_dir?
+        if @opt.act[:version_info][:set]==:on \
+        || @opt.act[:verbose][:set]==:on \
+        || @opt.act[:verbose_plus][:set]==:on \
+        || @opt.act[:maintenance][:set]==:on
+          SiSU_Screen::Ansi.new(
+            @opt.act[:color_state][:set],
+            ' ' + File.dirname(__FILE__)
+          ).grey
+        end
+      end
       self
     end
     def prepare
@@ -853,14 +864,6 @@ module SiSU_Hub_Actions
       end
       def init?
         SiSU_Env::InfoProcessingFlag.new
-        if (@opt.act[:verbose][:set]==:on \
-        || @opt.act[:verbose_plus][:set]==:on \
-        || @opt.act[:maintenance][:set]==:on)
-          SiSU_Screen::Ansi.new(
-            @opt.act[:color_state][:set],
-            ' ' + File.dirname(__FILE__)
-          ).grey
-        end
         if @opt.act[:ao][:set]==:on \
         or @opt.act[:maintenance][:set]==:on             #% --maintenance, -M
           env=SiSU_Env::InfoEnv.new(@opt.fns)
index 5625963b78124b0313de692003264654506be9ae..336f0d936a7afd0e549618d5f88fe56fdf185831 100644 (file)
@@ -316,7 +316,9 @@ module SiSU_Commandline
       c,w='',''
       m,f,pth,lng,lngs=[],[],[],[],[]
       lng_is=''
-      a=s.split(/\s+/)
+      a=(s.nil?) \
+      ? ['-v']
+      : s.split(/\s+/)
       r_l=Px[:lng_lst].join('|')
       a.uniq.each do |x|
         if x =~/^-[a-z0-5]+/i \