vendor/mailfactory-1.2.3/lib/mailfactory.rb
vendor/mailfactory-1.2.3/tests/test_mailfactory.rb
@@ -28,7 +28,9 @@ namespace :warehouse do
require 'yaml'
require 'config/initializers/svn'
require 'lib/cache_key'
- $LOAD_PATH << 'vendor/ruby-sequel/lib' << 'vendor/metaid-1.0'
+ $LOAD_PATH << 'vendor/ruby-sequel/lib' << 'vendor/metaid-1.0' << 'vendor/mailfactory-1.2.3/lib'
+ require 'lib/warehouse'
+ require 'config/initializers/warehouse'
require 'lib/warehouse/mailer'
require 'lib/warehouse/command'
require 'lib/warehouse/extension'
lib/tasks/importer.rake
@@ -49,18 +49,18 @@ module Warehouse
ActionMailer::Base.delivery_method = mail_type.to_sym
ActionMailer::Base.send("#{mail_type}_settings=", send("#{mail_type}_settings"))
elsif Warehouse.const_defined?(:Mailer)
- Warehouse::Mailer.test_send = :test_send
+ Warehouse::Mailer.delivery_method = :test_send
return if RAILS_ENV == 'test' || mail_type.nil? || send("#{mail_type}_settings").nil? || send("#{mail_type}_settings").empty?
- mail_type = mail_type.to_sym
options = send("#{mail_type}_settings")
- Warehouse::Mailer.delivery_method = mail_type == :smtp ? :net_smtp : :sendmail
+ Warehouse::Mailer.delivery_method = mail_type == 'smtp' ? :net_smtp : :sendmail
Warehouse::Mailer.config = {}
return if Warehouse::Mailer.delivery_method == :sendmail
- Warehouse::Mailer[:host] = options[:address]
- Warehouse::Mailer[:port] = options[:port]
- Warehouse::Mailer[:user] = options[:user_name]
- Warehouse::Mailer[:pass] = options[:password]
- Warehouse::Mailer[:auth] = options[:authentication]
+ Warehouse::Mailer.config[:domain] = options[:domain] if options[:domain] && options[:domain].size > 0
+ Warehouse::Mailer.config[:host] = options[:address] if options[:address] && options[:address].size > 0
+ Warehouse::Mailer.config[:port] = options[:port] if options[:port]
+ Warehouse::Mailer.config[:user] = options[:user_name] if options[:user_name] && options[:user_name].size > 0
+ Warehouse::Mailer.config[:pass] = options[:password] if options[:password] && options[:password].size > 0
+ Warehouse::Mailer.config[:auth] = options[:authentication] if options[:authentication] && options[:authentication].size > 0
end
end
lib/warehouse.rb
@@ -1,10 +1,8 @@
begin
- require 'rubygems'
require 'mailfactory'
require 'net/smtp'
rescue LoadError
- puts "You need to install the mailfactory gem to use Merb::Mailer"
- MERB_LOGGER.warn "You need to install the mailfactory gem to use Merb::Mailer"
+ puts "You need to install the mailfactory gem to use Warehouse::Mailer"
end
class MailFactory
@@ -35,7 +33,12 @@ module Warehouse
# m.deliver!
class Mailer
- class_inheritable_accessor :config, :delivery_method, :deliveries
+ class << self
+ attr_accessor :config
+ attr_accessor :delivery_method
+ attr_accessor :deliveries
+ end
+
attr_accessor :mail
self.deliveries = []
@@ -47,18 +50,18 @@ module Warehouse
# :plain, :login, or :cram_md5
def net_smtp
- Net::SMTP.start(config[:host], config[:port].to_i, config[:domain],
- config[:user], config[:pass], (config[:auth].to_sym||:plain)) { |smtp|
+ Net::SMTP.start(self.class.config[:host], self.class.config[:port].to_i, self.class.config[:domain],
+ self.class.config[:user], self.class.config[:pass], (self.class.config[:auth].to_sym||:plain)) { |smtp|
smtp.send_message(@mail.to_s, @mail.from.first, @mail.to)
}
end
def test_send
- deliveries << @mail
+ self.class.deliveries << @mail
end
def deliver!
- send(delivery_method || :net_smtp)
+ send(self.class.delivery_method || :net_smtp)
end
def attach(file_or_files, filename = file_or_files.is_a?(File) ? File.basename(file_or_files.path) : nil,
@@ -72,8 +75,7 @@ module Warehouse
end
def initialize(o={})
- self.config = :sendmail if config.nil?
- o[:rawhtml] = o.delete(:html)
+ self.class.config = :sendmail if self.class.config.nil?
m = MailFactory.new()
o.each { |k,v| m.send "#{k}=", v }
@mail = m
lib/warehouse/mailer.rb
@@ -34,20 +34,20 @@ Warehouse::Hooks.define :email do
body do
html = []
- body << "<h2>#{commit.revision}: #{CGI.escapeHTML(first_commit_line)}</h2>"
- body << "<p><strong>#{CGI.escapeHTML commit.author.capitalize}</strong> — " +
+ html << "<h2>#{commit.revision}: #{CGI.escapeHTML(first_commit_line)}</h2>"
+ html << "<p><strong>#{CGI.escapeHTML commit.author.capitalize}</strong> — " +
commit.changed_at.strftime("%I:%M%p, %a %d %b %Y") + "</p>"
- body << "<hr />"
+ html << "<hr />"
if extended_commit_lines
- body << "<h3>Complete change description:</h3>"
+ html << "<h3>Complete change description:</h3>"
extended_commit_lines.each do |line|
- body << "<p>#{CGI.escapeHTML(line)}</p>"
+ html << "<p>#{CGI.escapeHTML(line)}</p>"
end
end
- body << "<pre>"
+ html << "<pre>"
commit.diff.split("\n").each do |line|
color = nil
if line.match(/^Modified: /) || line.match(/^Added: /) || line.match(/^=+$/)
@@ -62,10 +62,10 @@ Warehouse::Hooks.define :email do
color = "#000"
end
- body << "<span style=\"color:#{color};\">#{CGI.escapeHTML(line)}</span>\n"
+ html << "<span style=\"color:#{color};\">#{CGI.escapeHTML(line)}</span>"
end
- body << "</pre>"
- body * "\n"
+ html << "</pre>"
+ html * "\n"
end
run do
vendor/plugins/hooks/email/hook.rb
@@ -72,7 +72,11 @@ END_XML
when Net::HTTPSuccess, Net::HTTPRedirection
## all good, we submitted...
else
- raise "#{res.inspect} - #{res.body}"
+ if res.code == '422'
+ puts "Validation error: #{res.body}"
+ else
+ raise "#{res.inspect} - #{res.body}"
+ end
end
end
end
\ No newline at end of file
vendor/plugins/hooks/lighthouse/hook.rb
6006304bd83e39abe1c81e3cc4c466872898050e
rick
rick@8456e5f2-bb15-0410-bd20-b44782a1fb1e
http://github.com/entp/warehouse/commit/2f13f04c4a3be4ab1faed349e8e7f86a35a363d5
2f13f04c4a3be4ab1faed349e8e7f86a35a363d5
2007-10-14T16:19:05-07:00
2007-10-14T16:19:05-07:00
freeze mailfactory, small tweaks to get mailing working
git-svn-id: http://activereload.svn.engineyard.com/warehouse/trunk@2231 8456e5f2-bb15-0410-bd20-b44782a1fb1e
e8f62dc168f890f0899defcb69ebffd266ba82d9
rick
rick@8456e5f2-bb15-0410-bd20-b44782a1fb1e