0
@@ -1,6 +1,6 @@
0
 require 'ticgit'
0
 require 'optparse'
0
-
0
+require 'yaml'
0
 # used Cap as a model for this - thanks Jamis
0
 
0
 module TicGit
0
@@ -250,6 +250,7 @@
0
       puts just('TicId', 10) + ': ' + t.ticket_id
0
       puts
0
       puts just('Assigned', 10) + ': ' + t.assigned.to_s 
0
+      puts just('Reporter', 10) + ': ' + t.reporter.to_s 
0
       puts just('Opened', 10) + ': ' + t.opened.to_s + ' (' + days_ago + ' days)'
0
       puts just('State', 10) + ': ' + t.state.upcase
0
       if !t.tags.empty?
0
0
0
0
0
0
0
@@ -297,45 +298,49 @@
0
         # interactive
0
         message_file = Tempfile.new('ticgit_message').path
0
         File.open(message_file, 'w') do |f|
0
-          f.puts "\n# ---"
0
-          f.puts "tags:"
0
-          f.puts "# first line will be the title of the tic, the rest will be the first comment"
0
-          f.puts "# if you would like to add initial tags, put them on the 'tags:' line, comma delim"
0
+          f.puts <<ISSUE_FILE
0
+title: 
0
+reporter: 
0
+#Put your tags after 'tags: ' in comma delimited form 
0
+tags: 
0
+
0
+#put your comment here. remember to indent it
0
+comments: >
0
+        
0
+ISSUE_FILE
0
+
0
         end
0
         if message = get_editor_message(message_file)
0
-          title = message.shift
0
+          puts message
0
+          issue_info = YAML.load(File.open(message))
0
+         
0
+          if issue_info.kind_of? String
0
+            puts "I couldn't parse that. Make sure that colons " +
0
+              "followed by space and your comments are indented"
0
+            return
0
+          end
0
+
0
+          title = issue_info['title']
0
           if title && title.chomp.length > 0
0
-            title = title.chomp
0
-            if message.last[0, 5] == 'tags:'
0
-              tags = message.pop
0
-              tags = tags.gsub('tags:', '')
0
-              tags = tags.split(',').map { |t| t.strip }
0
-            end
0
-            if message.size > 0
0
-              comment = message.join("")
0
-            end
0
-            ticket_show(@tic.ticket_new(title, :comment => comment, :tags => tags))
0
+            tags = issue_info['tags']
0
+            tags = tags.split(',').map { |t| t.strip }
0
+            comment = issue_info['comments']
0
+
0
+            ticket_show(@tic.ticket_new(title, :comment => comment, :tags => tags, :reporter => issue_info['reporter']))
0
           else
0
-                        puts "You need to at least enter a title"
0
+                        puts "You need to at least enter a title"
0
           end
0
-        else
0
-          puts "It seems you wrote nothing"
0
         end
0
       end
0
     end
0
-    
0
+
0
     def get_editor_message(message_file = nil)
0
       message_file = Tempfile.new('ticgit_message').path if !message_file
0
       
0
       editor = ENV["EDITOR"] || 'vim'
0
       system("#{editor} #{message_file}");
0
-      message = File.readlines(message_file)
0
-      message = message.select { |line| line[0, 1] != '#' } # removing comments   
0
-      if message.empty?
0
-        return false
0
-      else
0
-        return message
0
-      end   
0
+      return message_file
0
+
0
     end
0
     
0
     def parse_options! #:nodoc:      

0
@@ -3,16 +3,18 @@
0
   
0
     attr_reader :base, :opts
0
     attr_accessor :ticket_id, :ticket_name
0
-    attr_accessor :title, :state, :milestone, :assigned, :, :opened
0
+    attr_accessor :title, :state, :milestone, :assigned, :reporter, :opened
0
     attr_accessor :comments, :tags, :attachments # arrays
0
     
0
     def initialize(base, options = {})
0
       options[:user_name] ||= base.git.config('user.name') 
0
       options[:user_email] ||= base.git.config('user.email')      
0
-      
0
+      options[:reporter] ||= options[:user_email]
0
+
0
       @base = base
0
       @opts = options || {}
0
-      
0
+
0
+      @reporter = options[:reporter]
0
       @state = 'open' # by default
0
       @comments = []
0
       @tags = []
0
@@ -47,6 +49,9 @@
0
           if data[0] == 'ASSIGNED'
0
             t.assigned = data[1]
0
           end
0
+          if data[0] == 'REPORTER'
0
+            t.reporter = data[1]
0
+          end
0
           if data[0] == 'COMMENT'
0
             t.comments << TicGit::Comment.new(base, fname, value)
0
           end
0
@@ -80,6 +85,7 @@
0
           base.new_file('TICKET_ID', ticket_name)
0
           base.new_file('ASSIGNED_' + email, email)
0
           base.new_file('STATE_' + state, state)
0
+          base.new_file('REPORTER_' + reporter, reporter)
0
 
0
           # add initial comment
0
           #COMMENT_080315060503045__schacon_at_gmail
0
@@ -186,7 +192,7 @@
0
     def email
0
       opts[:user_email] || 'anon'
0
     end
0
-    
0
+
0
     def assigned_name
0
       assigned.split('@').first rescue ''
0
     end