cerberus 0.7.5 → 0.7.6

data/Changelog.txt

@@ -1,7 +1,16 @@
 = Cerberus Changelog
 
-== Version 0.7.5
-New SCM and configuration options for publisher
+== Version 0.7.2
+Bugfixes and updates to RSS publisher
+
+* Fix mercurial builder to properly read revision number of merged commits
+* Updated RSS publisher to output a properly formatted RSS feed with the
+ability to keep a certain number of previous builds in the feed.  For more 
+info on the changes please see the commit message on the following commit:
+http://github.com/cpjolicoeur/cerberus/commit/1f7176a6a611f30a0d70e0f75ec90724f6302043
+
+== Version 0.7.1
+New configuration options for publisher
 
 * added "extra_subject" publisher option
 * added Mercurial SCM support

data/lib/cerberus/config.example.yml

@@ -23,6 +23,8 @@ publisher:
 #    url: http://someemail:password@cerberustool.campfirenow.com/room/51660
 #  rss:
 #    file: /usr/www/rss.xml
+#    channel_link: http://example.com/rss.xml
+#    keep: 1
 #  extra_subject: "#deployment #tags"
 #builder:
 #  rake:

data/lib/cerberus/constants.rb

@@ -4,5 +4,5 @@ module Cerberus
 
   LOCK_WAIT = 30 * 60 # 30 minutes
 
-  VERSION = '0.7.5'
+  VERSION = '0.7.6'
 end

data/lib/cerberus/publisher/rss.rb

@@ -1,29 +1,41 @@
 require 'cerberus/publisher/base'
 require 'time'
 require 'builder'
+require 'rss'
 
 class Cerberus::Publisher::RSS < Cerberus::Publisher::Base
   def self.publish(state, manager, options)
     config = options[:publisher, :rss]
     subject,body = Cerberus::Publisher::Base.formatted_message(state, manager, options)
 
-    pub_date = Time.now.iso8601
-    description = "<pre>#{body}</pre>".to_xs
-    result = <<-END
-<rss version="2.0">
-  <channel>
-    <title>Cerberus build feed for #{options[:application_name].to_xs}</title>
-    <pubDate>#{pub_date}</pubDate>
-    <generator>http://rubyforge.org/projects/cerberus</generator>
-    <item>
-      <title>#{subject.to_xs}</title>
-      <pubDate>#{pub_date}</pubDate>
-      <description>#{description}</description>
-    </item>
-  </channel>
-</rss>
-    END
+    pub_date = Time.now
 
-    IO.write(config[:file], result)
+    begin
+      feed = RSS::Parser.parse(File.read(config[:file]), false)
+      raise RSS::Error unless feed
+      keep = config[:keep] || 1
+      feed.items.slice!(keep -1 ..-1)  # one less than keep value, to make room for the new build
+    rescue RSS::Error, Errno::ENOENT
+      # if there's no existing file or we can't parse it, start a new one from scratch
+      feed = RSS::Maker.make("2.0") do |new_rss|
+        new_rss.channel.title = "#{options[:application_name].to_xs} build status"
+        new_rss.channel.description = "Cerberus build feed for #{options[:application_name].to_xs}"
+        new_rss.channel.generator = "http://rubyforge.org/projects/cerberus"
+        new_rss.channel.link = config[:channel_link] || "file://#{config[:file]}"
+      end
+    end
+
+    # update channel link if we have it explicitly set, otherwise retain existing value
+    feed.channel.link = config[:channel_link] unless config[:channel_link].nil?
+    feed.channel.pubDate = pub_date
+
+    new_item = RSS::Rss::Channel::Item.new()
+    new_item.title = subject
+    new_item.pubDate = pub_date
+    new_item.description = "<pre>#{body}</pre>"
+
+    feed.items.unshift new_item
+
+    IO.write(config[:file], feed)
   end
 end

data/lib/cerberus/scm/bzr.rb

@@ -54,7 +54,7 @@ class Cerberus::SCM::Bazaar < Cerberus::SCM::Base
     # message:
     #   sidfugsdiufgsdifusdg
  
-    @revision = lastlog.match(/^revno: (\d+)$/)[1].to_i
+    @revision = lastlog.match(/^revno: (\d+).*$/)[1].to_i
     @author   = lastlog.match(/^committer: (.+)$/)[1]
     @date     = Time.parse(lastlog.match(/^timestamp: (.+)$/)[1])
     @message  = lastlog.match(/message:\n  (.*)/m)[1]

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cerberus
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 6
+  version: 0.7.6
 platform: ruby
 authors: 
 - Craig P Jolicoeur
@@ -9,39 +14,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 -05:00
+date: 2010-03-20 00:00:00 -04:00
 default_executable: cerberus
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionmailer
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 2
         version: 1.4.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 3
         version: 0.7.3
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: Cerberus is a Continuous Integration software for Ruby projects. CI helps you keep your project in a good shape. Cerberus could be easily invoked from Cron (for Unix) or nnCron (for Windows) utilities.
 email: cpjolicoeur@gmail.com
 executables: 
@@ -385,18 +402,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 2
       version: 1.8.2
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: cerberus
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Cerberus is a Continuous Integration tool that could be easily run from Cron.