From 4db4dcc886b85bf9db43d66025452fb33c94a9dd Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 26 Nov 2014 09:12:11 -0500
Subject: 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))]
---
 bin/sisu | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

(limited to 'bin')

diff --git a/bin/sisu b/bin/sisu
index 317d036d..d96f8a7c 100644
--- a/bin/sisu
+++ b/bin/sisu
@@ -18,6 +18,12 @@ class Orient
     def default
      stable
     end
+    def current
+     'current'
+    end
+    def next
+     'next'
+    end
     self
   end
   def sisu_called_from_directory
@@ -57,6 +63,12 @@ class Orient
     def default
       'v' + version.default
     end
+    def current
+      'current'
+    end
+    def next
+      'develop'
+    end
     def stable_bin_file_regex
       %r{\bsisu#{version.stable}$}
     end
@@ -70,10 +82,10 @@ class Orient
       %r{\/sisu-#{version.unstable}\.(?:\d+|[a-z])\.(?:\d+|[a-z])\/}
     end
     def stable_modifier_regex
-      %r{"(?:--v#{version.stable}|--current|--stable)"}
+      %r{"(?:--v#{version.stable}|--current|--stable|--release)"}
     end
     def unstable_modifier_regex
-      %r{"(?:--v#{version.unstable}|--current|--stable)"}
+      %r{"(?:--v#{version.unstable}|--next|--unstable|--dev)"}
     end
     self
   end
@@ -88,28 +100,28 @@ class Orient
     end
   end
   def sisu_version_info_path
-    "#{sisu_path_base_system_data}/#{select_version_check}/v/version.yml"
+    "#{sisu_path_base_system_data}/version/#{select_version_check}.yml"
   end
   def select_version_check
     if sisu_run_from == :full_path_to_sisu_bin_in_sisu_dir_tree \
     or sisu_run_from == :system_install
       case processing.called_as
-      when processing.stable_bin_file_regex      then processing.stable
-      when processing.unstable_bin_file_regex    then processing.unstable
+      when processing.stable_bin_file_regex      then processing.current
+      when processing.unstable_bin_file_regex    then processing.next
       else
         case processing.argv_str
-        when processing.stable_modifier_regex    then processing.stable
-        when processing.unstable_modifier_regex  then processing.unstable
-        else                                          processing.default
+        when processing.stable_modifier_regex    then processing.current
+        when processing.unstable_modifier_regex  then processing.next
+        else                                          processing.current
         end
       end
     elsif sisu_run_from == :gem_install
       case processing.file_full_path
-      when processing.stable_gem_regex           then processing.stable
-      when processing.unstable_gem_regex         then processing.unstable
-      else                                            processing.default
+      when processing.stable_gem_regex           then processing.current
+      when processing.unstable_gem_regex         then processing.next
+      else                                            processing.current
       end
-    else                                              processing.default
+    else                                              processing.current
     end
   end
   def paths_set
-- 
cgit v1.2.3