c&d: project dir structure, libs moved under new branch names

* libs & version files under new branch names: current & develop
* previously under branch version numbers (v5|v6)
* version .yml files moved
* associated adjustments made as required, notably to:
  bin/sisu se* qi* (file headers); breakage potential, testing
  required
* [on dir names, want release to (alphabetically) precede
  next/development, considered (cur|dev)
  (current|(dev|development|progress|next)) (stable|unstable),
  alpha sorting fail (release|(next|develop))]

1 files changed, 32 insertions, 21 deletions

diff --git a/qi b/qi
index 3b4ba501..2d8d878b 100755
--- a/qi
+++ b/qi
@@ -38,7 +38,7 @@ require 'yaml'
 module SiSUconf
   class Configure < Thor
     class_option :verbose, :type => :boolean
-    desc 'setup --all --bin --lib --conf --data --alt',
+    desc 'setup --all --bin --lib --conf --data --alt --dryrun',
       'setup sisu'
     options \
       :all => :boolean,
@@ -49,7 +49,8 @@ module SiSUconf
       :share => :boolean,
       :man => :boolean,
       :vim => :boolean,
-      :alt => :boolean
+      :alt => :boolean,
+      :dryrun => :boolean
     def setup
       unless options.length >= 1 \
       and not (options[:bin] \
@@ -61,72 +62,73 @@ module SiSUconf
       or options[:vim])
         puts 'setup --all --bin --lib --conf --data --share --man --vim'
       end
+      act=(options[:dryrun]) ? (:dryrun) : (:action)
       if not options[:alt]
         if options[:all] \
         or options[:bin]
           exclude_files=['sisugem']
-          Install.setup_find_create('bin',Project_details.dir.bin,exclude_files) \
+          Install.setup_find_create('bin',Project_details.dir.bin,exclude_files,act)  \
             if File.directory?('bin')
         end
         if options[:all] \
         or options[:lib]
-          Install.setup_find_create('lib',Project_details.dir.lib) \
+          Install.setup_find_create('lib',Project_details.dir.lib,act) \
             if File.directory?('lib')
         end
         if options[:all] \
         or options[:conf]
-          Install.setup_find_create('conf',Project_details.dir.conf) \
+          Install.setup_find_create('conf',Project_details.dir.conf,act) \
             if File.directory?('conf')
         end
         if options[:all] \
         or options[:data]
-          Install.setup_find_create('data',Project_details.dir.data) \
+          Install.setup_find_create('data',Project_details.dir.data,act) \
             if File.directory?('data')
         end
         if options[:all] \
         or options[:share]
-          Install.setup_find_create('data/sisu',Project_details.dir.share) \
+          Install.setup_find_create('data/sisu',Project_details.dir.share,act) \
             if File.directory?('data/sisu')
         end
         if options[:all] \
         or options[:man]
-          Install.setup_find_create('man',Project_details.dir.man) \
+          Install.setup_find_create('man',Project_details.dir.man,act) \
             if File.directory?('man')
         end
         if options[:all] \
         or options[:vim]
-          Install.setup_find_create('data/vim',Project_details.dir.vim) \
+          Install.setup_find_create('data/vim',Project_details.dir.vim,act) \
             if File.directory?('data/vim')
         end
       else
         if options[:all] \
         or options[:bin]
-          Install.setup_find_cp_r('bin',Project_details.dir.bin) \
+          Install.setup_find_cp_r('bin',Project_details.dir.bin,act) \
             if File.directory?('bin')
         end
         if options[:all] \
         or options[:bin]
-          Install.setup_find_cp_r('lib',Project_details.dir.lib) \
+          Install.setup_find_cp_r('lib',Project_details.dir.lib,act) \
             if File.directory?('lib')
         end
         if options[:all] \
         or options[:conf]
-          Install.setup_find_cp_r('conf',Project_details.dir.conf) \
+          Install.setup_find_cp_r('conf',Project_details.dir.conf,act) \
             if File.directory?('conf')
         end
         if options[:all] \
         or options[:data]
-          Install.setup_find_cp_r('data',Project_details.dir.data) \
+          Install.setup_find_cp_r('data',Project_details.dir.data,act) \
             if File.directory?('data')
         end
         if options[:all] \
         or options[:share]
-          Install.setup_find_cp_r('data/sisu',Project_details.dir.share) \
+          Install.setup_find_cp_r('data/sisu',Project_details.dir.share,act) \
             if File.directory?('data/sisu') #
         end
         if options[:all] \
         or options[:man]
-          Install.setup_find_cp_r('man',Project_details.dir.man) \
+          Install.setup_find_cp_r('man',Project_details.dir.man,act) \
             if File.directory?('man')
         end
         #if options[:all] \
@@ -193,17 +195,26 @@ module SiSUconf
     desc 'pkg',
       'package maintenance tasks, of no general interest (maintainer specific for package maintainer\'s convenience)'
     options \
-      :update_version=> :boolean,
+      :open_version=> :boolean,
+      :version_and_tag_for_release=> :boolean,
       :tip => :boolean
     def pkg
       if options[:tip]
         Package.sequence
       end
-      if options[:update_version]
-        Version_info::Update.update_stable
-        Version_info::Update.update_unstable
-        puts "\n" + Version_info::Update.changelog_header_stable
-        puts "\n" + Version_info::Update.changelog_header_unstable
+      if options[:open_version]
+        Version_info::Update.update_stable(:pre_release)
+        Version_info::Update.update_unstable(:pre_release)
+        Version_info::Update.changelog_header_stable_pre_release
+        Version_info::Update.changelog_header_unstable_pre_release
+        Version_info::Update.changelog_header_commit(:pre_release)
+      end
+      if options[:version_and_tag_for_release]
+        Version_info::Update.update_stable(:release)
+        Version_info::Update.update_unstable(:release)
+        Version_info::Update.changelog_header_stable
+        Version_info::Update.changelog_header_unstable
+        Version_info::Update.changelog_header_commit_tag_upstream(:release)
       end
       if options.length == 0
         system("#{$called_as} help pkg")