exception_notification-rake 0.0.1.alpha1 → 0.0.1.alpha2

data/exception_notification-rake.gemspec

@@ -13,8 +13,9 @@ Gem::Specification.new do |s|
     ' sending mail upon failures in Rake tasks'
 
   s.add_runtime_dependency 'exception_notification', '~> 3.0.0'
-  # TODO how to specify rake dependency?
-  s.add_development_dependency 'rake'
+  # NB: Rake before 0.9.0 won't support the exception hook we're using
+  s.add_runtime_dependency 'rake', '>= 0.9.0'
+  s.add_development_dependency 'rails', '~> 3.2.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/exception_notifier/rake/multi_delegator.rb

@@ -0,0 +1,21 @@
+require 'delegate'
+
+class ExceptionNotifier
+  class Rake
+    class MultiDelegator
+
+      def initialize(delegates)
+        @delegates = delegates.map do |del|
+          SimpleDelegator.new(del)
+        end
+      end
+
+      def method_missing(m, *args, &block)
+        return_values = @delegates.map do |del|
+          del.method_missing(m, *args, &block)
+        end
+        return_values.first
+      end
+    end
+  end
+end

data/lib/exception_notifier/rake/rake.rb

@@ -1,9 +1,11 @@
 require 'exception_notifier'
 
 class ExceptionNotifier
-  class Rake
 
-    ALWAYS_TRUE = lambda { true }
+  # Append application view path to the ExceptionNotifier lookup context.
+  Notifier.append_view_path "#{File.dirname(__FILE__)}/views"
+
+  class Rake
 
     @notifier_options = {}
 
@@ -11,8 +13,7 @@ class ExceptionNotifier
       !@notifier_options.empty?
     end
 
-    def self.configure(config, options = {})
-      # TODO add ExceptionNotifier to middleware if needed
+    def self.configure(options = {})
       @notifier_options.merge!(default_notifier_options)
       @notifier_options.merge!(options)
     end
@@ -20,10 +21,7 @@ class ExceptionNotifier
     def self.default_notifier_options
       {
         :email_prefix => "[Rake Failure] ",
-        # TODO add stdin/stderr sections with captured output
-        :background_sections => %w(backtrace),
-        # TODO include this only if ExceptionNotifer not already in use
-        :ignore_if => ALWAYS_TRUE,
+        :background_sections => %w(rake backtrace),
       }
     end
 
@@ -31,11 +29,15 @@ class ExceptionNotifier
       @notifier_options
     end
 
-    def self.maybe_deliver_notification(exception)
-      # TODO needs test
+    def self.maybe_deliver_notification(exception, data={})
       if configured?
+        options = notifier_options
+        if !data.empty?
+          options = options.dup
+          options[:data] = data.merge(options[:data] || {})
+        end
         ExceptionNotifier::Notifier.background_exception_notification(
-          exception, notifier_options).deliver
+          exception, options).deliver
       end
     end
 

data/lib/exception_notifier/rake/rake_patch.rb

@@ -10,8 +10,13 @@ class ExceptionNotifier
     end
 
     def display_error_message_with_notifications(ex)
-      ExceptionNotifier::Rake.maybe_deliver_notification(ex)
       display_error_message_without_notifications(ex)
+      ExceptionNotifier::Rake.maybe_deliver_notification(ex,
+        :rake_command_line => reconstruct_command_line)
+    end
+
+    def reconstruct_command_line
+      "rake #{ARGV.join(' ')}"
     end
   end
 end

data/lib/exception_notifier/rake/version.rb

@@ -1,5 +1,5 @@
 class ExceptionNotifier
   class Rake
-    VERSION = '0.0.1.alpha1'
+    VERSION = '0.0.1.alpha2'
   end
 end

data/lib/exception_notifier/rake/views/exception_notifier/_rake.html.erb

@@ -0,0 +1 @@
+<%= raw @data[:rake_command_line] %>

data/lib/exception_notifier/rake/views/exception_notifier/_rake.text.erb

@@ -0,0 +1 @@
+<%= raw @data[:rake_command_line] %>

data/test/multi_delegator_test.rb

@@ -0,0 +1,34 @@
+require 'test/unit'
+
+require 'exception_notifier/rake/multi_delegator'
+
+class MultiDelegatorTest < Test::Unit::TestCase
+
+  def setup
+    @delegate1 = []
+    @delegate2 = [42]
+  end
+
+  def test_one_delegate
+    delegator = ExceptionNotifier::Rake::MultiDelegator.new([@delegate1])
+    result = delegator.push(42)
+    assert_equal [42], @delegate1
+    assert_equal [42], result
+  end
+
+  def test_multiple_delegates
+    delegator = ExceptionNotifier::Rake::MultiDelegator.new([@delegate1, @delegate2])
+    result = delegator.push(43)
+    assert_equal [43], result
+    assert_equal [43], @delegate1
+    assert_equal [42, 43], @delegate2
+  end
+
+  def test_multiple_delegates_block_argument
+    delegator = ExceptionNotifier::Rake::MultiDelegator.new([@delegate1, @delegate2])
+    result = delegator.map! do |e| e + 1 end
+    assert_equal [], result
+    assert_equal [], @delegate1
+    assert_equal [43], @delegate2
+  end
+end

data/test/rake_test.rb

@@ -1,4 +1,6 @@
 require 'test/unit'
+require 'mocha/setup'
+
 require 'exception_notifier/rake'
 
 class RakeTest < Test::Unit::TestCase
@@ -8,8 +10,15 @@ class RakeTest < Test::Unit::TestCase
     assert !ExceptionNotifier::Rake.configured?
   end
 
+  def expect_delivery(exception, options)
+    mail = Object.new
+    ExceptionNotifier::Notifier.expects(:background_exception_notification)
+      .with(exception, options).returns(mail)
+    mail.expects(:deliver)
+  end
+
   def test_configure_only_default_options
-    ExceptionNotifier::Rake.configure({})
+    ExceptionNotifier::Rake.configure
     assert ExceptionNotifier::Rake.configured?
     assert_equal ExceptionNotifier::Rake.default_notifier_options,
       ExceptionNotifier::Rake.notifier_options
@@ -20,9 +29,31 @@ class RakeTest < Test::Unit::TestCase
       :sender_address => 'foo@example.com',
       :exception_recipients => ['bar@example.com'],
     }
-    ExceptionNotifier::Rake.configure({}, some_options)
+    ExceptionNotifier::Rake.configure some_options
     assert ExceptionNotifier::Rake.configured?
     assert_equal some_options.merge(ExceptionNotifier::Rake.default_notifier_options),
       ExceptionNotifier::Rake.notifier_options
   end
+
+  def test_maybe_deliver_notifications_without_configuration
+    ExceptionNotifier::Rake.maybe_deliver_notification(Exception.new)
+  end
+
+  def test_maybe_deliver_notifications_with_config
+    ExceptionNotifier::Rake.configure
+    ex = Exception.new
+    expect_delivery(ex, ExceptionNotifier::Rake.notifier_options)
+    ExceptionNotifier::Rake.maybe_deliver_notification(ex)
+  end
+
+  def test_maybe_deliver_notifications_with_data
+    ExceptionNotifier::Rake.configure
+    data = {:foo => :bar}
+    options = ExceptionNotifier::Rake.notifier_options
+    original_options = options.dup
+    ex = Exception.new
+    expect_delivery(ex, options.merge({:data => data}))
+    ExceptionNotifier::Rake.maybe_deliver_notification(ex, data)
+    assert_equal(original_options, options)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exception_notification-rake
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha1
+  version: 0.0.1.alpha2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exception_notification
@@ -34,15 +34,31 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.9.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: An extension of the exception_notification gem to support sending mail
   upon failures in Rake tasks
 email:
@@ -58,9 +74,13 @@ files:
 - Rakefile
 - exception_notification-rake.gemspec
 - lib/exception_notifier/rake.rb
+- lib/exception_notifier/rake/multi_delegator.rb
 - lib/exception_notifier/rake/rake.rb
 - lib/exception_notifier/rake/rake_patch.rb
 - lib/exception_notifier/rake/version.rb
+- lib/exception_notifier/rake/views/exception_notifier/_rake.html.erb
+- lib/exception_notifier/rake/views/exception_notifier/_rake.text.erb
+- test/multi_delegator_test.rb
 - test/rake_test.rb
 homepage: https://github.com/nikhaldi/exception_notification-rake
 licenses: []
@@ -87,5 +107,6 @@ signing_key:
 specification_version: 3
 summary: Sending exception notifications upon Rake task failures
 test_files:
+- test/multi_delegator_test.rb
 - test/rake_test.rb
 has_rdoc: