From grstarrett at cox.net Fri May 13 00:55:50 2005 From: grstarrett at cox.net (Glen Starrett) Date: Thu, 12 May 2005 17:55:50 -0700 Subject: [cvsspam-devel] Word wrapping the comment Message-ID: <4283FB16.9070508@cox.net> Hi, I *really* like CVSspam, it's a joy to use and looks very nice. I hacked in a CSS change to force the comments to wrap, but I thought I'd suggest a feature for future versions of CVSspam. My hack is very limited, all whitespace reverts to 'normal'. Maybe cvsspam could check for multiple lines and switch between 'normal' and 'pre' white-space settings? That is, 'normal' when it's just one line or 'pre' otherwise. My hack just adds the white-space style to the beginning of the comment class at line 1358 (cvsspam 0.2.11). .comment {white-space:normal;padding:4px;border:1px dashed #000000;background-color:#ffffdd} Thanks for the work you put into this. FYI, I'm running under cvsnt 2.5.01.1927 on FC2. -- Glen Starrett From dave at badgers-in-foil.co.uk Fri May 13 09:44:16 2005 From: dave at badgers-in-foil.co.uk (David Holroyd) Date: Fri, 13 May 2005 09:44:16 +0000 Subject: [cvsspam-devel] Word wrapping the comment In-Reply-To: <4283FB16.9070508@cox.net> References: <4283FB16.9070508@cox.net> Message-ID: <20050513094415.GA14493@vhost.badgers-in-foil.co.uk> On Thu, May 12, 2005 at 05:55:50PM -0700, Glen Starrett wrote: > I *really* like CVSspam, it's a joy to use and looks very nice. Thanks! :) > I hacked in a CSS change to force the comments to wrap, but I thought > I'd suggest a feature for future versions of CVSspam. My hack is very > limited, all whitespace reverts to 'normal'. Maybe cvsspam could check > for multiple lines and switch between 'normal' and 'pre' white-space > settings? That is, 'normal' when it's just one line or 'pre' otherwise. > > My hack just adds the white-space style to the beginning of the comment > class at line 1358 (cvsspam 0.2.11). > > .comment {white-space:normal;padding:4px;border:1px dashed > #000000;background-color:#ffffdd} This made me look up the other possible values for 'white-space'; maybe 'pre-wrap' would be a good compromise between 'pre' and 'normal'? Given MUA support, this should provide the preformatting required by people who write commit comments with Figlet, but also allows the long lines written by Eclipse users to be wrapped. What do you think? dave -- http://david.holroyd.me.uk/ From grstarrett at cox.net Fri May 13 16:22:18 2005 From: grstarrett at cox.net (Glen Starrett) Date: Fri, 13 May 2005 09:22:18 -0700 Subject: [cvsspam-devel] Word wrapping the comment In-Reply-To: <20050513094415.GA14493@vhost.badgers-in-foil.co.uk> References: <4283FB16.9070508@cox.net> <20050513094415.GA14493@vhost.badgers-in-foil.co.uk> Message-ID: <4284D43A.5060809@cox.net> This is a multi-part message in MIME format. --------------000100020202080702070901 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit David Holroyd wrote: >>My hack just adds the white-space style to the beginning of the comment >>class at line 1358 (cvsspam 0.2.11). >> >> .comment {white-space:normal;padding:4px;border:1px dashed >>#000000;background-color:#ffffdd} >> >> > >This made me look up the other possible values for 'white-space'; maybe >'pre-wrap' would be a good compromise between 'pre' and 'normal'? Given >MUA support, this should provide the preformatting required by people >who write commit comments with Figlet, but also allows the long lines >written by Eclipse users to be wrapped. > > I never knew about pre-wrap, I would guess it's part of CSS2 (the pocket reference I was using is a bit outdated). From the definition it sounds like a perfect fit. Unfortunately, it looks like Thunderbird doesn't understand it :( Long term I would think it will support it, but for now I'd have to stick with 'normal'. Ahhh, the joy of CSS authoring! :[ Glen Starrett --------------000100020202080702070901 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit David Holroyd wrote: 
My hack just adds the white-space style to the beginning of the comment 
class at line 1358 (cvsspam 0.2.11).

 .comment {white-space:normal;padding:4px;border:1px dashed 
#000000;background-color:#ffffdd}
    

This made me look up the other possible values for 'white-space'; maybe
'pre-wrap' would be a good compromise between 'pre' and 'normal'?  Given
MUA support, this should provide the preformatting required by people
who write commit comments with Figlet, but also allows the long lines
written by Eclipse users to be wrapped.

I never knew about pre-wrap, I would guess it's part of CSS2 (the pocket reference I was using is a bit outdated).  From the definition it sounds like a perfect fit.  Unfortunately, it looks like Thunderbird doesn't understand it :(  Long term I would think it will support it, but for now I'd have to stick with 'normal'.

Ahhh, the joy of CSS authoring!  :[

Glen Starrett


--------------000100020202080702070901-- From dave at badgers-in-foil.co.uk Fri May 13 16:41:23 2005 From: dave at badgers-in-foil.co.uk (David Holroyd) Date: Fri, 13 May 2005 16:41:23 +0000 Subject: [cvsspam-devel] Word wrapping the comment In-Reply-To: <4284D43A.5060809@cox.net> References: <4283FB16.9070508@cox.net> <20050513094415.GA14493@vhost.badgers-in-foil.co.uk> <4284D43A.5060809@cox.net> Message-ID: <20050513164123.GA20859@vhost.badgers-in-foil.co.uk> On Fri, May 13, 2005 at 09:22:18AM -0700, Glen Starrett wrote: > David Holroyd wrote: > > >>My hack just adds the white-space style to the beginning of the comment > >>class at line 1358 (cvsspam 0.2.11). > >> > >>.comment {white-space:normal;padding:4px;border:1px dashed > >>#000000;background-color:#ffffdd} > > > >This made me look up the other possible values for 'white-space'; maybe > >'pre-wrap' would be a good compromise between 'pre' and 'normal'? Given > >MUA support, this should provide the preformatting required by people > >who write commit comments with Figlet, but also allows the long lines > >written by Eclipse users to be wrapped. > > I never knew about pre-wrap, I would guess it's part of CSS2 (the pocket > reference I was using is a bit outdated). From the definition it sounds > like a perfect fit. Unfortunately, it looks like Thunderbird doesn't > understand it :( Long term I would think it will support it, but for > now I'd have to stick with 'normal'. Ah, we need the moz pixie dust. Works for me in Debian Thunderbird version 1.0 (20050116)... 
123456789   123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789.
dave -- http://david.holrovyd.e.uk/ From grstarrett at cox.net Fri May 13 21:44:17 2005 From: grstarrett at cox.net (Glen Starrett) Date: Fri, 13 May 2005 14:44:17 -0700 Subject: [cvsspam-devel] Word wrapping the comment In-Reply-To: <20050513164123.GA20859@vhost.badgers-in-foil.co.uk> References: <4283FB16.9070508@cox.net> <20050513094415.GA14493@vhost.badgers-in-foil.co.uk> <4284D43A.5060809@cox.net> <20050513164123.GA20859@vhost.badgers-in-foil.co.uk> Message-ID: <42851FB1.1030904@cox.net> This is a multi-part message in MIME format. --------------040308030904030306050009 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit David Holroyd wrote: >>I never knew about pre-wrap, I would guess it's part of CSS2 (the pocket >>reference I was using is a bit outdated). From the definition it sounds >>like a perfect fit. Unfortunately, it looks like Thunderbird doesn't >>understand it :( Long term I would think it will support it, but for >>now I'd have to stick with 'normal'. >> >> > >Ah, we need the moz pixie dust. Works for me in Debian Thunderbird >version 1.0 (20050116)... > > > > > > Bring on the magic dust! It works like a charm, thanks!! (using Win32 Thunderbird 1.0) Glen Starrett --------------040308030904030306050009 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit David Holroyd wrote: 
I never knew about pre-wrap, I would guess it's part of CSS2 (the pocket 
reference I was using is a bit outdated).  From the definition it sounds 
like a perfect fit.  Unfortunately, it looks like Thunderbird doesn't 
understand it :(  Long term I would think it will support it, but for 
now I'd have to stick with 'normal'.
    

Ah, we need the moz pixie dust.  Works for me in Debian Thunderbird
version 1.0 (20050116)...

  <html>
    <head>
      <style type="text/css"><!--
        pre {white-space:-moz-pre-wrap;white-space:pre-wrap;}
      --></style>

Bring on the magic dust!  It works like a charm, thanks!!

(using Win32 Thunderbird 1.0)

Glen Starrett

--------------040308030904030306050009-- From dave at badgers-in-foil.co.uk Sat May 14 11:12:46 2005 From: dave at badgers-in-foil.co.uk (David Holroyd) Date: Sat, 14 May 2005 11:12:46 +0000 Subject: [cvsspam-devel] Message theading In-Reply-To: <200504151509.37559.glen@delfi.ee> References: <200504151509.37559.glen@delfi.ee> Message-ID: <20050514111246.GA2412@vhost.badgers-in-foil.co.uk> --ikeVEW9yuYc//A+q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Apr 15, 2005 at 03:09:37PM +0300, Elan Ruusam?e wrote: > ps: david how's going with the treading mails feature? Patch attached. I hope it applies cleanly to whatever you've got at the moment. I tested with Mutt, and multiple commits to the same individual file now get nicely threaded together. I didn't make it include In-Reply-To, because it doesn't seem to be needed (for Mutt, at least). If some MUA specifically requires that too, then I'll think about adding it in. Also, I deliberately avoid adding the headers if more than one file is committed at once -- I just don't see what use-case would be served by having multi-file commits possibly-maybe-sometimes get attached to some previous simgle-file commit. Any good? dave -- http://david.holroyd.me.uk/ --ikeVEW9yuYc//A+q Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="mail_threading_patch1.diff" Index: cvsspam.rb =================================================================== RCS file: /var/lib/cvs/cvsspam/cvsspam.rb,v retrieving revision 1.69 diff -u -r1.69 cvsspam.rb --- cvsspam.rb 13 May 2005 20:06:55 -0000 1.69 +++ cvsspam.rb 14 May 2005 10:53:33 -0000 @@ -1235,6 +1235,7 @@ $debug = false $recipients = Array.new $sendmail_prog = "/usr/sbin/sendmail" +$hostname = ENV['HOSTNAME'] || 'localhost' $no_removed_file_diff = false $no_added_file_diff = false $no_diff = false @@ -1748,7 +1749,7 @@ from = EmailAddress.new(ENV['USER'] || ENV['USERNAME'] || 'cvsspam') end unless from.address =~ /@/ - from.address = "#{from.address}@#{ENV['HOSTNAME']||'localhost'}" + from.address = "#{from.address}@#{$hostname}" end smtp = Net::SMTP.new(@smtp_host) blah("connecting to '#{@smtp_host}'") @@ -1764,6 +1765,40 @@ end end + +def make_msg_id(localpart, hostpart) + "" +end + + +# replaces control characters, and a selection of other characters that +# may not appear unquoted in an RFC822 'word', with underscores. (It +# doesn't actually zap '.' though.) +def zap_header_special_chars(text) + text.gsub(/<>()\[\]@,;:\\[\000-\037\177]/, "_") +end + + +# Mail clients will try to 'thread' together a conversation over +# several email messages by inspecting the In-Reply-To and References headers, +# which should refer to previous emails in the conversation by mentioning +# the value of the previous message's Message-Id header. This function invents +# values for these headers so that, in the special case where a *single* file +# is committed to repeatedly, the emails giving notification of these commits +# can be threaded together automatically by the mail client. +def inject_threading_headers(mail) + return unless $fileEntries.length == 1 + file = $fileEntries[0] + name = zap_header_special_chars(file.path) + unless file.fromVer == "NONE" + mail.header("References", make_msg_id("#{name}.#{file.fromVer}", $hostname)) + end + unless file.toVer == "NONE" + mail.header("Message-ID", make_msg_id("#{name}.#{file.toVer}", $hostname)) + end +end + + if $smtp_host require 'net/smtp' mailer = SMTPMailer.new($smtp_host) @@ -1775,6 +1810,7 @@ mailer.send($from_address, $recipients) do |mail| mail.header("Subject", mailSubject) + inject_threading_headers(mail) mail.header("MIME-Version", "1.0") mail.header("Content-Type", "text/html" + ($charset.nil? ? "" : "; charset=\"#{$charset}\"")) if ENV['REMOTE_HOST'] --ikeVEW9yuYc//A+q-- From glen at delfi.ee Sat May 14 20:34:37 2005 From: glen at delfi.ee (Elan =?iso-8859-1?q?Ruusam=E4e?=) Date: Sat, 14 May 2005 23:34:37 +0300 Subject: [cvsspam-devel] Word wrapping the comment In-Reply-To: <20050513164123.GA20859@vhost.badgers-in-foil.co.uk> References: <4283FB16.9070508@cox.net> <4284D43A.5060809@cox.net> <20050513164123.GA20859@vhost.badgers-in-foil.co.uk> Message-ID: <200505142334.38612.glen@delfi.ee> On Friday 13 May 2005 19:41, David Holroyd wrote: > On Fri, May 13, 2005 at 09:22:18AM -0700, Glen Starrett wrote: > > David Holroyd wrote: > > >>My hack just adds the white-space style to the beginning of the comment > > >>class at line 1358 (cvsspam 0.2.11). > > >> > > >>.comment {white-space:normal;padding:4px;border:1px dashed > > >>#000000;background-color:#ffffdd} > > > > > >This made me look up the other possible values for 'white-space'; maybe > > >'pre-wrap' would be a good compromise between 'pre' and 'normal'? Given > > >MUA support, this should provide the preformatting required by people > > >who write commit comments with Figlet, but also allows the long lines > > >written by Eclipse users to be wrapped. > > > > I never knew about pre-wrap, I would guess it's part of CSS2 (the pocket > > reference I was using is a bit outdated). From the definition it sounds > > like a perfect fit. Unfortunately, it looks like Thunderbird doesn't > > understand it :( Long term I would think it will support it, but for > > now I'd have to stick with 'normal'. > > Ah, we need the moz pixie dust. Works for me in Debian Thunderbird > version 1.0 (20050116)... > > > > > > > 
123456789   123456789 123456789 123456789 123456789 123456789
> 123456789 123456789 123456789 123456789 123456789 123456789 123456789
> 123456789 123456789 123456789 123456789 123456789 123456789 123456789
> 123456789 123456789 123456789 123456789.
> http://forums.techguy.org/archive/index.php/t-249849.html have look at that one, to get the most compatible behaviour. > dave -- glen From glen at delfi.ee Sat May 14 20:47:53 2005 From: glen at delfi.ee (Elan =?iso-8859-13?q?Ruusam=E4e?=) Date: Sat, 14 May 2005 23:47:53 +0300 Subject: [cvsspam-devel] Message theading In-Reply-To: <20050514111246.GA2412@vhost.badgers-in-foil.co.uk> References: <200504151509.37559.glen@delfi.ee> <20050514111246.GA2412@vhost.badgers-in-foil.co.uk> Message-ID: <200505142347.54717.glen@delfi.ee> On Saturday 14 May 2005 14:12, David Holroyd wrote: > On Fri, Apr 15, 2005 at 03:09:37PM +0300, Elan Ruusam?e wrote: > > ps: david how's going with the treading mails feature? > > Patch attached. I hope it applies cleanly to whatever you've got at the > moment. I tested with Mutt, and multiple commits to the same individual > file now get nicely threaded together. > > I didn't make it include In-Reply-To, because it doesn't seem to be > needed (for Mutt, at least). If some MUA specifically requires that > too, then I'll think about adding it in. i guess the in-reply-to makes sense if you are filling the in-reply-to with multiple msgids, to specify to which msgid exactly the reply was. but you only fill the "parent" msgid. > Also, I deliberately avoid adding the headers if more than one file is > committed at once -- I just don't see what use-case would be served by > having multi-file commits possibly-maybe-sometimes get attached to some > previous simgle-file commit. that's okay. > Any good? yes! thank you! :) except that maybe it's possible to make the host portion of msgid configurable in config file, because in my env the $HOSTNAME is always blank. and besides if the HOSTNAME is visible, it would be not the one i'd use :) > dave -- glen From dave at badgers-in-foil.co.uk Sun May 15 16:05:41 2005 From: dave at badgers-in-foil.co.uk (David Holroyd) Date: Sun, 15 May 2005 16:05:41 +0000 Subject: [cvsspam-devel] Word wrapping the comment In-Reply-To: <200505142334.38612.glen@delfi.ee> References: <4283FB16.9070508@cox.net> <4284D43A.5060809@cox.net> <20050513164123.GA20859@vhost.badgers-in-foil.co.uk> <200505142334.38612.glen@delfi.ee> Message-ID: <20050515160540.GA28366@vhost.badgers-in-foil.co.uk> On Sat, May 14, 2005 at 11:34:37PM +0300, Elan Ruusam?e wrote: > http://forums.techguy.org/archive/index.php/t-249849.html Cool. So the rule now reads, .comment {white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;white-space:pre-wrap;word-wrap:break-word;padding:4px;border:1px dashed #000000;background-color:#ffffdd} Thanks for the tip! dave -- http://david.holroyd.me.uk/ From dave at badgers-in-foil.co.uk Sun May 15 16:13:33 2005 From: dave at badgers-in-foil.co.uk (David Holroyd) Date: Sun, 15 May 2005 16:13:33 +0000 Subject: [cvsspam-devel] Message theading In-Reply-To: <200505142347.54717.glen@delfi.ee> References: <200504151509.37559.glen@delfi.ee> <20050514111246.GA2412@vhost.badgers-in-foil.co.uk> <200505142347.54717.glen@delfi.ee> Message-ID: <20050515161333.GB28366@vhost.badgers-in-foil.co.uk> On Sat, May 14, 2005 at 11:47:53PM +0300, Elan Ruusam?e wrote: > On Saturday 14 May 2005 14:12, David Holroyd wrote: > > Patch attached. I hope it applies cleanly to whatever you've got at the > > moment. I tested with Mutt, and multiple commits to the same individual > > file now get nicely threaded together. > > Any good? > yes! thank you! :) > > except that maybe it's possible to make the host portion of msgid configurable > in config file, because in my env the $HOSTNAME is always blank. and besides > if the HOSTNAME is visible, it would be not the one i'd use :) I think that it should be possible to simply assign a new value to $hostname in cvsspam.conf without any additional changes to the code. dave -- http://david.holroyd.me.uk/ From glen at delfi.ee Sun May 15 17:38:04 2005 From: glen at delfi.ee (Elan =?iso-8859-1?q?Ruusam=E4e?=) Date: Sun, 15 May 2005 20:38:04 +0300 Subject: [cvsspam-devel] Message theading In-Reply-To: <20050515161333.GB28366@vhost.badgers-in-foil.co.uk> References: <200504151509.37559.glen@delfi.ee> <200505142347.54717.glen@delfi.ee> <20050515161333.GB28366@vhost.badgers-in-foil.co.uk> Message-ID: <200505152038.06183.glen@delfi.ee> On Sunday 15 May 2005 19:13, David Holroyd wrote: > On Sat, May 14, 2005 at 11:47:53PM +0300, Elan Ruusam?e wrote: > > On Saturday 14 May 2005 14:12, David Holroyd wrote: > > > Patch attached. I hope it applies cleanly to whatever you've got at > > > the moment. I tested with Mutt, and multiple commits to the same > > > individual file now get nicely threaded together. > > > > > > Any good? > > > > yes! thank you! :) > > > > except that maybe it's possible to make the host portion of msgid > > configurable in config file, because in my env the $HOSTNAME is always > > blank. and besides if the HOSTNAME is visible, it would be not the one > > i'd use :) > > I think that it should be possible to simply assign a new value to > $hostname in cvsspam.conf without any additional changes to the code. yes. unbelieveable :) but i think if you're going to leave in this feature, you should add it to default cvsspam.conf as a sample :) > dave -- glen From pardinilist at pardini.net Tue May 17 14:48:13 2005 From: pardinilist at pardini.net (Ricardo Pardini) Date: Tue, 17 May 2005 11:48:13 -0300 Subject: [cvsspam-devel] Request: Wiki-links support in CVSSpam Message-ID: <428A042D.6040806@pardini.net> Hello list, David, first I wanna thank again for CVSSpam, it works wonders! Now I'm setting up a private Wiki for our development team, and I'd like to use CVSSpam to link to the Wiki, just like CVSSpam already does for Bugzilla/JIRA/RT. The needs are as follows: * The base URL for the wiki is configured in cvsspam.conf. * The users embed links to the Wiki in their commit messages, in [[wiki link format]], using "[[" and "]]"; CVSSpam parses that and turns them into clicable links in the HTML email body. * If [[wikilinks]] are detected on the first line of the commit message (the one that goes into the Subject: header), they're stripped, to avoid polluting; but the link is still present in the mail body. Taking a look at at CVSSPam 0.2.11, I found the MultiSub class, and the 'mailSub', 'bugzillaSub', etc, regex substitutions; I suppose I can just add a new regex there to handle the [[links]]. Am I in the right direction? Also, is 0.2.11 the version I should be working against, or is there a CVS repos? Again, thanks a lot. -- Ricardo Pardini From pardinilist at pardini.net Thu May 19 23:59:45 2005 From: pardinilist at pardini.net (Ricardo Pardini) Date: Thu, 19 May 2005 20:59:45 -0300 Subject: [cvsspam-devel] Request: Wiki-links support in CVSSpam In-Reply-To: <428A042D.6040806@pardini.net> References: <428A042D.6040806@pardini.net> Message-ID: <428D2871.9090004@pardini.net> This is a multi-part message in MIME format. --------------050400060902010302030107 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit I love replying to myself... I went ahead and made a patch against 0.2.11. I think it works ok... -- Pardini Ricardo Pardini wrote: > Hello list, David, > > first I wanna thank again for CVSSpam, it works wonders! Now I'm > setting up a private Wiki for our development team, and I'd like to > use CVSSpam to link to the Wiki, just like CVSSpam already does for > Bugzilla/JIRA/RT. The needs are as follows: > > * The base URL for the wiki is configured in cvsspam.conf. > * The users embed links to the Wiki in their commit messages, in > [[wiki link format]], using "[[" and "]]"; CVSSpam parses that and > turns them into clicable links in the HTML email body. > * If [[wikilinks]] are detected on the first line of the commit > message (the one that goes into the Subject: header), they're > stripped, to avoid polluting; but the link is still present in the > mail body. > > Taking a look at at CVSSPam 0.2.11, I found the MultiSub class, and > the 'mailSub', 'bugzillaSub', etc, regex substitutions; I suppose I > can just add a new regex there to handle the [[links]]. Am I in the > right direction? Also, is 0.2.11 the version I should be working > against, or is there a CVS repos? > > Again, thanks a lot. > > -- > Ricardo Pardini > > _______________________________________________ > cvsspam-devel mailing list > cvsspam-devel@lists.badgers-in-foil.co.uk > http://lists.badgers-in-foil.co.uk/mailman/listinfo/cvsspam-devel --------------050400060902010302030107 Content-Type: text/plain; name="cvsspam.wiki.regex.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="cvsspam.wiki.regex.patch" Index: cvsspam.conf =================================================================== RCS file: /var/lib/cvs/cvsspam/cvsspam.conf,v retrieving revision 1.1 diff -u -r1.1 cvsspam.conf --- cvsspam.conf 19 May 2005 23:50:35 -0000 1.1 +++ cvsspam.conf 19 May 2005 23:55:05 -0000 @@ -40,6 +40,18 @@ #$jiraURL = "http://jira.atlassian.com/secure/ViewIssue.jspa?key=%s" +# Link to Wiki systems +# +# If you want comments to include links to a Wiki installation, give +# $wikiURL of the wiki's page, using %s to specify where the link +# should be substituted. Example: +# +# $wikiURL = "http://en.wikipedia.org/wiki/%s" +# +# If you specify a URL, text within log-comments of the form '[[wiki link]]' +# will be made into hyperlinks in the generated email. + +$wikiURL = "http://en.wikipedia.org/wiki/%s" # Link to CVS web frontends (Optional) Index: cvsspam.rb =================================================================== RCS file: /var/lib/cvs/cvsspam/cvsspam.rb,v retrieving revision 1.1 diff -u -r1.1 cvsspam.rb --- cvsspam.rb 19 May 2005 23:50:35 -0000 1.1 +++ cvsspam.rb 19 May 2005 23:52:24 -0000 @@ -516,9 +516,15 @@ match =~ /([0-9]+)/ "#{match}" } +wikiSub = proc { |match| + match =~ /\[\[(.*)\]\]/ + raw = $1 + "#{raw}" +} commentSubstitutions = { '(?:mailto:)?[\w\.\-\+\=]+\@[\w\-]+(?:\.[\w\-]+)+\b' => mailSub, - '\b(?:http|https|ftp):[^ \t\n<>"]+[\w/]' => urlSub} + '\b(?:http|https|ftp):[^ \t\n<>"]+[\w/]' => urlSub + } # outputs commit log comment text supplied by LogReader as preformatted HTML class CommentHandler < LineConsumer @@ -1158,6 +1164,7 @@ $no_diff = false $task_keywords = ['TODO', 'FIXME'] $bugzillaURL = nil +$wikiURL = nil $jiraURL = nil $ticketURL = nil $viewcvsURL = nil @@ -1263,6 +1270,9 @@ if $ticketURL != nil commentSubstitutions['\b[Tt][Ii][Cc][Kk][Ee][Tt]\s*#?[0-9]+\b'] = ticketSub end +if $wikiURL != nil + commentSubstitutions['\[\[.+\]\]'] = wikiSub +end $commentEncoder = MultiSub.new(commentSubstitutions) --------------050400060902010302030107-- From dave at badgers-in-foil.co.uk Thu May 26 00:13:29 2005 From: dave at badgers-in-foil.co.uk (David Holroyd) Date: Thu, 26 May 2005 00:13:29 +0000 Subject: [cvsspam-devel] Request: Wiki-links support in CVSSpam In-Reply-To: <428D2871.9090004@pardini.net> References: <428A042D.6040806@pardini.net> <428D2871.9090004@pardini.net> Message-ID: <20050526001328.GA14636@vhost.badgers-in-foil.co.uk> Sorry about the delayed reply, On Thu, May 19, 2005 at 08:59:45PM -0300, Ricardo Pardini wrote: > I love replying to myself... I went ahead and made a patch against > 0.2.11. I think it works ok... Patch applied. The only minor changed I made on top of your code was to try and ensure we construct valid URLs... ----8<---- --- cvsspam.rb 25 May 2005 23:56:03 -0000 1.72 +++ cvsspam.rb 26 May 2005 00:05:28 -0000 @@ -547,7 +547,7 @@ wikiSub = proc { |match| match =~ /\[\[(.*)\]\]/ raw = $1 - "#{raw}" + "#{raw}" } commentSubstitutions = { '(?:mailto:)?[\w\.\-\+\=]+\@[\w\-]+(?:\.[\w\-]+)+\b' => mailSub, ---->8---- Thanks for adding a cool new feature! dave -- http://david.holroyd.me.uk/ From matthew at nocturnal.org Fri May 27 18:31:47 2005 From: matthew at nocturnal.org (Matthew Lenz) Date: Fri, 27 May 2005 13:31:47 -0500 Subject: [cvsspam-devel] /export/home/cvs/repository/CVSROOT/cvsspam.rb:561: warning: instance variable @repository_name not initialized Message-ID: <1117218708.5881.42.camel@mlenzdesktop> I'm getting this error with cvsspam 0.2.11 and cvs 1.11.5 I looked on the readme and one of the fixes suggested moving to 1.12.x which isn't the stable tree. Will 1.11.20 fix this problem? From dave at badgers-in-foil.co.uk Sat May 28 09:03:23 2005 From: dave at badgers-in-foil.co.uk (David Holroyd) Date: Sat, 28 May 2005 09:03:23 +0000 Subject: [cvsspam-devel] /export/home/cvs/repository/CVSROOT/cvsspam.rb:561: warning: instance variable @repository_name not initialized In-Reply-To: <1117218708.5881.42.camel@mlenzdesktop> References: <1117218708.5881.42.camel@mlenzdesktop> Message-ID: <20050528090323.GA30161@vhost.badgers-in-foil.co.uk> Heya, On Fri, May 27, 2005 at 01:31:47PM -0500, Matthew Lenz wrote: > I'm getting this error with cvsspam 0.2.11 and cvs 1.11.5 > > I looked on the readme and one of the fixes suggested moving to 1.12.x > which isn't the stable tree. Will 1.11.20 fix this problem? Are you certain you've got CVSspam 0.2.11 there? I think this was a problem fixed between releases 0.2.10 and 0.2.11 -- the line number in the error message matches the 0.2.10 codebase too. dave -- http://david.holroyd.me.uk/ From mmcconnell at mha.ca Tue May 31 04:02:06 2005 From: mmcconnell at mha.ca (Michael McConnell) Date: Mon, 30 May 2005 21:02:06 -0700 Subject: [cvsspam-devel] Debian Sarge upgrade caused issues Message-ID: <429BE1BE.9040300@mha.ca> Hello all, I have been enjoying using CVSSpam for quite some time, its simply a great tool! Recently I performed an apt-get update / upgrade, and since then CVSSpam hasn't been running correctly. My guess is the problem is related to the upgrade version of Ruby to 1.8.2 (2005-04-11). Now when I run; collect_diffs.rb --config I get; /usr/lib/ruby/1.8/getoptlong.rb:265:in `set_error': option `--config' requires an argument (GetoptLong::MissingArgument) from /usr/lib/ruby/1.8/getoptlong.rb:377:in `get_option' from /usr/lib/ruby/1.8/getoptlong.rb:458:in `each' from /usr/lib/ruby/1.8/getoptlong.rb:457:in `loop' from /usr/lib/ruby/1.8/getoptlong.rb:457:in `each' from /root/CVSROOT/collect_diffs.rb:366 And when I try to commit I get; /usr/home/cvs/CVSROOT/log_accum.pl,v <-- log_accum.pl new revision: 1.70; previous revision: 1.69 cvs status: in directory `/usr/home/cvs/CVSROOT': cvs [status aborted]: there is no version here; do `cvs checkout' first /usr/home/cvs/CVSROOT/collect_diffs.rb:209:in `process_log': couldn't get cvs status: (exited with 256) (RuntimeError) from /usr/home/cvs/CVSROOT/collect_diffs.rb:195:in `each' from /usr/home/cvs/CVSROOT/collect_diffs.rb:195:in `process_log' from /usr/home/cvs/CVSROOT/collect_diffs.rb:178:in `open' from /usr/home/cvs/CVSROOT/collect_diffs.rb:178:in `process_log' from /usr/home/cvs/CVSROOT/collect_diffs.rb:423 cvs commit: Rebuilding administrative file database Any suggestions would be greatly appreciated. Thanks, Mike From pardinilist at pardini.net Tue May 31 04:20:01 2005 From: pardinilist at pardini.net (Ricardo Pardini) Date: Tue, 31 May 2005 01:20:01 -0300 Subject: [cvsspam-devel] Debian Sarge upgrade caused issues In-Reply-To: <429BE1BE.9040300@mha.ca> References: <429BE1BE.9040300@mha.ca> Message-ID: <429BE5F1.6050403@pardini.net> Michael McConnell wrote: > I have been enjoying using CVSSpam for quite some time, its simply > a great tool! Recently I performed an apt-get update / upgrade, and > since then CVSSpam hasn't been running correctly. My guess is the > problem is related to the upgrade version of Ruby to 1.8.2 (2005-04-11). Unlikely; I run Sarge, with Ruby 1.8.2 with no problems. Probably this has more to do with a CVS update and the commitinfo/loginfo format, but I'm not sure. Check your CVS version, probably sarge's update/upgrade brought in a recent CVS version (1.12.x) which requires changes to loginfo/commitinfo format. Here I run CVS 1.12.9-13, using the following line in 'loginfo': DEFAULT $CVSROOT/CVSROOT/collect_diffs.rb --to smth@example.com %{sVv} and 'commitinfo': DEFAULT $CVSROOT/CVSROOT/record_lastdir.rb %r/%p %s and in 'config': UseNewInfoFmtStrings=yes -- Pardini