fixed integration tests; added bin script for monitoring

README

@@ -33,9 +33,12 @@ Try to run it:
 
 Finally, you can schedule a cron job (with crontab -e), like this:
 
-	*/5 * * * * /bin/bash -l -c 'cd $path_to_cruise_monitor && rake monitor'
+	*/5 * * * * $path_to_cruise_monitor/bin/monitor.sh
 
-where $path_to_cruise_monitor links to the folder you have copied Cruise-monitor into.
+where $path_to_cruise_monitor links to the folder you have copied Cruise-monitor into. Don't forget to set
+monitor.sh as an executable file, with:
+
+	chmod +x bin/monitor.sh
 
 That's it. Have fun, and keep the build clean!
 

bin/monitor.bat

@@ -0,0 +1,5 @@
+@echo off
+set CURRENT_FOLDER=%~dp0
+
+cd %CURRENT_FOLDER%
+rake monitor

bin/monitor.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+CURRENT_FOLDER="$( cd "$( dirname "$0" )" && pwd )"
+
+cd $CURRENT_FOLDER
+rake monitor

bin/say.bat

@@ -1,3 +1,4 @@
 @echo off
 set CURRENT_FOLDER=%~dp0
+
 %CURRENT_FOLDER%\say.vbs %1

test/integration/base_integration_test.rb

@@ -3,11 +3,7 @@
 module CruiseMonitor
   class BaseIntegrationTest < Test::Unit::TestCase
 
-    STORAGE_FILE = Utils.temp_file('/latest.info')
-
     def setup
-      Utils.delete_if_exists(STORAGE_FILE)
-
       @server = FeedServer.new(10123)
       @server.start
 
@@ -16,7 +12,6 @@ def setup
 
     def teardown
       @server.stop
-      Utils.delete_if_exists(STORAGE_FILE)
     end
 
     def test_ignore_this; end

test/integration/build_test.rb

@@ -4,28 +4,28 @@ module CruiseMonitor
   class BuildTest < Test::Unit::TestCase
     include Build
 
-    STORAGE_FILE = Utils.temp_file('latest.info')
+    ANY_STORAGE = Utils.temp_file('any.file')
 
     def test_set_parser_for_cruise_rb
-      server = cruise_at("", STORAGE_FILE)
+      server = cruise_at("", ANY_STORAGE)
       assert_parser_type CruiseControlRbParser, server
     end
 
     def test_set_parser_for_hudson
-      server = hudson_at("", STORAGE_FILE)
+      server = hudson_at("", ANY_STORAGE)
       assert_parser_type HudsonParser, server
     end
 
     def test_set_parser_for_ccnet_with_feed_url
       feed_url = 'http://anyserver/ccnet/server/local/project/myproject/RSSFeed.aspx'
-      server = ccnet_at(feed_url, STORAGE_FILE)
+      server = ccnet_at(feed_url, ANY_STORAGE)
 
       assert_parser_type CruiseControlNetParser, server
     end
 
     def test_set_parser_for_ccnet_with_page_url
       feed_url = 'http://anyserver/ccnet/server/local/project/myproject/ViewAllBuilds.aspx'
-      server = ccnet_at(feed_url, STORAGE_FILE)
+      server = ccnet_at(feed_url, ANY_STORAGE)
 
       assert_parser_type CruiseControlNetHtmlParser, server
     end

test/integration/monitoring_test.rb

@@ -1,8 +1,20 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 module CruiseMonitor
-  class RssAndFileTest < BaseIntegrationTest
+  class MonitoringTest < BaseIntegrationTest
     include Build
+
+    STORAGE_FILE = Utils.temp_file('/latest.info')
+
+    def setup
+      Utils.delete_if_exists(STORAGE_FILE)
+      super
+    end
+
+    def teardown
+      super
+      Utils.delete_if_exists(STORAGE_FILE)
+    end
 
     def test_should_connect_to_local_feed_and_notify_success_on_build_back_clean
       Utils.write_content(STORAGE_FILE, 'myproject build 1000 failed')