RubyGems - capistrano_mailer - Versions diffs - 3.3.0 → 4.0.0 - Mend

capistrano_mailer 3.3.0 → 4.0.0

Files changed (31) hide show

data/MIT-LICENSE +21 -0
data/README.rdoc +206 -0
data/Rakefile +31 -3
data/VERSION.yml +5 -0
data/capistrano_mailer.gemspec +50 -0
data/lib/cap_mailer.rb +46 -88
data/lib/capistrano/mailer.rb +6 -26
data/views/cap_mailer/_section.html.erb +2 -2
data/views/cap_mailer/_section_custom.html.erb +1 -2
data/views/cap_mailer/notification_email.html.erb +39 -1
data/views/cap_mailer/notification_email.text.erb +22 -0
metadata +41 -102
data/CHANGELOG.md +0 -116
data/LICENSE.txt +0 -23
data/README.md +0 -268
data/lib/capistrano/mailer_recipes.rb +0 -43
data/lib/capistrano_mailer.rb +0 -2
data/lib/capistrano_mailer/version.rb +0 -3
data/spec/create_gemset_spec.rb +0 -44
data/spec/empty_gemset_spec.rb +0 -32
data/spec/install_ruby_spec.rb +0 -120
data/spec/rvm_paths_spec.rb +0 -93
data/spec/spec_helper.rb +0 -3
data/spec/support/abort_matcher.rb +0 -42
data/spec/support/capistrano.rb +0 -24
data/test/build_gem_test.rb +0 -18
data/views/cap_mailer/_message_body.html.erb +0 -39
data/views/cap_mailer/_message_body.text.erb +0 -22
data/views/cap_mailer/failed.notification_email.html.erb +0 -1
data/views/cap_mailer/failed.notification_email.plain.erb +0 -1
data/views/cap_mailer/notification_email.plain.erb +0 -1

@@ -1,45 +1,25 @@
-require 'capistrano_mailer/version'
-require 'capistrano'
+require 'rubygems' unless defined?(Rubygems)
+require 'capistrano' unless defined?(Capistrano)
 unless Capistrano::Configuration.respond_to?(:instance)
-  abort 'capistrano/mailer requires Capistrano 2'
+  abort "capistrano/mailer requires Capistrano 2"
 end
-require 'capistrano/log_with_awesome'
-require 'action_mailer'
+require 'action_mailer' unless defined?(ActionMailer)
-require 'cap_mailer'
+require 'cap_mailer' unless defined?(CapMailer)
-module CapistranoMailer
-end
 module Capistrano
   class Configuration
     module CapistranoMailer
       def send_notification_email(cap, config = {}, *args)
-        CapMailer.deliver_notification_email(cap, config, *args)
+        CapMailer.notification_email(cap, config, *args).deliver
       end
     end
     include CapistranoMailer
-    module Execution
-      protected
-        def __rollback_with_mailer!
-          set :mailer_status, :failure
-          find_and_execute_task "deploy:notify"
-          __rollback_without_mailer!
-        end
-        alias_method :__rollback_without_mailer!, :rollback!
-        alias_method :rollback!, :__rollback_with_mailer!
-    end
   end
 end
 Capistrano.plugin :mailer, Capistrano::Configuration::CapistranoMailer
-if cap = Capistrano::Configuration.instance
-  cap.load("#{File.expand_path(File.dirname(__FILE__))}/mailer_recipes.rb")
-end

data/views/cap_mailer/_section.html.erb CHANGED

@@ -21,11 +21,11 @@
       <% if key.is_a?(Symbol) && !data[key].nil?-%>
         <p style="margin: 10px; padding: 0px;">
           <span style="float:left; width:150px; padding: 10px 10px 0;"><%= key.to_s.titleize %></span>
