Changeset 85 for cleverbox/branches/0.1

Timestamp:

07/10/06 13:10:56 (6 years ago)

Author:

trivoallan

Message:

• User cannot choose client directory anymore
• LDAP password is automatically set in apache conf
• User is asked to enable project at project creation

Location:

cleverbox/branches/0.1/cleverbox

Files:

• CHANGELOG (added)
• scripts/admin.py (modified) (10 diffs)

cleverbox/branches/0.1/cleverbox/scripts/admin.py

@@ -6 +6 @@
 import sys
 import traceback
+import re
 from trac import util
 from trac.scripts.admin import TracAdmin
@@ -249 +250 @@
         if not self._client_exists(client_name):
 
+            # Client name cannot contain strokes
+            if client_name.count('-') != 0:
+                print "** Client's identifier can not contain the '-' character."
+                return
+
             # Information collection
             collected_infos = { 'full_name'    : None,
@@ -254 +260 @@
                                 'ftp_password' : None }
 
-            print
-            print "Creating a new client."
-            print "Let's collect some informations about him : "
-            print
-            print "  Please enter client's full name."
-            print "  This will be used in several interface screens and in emails."
-            print
-
-            dfn = client_name.capitalize()
-            collected_infos['full_name'] = raw_input('Full Name [%s]> ' % dfn).strip() or dfn
-
-            print
-            print "  Please enter client's home directory."
-            print "  All data regarding client's projects will be stored in there."
-            print
-
-            dhd = os.path.join(self.getConfig('clients_root', 'general'), client_name)
-            collected_infos['home_dir'] = raw_input('Home Directory [%s]> ' % dhd).strip() or dhd
+            collected_infos['home_dir'] = os.path.join(self.getConfig('clients_root', 'general'), client_name)
 
             # A few checks before effectively creating client
@@ -280 +269 @@
                 print "Directory %s is not writable or already exists, aborting." % collected_infos['home_dir']
                 raise os.error
+
+
+            print
+            print "Creating a new client."
+            print "Let's collect some informations about him : "
+            print
+            print "  Please enter client's full name."
+            print "  This will be used in several interface screens and in emails."
+            print
+
+            dfn = client_name.capitalize()
+            collected_infos['full_name'] = raw_input('Full Name [%s]> ' % dfn).strip() or dfn
 
             print
@@ -554 +555 @@
 
         # Restrict to requested client
+        pattern = re.compile('(\w+)-(.*)')
         if (client_name):
             client_projects = []
-            for p in list_projects:
-                if p.rsplit('-')[0] == client_name:
-                    client_projects.append(p)
+            for project_name in list_projects:
+                matches = pattern.findall(project_name)
+                if (client_name == matches[0][0]):
+                    client_projects.append(matches[0][1])
             list_projects = client_projects
 
-        # Filter out the "client-" part
-        filtered_list = []
-        for p in list_projects:
-            filtered_list.append(p.rsplit('-')[1])
-
-        return filtered_list
+        return list_projects
 
     def _do_project_disable(self, args):
@@ -697 +695 @@
                 traceback.print_exc()
 
+            # -- Enable client ?
+            print "Project has been created. Do you want to enable it ?"
+            print
+            enable_project = raw_input('Enable project ? [y/N]> ').strip() or False
+
+            if enable_project == 'y':
+                self._do_project_enable((client_name, project_name))
+
         else:
             self.do_help('project')
@@ -764 +770 @@
        'project_name'  : infos['short_name'],
        'clients_root'  : self.getConfig('clients_root', 'general'),
-       'ldap_password' : '<LDAP_PASSWORD>' }
+       'ldap_password' : self.getConfig('ldap_password', 'general') }
 
         apache_conf_filepath = os.path.join( self.envname, 'projects-available', '%s-%s' % (infos['client'], infos['short_name']) )
@@ -936 +942 @@
         comp = []
 
-        # "enable" subcommand's first argument is client's name
+        # "disable" subcommand's first argument is client's name
         if not args or (len(args) <= 1 and args[0] not in self._get_clients()):
             comp = self._get_clients()
-        # "enable" subcommand second argument is project's name
+        # "disable" subcommand second argument is project's name
         else :
             comp = self._get_projects(args[0], 'enabled')
@@ -948 +954 @@
         comp = []
 
-        # "enable" subcommand's first argument is client's name
+        # "remove" subcommand's first argument is client's name
         if not args or (len(args) <= 1 and args[0] not in self._get_clients()):
             comp = self._get_clients()
-        # "enable" subcommand second argument is project's name
+        # "remove" subcommand second argument is project's name
         else :
             comp = self._get_projects(args[0])
@@ -983 +989 @@
         try:
             if (os.path.isdir(directory)):
+                os.chown(directory, uid, gid)
                 direntries = os.listdir(directory)
                 for direntry in direntries: