RubyGems - log_master - Versions diffs - 0.1.1 → 0.1.3 - Mend

log_master 0.1.1 → 0.1.3

Files changed (12) hide show

data/VERSION CHANGED Viewed

data/lib/log_master/configuration.rb CHANGED Viewed

@@ -4,7 +4,7 @@ module LogMaster
   class Configuration
     include Singleton
-    attr_accessor :title, :reporting
+    attr_accessor :title, :reporting, :failure_conditions
     # These are options that directly affect the email
     attr_accessor :recipients, :from, :reply_to
@@ -18,6 +18,7 @@ module LogMaster
     def reset
       @title = "No Title"
       @reporting = {}
+      @failure_conditions = []
       @@configured = false
     end

data/lib/log_master/director.rb CHANGED Viewed

@@ -7,9 +7,10 @@ module LogMaster
     def initialize(files)
       raise "LogMaster has not yet been configured" unless Configuration.configured?
+      @configuration = Configuration.instance
+      @reports = {}
       create_log_files(files)
-      @reports = {}
     end
     def run
@@ -26,18 +27,18 @@ module LogMaster
       end
     end
-    def status
-      @reports[:fatal] == 0 && @reports[:error] == 0
+    def successful?
+      @configuration.failure_conditions.all? {|fc| @reports.fetch(fc, 0) == 0} && @logs.all? {|l| l.valid?}
     end
     def send_email
-      Notifier.deliver_update_notification(status, @reports, @logs)
+      Notifier.deliver_update_notification(successful?, @reports, @logs)
     end
     private
     def create_log_files(files)
       files = files.respond_to?(:each) ? files : [files]
-      @logs = files.map { |f| LogFile.new(f, Configuration.instance.reporting) }
+      @logs = files.map { |f| LogFile.new(f, @configuration.reporting) }
     end
   end
 end

data/lib/log_master/notifier.rb CHANGED Viewed

@@ -14,7 +14,10 @@ module LogMaster
       sent_on       Time.now
       body          :title => @configuration.title, :logs => logs, :reports => reports
     end
+    def template_path
+      File.expand_path(File.dirname(__FILE__) + "/../../templates/log_master/notifier/update_notification.html.erb")
+    end
     def create_subject
       @configuration.title + (@status ? " SUCCESSFUL" : " FAILED")

data/lib/log_master.rb CHANGED Viewed

@@ -1,13 +1,11 @@
 begin
-  require 'actionmailer'
+  require 'action_mailer'
 rescue LoadError
   warn 'To use LogMaster you need the actionmailer gem:'
   warn '$ sudo gem install actionmailer'
   raise
 end
-ActionMailer::Base.template_root = File.dirname(__FILE__) + "/templates"
 require 'log_master/configuration'
 require 'log_master/director'
 require 'log_master/log_file'

@@ -1,8 +1,11 @@
-<!DOCTYPE html>
 <html>
   <head>
     <title><%= @subject %></title>
     <style type="text/css">
+      h3 {
+        text-align: center;
+      }
       .pre {
         white-space: pre;
         font-family: monospace;
@@ -33,23 +36,25 @@
     </style>
   </head>
   <body>
-    <h2>
+    <h3>
       <%= @title %>
-    </h2>
+    </h3>
+    <h4>Overall Summary</h4>
     <p>
       <% @reports.each do |name, count| %>
-        <strong class="<%= name %>"><%= name.to_s.titleize %>: </strong><%= count %><br />
+        <strong class="<%= name %>"><%= name.to_s.titleize.pluralize %>: </strong><%= count %><br />
       <% end %>
     </p>
     <hr />
     <% @logs.each do |log| -%>
-      <div class="log"><%= log.file_name %></div>
+      <p class="log"><%= log.file_name %></p>
       <div class="pre">
         <% log.body.each do |line| -%>
-          <span class="<%= stylize_output(line) %>"><%= line.chomp -%></span>
+          <span class="<%= stylize_output(line) %>"><%= line.chomp -%></span><br />
         <% end -%>
       </div>

data/log_master.gemspec CHANGED Viewed

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{log_master}
-  s.version = "0.1.1"
+  s.version = "0.1.3"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zachary Belzer"]
-  s.date = %q{2009-12-02}
+  s.date = %q{2009-12-03}
   s.description = %q{Creates and emails a simple report for a set of log (or text) files. Useful for aggretating small log files.}
   s.email = %q{zbelzer@gmail.com}
   s.extra_rdoc_files = [

data/spec/director_spec.rb CHANGED Viewed

@@ -23,5 +23,26 @@ module LogMaster
         log_master.reports[:error].should == 2
       end
     end
+    describe "successful?" do
+      it "should be true when no aggregate count for failure_conditions" do
+        log_master = Director.new(log_file_path('log_without_errors.log'))
+        log_master.run
+        log_master.should be_successful
+      end
+      it "should be false when aggregate count for failure_conditions > 0" do
+        log_master = Director.new(log_file_path('log_with_errors.log'))
+        log_master.run
+        log_master.should_not be_successful
+      end
+      it "should be false when given missing file" do
+        log_master = Director.new(log_file_path('nosuchfile.log'))
+        log_master.run
+        log_master.should_not be_successful
+      end
+    end
   end
 end

data/spec/notification_spec.rb CHANGED Viewed

@@ -20,9 +20,9 @@ module LogMaster
       it "should contain the aggregate report" do
         email = Notifier.deliver_update_notification(true, {:error => 1, :warn => 2, :fatal => 0}, [])
-        email.should have_body_text(/Error:.*1/)
-        email.should have_body_text(/Warn:.*2/)
-        email.should have_body_text(/Fatal:.*0/)
+        email.should have_body_text(/Errors:.*1/)
+        email.should have_body_text(/Warns:.*2/)
+        email.should have_body_text(/Fatals:.*0/)
       end
       it "should contain each of the provided logfiles" do

data/spec/spec_helper.rb CHANGED Viewed

@@ -1,6 +1,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
+# Explicitly required so we can set class vars before Notifier gets loaded
+require 'action_mailer'
+ActionMailer::Base.template_root = File.dirname(__FILE__) + "/../lib/templates"
+ActionMailer::Base.delivery_method = :test
+# ActionMailer::Base.logger = Logger.new('test.log')
 require 'log_master'
 require 'spec'
 require 'spec/autorun'
@@ -13,12 +21,10 @@ require File.dirname(__FILE__) + '/../lib/log_master'
 FIXTURES_DIR = File.dirname(__FILE__) + "/fixtures"
-ActionMailer::Base.delivery_method = :test
-# ActionMailer::Base.logger = Logger.new('test.log')
 LogMaster::Configuration.configure do |config|
   config.title = "Testing LogMaster"
   config.reporting = {:warn => /WARN/, :error => /ERROR/, :fatal => /FATAL/}
+  config.failure_conditions = [:error, :fatal]
   config.recipients = {:success => "success@example.com", :failure => "failure@example.com"}
 end

data/tasks/log_master.rake CHANGED Viewed

@@ -1,6 +1,6 @@
 namespace :log_master do
   task :configure do
-    require 'action_mailer'
+    require 'actionmailer'
     ActionMailer::Base.delivery_method = :sendmail
     LogMaster::Configuration.configure do |config|

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: log_master
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Zachary Belzer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-12-02 00:00:00 -06:00
+date: 2009-12-03 00:00:00 -06:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency