mattmatt-cijoe 0.1.2 → 0.1.3

data/lib/cijoe/email.rb

@@ -17,7 +17,7 @@ class CIJoe
         puts "\tuser = horst"
         puts "\tpass = passw0rd"
         puts "\thost = mail.example.com"
-        puts "\ttype = login"
+        puts "\tauthtype = login"
       end
     end
 
@@ -27,7 +27,7 @@ class CIJoe
         :user      => Config.email.user.to_s,
         :pass      => Config.email.pass.to_s,
         :host      => Config.email.host.to_s,
-        :type      => Config.email.type || 'plain'
+        :auth_type      => Config.email.authtype.to_s
       }
     end
 
@@ -41,17 +41,18 @@ class CIJoe
       options = {
         :to => Email.config[:to],
         :from => Email.config[:to],
-        :subject => "(#{commit.project}) Build failed",
+        :subject => "(#{project}) Build failed",
         :body => mail_body
       }
-      MmMail.send(options, mail_config) if failed?
+      MmMail.mail(options, mail_config) if failed?
     end
 
     def mail_config
-      config = MmMail::Config.new
+      config = MmMail::Transport::Config.new
       config.auth_user = Email.config[:user]
       config.auth_pass = Email.config[:pass]
-      config.auth_type = Email.config[:type]
+      config.auth_type = Email.config[:auth_type].to_sym
+      config.host = Email.config[:host]
       config
     end
     

data/lib/cijoe/version.rb

@@ -1,3 +1,3 @@
 class CIJoe
-  Version = "0.1.2"
+  Version = "0.1.3"
 end

data/lib/mmmail.rb

@@ -2,6 +2,7 @@
 # http://github.com/lsegal/mmmail/ 
 
 require 'net/smtp'
+require File.expand_path(File.dirname(__FILE__) + '/lib/smtp_tls')
 
 module MmMail
   # General exception class when something goes wrong in MmMail
@@ -29,6 +30,9 @@ module MmMail
     class Config
       # Set/get the SMTP host/port information
       attr_accessor :host, :port
+
+      # Enable TLS
+      attr_accessor :enable_tls
       
       # Set/get the authentication type (nil for none, :plain, :login or :cram_md5)
       attr_accessor :auth_type
@@ -105,6 +109,7 @@ module MmMail
     # 
     # @param [#to_s] message the message to send
     def mail_smtp(message)
+      Net::SMTP.enable_tls
       Net::SMTP.start(config.host, config.port, 'localhost.localdomain', 
           config.auth_user, config.auth_pass, config.auth_type) do |smtp|
         smtp.send_message(message.to_s, message.from, message.recipients_list)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mattmatt-cijoe
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Chris Wanstrath