Changeset 200 for cleverbox/trunk/cleverbox

Timestamp:

09/12/07 20:35:55 (5 years ago)

Author:

trivoallan

Message:

cleverbox :

• client and projects can now be generated without human interaction
• started implementation of project unit tests

Location:

cleverbox/trunk/cleverbox

Files:

• client.py (modified) (2 diffs)
• environment.py (modified) (1 diff)
• project.py (modified) (11 diffs)
• tests/__init__.py (modified) (1 diff)
• tests/client.py (modified) (4 diffs)
• tests/project.py (modified) (2 diffs)

cleverbox/trunk/cleverbox/client.py

@@ -47 +47 @@
     return list_clients
 
-def add(environment, client_name):
+def add(environment, client_name, parameters = {}):
     """
     Creates a new client in supplied environment.
@@ -118 +118 @@
     # -- Enable client ?
     print styles.style.RESET('')
-    enable_client = raw_input('Enable client ? [y/N]> ').strip() or False
-
-    if enable_client == 'y':
+    try:
+        enable_client = parameters['enable']
+    except KeyError:
+        enable_client = raw_input('Enable client ? [y/N]> ').strip() or False
+
+    if str(enable_client).find('y') == 0:
         enable(environment,client_name)
 

cleverbox/trunk/cleverbox/environment.py

@@ -102 +102 @@
 
         except Exception, exception:
-            
             logging.error(exception)
             logging.error("  Environment couldn't be initialized in %(env_dir)s" % {'env_dir' : self.path})

cleverbox/trunk/cleverbox/project.py

@@ -82 +82 @@
     print styles.style.RESET('')
 
-def add(environment, client_name, project_name):
+def add(environment, client_name, project_name, parameters = {}):
     """
     Creates a new project for client in environment.
@@ -101 +101 @@
         'short_name' : project_name,
         'full_name'  : None
-        }
-
-    print
-    print "Creating a new project for client '%s'" % client_name
-    print "Let's collect some informations about the project :"
-    print
-    print "  Please enter project's full name."
-    print "  This will be displayed in various places and emails."
-    print
-
-    dfn = project_name.capitalize()
-    collected_infos['full_name'] = raw_input('Full Name [%s]> ' % dfn).strip() or dfn
-
-    print
-    print "  What configuration profile should be used ?"
-    print "  Those reside in %s/profiles/" % environment.path
-    print
-
-    dp = environment.config.get('general', 'default_profile')
-    collected_infos['profile'] = raw_input('Configuration profile [%s]> ' % dp).strip() or dp
+    }
+
+    try:
+        collected_infos['full_name'] = parameters['full_name']
+    except KeyError:
+        print
+        print "Creating a new project for client '%s'" % client_name
+        print "Let's collect some informations about the project :"
+        print
+        print "  Please enter project's full name."
+        print "  This will be displayed in various places and emails."
+        print
+    
+        dfn = project_name.capitalize()
+        collected_infos['full_name'] = raw_input('Full Name [%s]> ' % dfn).strip() or dfn
+
+    try:
+        collected_infos['profile'] = parameters['profile']
+    except KeyError:
+        print
+        print "  What configuration profile should be used ?"
+        print "  Those reside in %s/profiles/" % environment.path
+        print
+    
+        dp = environment.config.get('general', 'default_profile')
+        collected_infos['profile'] = raw_input('Configuration profile [%s]> ' % dp).strip() or dp
 
     # Project creation
@@ -130 +136 @@
     try:
         # -- Apache configuration file
-        _write_apache_conf(environment, collected_infos)
+        _write_apache_conf(environment, collected_infos, parameters)
 
         # -- Create required dirs
-        _create_dirs(environment, collected_infos)
+        _create_dirs(environment, collected_infos, parameters)
 
         # -- SVN repository creation
-        _create_svn_repos(environment, collected_infos)
+        _create_svn_repos(environment, collected_infos, parameters)
 
         # -- Trac environment initialisation
