Mail handler: more control over issue attributes (#1110).

Tracker, category and priority attributes can be specified in command line arguments and/or individually specified as overridable by email body keywords.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1643 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 49 insertions, 16 deletions

diff --git a/extra/mail_handler/rdm-mailhandler.rb b/extra/mail_handler/rdm-mailhandler.rb
index 585afefef..87a6798fa 100644
--- a/extra/mail_handler/rdm-mailhandler.rb
+++ b/extra/mail_handler/rdm-mailhandler.rb
@@ -12,16 +12,22 @@ require 'getoptlong'
 class RedmineMailHandler
   VERSION = '0.1'
   
-  attr_accessor :verbose, :project, :url, :key
+  attr_accessor :verbose, :issue_attributes, :allow_override, :url, :key
 
   def initialize
+    self.issue_attributes = {}
+    
     opts = GetoptLong.new(
       [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
       [ '--version', '-V', GetoptLong::NO_ARGUMENT ],
       [ '--verbose', '-v', GetoptLong::NO_ARGUMENT ],
       [ '--url', '-u', GetoptLong::REQUIRED_ARGUMENT ],
       [ '--key', '-k', GetoptLong::REQUIRED_ARGUMENT],
-      [ '--project', '-p', GetoptLong::REQUIRED_ARGUMENT ]
+      [ '--project', '-p', GetoptLong::REQUIRED_ARGUMENT ],
+      [ '--tracker', '-t', GetoptLong::REQUIRED_ARGUMENT],
+      [ '--category', GetoptLong::REQUIRED_ARGUMENT],
+      [ '--priority', GetoptLong::REQUIRED_ARGUMENT],
+      [ '--allow-override', '-o', GetoptLong::REQUIRED_ARGUMENT]
     )
 
     opts.each do |opt, arg|
@@ -36,8 +42,10 @@ class RedmineMailHandler
         self.verbose = true
       when '--version'
         puts VERSION; exit
-      when '--project'
-        self.project = arg.dup
+      when '--project', '--tracker', '--category', '--priority'
+        self.issue_attributes[opt.gsub(%r{^\-\-}, '')] = arg.dup
+      when '--allow-override'
+        self.allow_override = arg.dup
       end
     end
     
@@ -46,8 +54,11 @@ class RedmineMailHandler
   
   def submit(email)
     uri = url.gsub(%r{/*$}, '') + '/mail_handler'
+    
+    data = { 'key' => key, 'email' => email, 'allow_override' => allow_override }
+    issue_attributes.each { |attr, value| data["issue[#{attr}]"] = value }
+             
     debug "Posting to #{uri}..."
-    data = { 'key' => key, 'project' => project, 'email' => email }
     response = Net::HTTP.post_form(URI.parse(uri), data)
     debug "Response received: #{response.code}"
     response.code == 201 ? 0 : 1
@@ -56,17 +67,39 @@ class RedmineMailHandler
   private
   
   def usage
-    puts "Usage: rdm-mailhandler [options] --url=<Redmine URL> --key=<API key>"
-    puts "Reads an email from standard input and forward it to a Redmine server"
-    puts
-    puts "Options:"
-    puts "  --help             show this help"
-    puts "  --verbose          show extra information"
-    puts "  --project          identifier of the target project"
-    puts
-    puts "Examples:"
-    puts "  rdm-mailhandler --url http://redmine.domain.foo --key secret"
-    puts "  rdm-mailhandler --url https://redmine.domain.foo --key secret --project foo"
+    puts  <<-USAGE
+Usage: rdm-mailhandler [options] --url=<Redmine URL> --key=<API key>
+Reads an email from standard input and forward it to a Redmine server
+
+Required:
+  -u, --url                      URL of the Redmine server
+  -k, --key                      Redmine API key
+  
+General options:
+  -h, --help                     show this help
+  -v, --verbose                  show extra information
+  -V, --version                  show version information and exit
+
+Issue attributes control options:
+  -p, --project=PROJECT          identifier of the target project
+  -t, --tracker=TRACKER          name of the target tracker
+      --category=CATEGORY        name of the target category
+      --priority=PRIORITY        name of the target priority
+  -o, --allow-override=ATTRS     allow email content to override attributes
+                                 specified by previous options
+                                 ATTRS is a comma separated list of attributes
+      
+Examples:
+  # No project specified. Emails MUST contain the 'Project' keyword:
+  rdm-mailhandler --url http://redmine.domain.foo --key secret
+  
+  # Fixed project and default tracker specified, but emails can override
+  # both tracker and priority attributes:
+  rdm-mailhandler --url https://domain.foo/redmine --key secret \\
+                  --project foo \\
+                  --tracker bug \\
+                  --allow-override tracker,priority
+USAGE
     exit
   end