cadre 0.1.0 → 0.2.0

data/lib/cadre/growl/notifier.rb

@@ -1,25 +1,25 @@
+require 'cadre/notifier'
+
 module Cadre
   module Growl
-    #XXXX This isn't going to work at all as is. Lifted from other code, as #ok
-    #hints toward a working adapter
-    class Notifier
-      def close
-        super
-        summary = summary_line example_count, failure_count, pending_count
-        if failure_count > 0
-          growlnotify "--image ./autotest/fail.png -p Emergency -m '#{summary}' -t 'Spec failure detected'" #ok
-        elsif pending_count > 0
-          growlnotify "--image ./autotest/pending.png -p High -m '#{summary}' -t 'Pending spec(s) present'" #ok
-        else
-          growlnotify "--image ./autotest/pass.png -p 'Very Low' -m '#{summary}' -t 'All specs passed'" #ok
-        end
+    class Notifier < ::Cadre::Notifier
+      register :growl
+
+      def self.available?
+        #XXXX This isn't going to work at all as is. Lifted from other code, as #ok
+        #hints toward a working adapter
+        availables["growlnotify"]
+      end
+
+      def go
+#        growlnotify "--image ./autotest/fail.png -p Emergency -m '#{summary}' -t '#{message}'" #ok
+#        growlnotify "--image ./autotest/pending.png -p High -m '#{summary}' -t '#{message}'" #ok
+#        growlnotify "--image ./autotest/pass.png -p 'Very Low' -m '#{summary}' -t '#{message}'" #ok
+        growlnotify "-m '#{summary}' -t '#{message}'" #ok
       end
 
       def growlnotify str
-        system 'which growlnotify > /dev/null'
-        if $?.exitstatus == 0
-          system "growlnotify -n autotest #{str}"
-        end
+        system "growlnotify -n cadre #{str}"
       end
 
     end

data/lib/cadre/libnotify/notifier.rb

@@ -2,17 +2,22 @@ require 'cadre/valise'
 
 module Cadre
   module Libnotify
-    class Notifier
-      def initialize
-        yield self if block_given?
-      end
+    class Notifier < ::Cadre::Notifier
+      register :libnotify
 
-      attr_accessor :summary, :message, :sound, :expire_time, :app_name, :transient
+      def self.available?
+        return availables["notify-send"]
+      end
 
       def go
         cmd = "notify-send #{options} \"#@summary\" \"#@message\""
         %x[#{cmd}]
-        %x[paplay #{Valise.find(["sounds", sound]).full_path}] if String === sound
+
+        if available?("paplay")
+          %x[paplay #{Valise.find(["sounds", sound]).full_path}] if String === sound
+        elsif available?("aplay")
+          %x[aplay #{Valise.find(["sounds", sound]).full_path}] if String === sound
+        end
       end
 
       def options

data/lib/cadre/notifier.rb

@@ -0,0 +1,48 @@
+module Cadre
+  class Notifier
+    class << self
+      def registry
+        @registry ||= {}
+      end
+
+      def register(name)
+        Notifier.registry[name] = self
+      end
+
+      def get
+        registry.each_pair do |name, notifier|
+          return notifier if notifier.available?
+        end
+
+        return DumbNotifier
+      end
+
+      def availables
+        @availables ||= Hash.new{|h,k| h[k] = system("which", k, :out => "/dev/null")}
+      end
+    end
+
+    def available?(program)
+      self.class.availables[program]
+    end
+
+    def initialize
+      yield self if block_given?
+    end
+
+    attr_accessor :summary, :message, :sound, :expire_time, :app_name, :transient
+
+    def go
+    end
+  end
+
+  class DumbNotifier < Notifier
+    def go
+      puts summary
+      puts message
+    end
+  end
+end
+
+require 'cadre/libnotify/notifier'
+require 'cadre/growl/notifier'

data/lib/cadre/rspec/notify-on-complete-formatter.rb

@@ -1,4 +1,4 @@
-require 'cadre/libnotify/notifier'
+require 'cadre/notifier'
 require 'rspec/core/formatters/base_formatter'
 
 rspec_pid = Process.pid
@@ -22,7 +22,8 @@ module Cadre
       end
 
       def dump_summary(duration, example_count, failure_count, pending_count)
-        notifier = Libnotify::Notifier.new
+        notifier = Cadre::Notifier.get.new
+
         if duration < 20
           notifier.transient = true
           notifier.summary = "Finished spec run"

metadata

@@ -2,14 +2,14 @@
 name: cadre
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -19,20 +19,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        segments:
-        - 0
-        - 18
-        - 1
         version: 0.18.1
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        segments:
-        - 0
-        - 18
-        - 1
         version: 0.18.1
     none: false
 - !ruby/object:Gem::Dependency
@@ -43,18 +35,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        segments:
-        - 1
-        - 0
         version: '1.0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        segments:
-        - 1
-        - 0
         version: '1.0'
     none: false
 - !ruby/object:Gem::Dependency
@@ -65,18 +51,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        segments:
-        - 1
-        - 0
         version: '1.0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        segments:
-        - 1
-        - 0
         version: '1.0'
     none: false
 description: ! "  Three things:\n\n  An rspec formatter that triggers libnotify on
@@ -106,6 +86,7 @@ files:
 - lib/cadre/config.rb
 - lib/cadre/command-line.rb
 - lib/cadre/valise.rb
+- lib/cadre/notifier.rb
 - lib/cadre/simplecov/vim-formatter.rb
 - lib/cadre/simplecov.rb
 - bin/cadre
@@ -120,7 +101,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- cadre-0.1.0 Documentation
+- cadre-0.2.0 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -129,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -11582157
+      hash: 711415251
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement