@@ -1,8 +1,10 @@ -HEAD +1.0 * make it more like a gem with a /lib folder * add early failure if tinder gem is not available + * show project name in the messages spoken into Campfire + * Upping version to 1.0 to reflect stability, feature completion 0.1 - * Forked from http://rubyforge.org/projects/campfire-ccrb/ - * apr_error are also SVN errors (BUG FIX) - * doesn't spam campfire when the build loop breaks (BUG FIX) - * Include link back to build report \ No newline at end of file + * Forked from http://rubyforge.org/projects/campfire-ccrb/ + * apr_error are also SVN errors (BUG FIX) + * doesn't spam campfire when the build loop breaks (BUG FIX) + * Include link back to build report HISTORY @@ -8,7 +8,7 @@ end require 'tinder' class SmokeSignals - VERSION = 0.1 + VERSION = 1.0 attr_accessor :room_name def initialize(project = nil) @@ -18,11 +18,11 @@ class SmokeSignals def self.settings YAML.load_file(File.join(RAILS_ROOT, "config", "smoke_signals.yml")) rescue nil end - + def settings SmokeSignals.settings end - + def room self.room_name ||= settings["room"] return if room_name.nil? @@ -35,10 +35,10 @@ class SmokeSignals logger.error("Trouble initalizing campfire room #{room_name}") raise end - + def build_finished(build) clear_flag - build_text = "Build #{build.label}" + build_text = "#{@project.name} build #{build.label}" build_text << (build.failed? ? " broken" : " successful") build_text << ". See #{build.url} for details." speak(build_text) @@ -46,16 +46,16 @@ class SmokeSignals def build_fixed(build, previous_build=nil) clear_flag - speak("Build fixed in #{build.label}.") + speak("#{@project.name} build fixed in #{build.label}.") end - + def build_loop_failed(error) return if flagged? && is_subversion_down?(error) if is_subversion_down?(error) - speak "Build loop failed: Error connecting to Subversion: #{error.message}" + speak "#{@project.name} build loop failed: Error connecting to Subversion: #{error.message}" set_flag else - speak( "Build loop failed with: #{error.class}: #{error.message}") + speak( "#{@project.name} build loop failed with: #{error.class}: #{error.message}") speak error.backtrace.join("\n") end end @@ -63,30 +63,30 @@ class SmokeSignals def speak(message) room.speak(message) unless room_name.nil? rescue => e - logger.error("Error speaking into campfire room #{room_name}") + logger.error("Error speaking into campfire room #{room_name} for #{@project.name}") raise end - + def logger CruiseControl::Log end - + def flagged? File.exists?("#{@project.name}.svn_flag") end - + def set_flag File.open("#{@project.name}.svn_flag","w") do |file| file.puts "#{@project.name} subversion down" end end - + def clear_flag return unless flagged? File.delete("#{@project.name}.svn_flag") speak "Subversion is back" end - + def is_subversion_down?(error) !(/(svn: PROPFIND request failed|apr_error)/.match(error.message).nil?) end lib/smoke_signals.rb @@ -5,23 +5,23 @@ require 'test/spec' describe "SmokeSignals" do it "speaks when the build is fixed" do - notifier = SmokeSignals.new + notifier = SmokeSignals.new(stub(:name => "project_name")) build = stub(:label => "label", :url => "url") - notifier.expects(:speak).with("Build fixed in label.") + notifier.expects(:speak).with("project_name build fixed in label.") notifier.expects(:clear_flag) notifier.build_fixed(build) end it "speaks when the build is successful" do - notifier = SmokeSignals.new + notifier = SmokeSignals.new(stub(:name => "project_name")) build = stub(:label => "label", :failed? => false, :url => "http://cc.project.com/builds/Project/label") - notifier.expects(:speak).with("Build label successful. See http://cc.project.com/builds/Project/label for details.") + notifier.expects(:speak).with("project_name build label successful. See http://cc.project.com/builds/Project/label for details.") notifier.expects(:clear_flag) notifier.build_finished(build) end it "speaks when the build fails" do - notifier = SmokeSignals.new + notifier = SmokeSignals.new(stub(:name => "project_name")) build = stub(:label => "label", :failed? => true, :url => "http://cc.project.com/builds/Project/label") - notifier.expects(:speak).with("Build label broken. See http://cc.project.com/builds/Project/label for details.") + notifier.expects(:speak).with("project_name build label broken. See http://cc.project.com/builds/Project/label for details.") notifier.expects(:clear_flag) notifier.build_finished(build) end @@ -34,15 +34,15 @@ describe "SmokeSignals" do notifier.is_subversion_down?(stub(:message => "svn: PROPFIND request failed|apr_error")).should == true end it "speaks when the build loop fails because of a subversion error" do - notifier = SmokeSignals.new + notifier = SmokeSignals.new(stub(:name => "project_name")) notifier.stubs(:flagged?).returns(false) - notifier.expects(:speak).with("Build loop failed: Error connecting to Subversion: svn: PROPFIND request failed") + notifier.expects(:speak).with("project_name build loop failed: Error connecting to Subversion: svn: PROPFIND request failed") notifier.expects(:is_subversion_down?).returns(true) notifier.expects(:set_flag) notifier.build_loop_failed(stub(:message => "svn: PROPFIND request failed")) end it "doesn't spam campfire when failing because it's not an svn error" do - notifier = SmokeSignals.new + notifier = SmokeSignals.new(stub_everything) notifier.stubs(:flagged?).returns(false) notifier.expects(:speak).times(2) notifier.expects(:is_subversion_down?).returns(false) @@ -56,6 +56,6 @@ describe "SmokeSignals" do end it "delegates settings to the class variable settings" do SmokeSignals.stubs(:settings).returns(settings = stub) - SmokeSignals.new.settings.should == settings + SmokeSignals.new(stub(:name => "project_name")).settings.should == settings end -end \ No newline at end of file +end test/smoke_signals_test.rb 4b546642c704e69d566782dfc7f78acff85d9851 Muness Alrubaie muness@thinkrelevance.com http://github.com/relevance/smoke_signals/commit/cf08f4690c567a97ca84d6cb447ae85e03e81b31 cf08f4690c567a97ca84d6cb447ae85e03e81b31

2008-09-19T20:28:13-07:00

Trac#21, up version number to 1.0 b370965acad2ff384d2bc25029852a93d5b4d855 Muness Alrubaie muness@thinkrelevance.com