capistrano-mailgun 2.0.0pre → 2.0.0pre1

data/CHANGELOG.md

@@ -1,26 +1,36 @@
+## 2013-07-23 - 2.0.0pre1
+
+ * added support for overriding html/text data in `mailgun#send_email`
+
 ## 2013-01-30 - v1.3.0
+
  * added option to include list of servers deployed to in email notification
  * fixed a bug where requiring `capistrano-mailgun` after you load `deploy.rb` would cause variables to be overwritten with defaults.
  * don't call `mailgun.log_output` twice in html template
  * fixed an issue where, depending on when `mailgun_notify` is called, it may or may not use the correct revisions when building the commit log.
 
 ## 2012-11-?? - v1.2.0
+
  * properly handle failures when running git-log
 
 ## 2012-10-22 - v1.1.0
+
  * default subject now includes stage
  * built-in templates
  * support for custom messages
 
 ## 2012-10-15 - v1.0.2
+
  * Minor release
  * documentation changes
 
 ## 2012-10-15 - v1.0.1
+
  * Minor release
  * documentation changes
 
 ## 2012-10-15 - v1.0.0
+
  * Version 1.0.0!
  * Proper definitions of dependencies
  * Proper documentation

data/lib/capistrano-mailgun.rb

@@ -107,8 +107,8 @@ module Capistrano
       options[:cc] = build_recipients(options[:cc]) unless options[:cc].nil?
       options[:bcc] = build_recipients(options[:bcc]) unless options[:bcc].nil?
 
-      options[:text] = fetch(:capnotify_deployment_notification_text) if fetch(:capnotify_deployment_notification_text_template_path, nil)
-      options[:html] = fetch(:capnotify_deployment_notification_html) if fetch(:capnotify_deployment_notification_html_template_path, nil)
+      options[:text] ||= fetch(:capnotify_deployment_notification_text) if fetch(:capnotify_deployment_notification_text_template_path, nil)
+      options[:html] ||= fetch(:capnotify_deployment_notification_html) if fetch(:capnotify_deployment_notification_html_template_path, nil)
 
       options
     end

data/lib/capistrano-mailgun/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Mailgun
-    VERSION = "2.0.0pre"
+    VERSION = "2.0.0pre1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-mailgun
 version: !ruby/object:Gem::Version
-  version: 2.0.0pre
+  version: 2.0.0pre1
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capnotify