capistrano-notifier 0.1.2 → 0.2.0

data/.travis.yml

@@ -1,9 +1,25 @@
+env:
+  - TEST_ENV=default
+  - TEST_ENV=rails-2.3
+  - TEST_ENV=rails-3.0
+  - TEST_ENV=rails-3.1
+  - TEST_ENV=rails-3.2
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ruby-head
+  - jruby
+  - rbx
   - ree
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: jruby
+    - rvm: rbx
+    - rvm: ruby-head
+  exclude:
+    - rvm: ruby-head
+      env: TEST_ENV=rails-2.3
 notifications:
   email:
     - sysadmin@cramerdev.com

data/README.md

@@ -31,7 +31,7 @@ set :notifier_mail_options, {
 ```
 
 If you specified `:method => test`, you can see the email that would be
-generated in your console with `cap deploy:notify`.
+generated in your console with `cap deploy:notify:mail`.
 
 
 ## StatsD
@@ -59,3 +59,5 @@ set :notifier_statsd_options, {
   :port => "8125"
 }
 ```
+
+The `nc` ([Netcat](http://netcat.sourceforge.net/)) command is used to send messages to statsd and must be installed on the remote hosts. This is installed by default on most Unix machines.

data/capistrano-notifier.gemspec

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

data/lib/capistrano/notifier/base.rb

@@ -18,18 +18,22 @@ class Capistrano::Notifier::Base
   end
 
   def git_current_revision
-    cap.current_revision[0,7]
+    cap.current_revision[0,7] if cap.respond_to? :current_revision
   end
 
   def git_log
+    return unless git_range
+
     `git log #{git_range} --no-merges --format=format:"%h %s (%an)"`
   end
 
   def git_previous_revision
-    cap.previous_revision[0,7]
+    cap.previous_revision[0,7] if cap.respond_to? :previous_revision
   end
 
   def git_range
+    return unless git_previous_revision && git_current_revision
+
     "#{git_previous_revision}..#{git_current_revision}"
   end
 

data/lib/capistrano/notifier/mail.rb

@@ -1,5 +1,33 @@
 require 'capistrano/notifier'
-require 'action_mailer'
+
+begin
+  require 'action_mailer'
+rescue LoadError => e
+  require 'actionmailer'
+end
+
+class Capistrano::Notifier::Mailer < ActionMailer::Base
+
+  if ActionMailer::Base.respond_to?(:mail)
+    def notice(text, from, subject, to, delivery_method)
+      mail({
+        :body => text,
+        :delivery_method => delivery_method,
+        :from => from,
+        :subject => subject,
+        :to => to
+      })
+    end
+  else
+    def notice(text, from, subject, to)
+      body text
+      from from
+      subject subject
+      recipients to
+    end
+  end
+
+end
 
 class Capistrano::Notifier::Mail < Capistrano::Notifier::Base
   def self.load_into(configuration)
@@ -9,6 +37,10 @@ class Capistrano::Notifier::Mail < Capistrano::Notifier::Base
           desc 'Send a deployment notification via email.'
           task :mail do
             Capistrano::Notifier::Mail.new(configuration).perform
+
+            if configuration.notifier_mail_options[:method] == :test
+              puts ActionMailer::Base.deliveries
+            end
           end
         end
       end
@@ -18,20 +50,23 @@ class Capistrano::Notifier::Mail < Capistrano::Notifier::Base
   end
 
   def perform
-    mail = ActionMailer::Base.mail({
-      :body => text,
-      :delivery_method => notify_method,
-      :from => from,
-      :subject => subject,
-      :to => to
-    })
+    if defined?(ActionMailer::Base) && ActionMailer::Base.respond_to?(:mail)
+      perform_with_action_mailer
+    else
+      perform_with_legacy_action_mailer
+    end
+  end
 
-    mail.deliver
+  private
 
-    puts ActionMailer::Base.deliveries if notify_method == :test
+  def perform_with_legacy_action_mailer(notifier = Capistrano::Notifier::Mailer)
+    notifier.delivery_method = notify_method
+    notifier.deliver_notice(text, from, subject, to)
   end
 
-  private
+  def perform_with_action_mailer(notifier = Capistrano::Notifier::Mailer)
+    notifier.notice(text, from, subject, to, notify_method).deliver
+  end
 
   def body
     <<-BODY.gsub(/^ {6}/, '')

data/lib/capistrano/notifier/statsd.rb

@@ -10,7 +10,7 @@ class Capistrano::Notifier::StatsD < Capistrano::Notifier::Base
         namespace :notify do
           desc 'Notify StatsD of deploy.'
           task :statsd do
-            Capistrano::Notifier::StatsD.new(configuration).perform
+            run Capistrano::Notifier::StatsD.new(configuration).command
           end
         end
       end
@@ -19,8 +19,8 @@ class Capistrano::Notifier::StatsD < Capistrano::Notifier::Base
     end
   end
 
-  def perform
-    socket.send packet, 0, host, port
+  def command
+    "echo #{packet.gsub('|', '\\|')} | nc -w 1 -u #{host} #{port}"
   end
 
   private
@@ -49,10 +49,6 @@ class Capistrano::Notifier::StatsD < Capistrano::Notifier::Base
     options[:port]
   end
 
-  def socket
-    @socket ||= UDPSocket.new
-  end
-
   def with
     case options[:with]
     when :counter then "1|c"

data/lib/capistrano/notifier/version.rb

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

data/spec/capistrano/notifier/base_spec.rb

@@ -21,4 +21,13 @@ describe Capistrano::Notifier::Base do
       end
     end
   end
+
+  describe "#git_*" do
+    context "on initial deploy" do
+      it { subject.send(:git_log).should be_nil }
+      it { subject.send(:git_range).should be_nil }
+      it { subject.send(:git_current_revision).should be_nil }
+      it { subject.send(:git_previous_revision).should be_nil }
+    end
+  end
 end

data/spec/capistrano/notifier/mail_spec.rb

@@ -29,6 +29,26 @@ describe Capistrano::Notifier::Mail do
     subject.stub(:user_name).and_return "John Doe"
   end
 
+  it 'delivers mail' do
+    configuration.load do |configuration|
+      set :notifier_mail_options, {
+        :github => 'example/example',
+        :method => :test,
+        :from   => 'sender@example.com',
+        :to     => 'example@example.com'
+      }
+    end
+
+    subject.perform
+
+    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 { subject.send(:github).should         == 'example/example' }
   it { subject.send(:notify_method).should  == :sendmail }
   it { subject.send(:from).should           == 'sender@example.com' }

data/spec/capistrano/notifier/statsd_spec.rb

@@ -19,12 +19,9 @@ describe Capistrano::Notifier::StatsD do
     subject.send(:packet).should == "example.deploy:1|c"
   end
 
-  it "sends a packet" do
-    UDPSocket.any_instance.should_receive(:send).once.with(
-      "example.deploy:1|c", 0, "127.0.0.1", "8125"
-    )
-
-    subject.perform
+  it "creates a command" do
+    subject.command.should ==
+      "echo 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.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer