capistrano-notifier 0.2.0 → 0.2.1

data/.travis.yml

@@ -1,9 +1,9 @@
 env:
-  - TEST_ENV=default
-  - TEST_ENV=rails-2.3
-  - TEST_ENV=rails-3.0
-  - TEST_ENV=rails-3.1
-  - TEST_ENV=rails-3.2
+  - RAILS_VERSION=none
+  - RAILS_VERSION=2.3
+  - RAILS_VERSION=3.0
+  - RAILS_VERSION=3.1
+  - RAILS_VERSION=3.2
 rvm:
   - 1.8.7
   - 1.9.2
@@ -19,7 +19,7 @@ matrix:
     - rvm: ruby-head
   exclude:
     - rvm: ruby-head
-      env: TEST_ENV=rails-2.3
+      env: RAILS_VERSION=2.3
 notifications:
   email:
     - sysadmin@cramerdev.com

data/README.md

@@ -30,9 +30,30 @@ set :notifier_mail_options, {
 }
 ```
 
-If you specified `:method => test`, you can see the email that would be
+If you specified `:method => :test`, you can see the email that would be
 generated in your console with `cap deploy:notify:mail`.
 
+If you specified `:method => :smtp`, you can specify `:smtp_settings`
+
+For example:
+
+```rb
+set :notifier_mail_options, {
+  :method => :smtp,
+  :from   => 'capistrano@domain.com',
+  :to     => ['john@doe.com', 'jane@doe.com'],
+  :github => 'MyCompany/project-name',
+  :smtp_settings => {
+    address: "smtp.gmail.com",
+    port: 587,
+    domain: "gmail.com",
+    authentication: "plain",
+    enable_starttls_auto: true,
+    user_name: MY_USERNAME,
+    password: MY_PASSWORD
+  }
+}
+```
 
 ## StatsD
 

data/capistrano-notifier.gemspec

@@ -15,14 +15,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Capistrano::Notifier::VERSION
 
-  case ENV['TEST_ENV']
-  when 'rails-2.3'
+  case ENV['RAILS_VERSION']
+  when '2.3'
     gem.add_dependency 'actionmailer', '~> 2.3.0'
-  when 'rails-3.0'
+  when '3.0'
     gem.add_dependency 'actionmailer', '~> 3.0.0'
-  when 'rails-3.1'
+  when '3.1'
     gem.add_dependency 'actionmailer', '~> 3.1.0'
-  when 'rails-3.2'
+  when '3.2'
     gem.add_dependency 'actionmailer', '~> 3.2.0'
   else
     gem.add_dependency 'actionmailer'

data/lib/capistrano/notifier/mail.rb

@@ -65,6 +65,7 @@ class Capistrano::Notifier::Mail < Capistrano::Notifier::Base
   end
 
   def perform_with_action_mailer(notifier = Capistrano::Notifier::Mailer)
+    notifier.smtp_settings = smtp_settings
     notifier.notice(text, from, subject, to, notify_method).deliver
   end
 
@@ -114,6 +115,10 @@ class Capistrano::Notifier::Mail < Capistrano::Notifier::Base
     cap.notifier_mail_options[:method]
   end
 
+  def smtp_settings
+    cap.notifier_mail_options[:smtp_settings]
+  end
+
   def subject
     "#{application.titleize} branch #{branch} deployed to #{stage}"
   end

data/lib/capistrano/notifier/statsd.rb

@@ -20,7 +20,7 @@ class Capistrano::Notifier::StatsD < Capistrano::Notifier::Base
   end
 
   def command
-    "echo #{packet.gsub('|', '\\|')} | nc -w 1 -u #{host} #{port}"
+    "echo -n #{packet.gsub('|', '\\|')} | nc -w 1 -u #{host} #{port}"
   end
 
   private

data/lib/capistrano/notifier/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Notifier
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/spec/capistrano/notifier/mail_spec.rb

@@ -48,12 +48,52 @@ describe Capistrano::Notifier::Mail do
 
     ActionMailer::Base.deliveries.clear
   end
-
+  
   it { subject.send(:github).should         == 'example/example' }
   it { subject.send(:notify_method).should  == :sendmail }
   it { subject.send(:from).should           == 'sender@example.com' }
   it { subject.send(:to).should             == 'example@example.com' }
 
+
+  it 'delivers smtp mail' do
+    configuration.load do |configuration|
+      set :notifier_mail_options, {
+        :github => 'example/example',
+        :method => :test,
+        :from   => 'sender@example.com',
+        :to     => 'example@example.com',
+        :smtp_settings => {
+          :address => "smtp.gmail.com",
+          :port => 587,
+          :domain => "gmail.com",
+          :authentication => "plain",
+          :enable_starttls_auto => true,
+          :user_name => "USERNAME",
+          :password => "PASSWORD"
+        }
+      }
+    end
+
+    subject.perform
+
+    subject.send(:smtp_settings).should == {
+      :address => "smtp.gmail.com",
+      :port => 587,
+      :domain => "gmail.com",
+      :authentication => "plain",
+      :enable_starttls_auto => true,
+      :user_name => "USERNAME",
+      :password => "PASSWORD"
+    }
+
+    last_delivery = ActionMailer::Base.deliveries.last
+
+    last_delivery.to.should include 'example@example.com'
+    last_delivery.from.should include 'sender@example.com'
+
+    ActionMailer::Base.deliveries.clear
+  end
+
   it "creates a subject" do
     subject.send(:subject).should == "Example branch master deployed to test"
   end

data/spec/capistrano/notifier/statsd_spec.rb

@@ -21,7 +21,7 @@ describe Capistrano::Notifier::StatsD do
 
   it "creates a command" do
     subject.command.should ==
-      "echo example.deploy:1\\|c | nc -w 1 -u 127.0.0.1 8125"
+      "echo -n example.deploy:1\\|c | nc -w 1 -u 127.0.0.1 8125"
   end
 
   context "with a stage" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-notifier
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -151,15 +151,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -700121420444324432
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -700121420444324432
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Capistrano Notifier