cerberus 0.3.5 → 0.3.6

data/lib/cerberus/publisher/base.rb

@@ -1,47 +1,47 @@
-require 'cerberus/constants'
-
-module Cerberus
-  module Publisher
-    class Base
-      def self.formatted_message(state, manager, options)
-        subject = 
-        case state.current_state
-        when :setup
-          "Cerberus set up for project (##{manager.scm.current_revision})"
-        when :broken
-          additional_message = nil
-          if state.previous_brokeness and state.current_brokeness
-            additional_message =
-            case
-              when state.previous_brokeness > state.current_brokeness
-                ' but getting better'
-              when state.previous_brokeness < state.current_brokeness
-                ' and getting worse'
-            end
-          end
-          "Build still broken#{additional_message} (##{manager.scm.current_revision})"
-
-        #FIXME instead of using last author as person that broken build try to guess it. I.e. only if one author since last commit did commit - then he broken it.
-        when :failed
-          "Build broken by #{manager.scm.last_author} (##{manager.scm.current_revision})"
-        when :revival
-          "Build fixed by #{manager.scm.last_author} (##{manager.scm.current_revision})"
-        when :succesful
-          "Build was successfully built (##{manager.scm.current_revision})"
-        else                              
-          raise "Unknown build state '#{state.current_state.to_s}'"
-        end
-
-        subject = "[#{options[:application_name]}] #{subject}"
-        generated_by = "--\nCerberus #{Cerberus::VERSION}, http://cerberus.rubyforge.org/"
-        body = [ manager.scm.last_commit_message ]
-        if options[:changeset_url]
-          body << options[:changeset_url] + manager.scm.current_revision.to_s + "\n"
-        end
-        body += [ manager.builder.output, generated_by ]
-
-        return subject, body.join("\n")
-      end
-    end
-  end
-end
+require 'cerberus/constants'
+
+module Cerberus
+  module Publisher
+    class Base
+      def self.formatted_message(state, manager, options)
+        subject = 
+        case state.current_state
+        when :setup
+          "Cerberus set up for project (##{manager.scm.current_revision})"
+        when :broken
+          additional_message = nil
+          if state.previous_brokeness and state.current_brokeness
+            additional_message =
+            case
+              when state.previous_brokeness > state.current_brokeness
+                ' but getting better'
+              when state.previous_brokeness < state.current_brokeness
+                ' and getting worse'
+            end
+          end
+          "Build still broken#{additional_message} (##{manager.scm.current_revision})"
+
+        #FIXME instead of using last author as person that broken build try to guess it. I.e. only if one author since last commit did commit - then he broken it.
+        when :failed
+          "Build broken by #{manager.scm.last_author} (##{manager.scm.current_revision})"
+        when :revival
+          "Build fixed by #{manager.scm.last_author} (##{manager.scm.current_revision})"
+        when :successful
+          "Build successful (##{manager.scm.current_revision})"
+        else                              
+          raise "Unknown build state '#{state.current_state.to_s}'"
+        end
+
+        subject = "[#{options[:application_name]}] #{subject}"
+        generated_by = "--\nThis email generated by Cerberus tool ver. #{Cerberus::VERSION}, http://cerberus.rubyforge.org/"
+        body = [ manager.scm.last_commit_message ]
+        if options[:changeset_url]
+          body << options[:changeset_url] + manager.scm.current_revision.to_s + "\n"
+        end
+        body += [ manager.builder.output, generated_by ]
+
+        return subject, body.join("\n")
+      end
+    end
+  end
+end

data/lib/cerberus/publisher/gmailer.rb

@@ -0,0 +1,17 @@
+require 'cerberus/publisher/base'
+
+class Cerberus::Publisher::Gmailer < Cerberus::Publisher::Base
+  def self.publish(state, manager, options)
+    require 'gmailer'
+
+    subject, body = Cerberus::Publisher::Base.formatted_message(state, manager, options)
+
+    gopts = options[:publisher, :gmailer]
+    recipients = options[:publisher, :gmailer, :recipients]
+    GMailer.connect(gopts) do |g|
+      success = g.send(:to => recipients, :subject => subject, :body => body)
+
+      raise 'Unable to send mail using Gmailer' unless success
+    end
+  end
+end

data/lib/cerberus/publisher/irc.rb

