@@ -49,7 +49,7 @@ BANNER opts.on("-d", "--doom", "Special Doom Edition.", - "Only for Mac.") { |OPTIONS[:doom]| OPTIONS[:doom] = true } + "Only for Mac/Cygwin.") { |OPTIONS[:doom]| OPTIONS[:doom] = true } opts.on("-b", "--buuf", "Special Buuf Images.", @@ -65,11 +65,11 @@ BANNER opts.on("--success-sound=PATH", String, "Sound to play on success.", - "Only for Mac") { |OPTIONS[:sound][:success]| } + "Only for Mac/Cygwin.") { |OPTIONS[:sound][:success]| } opts.on("--failure-sound=PATH", String, "Sound to play on success.", - "Only for Mac") { |OPTIONS[:sound][:failure]| } + "Only for Mac/Cygwin.") { |OPTIONS[:sound][:failure]| } opts.on("-h", "--help", "Show this help message.") { puts opts; exit } @@ -103,4 +103,4 @@ f.write("FAILURE_SOUND = '#{OPTIONS[:sound][:failure]}'\n") f.close puts "\nAs from now all tests will be notified automatically." -puts "" # a blank line \ No newline at end of file +puts "" # a blank line bin/an-install @@ -65,7 +65,7 @@ module AutotestNotification when /darwin/ Mac.notify(title, msg, img, total, failures, priority) when /cygwin/ - Cygwin.notify(title, msg, img) + Cygwin.notify(title, msg, img, total, failures) when /mswin/ Windows.notify(title, msg, img) end lib/autotest_notification.rb @@ -1,14 +1,34 @@ module AutotestNotification class Cygwin + @last_test_failed = false + class << self - def notify(title, msg, img) + def notify(title, msg, img, total = 1, failures = 0) img = get_image_path(img).strip system "sncmd /m '#{title}' '#{msg}' '#{img}' /t #{Config.expiration_in_seconds}" + play(SUCCESS_SOUND) unless SUCCESS_SOUND.empty? or failures > 0 + play(FAILURE_SOUND) unless FAILURE_SOUND.empty? or failures == 0 + say(total, failures) if DOOM_EDITION end def get_image_path(img) `cygpath -m #{img}` end + + def say(total, failures) + if failures > 0 + Doom.play_sound(total, failures) + @last_test_failed = true + elsif @last_test_failed + Doom.play_sound(total, failures) + @last_test_failed = false + end + end + + def play(sound_file) + system "cp #{sound_file} /dev/dsp" + end + end end end lib/autotest_notification/cygwin.rb @@ -13,6 +13,8 @@ module AutotestNotification `#{File.expand_path(File.dirname(__FILE__) + "/../../bin/")}/playsound #{sound_file}` when /linux/ system("/usr/bin/mplayer #{sound_file} > /dev/null 2> /dev/null") + when /cygwin/ + system "cp #{sound_file} /dev/dsp" end end lib/autotest_notification/doom.rb 9db71d2488fb6f72c3f3550b88e7b0e8a671243d Jesus Lopez jesus@jesusla.com http://github.com/carlosbrando/autotest-notification/commit/d5c1066cdb1b4f2cfcdfd3caa4c1fdc037e027b2 d5c1066cdb1b4f2cfcdfd3caa4c1fdc037e027b2 2009-03-18T18:58:19-07:00 2009-03-18T18:57:47-07:00 Support sound playback in Cygwin. Enables success and failure sound playback as well as "Doom Edition" on Cygwin platforms. Plays sound by copying wav file to /dev/dsp. fc6fdd6380e7204e45098f86963c02725dda915d Jesus Lopez jesus@jesusla.com