-          <span style="float:left; width:490px; padding: 10px 10px 0;"><%= data[key].is_a?(Array) ? data[key].to_sentence : data[key].is_a?(String) ? data[key] : data[key].inspect %></span>
+          <span style="float:left; width:490px; padding: 10px 10px 0;"><%= data[key].is_a?(Array) ? data[key].to_sentence : data[key].is_a?(String) ? data[key].gsub(/\n/, '<br>').gsub(/\n/, '<br>').html_safe : data[key].inspect.html_safe %></span>
         </p>
       <% end -%>
     <% end -%>
   <% end -%>
   <p style="clear:both"></p>
 </div>

data/views/cap_mailer/_section_custom.html.erb CHANGED

@@ -7,10 +7,9 @@
       <p style="margin: 10px; padding: 0px;">
         <span style="float:left; width:150px; padding: 10px 10px 0;"><%= key %></span>
         <span style="float:left; width:490px; padding: 10px 10px 0;"><%= value.is_a?(Array) ? value.to_sentence : value.is_a?(String) ? value : value.inspect%></span>
-        <span style="clear: both;"></span>
       </p>
     <% end -%>
   <% end unless data.nil?-%>
   <p style="clear:both"></p>
 </div>

data/views/cap_mailer/notification_email.html.erb CHANGED

@@ -1 +1,39 @@
-<%= render "message_body" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+		<title><%= @site_name %> Notification </title>
+	</head>
+	<body style="font: 14px normal Helvetica, Arial, Sans; background: #999;">
+    <div style="width:800px; margin: 10px auto; background: #fff; border: 10px solid #aaa;">
+      <h1 style="clear: both; margin: 0; padding: 40px 20px 5px 20px; border-bottom: 1px dotted; background: #ccc;">
+        <%= @site_name %> <%=@task_name.titleize unless @task_name.nil? %>
+      </h1>
+      <% unless @site_url.nil? %>
+        <p style="margin: 8px 0 20px 20px; padding: 0px; font-style: italic;" >
+          View site: <a href="<%= @site_url.html_safe -%>"><%= @site_url.html_safe -%></a>
+        </p>
+      <% end %>
+      <p style="margin: 10px 20px; font-weight: bold;">Released: <%= @date %> at <%= @time %></p>
+      <%= @sections.map { |section|
+        data = @section_data[section.to_sym]
+        if !data.empty?
+          if %w(extra_information release_data).include?(section)
+            render :partial => 'section_custom.html.erb', :locals => {:section_title => section, :data => data}
+          else
+            render :partial => 'section.html.erb', :locals => {:section_title => section, :data => data}
+          end
+        end
+      }.join.html_safe unless @sections.nil? %>
+   </div>
+    <p style="margin: 8px 0 20px 20px; padding: 0px; font-style: italic;" >
+      Brought to you by: <a href="http://github.com/textgoeshere/capistrano_mailer">Capistrano Mailer</a>
+    </p>
+	</body>
+</html>

data/views/cap_mailer/notification_email.text.erb ADDED

@@ -0,0 +1,22 @@
+<%= @site_name %> Notification
+===========================================================
+    <%= @site_name %> <%=@task_name.titleize unless @task_name.nil? %>
+===========================================================
+      Brought to you by: Capistrano Mailer - http://github.com/pboling/capistrano_mailer
+      Released: <%= @date %> at <%= @time %>
+      <%= @sections.map { |section|
+        data = @section_data[section.to_sym]
+        if !data.empty?
+          if %w(extra_information release_data).include?(section)
+            render :partial => 'section_custom.text.erb', :locals => {:section_title => section, :data => data}
+          else
+            render :partial => 'section.text.erb', :locals => {:section_title => section, :data => data}
+          end
+        end
+      }.join.html_safe unless @sections.nil? %>
+===========================================================
+    Copyright 2009 9thBit LLC under MIT License
+    Copyright 2007-8 Sagebit LLC under MIT License

metadata CHANGED

@@ -1,136 +1,75 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: capistrano_mailer
-version: !ruby/object:Gem::Version
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 4.0.0
   prerelease:
