cerberus 0.2.3 → 0.2.4

data/CHANGES

@@ -1,5 +1,13 @@
 = Cerberus Changelog
 
+== Version 0.2.4
+Features release
+
+* Fix problem with TLS hack. Now possible to send to SSL and vanilla mailservers without modifying code.
+* Added rant support (http://make.rubyforge.org) [Xavier Shay]
+* Fixed escaping of code in RSS publisher [Xavier Shay]
+* If we have only builder or publisher in configuration then use it. Param :type made mandatory.
+
 == Version 0.2.3
 Features release
 

data/lib/cerberus/builder/rake.rb

@@ -1,39 +1,5 @@
-class Cerberus::Builder::Rake
-  include Cerberus::Utils
-  attr_reader :output
-
+class Cerberus::Builder::Rake < Cerberus::Builder::RubyBase
   def initialize(config)
-    @config = config
+    super(config, "rake")
   end
-
-  def run
-    Dir.chdir @config[:application_root]
-    @output = `#{@config[:bin_path]}#{choose_rake_exec()} #{@config[:builder, :rake, :task]} 2>&1`
-    successful?
-  end
-
-  def successful?
-    $?.exitstatus == 0 and not @output.include?('rake aborted!')
-  end
-
-  private
-  def choose_rake_exec
-    ext = ['']
-
-    if os() == :windows 
-      ext << '.bat' << '.cmd'
-    end
-
-    silence_stream(STDERR) {
-      ext.each do |e|
-        begin
-          out = `#{@config[:bin_path]}rake#{e} --version`
-          return "rake#{e}" if out =~ /rake/
-        rescue
-        end
-      end
-    }
-
-    raise "Rake builder did not find. Make sure that such script exists and have executable permissions."
-  end
-end
+end

data/lib/cerberus/builder/rant.rb

@@ -0,0 +1,5 @@
+class Cerberus::Builder::Rant < Cerberus::Builder::RubyBase
+  def initialize(config)
+    super(config, "rant")
+  end
+end

data/lib/cerberus/builder/ruby_base.rb

@@ -0,0 +1,40 @@
+class Cerberus::Builder::RubyBase
+  include Cerberus::Utils
+  attr_reader :output
+
+  def initialize(config, cmd)
+    @config = config
+    @cmd = cmd
+  end
+
+  def run
+    Dir.chdir @config[:application_root]
+    @output = `#{@config[:bin_path]}#{choose_exec()} #{@config[:builder, @cmd.to_sym, :task]} 2>&1`
+    successful?
+  end
+
+  def successful?
+    $?.exitstatus == 0 and not @output.include?("#{@cmd} aborted!")
+  end
+
+  private
+  def choose_exec
+    ext = ['']
+
+    if os() == :windows 
+      ext << '.bat' << '.cmd'
+    end
+
+    silence_stream(STDERR) {
+      ext.each do |e|
+        begin
+          out = `#{@config[:bin_path]}#{@cmd}#{e} --version`
+          return "#{@cmd}#{e}" if out =~ /#{@cmd}/
+        rescue
+        end
+      end
+    }
+
+    raise "#{@cmd} builder did not find. Make sure that such script exists and have executable permissions."
+  end
+end

data/lib/cerberus/helper/xchar.rb

@@ -0,0 +1,61 @@
+# http://www.intertwingly.net/blog/2005/09/28/XML-Cleansing
+# Tests available at above
+module XChar
+  # http://intertwingly.net/stories/2004/04/14/i18n.html#CleaningWindows
+  CP1252 = {
+    128 => 8364, # euro sign
+    130 => 8218, # single low-9 quotation mark
+    131 =>  402, # latin small letter f with hook
+    132 => 8222, # double low-9 quotation mark
+    133 => 8230, # horizontal ellipsis
+    134 => 8224, # dagger
+    135 => 8225, # double dagger
+    136 =>  710, # modifier letter circumflex accent
+    137 => 8240, # per mille sign
+    138 =>  352, # latin capital letter s with caron
+    139 => 8249, # single left-pointing angle quotation mark
+    140 =>  338, # latin capital ligature oe
+    142 =>  381, # latin capital letter z with caron
+    145 => 8216, # left single quotation mark
+    146 => 8217, # right single quotation mark
+    147 => 8220, # left double quotation mark
+    148 => 8221, # right double quotation mark
+    149 => 8226, # bullet
+    150 => 8211, # en dash
+    151 => 8212, # em dash
+    152 =>  732, # small tilde
+    153 => 8482, # trade mark sign
+    154 =>  353, # latin small letter s with caron
+    155 => 8250, # single right-pointing angle quotation mark
+    156 =>  339, # latin small ligature oe
+    158 =>  382, # latin small letter z with caron
+    159 =>  376} # latin capital letter y with diaeresis
+
+  # http://www.w3.org/TR/REC-xml/#dt-chardata
+  PREDEFINED = {
+    38 => '&', # ampersand
+    60 => '<',  # left angle bracket
+    62 => '>'}  # right angle bracket
+
+  # http://www.w3.org/TR/REC-xml/#charsets
+  VALID = [[0x9, 0xA, 0xD], (0x20..0xD7FF), 
+    (0xE000..0xFFFD), (0x10000..0x10FFFF)]
+end
+
+class Fixnum
+  # xml escaped version of chr
+  def xchr
+    n = XChar::CP1252[self] || self
+    n = 42 unless XChar::VALID.find {|range| range.include? n}
+    XChar::PREDEFINED[n] or (n<128 ? n.chr : "&##{n};")
+  end
+end
+
+class String
+  # xml escaped version of to_s
+  def to_xs
+    unpack('U*').map {|n| n.xchr}.join # ASCII, UTF-8
+  rescue
+    unpack('C*').map {|n| n.xchr}.join # ISO-8859-1, WIN-1252
+  end
+end

data/lib/cerberus/manager.rb

@@ -26,7 +26,8 @@ module Cerberus
 
   BUILDER_TYPES = {
     :maven2 => Cerberus::Builder::Maven2,
-    :rake => Cerberus::Builder::Rake
+    :rake => Cerberus::Builder::Rake,
+    :rant => Cerberus::Builder::Rant
   }
 
   class AddCommand
@@ -77,8 +78,6 @@ module Cerberus
     attr_reader :builder, :success, :scm, :status
 
     DEFAULT_CONFIG = {:scm => {:type => 'svn'}, 
-                      :builder => {:type => 'rake'}, 
-                      :publisher => {:active => 'mail'}, 
                       :log => {:enable => true}
                      }
 
@@ -98,7 +97,7 @@ module Cerberus
       scm_type = @config[:scm, :type]
       @scm = SCM_TYPES[scm_type.to_sym].new(@config[:application_root], @config)
 
-      builder_type = @config[:builder, :type]
+      builder_type = get_configuration_option(@config[:builder], :type, :rake)
       @builder = BUILDER_TYPES[builder_type.to_sym].new(@config)
     end
  
@@ -141,7 +140,7 @@ module Cerberus
 
           #send notifications
           if [:failure, :broken, :revival, :setup].include?(state)
-            active_publishers = @config[:publisher, :active]
+            active_publishers = get_configuration_option(@config[:publisher], :active, 'mail')
             active_publishers.split(/\W+/).each do |pub|
               raise "Publisher have no configuration: #{pub}" unless @config[:publisher, pub]
               clazz = PUBLISHER_TYPES[pub.to_sym]
@@ -163,6 +162,15 @@ module Cerberus
         end
       end
     end
+
+  private
+    def get_configuration_option(hash, defining_key = nil, default_option = nil)
+      if hash
+        return hash[defining_key] if hash[defining_key]
+        return hash.keys[0] if hash.size == 1
+      end
+      return default_option
+    end
   end
 
   class BuildAllCommand

data/lib/cerberus/publisher/mail.rb

@@ -1,6 +1,10 @@
 require 'action_mailer'
 require 'cerberus/publisher/base'
-require 'cerberus/publisher/netsmtp_tls_fix'
+
+if RUBY_VERSION > '1.8.2'
+  #This hack works only on 1.8.4
+  require 'cerberus/publisher/netsmtp_tls_fix'
+end
 
 class Cerberus::Publisher::Mail < Cerberus::Publisher::Base
   def self.publish(state, manager, options)

data/lib/cerberus/publisher/netsmtp_tls_fix.rb

@@ -10,20 +10,21 @@ Net::SMTP.class_eval do
     sock = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
     @socket = Net::InternetMessageIO.new(sock)
     @socket.read_timeout = 60 #@read_timeout
-#    @socket.debug_output = STDERR #@debug_output
+    #@socket.debug_output = STDERR #@debug_output
 
     check_response(critical { recv_response() })
     do_helo(helodomain)
 
-    raise 'openssl library not installed' unless defined?(OpenSSL)
-    starttls
-    ssl = OpenSSL::SSL::SSLSocket.new(sock)
-    ssl.sync_close = true
-    ssl.connect
-    @socket = Net::InternetMessageIO.new(ssl)
-    @socket.read_timeout = 60 #@read_timeout
-#    @socket.debug_output = STDERR #@debug_output
-    do_helo(helodomain)
+    if starttls
+      raise 'openssl library not installed' unless defined?(OpenSSL)
+      ssl = OpenSSL::SSL::SSLSocket.new(sock)
+      ssl.sync_close = true
+      ssl.connect
+      @socket = Net::InternetMessageIO.new(ssl)
+      @socket.read_timeout = 60 #@read_timeout
+      #@socket.debug_output = STDERR #@debug_output
+      do_helo(helodomain)
+    end
 
     authenticate user, secret, authtype if user
     @started = true
@@ -53,7 +54,8 @@ Net::SMTP.class_eval do
   end
 
   def starttls
-    getok('STARTTLS')
+    getok('STARTTLS') rescue return false
+    return true
   end
 
   def quit

data/lib/cerberus/publisher/rss.rb

@@ -1,4 +1,5 @@
 require 'cerberus/publisher/base'
+require 'cerberus/helper/xchar.rb'
 
 class Cerberus::Publisher::RSS < Cerberus::Publisher::Base
   def self.publish(state, manager, options)
@@ -6,16 +7,17 @@ class Cerberus::Publisher::RSS < Cerberus::Publisher::Base
     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]}</title>
