Diff for /CVSROOT/cvs2rss.pl between versions 1.1 and 1.13

version 1.1, 2005/10/11 19:45:18 version 1.13, 2008/11/26 18:43:30
Line 13 Line 13
 #  #
 # AddType application/rss+xml .rss  # AddType application/rss+xml .rss
 #  #
 # Important note:   
 # If you have html files (or files with html in them) in your CVS Repository, look in your RSS.pm for:  
 #  
 # $text =~ s/</&lt;/g;  
 #  
 # I suggest commenting out this line because it will screw up this script (I think its a bug in the parser)  
 # If you do not, when this script uses XML:RSS's parsefile(), it will mess up any <descriptions> that   
 # contain HTML.  
 #  
 # P.S. The "other" cvs2rss.pl isn't really cvs2rss, it is more like cvs2xml, boo!  # P.S. The "other" cvs2rss.pl isn't really cvs2rss, it is more like cvs2xml, boo!
 # P.P.S. Parts of this are stolen from commit2rss.rb and the XML::RSS examples.  # P.P.S. Parts of this are stolen from commit2rss.rb and the XML::RSS examples.
 #  #
 # Version 1.0 - 08.24.04 RSS Compliant, no cvs diff capability yet..  # Version 1.0 - 08.24.04 RSS Compliant, no cvs diff capability yet..
 # Version 1.1 - 08.31.04 Adding CVS Diff capability  # Version 1.1 - 08.31.04 Adding CVS Diff capability
 #  # Edit by Guy Albertelli, -- corrected the packaging of Entities
   #                          - commits now <pre>ed
   #                          - removed html rants
   # Edit by Stuart Raeburn, -- eliminated earlier HTML::Entities customization.
   
 use strict;  use strict;
 use XML::RSS;  use XML::RSS;
 use POSIX;  use POSIX;
   
 # Stuff you need to setup   # Stuff you need to setup 
 my $rssFeed ="/home/loninst/public_html/loncapa.rss";  my $cvslink = 'http://source.loncapa.org/cgi-bin/cvsweb.cgi/';
   my $rssFeed ="/home/rss/cvs.rss";
 my $emailDomain = "loncapa.org";  my $emailDomain = "loncapa.org";
 my $channelTitle = "Lon-CAPA RSS Feed";  my $channelTitle = "Lon-CAPA RSS Feed";
 my $channelLink = "http://install.loncapa.org/cvs.rss";  my $channelLink = "http://source.loncapa.org/rss/cvs.rss";
 my $numEntries = 200;  my $numEntries = 30;
   
 # Set this to 1 to enable cvs rdiff (is pretty broken if you are diffing html content)  # Set this to 1 to enable cvs rdiff
 my $cvsDiff = 1;  my $cvsDiff = 1;
   
 # Leave everything else alone  # Leave everything else alone
 my $author = getpwuid(getuid()) . "\@" . $emailDomain;  my $author = getpwuid(getuid());
 $author = 'guy' . "\@" . 'albertelli.com';  
 my $pubDate = strftime('%a, %d %b %Y %H:%M:%S %Z',localtime(time));  my $pubDate = strftime('%a, %d %b %Y %H:%M:%S %Z',localtime(time));
 my $description;  
 my @title=split(",",$ARGV[0]);  my @args = split(" ", $ARGV[0]);
   my $dir = shift(@args);
   
   # bail when this is a new directory
   &bail if $args[0] eq '-' && "$args[1] $args[2]" eq 'New directory';
   # bail if this is an import
   &bail if $args[0] eq '-' && $args[1] eq 'Imported';
   
   
 my $rss = new XML::RSS(version => '2.0');  my $rss = new XML::RSS(version => '2.0');
 $rss->channel(  
  title=> $channelTitle,  
  link => $channelLink,  
  language => 'en',  
  description => $channelTitle,  
  copyright => '(c) 2005 MSU Board of Trustees.'  
 );  
   
 # If rssFeed exists, parse it  # If rssFeed exists, parse it
 if (-r "$rssFeed") {  if (-r "$rssFeed") {
  $rss->parsefile($rssFeed);      $rss->parsefile($rssFeed);
 }  }
   
   $rss->channel(
         title=> $channelTitle,
         link => $channelLink,
         language => 'en',
         description => $channelTitle,
         copyright => '(c) 2005 MSU Board of Trustees.',
         pubDate => $pubDate 
         );
   
 # Limit entries in the feed to $numEntries  # Limit entries in the feed to $numEntries
 pop(@{$rss->{'items'}}) while (@{$rss->{'items'}} >= $numEntries);  pop(@{$rss->{'items'}}) while (@{$rss->{'items'}} >= $numEntries);
   
 # Format title of the rss item  my $commit_msg;
 # Remove space, append / and set title to /file/that/changed - oldversion/newversion  
 $title[0] =~s/ /\//;  
   
 # Format the cvslog msg itself  
 while (<STDIN>) {  while (<STDIN>) {
  chomp($_);      chomp($_);
  if ($_=~/^[A-Z].*:\s*$/) {      if ($_=~/^[A-Z].*:\s*$/) {
  $_ = "<br /><b>" . $_ . "</b><br />";   $_ = "<br /><b>" .$_."</b><br />";
  }      } else {
  else {   $_ .= "<br />";
  $_ .= "<br />";      }
  }      $commit_msg .= $_;
  $description .= $_;  
 }  }
   
 if ($cvsDiff == 1) {  $commit_msg .= '<br /><b>Author:</b><br />'.$author.'<br />';
  # If the old version of the file is not NONE (if it isn't a new file), and if it is a .txt or .java file (that has no html)  
  # This will rdiff it against the previous version, and include that diff in the rss feed  foreach my $file (@args) {
       my @title=split(",",$file);
  if (($title[1] != "NONE") && ($title[0]=~/(.*).(txt|java)$/)){  
  my $tmpFile = "/tmp/diff.$$";  
  my $cmdLine = "cvs -n rdiff -kk -r " . $title[1] .  " -r " . $title[2] . " " . $title[0] . ">" . $tmpFile;  
  system($cmdLine);  
   
  $description .= "<br /><b>Differences:</b><br />";  
  open CVSDIFF, "<" . $tmpFile;  
  foreach my $line (<CVSDIFF>) {  
  chomp($line);  
  $description .= $line . "<br />";  
  }  
  unlink($tmpFile);     
  }   
 }  
   
 $rss->add_item(      my $description = $commit_msg;
  title => "/" . $title[0] . " - " . $title[1] . "/" . $title[2],      # Format title of the rss item
  author => $author,      # Remove space, append / and set title to /file/that/changed - oldversion/newversion
  pubDate => $pubDate,       $title[0] =~s/ /\//;
  description=> $description,      $title[0] = $dir.'/'.$title[0];
  mode => 'insert'  
 );      # Format the cvslog msg itself
   
 # XML::RSS doesn't like HTML in the XML so Escape the description body with <![CDATA[ ]]>      if ($cvsDiff == 1) { 
 # This is messy and stupid, but both XML::RSS and XML are sort of dumb, and I can't figure out a way around it.  
 # Certain RSS readers will try and render the HTML regardless of if it is wrapped in a CDATA tag or not so um, deal.   # If the old version of the file is not NONE (if
 foreach my $element (@{$rss->{'items'}}) {   # it isn't a new file), and if it is a pm/pl/conf/tab file.
  $element->{'description'} = "<![CDATA[" . $element->{'description'} . "]]>";   # This will rdiff it against the previous version, and
    # include that diff in the rss feed
   
    if (($title[1] != "NONE") 
       && ($title[0]=~/(.*)\.(pm|pl|conf|tab)$/)
       && ($title[0]!~{/localize/localize/..\.pm}) ) {
       my $tmpFile = "/tmp/diff.$$";
       my $cmdLine = "cvs -n rdiff -u -kk -r " . $title[1] .  " -r " . $title[2] . " " . $title[0] . ">" . $tmpFile;
       system($cmdLine);
       
       $description .= "<br /><b>Differences:</b><br /><pre>";
       open CVSDIFF, "<" . $tmpFile;
       foreach my $line (<CVSDIFF>) {
    $description .= $line;
       }
       $description .= "</pre>";
       unlink($tmpFile);   
    }
       }
   
       my $link = $cvslink.$title[0];
       if ($title[1] != "NONE") {
           $link .= '.diff?r1='.$title[1].';r2='.$title[2].';f=h';
       }
   
       $rss->add_item(
      title => "/" . $title[0] . " - " . $title[1] . "/" . $title[2],
      author => $author,
      description=> $description,
      mode => 'insert',
      pubDate => $pubDate,
      link => $link
      );
 }  }
   
 $rss->save($rssFeed);  $rss->save($rssFeed);
Line 122  $rss->save($rssFeed); Line 138  $rss->save($rssFeed);
 # Rsync this rss feed to another publically accessable machine.  # Rsync this rss feed to another publically accessable machine.
 #my $cmdLine="rsync -r -e ssh --delete /export/www/rss/html/ builder\@monkey:/export/www/rss/html/";  #my $cmdLine="rsync -r -e ssh --delete /export/www/rss/html/ builder\@monkey:/export/www/rss/html/";
 #system($cmdLine);  #system($cmdLine);
   
   sub bail {
       my @toss = <STDIN>;
       exit @_;
   }

Removed from v.1.1  
changed lines
  Added in v.1.13


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>