integrity-email 1.0.3 → 1.0.4

data/integrity-email.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name              = "integrity-email"
-  s.version           = "1.0.3"
-  s.date              = "2009-04-06"
+  s.version           = "1.0.4"
+  s.date              = "2009-06-01"
   s.summary           = "Email notifier for the Integrity continuous integration server"
   s.description       = "Easily let Integrity send emails after each build"
   s.homepage          = "http://integrityapp.com"

data/lib/integrity/notifier/config.haml

@@ -24,12 +24,15 @@
 
 %p.normal
   %label{ :for => "email_notifier_auth" } Auth type
-  %select#email_notifier_auth{ :name => "notifiers[Email][auth]", :value => (config["auth"] || "plain"), :type => "text" }
-    %option{ :value => '', :selected => true } none
-    %option{ :value => 'login'} login
-    %option{ :value => 'cram_md5' } cram_md5
-    %option{ :value => 'plain' } plain
+  %input.text#email_notifier_auth{ :name => "notifiers[Email][auth]", :value => (config["auth"] || "plain"), :type => "text" }
 
 %p.normal
   %label{ :for => "email_notifier_domain" } Domain
   %input.text#email_notifier_domain{ :name => "notifiers[Email][domain]", :value => config["domain"], :type => "text" }
+
+
+%h3 Or, enter the path to sendmail:
+
+%p.normal
+  %label{ :for => "email_notifier_sendmail" } Sendmail path (often /usr/sbin/sendmail)
+  %input.text#email_notifier_sendmail{ :name => "notifiers[Email][sendmail]", :value => config["sendmail"], :type => "text" }

data/lib/integrity/notifier/email.rb

@@ -38,6 +38,11 @@ module Integrity
 
       private
         def configure_mailer
+          return configure_sendmail unless @config["sendmail"].blank?
+          configure_smtp
+        end
+
+        def configure_smtp
           user = @config["user"] || ""
           pass = @config["pass"] || ""
           user = nil if user.empty?
@@ -54,6 +59,11 @@ module Integrity
             :domain => @config["domain"]
           }
         end
+
+        def configure_sendmail
+          Sinatra::Mailer.delivery_method = :sendmail
+          Sinatra::Mailer.config = {:sendmail_path => @config['sendmail']}
+        end
     end
 
     register Email

data/test/integrity_email_test.rb

@@ -40,16 +40,17 @@ class IntegrityEmailTest < Test::Unit::TestCase
   end
 
   def test_configuration_form
-    assert_form_have_tag "h3", :content => "SMTP Server Configuration"
-
-    assert_form_have_option "to",    "foo@example.org"
-    assert_form_have_option "from",  "bar@example.org"
-    assert_form_have_option "host",  "foobarhost.biz"
-    assert_form_have_option "user",  "foobaruser"
-    assert_form_have_option "pass",  "secret"
-    # TODO assert_form_have_option "auth",  "plain"
-    assert_form_have_option "pass",  "secret"
-    assert_form_have_option "domain","localhost"
+    assert form_have_tag?("h3", :content => "SMTP Server Configuration")
+
+    assert provides_option? "to",    "foo@example.org"
+    assert provides_option? "from",  "bar@example.org"
+    assert provides_option? "host",  "foobarhost.biz"
+    assert provides_option? "user",  "foobaruser"
+    assert provides_option? "pass",  "secret"
+    assert provides_option? "auth",  "plain"
+    assert provides_option? "pass",  "secret"
+    assert provides_option? "domain","localhost"
+    assert provides_option? "sendmail","/usr/sbin/sendmail"
   end
 
   def test_it_sends_email_notification
@@ -64,6 +65,8 @@ class IntegrityEmailTest < Test::Unit::TestCase
     Integrity::Notifier::Email.new(successful, config.dup).deliver!
     Integrity::Notifier::Email.new(failed,     config).deliver!
 
+    assert_equal "net_smtp", Sinatra::Mailer.delivery_method
+
     mail = @mail_observer.messages.first
 
     assert_equal ["you@example.org"], mail.destinations
@@ -73,4 +76,18 @@ class IntegrityEmailTest < Test::Unit::TestCase
     assert mail.body.include?(successful.author.name)
     assert mail.body.include?(successful.output)
   end
+
+  def test_it_configures_email_notification_with_sendmail
+    sendmail_path = "/usr/sbin/sendmail"
+
+    config = { "sendmail" => sendmail_path,
+               "to"   => "sendmail@example.org",
+               "from" => "me@example.org"  }
+    successful = commit(:successful)
+
+    Integrity::Notifier::Email.new(successful, config)
+
+    assert_equal :sendmail, Sinatra::Mailer.delivery_method
+    assert_equal sendmail_path, Sinatra::Mailer.config[:sendmail_path]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: integrity-email
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-06 00:00:00 +02:00
+date: 2009-06-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,8 +58,10 @@ files:
 - lib/integrity/notifier/config.haml
 - lib/integrity/notifier/email.rb
 - test/integrity_email_test.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://integrityapp.com
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -80,9 +82,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: integrity
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Email notifier for the Integrity continuous integration server
 test_files: []