-        _trac_initenv(environment, collected_infos)
+        _trac_initenv(environment, collected_infos, parameters)
 
         # -- Trac initial permissions
-        _trac_setperms(environment, collected_infos)
+        _trac_setperms(environment, collected_infos, parameters)
 
         # -- Modifies Trac default conf
-        _trac_defaultconf(environment, collected_infos)
+        _trac_defaultconf(environment, collected_infos, parameters)
         
         # -- Fix perms
-        _fix_perms(environment, collected_infos)
+        _fix_perms(environment, collected_infos, parameters)
 
     except Exception, e:
@@ -155 +161 @@
         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 'n'
+    try:
+        enable_project = parameters['enable']
+    except KeyError:
+        # -- Enable client ?
+        print "Project has been created. Do you want to enable it ?"
+        print
+        enable_project = raw_input('Enable project ? [y/N]> ').strip() or 'n'
 
     if str(enable_project).find('y') == 0:
         enable(environment, client_name, project_name)
 
-def _create_dirs(environment, infos):
+def _create_dirs(environment, infos, parameters):
     os.makedirs(os.path.join(environment.config.get('general', 'clients_root'),
                              infos['client'],
@@ -171 +180 @@
     print "  Creating project's directory layout\n"
 
-def _write_apache_conf(environment, infos):
+def _write_apache_conf(environment, infos, parameters):
     """
     TODO : clients may not be stored in 'clients_root', be careful with that.
@@ -190 +199 @@
     print "  Apache configuration written to %s\n" % apache_conf_filepath
 
-def _create_svn_repos(environment, infos):
+def _create_svn_repos(environment, infos, parameters):
     repos_path = os.path.join( environment.config.get('general', 'clients_root'), infos['client'], 'var/svn', infos['short_name'] )
     create_cmd = 'svnadmin create %s' % repos_path
@@ -201 +210 @@
     print "  Subversion repository created in %s\n" % repos_path
 
-def _trac_initenv(environment, infos):
+def _trac_initenv(environment, infos, parameters):
 
     trac_env_path = os.path.join( environment.config.get('general', 'clients_root'),
@@ -231 +240 @@
     print "  Trac project initialized in %s\n" % trac_env_path
 
-def _trac_setperms(environment, infos):
+def _trac_setperms(environment, infos, parameters):
     trac_env_path = os.path.join( environment.config.get('general', 'clients_root'),
                                  infos['client'],
@@ -272 +281 @@
                                      'perms'      : perms_config.get('trac', profile)} )
 
-    # Let user choose who gets admin rights
-    print "  Please enter trac administrator username."
-    print "  This user will be granted full privileges on project's Trac instance."
-    print
-
-    dan = infos['short_name'] + '-admin'
-    admin_login = raw_input('Admin Login [%s]> ' % dan).strip() or dan
+    try:
+        admin_login = parameters['profile']
+    except KeyError:
+        # Let user choose who gets admin rights
+        print "  Please enter trac administrator username."
+        print "  This user will be granted full privileges on project's Trac instance."
+        print
+    
+        dan = infos['short_name'] + '-admin'
+        admin_login = raw_input('Admin Login [%s]> ' % dan).strip() or dan
 
     os.system( trac_perms_cmd % {'env_path'   : trac_env_path,
@@ -287 +299 @@
     print "  Trac initial permissions set (admin rights given to '%s')\n" % admin_login
 
-def _fix_perms(environment, infos):
+def _fix_perms(environment, infos, parameters):
     """
     chown -R dev:www-data /$CLIENTSROOT/$CLIENTNAME/var/svn/$PROJECTNAME
@@ -339 +351 @@
     print "  Perms fixed\n"
 
-def _trac_defaultconf(environment, infos):
+def _trac_defaultconf(environment, infos, parameters):
     """
     Overrides project's default trac.ini with values provided in configuration profile.

cleverbox/trunk/cleverbox/tests/__init__.py

@@ -35 +35 @@
     env = Environment(env_path)
     parameters = {'general' :
-                     {'clients_root' : os.path.join(test_root, 'var', 'cleverbox'),
-                      'assets_dir'   : os.path.join('/home/trivoallan/workspace/cleverbox-trunk/assets'),
-                      'apache_group' : 'www-data',
-                      'ssh_user'     : 'root',
-                      'ssh_group'    : 'root'}}
+                     {'clients_root'     : os.path.join(test_root, 'var', 'cleverbox'),
+                      'assets_dir'       : os.path.join('/home/trivoallan/workspace/cleverbox-trunk/assets'),
+                      'apache_group'     : 'www-data',
+                      'ssh_user'         : 'root',
+                      'ssh_group'        : 'root',
+                      'default_profile'  : 'default',
+                      'authbackend_pass' : '',
+                      'domain'           : 'test.domain.tld',
+                      'apache_user'      : 'www-data',
+                      'apache_group'     : 'www-data'},
+                  'trac' :
+                     {'lib_dir'          : '/usr/share/python-support/trac',
+                      'assets_dir'       : '/usr/share/trac'}}
     env.create(version, parameters)
 

cleverbox/trunk/cleverbox/tests/client.py

@@ -25 +25 @@
     def test_client_add_generate_expected_layout(self):
         client_name = 'testclient'
-        client.add(self.env, client_name) 
+        client.add(self.env, client_name, {'enable' : 'y'}) 
         clients_root = self.env.config.get('general', 'clients_root')
         expected = {os.path.join(self.env.path, 'clients-available', client_name)          : ('S_ISREG', '0640', 'root', 'www-data'),
@@ -40 +40 @@
     def test_client_add_generates_expected_apache_configuration(self):
         client_name = 'testclient'
-        client.add(self.env, client_name) 
+        client.add(self.env, client_name, {'enable' : 'y'}) 
         expected =  """
 # -- Include enabled projects configuration files
@@ -54 +54 @@
         """
         client_name = 'testclient'
-        client.add(self.env, client_name)
+        client.add(self.env, client_name, {'enable' : 'y'})
         try: 
-            client.add(self.env, client_name + 'f')
+            client.add(self.env, client_name, {'enable' : 'y'})
         except Exception, e:
             pass
@@ -65 +65 @@
         client_name = 'test-client'
         try:
-            client.add(self.env, client_name)
+            client.add(self.env, client_name, {'enable' : 'y'})
         except Exception, e:
             pass

cleverbox/trunk/cleverbox/tests/project.py

@@ -1 +1 @@
 import unittest
+
+import logging, os, shutil, tempfile
+from cleverbox.environment import Environment
+from cleverbox.scripts.admin import CleverboxAdmin
+from cleverbox import client, project
+import cleverbox.tests
+
+logging.basicConfig(stream=open('/dev/null', 'w+'))
 
 class ProjectTestCase(unittest.TestCase):
@@ -5 +13 @@
     # Fixtures
     def setUp(self):
-        pass
+        self.env = cleverbox.tests.create_environment('0.5test')
     
     def tearDown(self):
-        pass
+        shutil.rmtree(self.env.path)
+        shutil.rmtree(self.env.config.get('general', 'clients_root'))
+        
+    def test_exists_return_true_if_client_exists(self):
+        
+        client_name = 'testclient'
+        client.add(self.env, client_name, {'enable' : 'y'})
+        
+        project_name = 'testproject'
+        project_parameters = {'full_name'   : 'Test Project',
+                              'profile'     : 'default',
+                              'admin_login' : 'admin',
+                              'enable'      : 'y'}
+        project.add(self.env, client_name, project_name, project_parameters)
+        assert project.exists(self.env, client_name, project_name), 'project.exists() returns true if project already exists'
+        
+        
     
 def suite():
-    return unittest.makeSuite(ProjectTestCase,'test')
+    return unittest.makeSuite(ProjectTestCase, 'test')
 
 if __name__ == '__main__':