Changeset 621

Timestamp:

06/17/13 21:25:11 (11 years ago)

Author:

bas

Message:

added support for trac installations in a virtual environment, eg:

• configure --virtualenv=/data/virtualenvs/trac
• set/override it with email2trac --virtualenv=/data/virtualenv/trac_1.2

Updated release version to 2.7

Location:

trunk

Files:

• ChangeLog (modified) (2 diffs)
• configure (modified) (5 diffs)
• configure.in (modified) (2 diffs)
• debian/changelog (modified) (1 diff)
• email2trac.py.in (modified) (8 diffs)
• email2trac.spec (modified) (1 diff)

trunk/ChangeLog

@@ -1 @@
-2.X.X
+2.7.0
   * use self.env.get_read_db for trac version > 0.11. self.env.get_db_cnx is obsolete. TRAC
     api documentation.
@@ -6 +6 @@
   * fixed an UnicodeDecodeError when checking attachments filenames.
     Fixed by: Bas van der Vlies
+
+  * Added support for installing trac in a virtual enviroment. You can 
+    set a default virtualenv path add configuration time, eg:
+      - ./configure --with-virtualenv=/data/virtualenvs/trac
+   
+    Or set/override at runtime: eg:
+     - ./email2trac.py --virtualenv=/data/virtualenvs/trac 
+    Author:  Bas van der Vlies & Dennis Stam (Suggestion)
 
 2.6.2

trunk/configure

@@ -579 +579 @@
 PYTHON_VERSION
 PYTHON
+virtualenv
 install_user
 mta_user
@@ -627 +628 @@
 with_trac_user
 with_mta_user
+with_virtualenv
 '
       ac_precious_vars='build_alias
@@ -1254 +1256 @@
   --with-mta_user=USER    Specify the name of the user that your MTA use,
                           default=nobody
+
+  --with-virtualenv=directory    Specify the default virtualenv path to use for trac,
+                          default=""
 
 Some influential environment variables:
@@ -1894 +1899 @@
 
 
+
 #DEBUG=0
 
@@ -3209 +3215 @@
 else
   mta_user="nobody"
+
+fi
+
+# We can specify a default virtual env path for trac
+#
+
+# Check whether --with-virtualenv was given.
+if test "${with_virtualenv+set}" = set; then :
+  withval=$with_virtualenv; case "${withval}" in
+        *) virtualenv="${withval}" ;;
+  esac
+else
+  virtualenv=""
 
 fi

trunk/configure.in

@@ -15 +15 @@
 AC_SUBST(install_user)
 AC_SUBST(sysconfdir)
+AC_SUBST(virtualenv)
 
 #DEBUG=0
@@ -69 +70 @@
 )dnl            
 
+# We can specify a default virtual env path for trac 
+#
+AC_ARG_WITH(virtualenv,
+[
+  --with-virtualenv=directory    Specify the default virtualenv path to use for trac,
+                          default=""],
+
+  [case "${withval}" in
+        *) virtualenv="${withval}" ;;
+  esac],
+
+  [virtualenv=""]
+)dnl            
+
 dnl ##### Path to email2trac.conf
 dnl This ugly kludge to get the sysconfdir path is needed because

trunk/debian/changelog

@@ +1 @@
+email2trac (2.7.0-1) stable; urgency=low
+
+  * See Changelog
+
+ -- Bas van der Vlies <bas.vandervlies@surfsara.nl>  Mon, 17 Jun 2013 21:16:32 +0200
+
 email2trac (2.6.3-1) stable; urgency=low
 

trunk/email2trac.py.in

@@ -39 +39 @@
                 -h,--help
                 -d, --debug 
+                -e, --virtualenv <path>
                 -f,--file  <configuration file>
                 -n,--dry-run
@@ -47 +48 @@
         $Id$
 """
-
-### virualenv
-##
-#        if virtualenv and os.path.exists(virtualenv):
-#                activate_this = os.path.join(virtualenv,
-#'bin/activate_this.py')
-#               if os.path.exists(activate_this):
-#                        execfile(activate_this,
-
 import os
 import sys
@@ -76 +68 @@
 from datetime import timedelta, datetime
 from stat import *
-
-try:
-    from trac import __version__ as trac_version
-    from trac import config as trac_config
-
-except ImportError, detail:
-    print "Can not find a a valid trac installation, try setting PYTHONPATH"
-    sys.exit(1)
 
 ## Some global variables
@@ -1793 +1777 @@
         self.logger.info('subject: %s' %repr(subject))
 
+        ## Ticket id is in Delivered-To Field. Trac notify must send this
+        #
+        #try:
+        #    print self.parameters.project_name
+        #    print 'Delivered To', m['Delivered-To']
+        #    print self.parameters.to_parse_address_delimiter
+        #    id = m['Delivered-To'].split(self.parameters.to_parse_address_delimiter)[1]
+        #    print id
+        #    id = id.split('@')[0]
+        #    print id
+#
+#        except KeyError, detail:
+#            pass
+
+
         ## [hic] #1529: Re: LRZ
         #  [hic] #1529?owner=bas,priority=medium: Re: LRZ
@@ -2603 +2602 @@
     verbose = None
     debug_interactive = None
-
-    SHORT_OPT = 'cdhf:np:t:v'
-    LONG_OPT  =  ['component=', 'debug', 'dry-run', 'help', 'file=', 'project=', 'ticket_prefix=', 'verbose']
+    virtualenv = '@virtualenv@'
+
+    SHORT_OPT = 'cde:hf:np:t:v'
+    LONG_OPT  =  ['component=', 'debug', 'dry-run', 'help', 'file=', 'project=', 'ticket_prefix=', 'virtualenv=', 'verbose']
 
     try:
@@ -2623 +2623 @@
         elif opt in ['-d', '--debug']:
             debug_interactive = 1
+        elif opt in ['-e', '--virtualenv']:
+            virtualenv = value
         elif opt in ['-f', '--file']:
             configfile = value
@@ -2633 +2635 @@
         elif opt in ['-v', '--verbose']:
             verbose = True
+
+    if virtualenv and os.path.exists(virtualenv):
+        activate_this = os.path.join(virtualenv, 'bin/activate_this.py')
+        if os.path.exists(activate_this):
+            execfile(activate_this, dict(__file__=activate_this))
+
+    try:
+        from trac import __version__ as trac_version
+        from trac import config as trac_config
+
+    except ImportError, detail:
+        print "Can not find a a valid trac installation, solutions could be:"
+        print "\tset PYTHONPATH"
+        print "\tuse the --virtualenv <dir> option"
+        sys.exit(1)
     
     settings = ReadConfig(configfile, project_name)
@@ -2719 +2736 @@
             logger.error("trac error: %s" %detail)
             sys.exit(0)
+        except TracError, detail:
+            logger.error("trac error: %s" %detail)
+            sys.exit(0)
 
         tktparser = TicketEmailParser(env, settings, logger, float(version))

trunk/email2trac.spec

@@ -1 +1 @@
 Summary: Utilities for converting emails to trac tickets
 Name: email2trac
-Version: 2.6.2
+Version: 2.7.0
 Release: 1
 License: Apache License 2.0