Changeset 338 for cleverbox/branches

Timestamp:

05/03/08 09:55:04 (2 years ago)

Author:

trivoallan

Message:

cleverbox :

• fixed Cleverbox does not work if trac-admin script is in a non standard location (#48)
• fixed trac version dependency in setup.py
• debian packaging : binary-install actions should go in postinst file (#46)
• debian packaging : added python-setuptools to build dependencies

all fixes on both trunk and 0.4 branch.

Location:

cleverbox/branches/0.4

Files:

• cleverbox/scripts/admin.py (modified) (19 diffs)
• debian/control (modified) (1 diff)
• debian/postinst (added)
• debian/rules (modified) (1 diff)
• docs/CHANGELOG (modified) (1 diff)
• setup.py (modified) (3 diffs)

cleverbox/branches/0.4/cleverbox/scripts/admin.py

@@ -69 +69 @@
         self.envname = envname
         self.prompt = "Cleverbox [%s] > " % self.envname
-        
+
         # Check if environment needs an upgrade
         #  - open VERSION
@@ -79 +79 @@
                 print "Please upgrade or downgrade your trac installation."
                 print
-                
+
                 sys.exit(1)
-            
+
             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): 
+            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
@@ -93 +93 @@
             # no VERSION file means user wants to create an environment
             pass
-        
+
         if env is not None:
             self.__env = env
@@ -185 +185 @@
         # root user & group
         # we keep the ssh_user notion for backward compatibility.
-        # this will have to disappear in a future release 
+        # this will have to disappear in a future release
         collected_infos['ssh_user'] = 0
         collected_infos['ssh_group'] = 0
@@ -191 +191 @@
         # Host server domain name
         collected_infos['domain'] = raw_input('Domain name > ').strip()
-        
+
         # Authentication backend password (if any)
         collected_infos['authbackend_pass'] = raw_input('Authentication backend password (if any) []> ').strip() or ''
@@ -198 +198 @@
         dcp = 'default'
         collected_infos['default_profile'] = raw_input('Default configuration profile [%s]> ' % dcp).strip() or dcp
-                
+
         # Write ini file
         self._config.add_section('general')
@@ -214 +214 @@
         for directive, value in trac_infos.items() :
             self._config.set('trac', directive, str(value))
-        
+
         fh_config = open(os.path.join(self.envname, 'cleverbox.ini'), 'w+')
         self._config.write(fh_config)
@@ -241 +241 @@
         for filename in _defaults['profile_files']:
             shutil.copy(collected_infos['assets_dir'] + '/' + filename, os.path.join(self.envname, 'profiles', 'default'))
-        
+
 
         print
@@ -251 +251 @@
     def do_upgrade(self, line=None):
         env_version = open(os.path.join(self.envname, 'VERSION')).read()
-        if parse_version(env_version) < parse_version(_version): 
+        if parse_version(env_version) < parse_version(_version):
             from cleverbox.upgrades import upgrades
             i = 1
@@ -261 +261 @@
                     break
                 i = i + 1
-            
+
 
     ## help
@@ -432 +432 @@
                      int(self.getConfig('ssh_user', 'general')), int(self.getConfig('apache_group', 'general')) )
             os.chmod( os.path.join(collected_infos['home_dir'], 'tmp'), 0775 )
- 
+
             print "  Fixed permissions in %s\n" % collected_infos['home_dir']
 
@@ -795 +795 @@
                 # -- Revoke all permissions in trac
                 self._project_trac_revoke_all_perms( collected_infos )
-        
+
                 # -- Trac initial permissions
                 self._project_trac_setperms( collected_infos )
@@ -801 +801 @@
                 # -- Modifies Trac default conf
                 self._project_trac_defaultconf( collected_infos )
-                
+
                 # -- Fix perms
                 self._project_fix_perms( collected_infos )
@@ -870 +870 @@
                                 'var/svn',
                                 infos['short_name'] )
-        
+
         cmd_data = { 'env_path'         : trac_env_path,
                      'title'            : '"%s - %s - Trac"' % (infos['client'], infos['short_name']),
@@ -878 +878 @@
                      'trac_install_dir' : self.getConfig('lib_dir', 'trac')}
 
-        trac_cmd = '/usr/bin/trac-admin %(env_path)s initenv %(title)s %(db_dsn)s svn %(svn_path)s %(templates_path)s' % cmd_data
-        
+        trac_cmd = 'trac-admin %(env_path)s initenv %(title)s %(db_dsn)s svn %(svn_path)s %(templates_path)s' % cmd_data
+
         (stdin, stdout, stderr) = os.popen3( trac_cmd )
 
@@ -923 +923 @@
     def _project_trac_revoke_all_perms(self, infos):
         import trac.env