-  segments:
-  - 3
-  - 3
-  - 0
-  version: 3.3.0
 platform: ruby
-authors:
+authors:
 - Peter Boling
 - Dave Nolan
+- Jason Rust
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: capistrano-log_with_awesome
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 3
-        segments:
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency
+date: 2011-12-11 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: actionmailer
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement
+  requirement: &70339020048080 !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 3
-        segments:
-        - 0
-        version: "0"
-    - - <
-      - !ruby/object:Gem::Version
-        hash: 5
-        segments:
-        - 3
-        version: "3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: Capistrano Deployment Email Notification.  Keep the whole team informed of each release! (Rails 2.X version)
-email:
+  prerelease: false
+  version_requirements: *70339020048080
+description: Capistrano Deployment Email Notification.  Keep the whole team informed
+  of each release!
+email:
 - peter.boling@gmail.com
 - dave@textgoeshere.org.uk
+- jason@rustedcode.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- CHANGELOG.md
-- LICENSE.txt
-- README.md
-files:
+extra_rdoc_files:
+- README.rdoc
+files:
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
+- VERSION.yml
+- capistrano_mailer.gemspec
 - lib/cap_mailer.rb
 - lib/capistrano/mailer.rb
-- lib/capistrano/mailer_recipes.rb
-- lib/capistrano_mailer/version.rb
-- lib/capistrano_mailer.rb
-- test/build_gem_test.rb
-- spec/create_gemset_spec.rb
-- spec/empty_gemset_spec.rb
-- spec/install_ruby_spec.rb
-- spec/rvm_paths_spec.rb
-- spec/spec_helper.rb
-- spec/support/abort_matcher.rb
-- spec/support/capistrano.rb
-- views/cap_mailer/_message_body.html.erb
-- views/cap_mailer/_message_body.text.erb
 - views/cap_mailer/_section.html.erb
 - views/cap_mailer/_section.text.erb
 - views/cap_mailer/_section_custom.html.erb
 - views/cap_mailer/_section_custom.text.erb
-- views/cap_mailer/failed.notification_email.html.erb
-- views/cap_mailer/failed.notification_email.plain.erb
 - views/cap_mailer/notification_email.html.erb
-- views/cap_mailer/notification_email.plain.erb
-- LICENSE.txt
-- README.md
-- CHANGELOG.md
-- Rakefile
+- views/cap_mailer/notification_email.text.erb
 homepage: http://github.com/pboling/capistrano_mailer
 licenses: []
 post_install_message:
 rdoc_options: []
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.29
+rubygems_version: 1.8.10
 signing_key:
 specification_version: 3
 summary: Capistrano Deployment Email Notification
-test_files:
-- test/build_gem_test.rb
-- spec/create_gemset_spec.rb
-- spec/empty_gemset_spec.rb
-- spec/install_ruby_spec.rb
-- spec/rvm_paths_spec.rb
-- spec/spec_helper.rb
-- spec/support/abort_matcher.rb
-- spec/support/capistrano.rb
+test_files: []

data/CHANGELOG.md DELETED

