airblade-fyi 1.0.0 → 1.0.1

data/README.md

@@ -51,7 +51,7 @@ A notifier must:
 * subclass Fyi::Notifier
 * accept an options hash at initialisation (populated from
   configuration).
-* respond to `notify(command, result, output, error = '')`
+* respond to `notify(command, result, duration, output, error = '')`
 
 
 ## Installation

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/fyi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fyi}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Stewart"]
-  s.date = %q{2009-08-10}
+  s.date = %q{2009-08-12}
   s.default_executable = %q{fyi}
   s.email = %q{boss@airbladesoftware.com}
   s.executables = ["fyi"]

data/lib/fyi.rb

@@ -17,6 +17,7 @@ class Fyi
   end
 
   def run
+    start_stopwatch
     # Borrowed from CI Joe.
     out, err, status = '', '', nil
     status = Open4.popen4(@command) do |@pid, stdin, stdout, stderr|
@@ -30,16 +31,18 @@ class Fyi
   private
 
   def run_succeeded output
-    notify :success, output
+    stop_stopwatch
+    notify :success, duration, output
   end
 
   def run_failed output, error
-    notify :failure, output, error
+    stop_stopwatch
+    notify :failure, duration, output, error
   end
 
-  def notify result, output, error = ''
+  def notify result, duration, output, error = ''
     notifiers.each do |notifier|
-      notifier.notify @command, result, output, error
+      notifier.notify @command, result, duration, output, error
     end
   end
 
@@ -52,4 +55,16 @@ class Fyi
     end
   end
 
+  def duration
+    @stop - @start
+  end
+
+  def start_stopwatch
+    @start = Time.now
+  end
+
+  def stop_stopwatch
+    @stop = Time.now
+  end
+
 end

data/lib/fyi/notifiers/email.rb

@@ -33,8 +33,8 @@ class Fyi
         @on_failure = options.has_key?('on_failure') ? options['on_failure'] : true
       end
 
-      def notify command, result, output, error = ''
-        send_email(command, result, output, error) if should_notify?(result)
+      def notify command, result, duration, output, error = ''
+        send_email(command, result, duration, output, error) if should_notify?(result)
       end
 
       private
@@ -43,11 +43,11 @@ class Fyi
         (result == :success && @on_success) || (result == :failure && @on_failure)
       end
 
-      def send_email command, result, output, error
+      def send_email command, result, duration, output, error
         Pony.mail :to      => @to,
                   :from    => @from,
                   :subject => subject(command, result),
-                  :body    => body(command, output, error),
+                  :body    => body(command, duration, output, error),
                   :via     => :smtp,
                   :smtp    => @smtp
       end
@@ -56,10 +56,12 @@ class Fyi
         "[#{result.to_s.upcase}] #{truncate command}"
       end
 
-      def body command, output, error
+      def body command, duration, output, error
         <<END
 command: #{command}
 
+duration: #{duration}s
+
 stdout: #{output}
 
 stderr: #{error}

data/lib/fyi/notifiers/log.rb

@@ -17,8 +17,8 @@ class Fyi
         @logger = Logger.new log_file
       end
 
-      def notify command, result, output, error = ''
-        logger.log severity(result), message(command, result, output, error)
+      def notify command, result, duration, output, error = ''
+        logger.log severity(result), message(command, result, duration, output, error)
       end
 
       private
@@ -27,9 +27,10 @@ class Fyi
         result == :success ? Logger::INFO : Logger::WARN
       end
 
-      def message command, result, output, error
+      def message command, result, duration, output, error
         <<END
 command: #{command}
+duration: #{duration}s
 status: #{result.to_s.upcase}
 stdout: #{output}
 stderr: #{error}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: airblade-fyi
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Andy Stewart
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -07:00
+date: 2009-08-12 00:00:00 -07:00
 default_executable: fyi
 dependencies: 
 - !ruby/object:Gem::Dependency