@@ -1,27 +1,27 @@
-require 'rubygems'
-require 'IRC'
-require 'cerberus/publisher/base'
-
-class Cerberus::Publisher::IRC < Cerberus::Publisher::Base
-  def self.publish(state, manager, options)
-    irc_options = options[:publisher, :irc]
-    raise "There is no channel provided for IRC publisher" unless irc_options[:channel]
-    subject,body = Cerberus::Publisher::Base.formatted_message(state, manager, options)
-    message = subject + "\n" + '*' * subject.length + "\n" + body
-
-
-    channel = '#' + irc_options[:channel]
-    bot = IRC.new(irc_options[:nick] || 'cerberus', irc_options[:server], irc_options[:port] || 6667)
-
-    silence_stream(STDOUT) {
-      IRCEvent.add_callback('endofmotd') { |event| 
-        bot.add_channel(channel) 
-        message.split("\n").each{|line|
-          bot.send_message(channel, line)
-        }
-        bot.send_quit
-      }
-      bot.connect
-    }
-  end
-end
+require 'rubygems'
+require 'IRC'
+require 'cerberus/publisher/base'
+
+class Cerberus::Publisher::IRC < Cerberus::Publisher::Base
+  def self.publish(state, manager, options)
+    irc_options = options[:publisher, :irc]
+    raise "There is no channel provided for IRC publisher" unless irc_options[:channel]
+    subject,body = Cerberus::Publisher::Base.formatted_message(state, manager, options)
+    message = subject + "\n" + '*' * subject.length + "\n" + body
+
+
+    channel = '#' + irc_options[:channel]
+    bot = IRC.new(irc_options[:nick] || 'cerberus', irc_options[:server], irc_options[:port] || 6667)
+
+    silence_stream(STDOUT) {
+      IRCEvent.add_callback('endofmotd') { |event| 
+        bot.add_channel(channel) 
+        message.split("\n").each{|line|
+          bot.send_message(channel, line)
+        }
+        bot.send_quit
+      }
+      bot.connect
+    }
+  end
+end

data/lib/cerberus/publisher/jabber.rb

@@ -1,25 +1,25 @@
-require 'rubygems'
-require 'xmpp4r'
-require 'cerberus/publisher/base'
-
-class Cerberus::Publisher::Jabber < Cerberus::Publisher::Base
-  def self.publish(state, manager, options)
-    begin
-      jabber_options = options[:publisher, :jabber]
-      raise "There is no recipients provided for Jabber publisher" unless jabber_options[:recipients]
-
-      subject,body = Cerberus::Publisher::Base.formatted_message(state, manager, options)
-
-      client = Jabber::Client::new(Jabber::JID.new(jabber_options[:jid]))
-      client.connect
-      client.auth(jabber_options[:password])
-
-      jabber_options[:recipients].split(',').each do |address|
-        message = Jabber::Message::new(address.strip, body).set_subject(subject)
-        client.send(message)
-      end
-    ensure
-      client.close if client
-    end
-  end
-end
+require 'rubygems'
+require 'xmpp4r'
+require 'cerberus/publisher/base'
+
+class Cerberus::Publisher::Jabber < Cerberus::Publisher::Base
+  def self.publish(state, manager, options)
+    begin
+      jabber_options = options[:publisher, :jabber]
+      raise "There is no recipients provided for Jabber publisher" unless jabber_options[:recipients]
+
+      subject,body = Cerberus::Publisher::Base.formatted_message(state, manager, options)
+
+      client = Jabber::Client::new(Jabber::JID.new(jabber_options[:jid]))
+      client.connect
+      client.auth(jabber_options[:password])
+
+      jabber_options[:recipients].split(',').each do |address|
+        message = Jabber::Message::new(address.strip, body).set_subject(subject)
+        client.send(message)
+      end
+    ensure
+      client.close if client
+    end
+  end
+end

data/lib/cerberus/publisher/mail.rb