@@ -1,116 +0,0 @@
-## Next...
-* Add tests with rspec and capistrano-spec
-## Version 3.3.0 2014-03-17
-* Fix compatibility with Rails 2.3.18
-* Integrate Travis-ci
-* Integrate Coveralls
-* Backport (most) new features from master (4.X releases)
-  * Gemfile.lock should not be in version control for a gem by Peter Boling
-  * Do not require RubyGems by Peter Boling
-  * Fix dependency declarations; remove jeweler dependency; improve gemspec by Peter Boling
-  * Modernize the ruby manager by Peter Boling
-  * Modernize the VERSION by Peter Boling
-  * Markdown the Readme. by Peter Boling (pboling)
-  * Modern the License by Peter Boling (pboling)
-  * Markdown the Changelog by Peter Boling (pboling)
-  * Git Release Notes by Mark Sim (marksim)
-  * Improved Readme by Peter Boling (pboling)
-## Version 3.2.7 2011-12-11
-* General file cleanup
-* Improved Readme
-* Fix to \*args passing to CapMailer.deliver_notification_email (dreamnid)
-## Version 3.2.6 --botched--
-## Version 3.2.5 2010-04-29
-* Remove Active Support dependency
-## Version 3.2.4 2010-01-13
-* Fixed subject line format (mail client filters are based on format of subject line)
-## Version 3.2.3 2010-01-13
-* config[:user] is now optional.
-## Version 3.2.2 2010-01-13
-* Improved Readme
-## Version 3.2.1 2010-01-13
-* Added deprecation warning for configure_capistrano_mailer
-* commented :site_url, doesn't appear to be a native capistrano variable, if sent in will still be rendered.
-## Version 3.2.0 textgoeshere fork
-* config/cap_mailer_settings.rb is not longer a hard coded configuration location requirement.
-* refactoring core cap mailer class
-## Version 3.1.10 2010-01-07
-* included \_section.text.erb view in gem manifest
-* text version of email should render the text partials, not html
-## Version 3.1.9 2010-01-07
-* Fixed URL for capistrano_mailer repo on github in HTML email message
-## Version 3.1.8 2010-01-07
-* Improved Readme
-## Version 3.1.6 2009-11-10
-* Fixed installation instructions to reference gemcutter instead of github
-## Version 3.1.3 2009-09-29
-* Added Git as known compatable SCM to readme
-* Credited Dustin Deyoung as Author of HTML Email templates
-* Removed MIT-LICENSE file from gemspec (because github refuses to build with it there)
-* Still trying to get github to build the gem
-## Version 3.1.2 2009-09-25
-* Fixed footer copyright
-* Trying to get github to build the gem
-## Version 3.1.1 2009-09-24
-* Added back compatability with svn which broke when fixing for perforce (thanks to Matthew Beale / mixonic)
-* Improved Readme for plugin installation.  Tested as a plugin.  Verified continued compatibility with Deprec.
-## Version 3.1.0 2009-09-17
-* Added compatability with perforce (thanks to Andy Kock / ak47)
-## Version 3.0.3 2009-09-03
-* Improved readme and upgrade instructions
-## Version 3.0.2 2009-08-27
-* Fixed some typos in readme referencing outdated API
-## Version 3.0.1 2009-08-21
-* removed a stray puts used in debugging
-## Version 3.0.0 2009-08-19
-* turned into a gem
-* New API for configuration
-* improved email templates (hardened against crappy data)
-* added simple testing framwork and Rakefile
-* still compatible with deprec
-## Version 2.1.0 2008-11-15
-* improved readme, and other stuff I don't remember
-## Version 2.0.1 2008-07-30
-* Works when deploying to a server without capistrano installed
-* Updated README and WIKI (improved documentation)
-## Version 2.0 2008-07-25
-* Works with Rails 2.1
-* Works with Capistrano 2.4.3
-* Added access to many of Capistrano's internal variables (~25) so the emails can be more informative
-* Added inferred_command, repo_end and some other derived variables that give more insight into a deployment
-* Parameters are now sent in a hash
-* Emails updated with new information
-* HTML email improved layout, and added styling (thanks to Dustin Deyoung @ Sagebit)
-## Version 1.0.1 2008-03-26
-* Works with Rails 2.0.2
-* Works with Capistrano 2.1.0 - 2.2.0
-* Compatability with Deprec verified
-## Version 1.0 2008-02-11
-* Works with Rails 2.0.2
-* Works with Capistrano 2.1.0

data/LICENSE.txt DELETED

@@ -1,23 +0,0 @@
-Copyright (c) 2008-2014 Peter H. Boling (http://railsbling.com)
-Copyright (c) 2007-8 Sagebit, LLC
-MIT License
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.