+    <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}</title>
+      <title>#{subject.to_xs}</title>
       <pubDate>#{pub_date}</pubDate>
-      <description><pre>#{body}</pre></description>
+      <description>#{description}</description>
     </item>
   </channel>
 </rss>

data/lib/cerberus/version.rb

@@ -1,9 +1,5 @@
 module Cerberus
   module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 2
-    TINY  = 3
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = '0.2.4'
   end
 end

data/test/rss_publisher_test.rb

@@ -6,14 +6,16 @@ require 'tempfile'
 
 class RSSPublisherTest < Test::Unit::TestCase
   def test_publisher
-    rss_file = tf = Tempfile.new('cerberus-rss')
-    options = Cerberus::Config.new(nil, :publisher => {:rss => {:file => rss_file.path}}, :application_name => 'RSSApp')
+    rss_file = Tempfile.new('cerberus-rss')
+    options = Cerberus::Config.new(nil, :publisher => {:rss => {:file => rss_file.path}}, :application_name => 'RSS<App')
     build = DummyManager.new('last message', 'this is output', 1235, 'anatol')
 
     Cerberus::Publisher::RSS.publish(:setup, build, options)
 
     xml = REXML::Document.new(IO.read(rss_file.path))
 
-    assert_equal '[RSSApp] Cerberus set up for project (#1235)', xml.elements["rss/channel/item/title/"].get_text.value
+    assert_equal '[RSS<App] Cerberus set up for project (#1235)', xml.elements["rss/channel/item/title/"].get_text.value
+    assert_match %r{<pre>last message\n\nthis is output\n\n--\nCerberus 0.\d.\d, http://cerberus.rubyforge.com/</pre>}, 
+                     xml.elements["rss/channel/item/description/"].get_text.value
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0.1
+rubygems_version: 0.9.0.4
 specification_version: 1
 name: cerberus
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
-date: 2006-09-18 00:00:00 +04:00
+  version: 0.2.4
+date: 2006-09-23 00:00:00 +04:00
 summary: Cerberus is a Continuous Integration tool that could be easily run from Cron.
 require_paths: 
 - lib
@@ -37,6 +37,7 @@ files:
 - lib/cerberus/config.rb
 - lib/cerberus/config_migration.rb
 - lib/cerberus/constants.rb
+- lib/cerberus/helper
 - lib/cerberus/latch.rb
 - lib/cerberus/manager.rb
 - lib/cerberus/publisher
@@ -45,6 +46,9 @@ files:
 - lib/cerberus/version.rb
 - lib/cerberus/builder/maven2.rb
 - lib/cerberus/builder/rake.rb
+- lib/cerberus/builder/rant.rb
+- lib/cerberus/builder/ruby_base.rb
+- lib/cerberus/helper/xchar.rb
 - lib/cerberus/publisher/base.rb
 - lib/cerberus/publisher/irc.rb
 - lib/cerberus/publisher/jabber.rb