svn commit: r683724 - in /incubator/buildr/trunk: bin/buildr lib/buildr/core/application.rb

[as...@apache.org]

Author: assaf
Date: Thu Aug  7 14:37:28 2008
New Revision: 683724

URL: http://svn.apache.org/viewvc?rev=683724&view=rev
Log:
Removed require 'benchmark'.
Loading RubyCocoa at the very end.

Modified:
    incubator/buildr/trunk/bin/buildr
    incubator/buildr/trunk/lib/buildr/core/application.rb

Modified: incubator/buildr/trunk/bin/buildr
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/bin/buildr?rev=683724&r1=683723&r2=683724&view=diff
==============================================================================
--- incubator/buildr/trunk/bin/buildr (original)
+++ incubator/buildr/trunk/bin/buildr Thu Aug  7 14:37:28 2008
@@ -14,7 +14,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 start = Time.now
 require 'rubygems'
 require 'buildr'

Modified: incubator/buildr/trunk/lib/buildr/core/application.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/application.rb?rev=683724&r1=683723&r2=683724&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/application.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/application.rb Thu Aug  7 14:37:28 2008
@@ -36,7 +36,6 @@
 
 
 require 'highline/import'
-require 'benchmark'
 require 'rake'
 require 'rubygems/source_info_cache'
 require 'buildr/core/application_cli'
@@ -47,6 +46,7 @@
 ENV["HOME"] ||= File.expand_path(Gem::user_home)
 ENV['BUILDR_ENV'] ||= 'development'
 
+
 module Buildr
 
   # Provide settings that come from three sources.
@@ -395,29 +395,28 @@
 # Let's see if we know how to use Growl.  Only when running in terminal,
 # if you're running Buildr from CI, you'll want to get Growl notifications
 # from there instead. 
-if $stdout.isatty
-  begin
+if $stdout.isatty && RUBY_PLATFORM =~ /darwin/
+  def growl(type, title, message)
     require 'osx/cocoa'
     icon = OSX::NSApplication.sharedApplication.applicationIconImage
     icon = OSX::NSImage.alloc.initWithContentsOfFile(File.join(File.dirname(__FILE__), '../resources/buildr.icns'))
-    
+
     # Register with Growl, that way you can turn notifications on/off from system preferences.
     OSX::NSDistributedNotificationCenter.defaultCenter.
       postNotificationName_object_userInfo_deliverImmediately(:GrowlApplicationRegistrationNotification, nil,
         { :ApplicationName=>'Buildr', :AllNotifications=>['Completed', 'Failed'], 
           :ApplicationIcon=>icon.TIFFRepresentation }, true)
-    def growl(type, title, message)
-      OSX::NSDistributedNotificationCenter.defaultCenter.
-        postNotificationName_object_userInfo_deliverImmediately(:GrowlNotification, nil,
-          { :ApplicationName=>'Buildr', :NotificationName=>type, :NotificationTitle=>title, :NotificationDescription=>message }, true)
-    end
-    Buildr.application.on_completion do
-      growl 'Completed', 'Your build has completed', Dir.pwd if verbose
-    end
-    Buildr.application.on_failure do |ex|
-      growl 'Failed', 'Your build failed with an error', "#{Dir.pwd}:\n#{ex.message}" if verbose
-    end
-  rescue Exception
+
+    OSX::NSDistributedNotificationCenter.defaultCenter.
+      postNotificationName_object_userInfo_deliverImmediately(:GrowlNotification, nil,
+        { :ApplicationName=>'Buildr', :NotificationName=>type, :NotificationTitle=>title, :NotificationDescription=>message }, true)
+    rescue Exception
+  end
+  Buildr.application.on_completion do
+    growl 'Completed', 'Your build has completed', Dir.pwd if verbose
+  end
+  Buildr.application.on_failure do |ex|
+    growl 'Failed', 'Your build failed with an error', "#{Dir.pwd}:\n#{ex.message}" if verbose
   end
 end