From 18d2db9ff1ff29a809e7fecf2b613a741813a470 Mon Sep 17 00:00:00 2001 From: slavic Date: Sun, 22 May 2011 00:47:02 +0300 Subject: [PATCH] windows notifiaction works (tested with guard-bundler) --- Gemfile | 2 +- lib/guard/notifier.rb | 6 +++--- spec/guard/notifier_spec.rb | 17 +++++++---------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 2828b2a..675c4b3 100644 --- a/Gemfile +++ b/Gemfile @@ -15,5 +15,5 @@ end if Config::CONFIG['target_os'] =~ /mswin|mingw/i gem 'win32console', :require => false gem 'rb-fchange', '>= 0.0.2', :require => false - gem 'rb-notifu', :require => false + gem 'rb-notifu', '>= 0.0.3', :require => false end diff --git a/lib/guard/notifier.rb b/lib/guard/notifier.rb index bbddd2e..93ea92e 100644 --- a/lib/guard/notifier.rb +++ b/lib/guard/notifier.rb @@ -33,7 +33,7 @@ module Guard Libnotify.show :body => message, :summary => title, :icon_path => image_path(image) when /mswin|mingw/i require_rbnotifu - RbNotifu.show :message => message, :title => title, :type => image_level(image) + RbNotifu.show :message => message, :title => title, :type => image_level(image), :display => 3000 end end end @@ -87,10 +87,10 @@ module Guard end def self.require_rbnotifu - require 'rbnotifu' + require 'rb-notifu' rescue LoadError turn_off - UI.info "Please install rbnotifu gem for Windows notification support and add it to your Gemfile" + UI.info "Please install rb-notifu gem for Windows notification support and add it to your Gemfile" end end end \ No newline at end of file diff --git a/spec/guard/notifier_spec.rb b/spec/guard/notifier_spec.rb index 6c8dfb8..17dfdae 100644 --- a/spec/guard/notifier_spec.rb +++ b/spec/guard/notifier_spec.rb @@ -39,12 +39,13 @@ describe Guard::Notifier do if windows? if rbnotifu_installed? - it "uses rbnotifu on Windows" do - RbNotifu::show( - :message => "great", - :title => 'Guard', - :type => :info - ) + it "uses rb-notifu on Windows" do + @result = -1 + RbNotifu::show :message => "great", :title => 'Guard' do |status| + @result = status + end + sleep 1.5 + RbNotifu::ERRORS.include?(@result).should be_false end else it { should_not be_enabled } @@ -64,10 +65,6 @@ describe Guard::Notifier do Libnotify.should_not_receive(:show) subject.notify 'great', :title => 'Guard' end - elsif windows? && rbnotifu_installed? - it "prevents the notifications" do - - end end it { should_not be_enabled }