@@ -1,37 +1,37 @@
-require 'rubygems'
-require 'action_mailer'
-require 'cerberus/publisher/base'
-
-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)
-    mail_opts = options[:publisher, :mail].dup
-    raise "There is no recipients provided for mail publisher" unless mail_opts[:recipients]
-
-    configure(mail_opts)
-    ActionMailerPublisher.deliver_message(state, manager, options)
-  end
-
-  private
-  def self.configure(config)
-    [:authentication, :delivery_method].each do |k|
-      config[k] = config[k].to_sym if config[k]
-    end
-
-    ActionMailer::Base.delivery_method = config[:delivery_method] if config[:delivery_method]
-    ActionMailer::Base.smtp_settings = config
-  end
-
-  class ActionMailerPublisher < ActionMailer::Base
-    def message(state, manager, options)
-      @subject, @body = Cerberus::Publisher::Base.formatted_message(state, manager, options)
-      @recipients, @sent_on = options[:publisher, :mail, :recipients], Time.now
-      @from = options[:publisher, :mail, :sender] || "'Cerberus' <cerberus@example.com>"
-      raise "Please specify recipient addresses for application '#{options[:application_name]}'" unless @recipients
-    end
-  end
+require 'rubygems'
+require 'action_mailer'
+require 'cerberus/publisher/base'
+
+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)
+    mail_opts = options[:publisher, :mail].dup
+    raise "There is no recipients provided for mail publisher" unless mail_opts[:recipients]
+
+    configure(mail_opts)
+    ActionMailerPublisher.deliver_message(state, manager, options)
+  end
+
+  private
+  def self.configure(config)
+    [:authentication, :delivery_method].each do |k|
+      config[k] = config[k].to_sym if config[k]
+    end
+
+    ActionMailer::Base.delivery_method = config[:delivery_method] if config[:delivery_method]
+    ActionMailer::Base.smtp_settings = config
+  end
+
+  class ActionMailerPublisher < ActionMailer::Base
+    def message(state, manager, options)
+      @subject, @body = Cerberus::Publisher::Base.formatted_message(state, manager, options)
+      @recipients, @sent_on = options[:publisher, :mail, :recipients], Time.now
+      @from = options[:publisher, :mail, :sender] || "'Cerberus' <cerberus@example.com>"
+      raise "Please specify recipient addresses for application '#{options[:application_name]}'" unless @recipients
+    end
+  end
 end

data/lib/cerberus/publisher/netsmtp_tls_fix.rb

@@ -1,67 +1,67 @@
-require "openssl"
-require "net/smtp"
-
-Net::SMTP.class_eval do
-  private
-  def do_start(helodomain, user, secret, authtype)
-    raise IOError, 'SMTP session already started' if @started
-    check_auth_args user, secret, authtype if user or secret
-
-    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
-
-    check_response(critical { recv_response() })
-    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
-  ensure
-    unless @started
-      # authentication failed, cancel connection.
-      @socket.close if not @started and @socket and not @socket.closed?
-      @socket = nil
-    end
-  end
-
-  def do_helo(helodomain)
-     begin
-      if @esmtp
-        ehlo helodomain
-      else
-        helo helodomain
-      end
-    rescue Net::ProtocolError
-      if @esmtp
-        @esmtp = false
-        @error_occured = false
-        retry
-      end
-      raise
-    end
-  end
-
-  def starttls
-    getok('STARTTLS') rescue return false
-    return true
-  end
-
-  def quit
-    begin
-      getok('QUIT')
-    rescue EOFError
-    end
-  end
+require "openssl"
+require "net/smtp"
+
+Net::SMTP.class_eval do
+  private
+  def do_start(helodomain, user, secret, authtype)
+    raise IOError, 'SMTP session already started' if @started
+    check_auth_args user, secret, authtype if user or secret
+
+    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
+
+    check_response(critical { recv_response() })
+    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
+  ensure
+    unless @started
+      # authentication failed, cancel connection.
+      @socket.close if not @started and @socket and not @socket.closed?
+      @socket = nil
+    end
+  end
+
+  def do_helo(helodomain)
+     begin
+      if @esmtp
+        ehlo helodomain
+      else
+        helo helodomain
+      end
+    rescue Net::ProtocolError
+      if @esmtp
+        @esmtp = false
+        @error_occured = false
+        retry
+      end
+      raise
+    end
+  end
+
+  def starttls
+    getok('STARTTLS') rescue return false
+    return true
+  end
+
+  def quit
+    begin
+      getok('QUIT')
+    rescue EOFError
+    end
+  end
 end

data/lib/cerberus/publisher/rss.rb

@@ -1,28 +1,27 @@
-require 'cerberus/publisher/base'
-require 'cerberus/helper/xchar.rb'
-
-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
-
-    IO.write(config[:file], result)
-  end
-end
+require 'cerberus/publisher/base'
+
+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
+
+    IO.write(config[:file], result)
+  end
+end