Merge pull request #46 from travis-ci/email_fixes

Lets get emails working again

Author: joshk

Gemfile

@@ -7,18 +7,19 @@ gem 'travis-config',  '~> 1.0.0'
 
 gem 'sidekiq',         '~> 4.0.0'
 gem 'redis-namespace'
-gem 'gh',              github: 'travis-ci/gh'
 gem 'sentry-raven'
 gem 'rollout',         github: 'jamesgolick/rollout', :ref => 'v1.1.0'
-gem 'newrelic_rpm',    '~> 3.3.2'
+gem 'metriks'
+gem 'metriks-librato_metrics'
+gem 'jemalloc'
+
+gem 'gh',              github: 'travis-ci/gh'
 gem 'aws-sdk'
 gem 'actionmailer',    '~> 3.2.18'
 gem 'roadie'
-gem 'metriks'
-gem 'metriks-librato_metrics'
+gem 'roadie-rails',    '~> 1.0'
 gem 'multi_json'
 gem 'pusher', '~> 0.14.5'
-gem 'jemalloc'
 
 group :test do
   gem 'rspec',        '~> 2.14.0'

Gemfile.lock

@@ -49,12 +49,12 @@ GEM
     atomic (1.1.99)
     avl_tree (1.2.1)
       atomic (~> 1.1)
-    aws-sdk (2.2.1)
-      aws-sdk-resources (= 2.2.1)
-    aws-sdk-core (2.2.1)
+    aws-sdk (2.2.3)
+      aws-sdk-resources (= 2.2.3)
+    aws-sdk-core (2.2.3)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.1)
-      aws-sdk-core (= 2.2.1)
+    aws-sdk-resources (2.2.3)
+      aws-sdk-core (= 2.2.3)
     backports (3.6.7)
     builder (3.0.4)
     coderay (1.1.0)
@@ -117,7 +117,6 @@ GEM
     nenv (0.2.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
-    newrelic_rpm (3.3.5)
     nokogiri (1.6.6.4)
       mini_portile (~> 0.6.0)
     notiffany (0.0.8)
@@ -136,17 +135,32 @@ GEM
     rack (1.4.7)
     rack-cache (1.5.1)
       rack (>= 0.4)
+    rack-ssl (1.3.4)
+      rack
     rack-test (0.6.3)
       rack (>= 1.0)
+    railties (3.2.22)
+      actionpack (= 3.2.22)
+      activesupport (= 3.2.22)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.4.2)
     rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
+    rdoc (3.12.2)
+      json (~> 1.4)
     redis (3.2.2)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
     roadie (3.1.0)
       css_parser (~> 1.3.4)
       nokogiri (>= 1.5.0, < 1.7.0)
+    roadie-rails (1.1.0)
+      railties (>= 3.0, < 4.3)
+      roadie (~> 3.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -196,10 +210,10 @@ DEPENDENCIES
   metriks-librato_metrics
   mocha (~> 0.10.0)
   multi_json
-  newrelic_rpm (~> 3.3.2)
   pusher (~> 0.14.5)
   redis-namespace
   roadie
+  roadie-rails (~> 1.0)
   rollout!
   rspec (~> 2.14.0)
   sentry-raven

lib/travis/addons/email/mailer/build.rb

@@ -1,10 +1,12 @@
 require 'action_mailer'
+require 'roadie-rails'
 
 module Travis
   module Addons
     module Email
       module Mailer
         class Build < ActionMailer::Base
+          include Roadie::Rails::Automatic
 
           helper Mailer::Helpers
 
@@ -32,6 +34,10 @@ def url_options
             nil
           end
 
+          def roadie_options
+            Roadie::Rails::Options.new
+          end
+
           private
 
             def subject

lib/travis/addons/email/mailer/views/build/finished_email.html.erb

@@ -369,9 +369,9 @@
             <img src="https://<%= Travis.config.assets.host -%>/images/mailer/email-footer-travis-logo.png" style="width: 50px; height: 50px;" />
           </td>
           <td style="" class="grey">
-            <a href="http://docs.travis-ci.com">Documentation</a> about Travis CI<br/>
+            <a href="https://docs.travis-ci.com">Documentation</a> about Travis CI<br/>
             For help please join our IRC channel <a href="irc://irc.freenode.net/travis">irc.freenode.net#travis</a>.<br/>
-            Choose who receives these build notification emails in your <a href="http://docs.travis-ci.com/user/notifications">configuration file</a>.
+            Choose who receives these build notification emails in your <a href="https://docs.travis-ci.com/user/notifications">configuration file</a>.
           </td>
         </tr>
       </table>
@@ -381,13 +381,7 @@
         <img id="mascot" src="https://<%= Travis.config.assets.host %>/images/mailer/travis-mascot.png" width="80" >
         <div class="section footnote">
           <p class="grey"><strong>Would you like to test your private code?</strong></p>
-          <p class="grey"><a href="http://travis-ci.com?utm_source=build_email_footer&utm_campaign=travis-ci.org&utm_medium=email">Travis Pro</a> could be your new best friend!</p>
-        </div>
-
-        <div class="tiny-footer">
-          <p class="grey">
-            <span>Travis CI is powered by </span><a href="http://bluebox.net"><img src="https://travis-ci.org/images/sponsors/bluebox-78x15.png"></a>
-          </p>
+          <p class="grey"><a href="https://travis-ci.com?utm_source=build_email_footer&utm_campaign=travis-ci.org&utm_medium=email">Travis CI for Private Projects</a> could be your new best friend!</p>
         </div>
       </div>
       <% end -%>

lib/travis/addons/email/mailer/views/build/finished_email.text.erb

@@ -15,5 +15,4 @@ View the full build log and details: <%= repository_build_url(slug: @repository.
 
 --
 
-You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications
-
+You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

spec/addons/email/mailer/build_spec.rb

@@ -88,11 +88,6 @@
         html.should include("まつもとゆきひろ a.k.a. Matz")
       end
 
-      it 'includes the build footer' do
-        email.deliver # inline css interceptor is called before delivery.
-        email.html_part.decoded.should =~ %r(<div class="tiny-footer">)
-      end
-
       describe 'with the footer disabled' do
         before do
           Travis.config.build_email_footer = false