Changeset 18 for emailtotracscript/trunk

Timestamp:

01/10/06 23:09:17 (17 years ago)

Author:

bas

Message:

EmailtoTracScript?:

emailtotracscript:

• Removed project_root option from config file
• Removed some obsolete code
• Added multiple stanza's for config file, selectable

with --projectp option

• email2trac.conf example for mulitple projects

Location:

emailtotracscript/trunk

Files:

• ChangeLog (modified) (1 diff)
• email2trac.conf (modified) (1 diff)
• email2trac.py (modified) (7 diffs)

emailtotracscript/trunk/ChangeLog

@@ +1 @@
+2006-01-10  Bas van der Vlies <basv@sara.nl>:
+        * Removed project_root from source and config file
+        * Adjust code so we can use mulitple stanza's in config file, eg:
+          [bas]
+          project: /data/trac/bas
+          spam_level: 3
+
+          use option "-p|--project bas" to select the stanza
+
 2006-01-04  Bas van der Vlies <basv@sara.nl>:
 

emailtotracscript/trunk/email2trac.conf

@@ -10 +10 @@
 email_header: 1
 trac_version: 0.9
+
+[bas]
+project: /data/trac/bas
+spam_level: 1

emailtotracscript/trunk/email2trac.py

@@ -47 +47 @@
 ----------
  * Create an config file:
-        [DEFAULT]                    # REQUIRED
-        project: /data/trac/test     # REQUIRED
-        debug: 1                     # OPTIONAL, if set print some DEBUG info
-        spam_level: 4                # OPTIONAL, if set check for SPAM mail 
-        reply_address: 1             # OPTIONAL, if set then fill in ticket CC field
-        umask: 022                   # OPTIONAL, if set then use this umask for creation of the attachments
-        mailto_link: 1               # OPTIONAL, if set then [mailto:<CC>] in description 
-        trac_version: 0.8            # OPTIONAL, default is 0.9
+        [DEFAULT]                        # REQUIRED
+        project      : /data/trac/test   # REQUIRED
+        debug        : 1                 # OPTIONAL, if set print some DEBUG info
+        spam_level   : 4                 # OPTIONAL, if set check for SPAM mail 
+        reply_address: 1                 # OPTIONAL, if set then fill in ticket CC field
+        umask        : 022               # OPTIONAL, if set then use this umask for creation of the attachments
+        mailto_link  : 1                 # OPTIONAL, if set then [mailto:<CC>] in description 
+        trac_version : 0.8               # OPTIONAL, default is 0.9
+
+        [jouvin]                         # OPTIONAL project declaration, if set both fields necessary
+        project      : /data/trac/jouvin # use -p|--project jouvin.  
         
  * default config file is : /etc/email2trac.conf
@@ -449 +452 @@
 
 
-def ReadConfig(file):
+def ReadConfig(file, name):
         """
         Parse the config file
@@ -459 +462 @@
 
         config = ConfigParser.ConfigParser()
-
         try:
-          config.read(file)
+                config.read(file)
         except ConfigParser.MissingSectionHeaderError,detail:
-          print detail
-          sys.exit(1)
-
-        defaults = config.defaults()
-        if not defaults.has_key('project') and  not defaults.has_key('project_root'):
-                print 'You have to define the location of your trac project'
-                print 'or the root of your projects, eg:'
-                print '\t project: /var/trac/<projectname>'
-                print '\t project_root: /var/trac'
-                sys.exit(1)
-          
-        return defaults
-
+                print detail
+                sys.exit(1)
+
+
+        # Use given project name else use defaults
+        #
+        if name:
+                if not config.has_section(name):
+                        print "Not an valid project name: %s" %name
+                        print "Valid names: %s" %config.sections()
+                        sys.exit(1)
+
+                project =  dict()
+                for option in  config.options(name):
+                        project[option] = config.get(name, option) 
+
+        else:
+                project = config.defaults()
+
+        return project
 
 if __name__ == '__main__':
@@ -481 +490 @@
         #
         configfile = '/etc/email2trac.conf'
+        configfile = './email2trac.conf'
         project = ''
         component = ''
@@ -491 +501 @@
                 sys.exit(1)
 
+        project_name = None
         for opt,value in opts:
                 if opt in [ '-h', '--help']:
@@ -500 +511 @@
                         configfile = value
                 elif opt in ['-p', '--project']:
-                        project = value
-
-        settings = ReadConfig(configfile)
-
-        if not settings.has_key('project') and not project:
-                print 'You must specify a project either in configuration file'
-                print 'or with option --project'
+                        project_name = value
+
+        settings = ReadConfig(configfile, project_name)
+        if not settings.has_key('project'):
+                print __doc__
+                print 'No project defined in config file, eg:\n\t project: /data/trac/bas'
                 sys.exit(1)
-                
-        if project:
-                if settings.has_key('project_root') :
-                        settings['project'] = os.path.join(settings['project_root'], project)
-                else:
-                        print 'You must specify a project root in configuration file'
-                        print 'in order to use option --project'
-                        sys.exit(1)
-        else:
-                if not re.search("/",settings['project']):
-                        if settings.has_key('project_root') :
-                                settings['project'] = os.path.join(settings['project_root'], settings['project'])
-                        else:
-                                print 'You must specify a project root in configuration file'
-                                print 'or specify the project full path'
-                                sys.exit(1)
 
         if component:
@@ -532 +526 @@
         else:
                 version = trac_default_version
+
+        #debug HvB
+        #print settings
 
         if version > 0.8: