rubycron 0.2.4 → 0.2.5

data/Gemfile

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 gem "mail", ">= 2.4.4"
 
+gem 'coveralls', require: false
+
 group :test do
   gem "rspec", "~> 2.0"
   gem "simplecov", "~> 0.7.1"

data/README.md

@@ -1,9 +1,13 @@
 # RubyCron
 
-Define your cronjobs in your favorite language, and get reporting for free!
+**Define your cronjobs in your favorite language, and get reporting for free!**
 
 By letting RubyCron deal with warnings, errors, and sending reports, you can focus on writing clean and effective cronjobs in Ruby.
 
+[![Build Status](https://travis-ci.org/bartkamphorst/rubycron.png?branch=master)](https://travis-ci.org/bartkamphorst/rubycron)
+[![Coverage Status](https://coveralls.io/repos/bartkamphorst/rubycron/badge.png?branch=master)](https://coveralls.io/r/bartkamphorst/rubycron?branch=master)
+[![Gem Version](https://badge.fury.io/rb/rubycron.png)](http://badge.fury.io/rb/rubycron)
+
 ## Author
 
 * Bart Kamphorst

data/lib/rubycron/errors.rb

@@ -0,0 +1,7 @@
+module RubyCron
+    class ExitOnWarning < StandardError
+    end
+  
+    class ExitOnError < StandardError
+    end
+end

data/lib/rubycron/main.rb

@@ -12,9 +12,12 @@ module RubyCron
   require 'mail'
   require 'erb'
   
-  attr_accessor :name, :author, :mailto, :mailfrom, :mailsubject, :mailon, :exiton, :template, :smtpsettings, :logfile, :verbose
+  attr_accessor :name, :author, :mailto, :mailfrom, :mailsubject, :mailon, :exiton, :template, :smtpsettings, :debug, :logfile, :verbose
   attr_reader   :warnings, :errors, :report
   
+  DEFAULT_SERVER = 'localhost'
+  DEFAULT_PORT   = 25
+  
     def initialize(args = nil)
       @warnings, @errors = [], []
       
@@ -59,6 +62,7 @@ module RubyCron
       
       check_smtp_settings
       set_defaults
+      enable_debug_mode if @debug
       enable_file_logging if @logfile  
     end
     
@@ -80,6 +84,11 @@ module RubyCron
       @exiton = :all unless self.exiton && [:none, :warning, :error, :all].include?(self.exiton)
     end
     
+    def enable_debug_mode
+      @mailon = :none
+      @verbose = true
+    end
+    
     def enable_file_logging
       $stdout.reopen(@logfile, "a")
       $stdout.sync = true
@@ -97,39 +106,46 @@ module RubyCron
     # Execute a given block of code (the cronjob), rescue encountered errors, 
     # and send a report about it if necessary.
     def execute(&block)
+      puts "[INFO ] Running in debug mode. Will not send mail." if self.debug
       @starttime = Time.now
       puts "\nStarting run of #{self.name} at #{@starttime}.\n----"  if self.verbose || self.logfile
       instance_eval(&block)
+    rescue ExitOnWarning, ExitOnError => e
+      terminate(e.message)
     rescue Exception => e
-      @errors << e.message
-      terminate(e.message) if exiton == (:error || :all)
+      trace = "#{e.message}\n" + e.backtrace.join("\n\t")
+      @errors << trace
+      $stderr.puts "[ERROR] #{trace}" if self.verbose || self.logfile
+      terminate(trace) if exiton == (:error || :all)
     ensure
       @endtime = Time.now
-      if self.verbose || self.logfile
-        puts "Run ended at #{@endtime}.\n----"  
-        puts "Number of warnings: #{@warnings.size}" 
-        puts "Number of errors  : #{@errors.size}" 
-      end
+      produce_summary if (self.verbose || self.logfile)
       unless self.mailon == :none || (@warnings.empty? && @errors.empty? && self.mailon != :all)
         send_report
       end 
     end
    
+   def produce_summary
+     puts "Run ended at #{@endtime}.\n----"  
+     puts "Number of warnings: #{@warnings.size}" 
+     puts "Number of errors  : #{@errors.size}"
+   end
+   
     def warning(message)
-     $stderr.puts message if self.verbose || self.logfile
-     raise "Configured to exit on warning." if exiton == (:warning || :all)
+     $stderr.puts "[WARN ] #{message}" if self.verbose || self.logfile
      @warnings << message
+     raise ExitOnWarning.new("Configured to exit on warning.") if exiton == (:warning || :all)
     end
 
     def error(message)
-      $stderr.puts message if self.verbose || self.logfile
-      raise "Configured to exit on error." if exiton == (:error || :all) 
+      $stderr.puts "[ERROR] #{message}" if self.verbose || self.logfile
       @errors << message
+      raise ExitOnError.new("Configured to exit on error.") if exiton == (:error || :all) 
     end
     
     private 
     def smtp_connection?
-      return true if Net::SMTP.start('localhost', 25)
+      return true if Net::SMTP.start(DEFAULT_SERVER, DEFAULT_PORT)
       rescue 
         return false
     end

data/lib/rubycron/version.rb

@@ -1,3 +1,3 @@
 module RubyCron
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/rubycron.rb

@@ -1,2 +1,3 @@
 require 'rubycron/main'
+require 'rubycron/errors'
 require 'rubycron/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubycron
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -70,13 +70,15 @@ files:
 - README.md
 - Gemfile
 - lib/rubycron.rb
+- lib/rubycron/errors.rb
 - lib/rubycron/main.rb
 - lib/rubycron/report.erb
 - lib/rubycron/version.rb
 - sample/test.rcj
 - bin/rcjrunner.rb
 homepage: https://github.com/bartkamphorst/rubycron
-licenses: []
+licenses:
+- Modified BSD
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -95,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Simplifies your Ruby cronjobs by automating the reporting process.