-        
+
         trac_env_path = os.path.join( self.getConfig('clients_root', 'general'),
                                      infos['client'],
                                      'var/trac',
                                      infos['short_name'] )
-        
+
         # Revoke all permissions
         trac_env = trac.env.open_environment(trac_env_path)
@@ -935 +935 @@
         db_cursor.execute('DELETE FROM permission')
         trac_db.commit()
-        
+
         print "  Revoked Trac default permissions\n"
 
@@ -970 +970 @@
                                        infos['short_name'],
                                        'conf','trac.ini' )
-        os.chmod( trac_ini_path, 0777 ) 
+        os.chmod( trac_ini_path, 0777 )
 
         # Subversion repository
@@ -996 +996 @@
         Overrides project's default trac.ini with values provided in configuration profile.
         """
-        
+
         # New defaults
         tracdefaults_config = ConfigParser.SafeConfigParser()
         tracdefaults_config.read(os.path.join(self.envname, 'profiles', infos['profile'], 'trac-defaults.ini'))
-        
+
         # Trac base config file
         project_config_path = os.path.join(self.getConfig('clients_root', 'general'), infos['client'], 'var', 'trac', infos['short_name'], 'conf', 'trac.ini')

cleverbox/branches/0.4/debian/control

@@ -2 +2 @@
 Section: web
 Priority: optional
-Build-Depends: cdbs (>= 0.4.43), python-all-dev, python-support (>= 0.3), debhelper (>= 4.1.0)
+Build-Depends: cdbs (>= 0.4.43), python-all-dev, python-support (>= 0.3), debhelper (>= 4.1.0), python-setuptools
 Maintainer: Tristan Rivoallan <tristan@rivoallan.net>
 Standards-Version: 3.7.2
 
-Package: cleverbox 
+Package: cleverbox
 Architecture: all
 Depends: ${python:Depends}, subversion (>=1.4.2), trac (>=0.10), libapache2-mod-python (>=3.2.10), libapache2-svn (>=1.4.2), python-setuptools (>=0.6c3-3)
-Conflicts:  trac-0.10.3 
-Suggests: libapache2-mod-macro 
-Description: Trac and Subversion instances deployment shell 
- The cleverbox provides an interactive command line shell dedicated to the 
+Conflicts:  trac-0.10.3
+Suggests: libapache2-mod-macro
+Description: Trac and Subversion instances deployment shell
+ The cleverbox provides an interactive command line shell dedicated to the
  deployment and maintenance of trac and subversion instances.
- It can handle multiple configuration profiles, enabling the deployment 
- of differently flavored type of projects :  
+ It can handle multiple configuration profiles, enabling the deployment
+ of differently flavored type of projects :
  trac configuration and permissions, apache configuration templates, etc.
- Project's main objective is to make your life as simple as possible. 
+ Project's main objective is to make your life as simple as possible.
  Thus, it comes with easy installation, easy upgrades and a comprehensive
  documentation.

cleverbox/branches/0.4/debian/rules

@@ -10 +10 @@
         # Project documentation is superceded by dedicated Debian docs
         rm -r debian/cleverbox/usr/share/doc
-        
-binary-install/cleverbox::
-        
-        # Enable mandatory apache modules
-        a2enmod dav_fs
-        a2enmod dav_svn
-
-        # Reload apache
-        /etc/init.d/apache2 reload

cleverbox/branches/0.4/docs/CHANGELOG

@@ -4 +4 @@
 
 == Changelog ==
+=== 2008-05-14 | 0.4.4-beta ===
 
+see http://www.clever-age.org/trac/milestone/cleverbox-0.4.4 for details.
+
+==== Fixes ====
+
+ * fixed Cleverbox does not work if trac-admin script is in a non standard location (#48)
+ * fixed trac version dependency in setup.py
+ * debian packaging : binary-install actions should go in postinst file (#46)
+ * debian packaging : added `python-setuptools` to build dependencies
 === 2008-02-29 | 0.4.3-beta ===
 

cleverbox/branches/0.4/setup.py

@@ -22 +22 @@
 
 setup(
-    
+
     # Project identity
     name='Cleverbox',
@@ -32 +32 @@
     url='http://www.clever-age.org/trac/wiki/cleverbox',
     license='GPLv3',
-    
+
     # Files
     packages=find_packages(),
@@ -39 +39 @@
                 ('/usr/share/doc/cleverbox', glob('docs/*')),
                 ('/usr/share/man/man1',     glob('scripts/*.1'))],
-    
+
     # Dependencies
-    install_requires=['setuptools>=0.6b1', 'trac>=0.10.4']
+    install_requires=['setuptools>=0.6b1', 'trac>=0.10.4', 'trac<=0.10.999']
 )