Changeset 180 for cleverbox/trunk/cleverbox

Timestamp:

08/13/07 19:30:27 (5 years ago)

Author:

trivoallan

Message:

cleverbox : fixed bugs regarding environment refactoring.

Location:

cleverbox/trunk/cleverbox

Files:

• environment.py (modified) (5 diffs)
• scripts/admin.py (modified) (3 diffs)

cleverbox/trunk/cleverbox/environment.py

@@ -1 @@
-import os, shutil, ConfigParser.SafeConfigParser
+import os, shutil, stat
+import ConfigParser
 from pkg_resources import parse_version
 from cleverbox.utils.termcolors import colorize, make_style
+
+layout = ('clients-available', 'clients-enabled',
+          'projects-available', 'projects-enabled',
+          'profiles/default')
+
+profile_files = ('project.apache.conf', 'trac-defaults.ini', 'permissions.ini')
 
 class Environment:
     
     path = ''
-
-    layout = ('clients-available', 'clients-enabled',
-              'projects-available', 'projects-enabled',
-              'profiles/default')
-    
-    profile_files = ('project.apache.conf', 'trac-defaults.ini', 'permissions.ini')
     
     def __init__(self, envdir):
         self.path = envdir
         self.config = ConfigParser.SafeConfigParser()
-        self.config.read(self.get_file_path('cleverbox.ini'))
+        self.config.read(self.get_path('cleverbox.ini'))
     
     def create(self, version, parameters):
@@ -22 +23 @@
         Creates a cleverbox environment.
         """
-        
+
+        # Do not do anything if base directories is not empty
+        if (len(os.listdir(self.path))):
+            raise IOError, '"%s" directory is not empty' % self.path
+
+        if (len(os.listdir(parameters['general']['clients_root']))):
+            raise IOError, '"%s" directory is not empty' % self.path
+
         # Create cleverbox.ini
-        for section_name, section_directives in parameters:
+        for (section_name, section_directives) in parameters.items():
             self.config.add_section(section_name)
-            for k, v in section_directives:
+            for (k, v) in section_directives.items():
                 self.config.set(section_name, k, v)
         
@@ -35 +43 @@
             env_dirs = []
             for dirname in layout:
-                env_dirs.append( os.path.join(self.env.path, dirname) )
+                env_dirs.append(self.get_path(dirname))
             map( os.makedirs, env_dirs )
 
@@ -41 +49 @@
             try:
                 print "\n\tCreating VERSION file\n"
-                fd = open( os.path.join(self.env.path, 'VERSION'), 'w' )
-                fd.write(_version)
+                fd = open(self.get_path('VERSION'), 'w')
+                fd.write(version)
             finally:
                 fd.close()
@@ -49 +57 @@
             print "\n\tCreating default configuration profile\n"
             for filename in profile_files:
-                shutil.copy(collected_infos['assets_dir'] + '/' + filename, os.path.join(self.env.path, 'profiles', 'default'))
+                shutil.copy(
+                    os.path.join(parameters['general']['assets_dir'], filename),
+                    os.path.join(self.get_path('profiles'), 'default'))
 
             # Write cleverbox.ini to disk
-            self.config.write(open(self.get_file_path('cleverbox.ini'), 'w+'))
+            self.config.write(open(self.get_path('cleverbox.ini'), 'w+'))
 
-        except IOError, ioexception :
-            print ioexception
+        except Exception, exception:
+            print exception
             print "** Environment couldn't be initialized in %(env_dir)s\n" % {'env_dir' : self.env.path}
+            print "Rolling back changes"
+            for entry in os.listdir(self.path):
+                path = os.path.join(self.path, entry)
+                stats = os.stat(path)
+                if (stat.S_ISDIR(stats[stat.ST_MODE])):
+                    os.rmdir(path)
+                else:
+                    os.remove(path)
 
 

cleverbox/trunk/cleverbox/scripts/admin.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 
-import shutil, cmd, os, shlex, sys, traceback, re, ConfigParser, posix
+import shutil, cmd, os, shlex, sys, traceback, re
+import ConfigParser, posix
 from pkg_resources import parse_version
 from trac import util
@@ -10 +11 @@
 
 _defaults = {
-    'env_dir_layout'    : ('clients-available', 'clients-enabled',
-                           'projects-available', 'projects-enabled',
-                           'profiles/default'),
     'client_dir_layout' : ('htdocs', 'logs', 'tmp', 'uploads',
-                           'var/svn', 'var/trac'),
-    'profile_files'     : ('project.apache.conf', 'trac-defaults.ini', 'permissions.ini')
+                           'var/svn', 'var/trac')
 }
 
@@ -92 +89 @@
             raise
         except Exception, e:
-            print >> sys.stderr, 'Command failed: %s' % e
+            print >> sys.stderr, style.ERROR('Command failed: %s' % e)
             rv = 2
         if not self.interactive: