marcinbunsch-bolt 0.1.10 → 0.2.0

data/lib/bolt/listener.rb

@@ -53,6 +53,16 @@ module Bolt
     # Pick a listener to launch
     def listener
       return selected if selected
+      
+      if Bolt['listener'] and ['generic', 'osx'].include?(Bolt['listener'])
+        self.selected= Bolt::Listeners::Generic.new if Bolt['listener'] == 'generic'
+        self.selected= Bolt::Listeners::Osx.new if Bolt['listener'] == 'osx'
+        $stdout.puts "** Found listener setting in .bolt"
+        return self.selected
+      end
+        
+      $stdout.puts "** Determining listener..."
+      
       # TODO: os identification via RUBY_PLATFORM is flawed as it will return 'java' in jruby. Look for a different solution
       os_string = RUBY_PLATFORM.downcase
       self.selected= Bolt::Listeners::Generic.new      

data/lib/bolt/notifier.rb

@@ -9,29 +9,39 @@ module Bolt
     
     # Constructor
     def initialize 
-      # find appropriate listener
-      $stdout.puts "** Using #{notifier.class} \n"
-
-      # launch appropriate listener      
-      # notifier.new
-      
+      # find appropriate notifier
+      notifier
+      # present
+      $stdout.puts "** Using #{notifier.class} \n"      
     end
 
     # Pick a listener to launch
     def notifier
-      return selected if selected      
-      self.selected= Bolt::Notifiers::Generic.new 
-      # growl
+      return selected if selected
+      
+
+      if Bolt['notifier'] and ['generic', 'growl'].include?(Bolt['notifier'])
+        self.selected= Bolt::Notifiers::Growl.new if Bolt['notifier'] == 'growl'
+        self.selected= Bolt::Notifiers::Generic.new if Bolt['notifier'] == 'generic'
+        $stdout.puts "** Found 'notifier' setting in .bolt"
+        return self.selected
+      end
+      
+      $stdout.puts "** Determining notifier... \n"
+      
+      # default - growl (if growlnotify is present)
       output = %x[which growlnotify]
-      if output.to_s.include?('/growlnotify')
-        self.selected= Bolt::Notifiers::Growl.new
+      if !Bolt['notifier'] and output.to_s.include?('/growlnotify')
+        self.selected= Bolt::Notifiers::Growl.new(:use_growlnotify => true)        
       end
-      #self.selected= Bolt::Listeners::Generic
-      # self.selected= Bolt::Listeners::OSX if os_string.include?("darwin")
-      #self.selected= Bolt::Listeners::Windows if os_string.include?("mswin")
-      #self.selected= Bolt::Listeners::Linux if os_string.include?("linux")
+      
+      # default if else fails
+      if !selected
+        self.selected= Bolt::Notifiers::Generic.new
+      end
+
       selected
     end
    
   end
-end
+end

data/lib/bolt/notifiers/growl.rb

@@ -1,16 +1,41 @@
 #
-# Bolt::Notifiers::Generic
+# Bolt::Notifiers::Growl
 #
-# The Generic Notifier does not do anything, it's for stability
+# The Growl Notifier uses Growl to report on test results
 # The Growl Notifer is copied from mislav/rspactor growl module
 #
+# Growl network support implemented by cziko (http://github.com/cziko/)
+#
 module Bolt
   module Notifiers
     class Growl
+
+      attr_accessor :host, :use_growlnotify
+
+      def initialize(pars = {})
+        if Bolt['notifier_host']
+          @host = Bolt['notifier_host']
+          # load the gem only if required
+          begin 
+            gem 'ruby-growl'
+            require 'ruby-growl'
+          rescue ::Gem::LoadError
+            puts "** ERROR: Could not start growl network support. Install 'ruby-growl' gem to enable."
+            @host = nil
+          end
+        end
+        @use_growlnotify = false
+        @use_growlnotify = true if pars[:use_growlnotify] or !@host
+      end
     
       # generic notify method
       def notify(title, msg, img, pri = 0)
-        system("growlnotify -w -n rspactor --image #{img} -p #{pri} -m #{msg.inspect} #{title} &") 
+        if @use_growlnotify
+          system("growlnotify -w -n bolt --image #{img} -p #{pri} -m #{msg.inspect} #{title} &") 
+        else
+          g = ::Growl.new(@host, "bolt", ["notification"])
+          g.notify("notification", title, msg, pri)
+        end
       end
 
       # info message
@@ -52,4 +77,4 @@ module Bolt
       
     end
   end
-end
+end

data/lib/bolt/runner.rb

@@ -9,8 +9,10 @@ module Bolt
     
     # Constructor
     def initialize 
-      # find appropriate listener
+      # find appropriate runner
       runner
+      
+      $stdout.puts "** Using #{selected.class} \n"
     end
     
     # Pick a listener to launch
@@ -20,13 +22,12 @@ module Bolt
       if Bolt['runner'] and ['test_unit', 'rspec'].include?(Bolt['runner'])
         self.selected= Bolt::Runners::TestUnit.new if Bolt['runner'] == 'test_unit'
         self.selected= Bolt::Runners::RSpec.new if Bolt['runner'] == 'rspec'
-        $stdout.puts "** Using #{selected.class} based on 'runner' setting in .bolt file \n"
+        $stdout.puts "** Found 'runner' setting in .bolt"
         return self.selected
       end
       $stdout.puts "** Determining runner... \n"
       self.selected= Bolt::Runners::TestUnit.new
       self.selected= Bolt::Runners::RSpec.new  if File.directory?('spec')
-      $stdout.puts "** Using #{selected.class} \n"
       self.selected
     end
     

data/lib/bolt.rb

@@ -82,4 +82,4 @@ module Bolt
     autoload :Generic, 'bolt/notifiers/generic'
     autoload :Growl, 'bolt/notifiers/growl'
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: marcinbunsch-bolt
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors: 
 - Marcin Bunsch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-17 00:00:00 -07:00
+date: 2009-06-18 00:00:00 -07:00
 default_executable: bolt
 dependencies: []