rubycron 0.2.1 → 0.2.2

data/Gemfile

@@ -1,3 +1,8 @@
 source :rubygems
 
-gem "mail"
+gem "mail"
+
+group :test do
+  gem "rspec", "~> 2.0"
+  gem "simplecov"
+end

data/lib/rubycron.rb

@@ -13,14 +13,14 @@ module RubyCron
   require 'erb'
   
   attr_accessor :name, :author, :mailto, :mailfrom, :mailsubject, :mailon, :exiton, :template, :smtpsettings, :logfile, :verbose
-  attr_reader   :warnings, :errors
+  attr_reader   :warnings, :errors, :report
   
     def initialize(args = nil)
       @warnings, @errors = [], []
       
       case args
         when NilClass then yield self if block_given?
-        when Proc     then instance_eval(args)
+        when Proc     then instance_eval(&args)
         when Hash     then 
           
           args = load_config(:file, args[:configfile]).merge(args) if args[:configfile]
@@ -45,12 +45,14 @@ module RubyCron
         io = open(source)
       end
       yml = YAML::load(io)
-      return yml if yml.is_a?(Hash)
-      return {}
+      if yml.is_a?(Hash)
+        return yml
+      else
+        terminate "Could not load the YAML configuration."
+      end
     end
     
     def check_sanity
-      
       raise "This job has no name."   unless @name 
       raise "This job has no author." unless @author
       raise "No To: header was set. " unless @mailto
@@ -58,7 +60,6 @@ module RubyCron
       check_smtp_settings
       set_defaults
       enable_file_logging if @logfile  
-  
     end
     
     def check_smtp_settings     
@@ -66,7 +67,7 @@ module RubyCron
         raise "SMTP settings have to be passed in as a hash." unless @smtpsettings.instance_of?(Hash)
         raise "SMTP settings should include at least an address (:address)." unless @smtpsettings.keys.include?(:address)
         raise "SMTP settings should include at least a port number (:port)." unless @smtpsettings.keys.include?(:port)
-      else
+      elsif @smtpsettings.nil?
         raise "Cannot connect to local smtp server." unless smtp_connection?
       end
     end
@@ -84,12 +85,12 @@ module RubyCron
       $stdout.sync = true
       $stderr.reopen($stdout)
       rescue => e
-        $stdout = STDOUT
+        $stdout, $stderr = STDOUT, STDERR
         raise e
     end
         
     def terminate(message)
-      $stderr.puts "## Cannot complete job. Reason: #{message}"
+      $stderr.puts "## Cannot complete job. Reason: #{message}" unless ENV['RSPEC']
       exit 1
     end
     
@@ -110,7 +111,7 @@ module RubyCron
         puts "Number of errors  : #{@errors.size}" 
       end
       unless self.mailon == :none || (@warnings.empty? && @errors.empty? && self.mailon != :all)
-        report
+        send_report
       end 
     end
    
@@ -128,6 +129,7 @@ module RubyCron
     
     private 
     def smtp_connection?
+      #return true if ENV['RSPEC']
       return true if Net::SMTP.start('localhost', 25)
       rescue 
         return false
@@ -136,12 +138,14 @@ module RubyCron
     # Report on the status of the cronjob through the use of
     # an erb template file, and mikel's excellent mail gem. 
     private
-    def report
+    def send_report
+      @report       = ERB.new(File.read(@template)).result(binding)      
       @mailsubject  = "Cron report for #{name}: #{@warnings.size} warnings & #{@errors.size} errors" unless @mailsubject
+      
       mailfrom      = @mailfrom
       mailto        = @mailto
       mailsubject   = @mailsubject
-      mailbody      = ERB.new(File.read(@template)).result(binding)
+      mailbody      = @report
     
       if @smtpsettings
         smtpsettings = @smtpsettings 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubycron
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &2153963780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153963780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Write clean cronjobs in Ruby, and get reporting for free!
 email: rubycron@kamphorst.com
 executables:
@@ -56,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simplifies your Ruby cronjobs by automating the reporting process.