Changeset 157 for cleverbox/trunk/cleverbox/scripts/admin.py

Timestamp:

08/10/07 21:51:05 (5 years ago)

Author:

trivoallan

Message:

cleverbox :

• implemented upgrade scripts framework

fixes #13

Files:

• cleverbox/trunk/cleverbox/scripts/admin.py (modified) (6 diffs)

cleverbox/trunk/cleverbox/scripts/admin.py

@@ -55 +55 @@
         # Check if environment needs an upgrade
         #  - open VERSION
-        env_version = open(os.path.join(self.envname, 'VERSION')).read()
-        
-        #  - compare with self._version
-        #  - if VERSION < self._version :
-        if parse_version(env_version) < parse_version(self._version): 
-            #    - call upgrade script corresponding to self._upg (?)
-            from cleverbox.upgrades import upgrades
-            i = 1
-            while i:
-                try:
-                    upgrades['do_upgrade_' + i].__call__(self.envname, env_version)
-                except ImportError, e:
-                    break
-                i = i + 1
-                
-        elif parse_version(env_version) > parse_version(self._version):
-            raise
+        try:
+            env_version = open(os.path.join(self.envname, 'VERSION')).read().strip()
+            
+            #  - compare with self._version
+            #  - if VERSION < self._version :
+            if parse_version(env_version) < parse_version(_version): 
+                print "\nCleverbox environment needs to be upgraded. Please run :"
+                print "  cleverbox-admin %s upgrade\n" % self.envname
+                sys.exit(1)
+        except IOError, e:
+            # no VERSION file means user wants to create an environment
+            pass
         
         if env is not None:
@@ -146 +141 @@
         collected_infos['clients_root'] = raw_input('Projects directory [%s]> ' % default_root).strip() or default_root
 
+        # Path to cleverbox assets
+        default_assets_dir = '/usr/share/cleverbox'
+        collected_infos['assets_dir'] = raw_input('Cleverbox assets directory [%s]> ' % default_assets_dir).strip() or default_assets_dir
+
         try :
             os.makedirs(collected_infos['clients_root'], 0775)
@@ -215 +214 @@
         print "\n\tCreating default configuration profile\n"
         for filename in _defaults['profile_files']:
-            shutil.copy('/usr/share/cleverbox/' + filename, os.path.join(self.envname, 'profiles', 'default'))
+            shutil.copy(collected_infos['assets_dir'] + '/' + filename, os.path.join(self.envname, 'profiles', 'default'))
         
 
@@ -222 +221 @@
         print "You need to add this statement to your apache configuration : \n" \
             "\t'Include %(env_dir)s/clients-enabled/*'\n" % {'env_dir' : self.envname}
+
+    _help_upgrade = [('upgrade', 'Executes necessary operation to make environment up to date')]
+    def do_upgrade(self, line=None):
+        env_version = open(os.path.join(self.envname, 'VERSION')).read()
+        if parse_version(env_version) < parse_version(_version): 
+            from cleverbox.upgrades import upgrades
+            i = 1
+            while i:
+                try:
+                    upgrade_func = getattr(upgrades, 'do_upgrade_' + str(i))
+                    upgrade_func.__call__(self.envname, env_version)
+                except AttributeError, e:
+                    break
+                i = i + 1
+            
 
     ## help
@@ -234 +248 @@
                 print "No documentation found for %s" % arg[0]
         else:
-            docs = (self._help_client + self._help_project + self._help_initenv)
+            docs = (self._help_client + self._help_project + self._help_initenv + self._help_upgrade)
             print 'cleverbox-admin - The Cleverbox Administration Console'
             if not self.interactive:
@@ -1087 +1101 @@
 
     if len(args) > 0:
-        if args[0] in ('-h', '--help', 'help'):
-            return admin.onecmd("help")
-        elif args[0] in ('-v','--version','about'):
-            return admin.onecmd("about")
+        if len(args) > 1:
+            if args[1] in ('-h', '--help', 'help'):
+                return admin.onecmd("help")
+            elif args[1] in ('-v','--version','about'):
+                return admin.onecmd("about")
+            elif args[1] in ('-u', '--upgrade', 'upgrade'):
+                admin.envname = args[0]
+                return admin.onecmd("upgrade")
         else:
             admin.env_set(os.path.abspath(args[0]))