guard-pusher 0.0.1 → 0.0.2

data/lib/guard/pusher/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module PusherVersion
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/guard/pusher.rb

@@ -1,22 +1,36 @@
 require 'guard'
 require 'guard/guard'
 require 'pusher'
+require 'erb'
 
 module Guard
   class Pusher < Guard
 
+    def self.configure(options)
+      %w{app_id key secret}.inject(Hash.new) { |hash, key|
+        hash[key] = options[key] || options[key.to_sym]
+        hash
+      }.each { |config, value|
+        ::Pusher.send("#{config}=", value)
+      }
+
+      ::Pusher['guard-pusher']
+
+      rescue ::Pusher::ConfigurationError
+    end
+
     def initialize(watchers = [], options = {})
       super
 
       @options = options
 
       config = if File.file?('config/pusher.yml')
-        YAML.load_file('config/pusher.yml')['development']
+        YAML.load(ERB.new(File.read('config/pusher.yml')).result)['development']
       else
         options
       end
 
-      if config_pusher_with(config)
+      if self.class.configure(config)
         UI.info('Pusher is ready.', :reset => true)
       else
         UI.info("D'oh! Pusher not properly configured. Make sure to add app_id, key and secret.", :reset => true)
@@ -24,18 +38,7 @@ module Guard
     end
 
     def run_on_change(paths)
-      ::Pusher['guard-pusher'].trigger(@options[:event] || 'guard', {})
-    end
-
-
-    private
-
-    def config_pusher_with(credentials)
-      %w{app_id key secret}.each do |config|
-        return false unless (value = credentials[config] || credentials[config.to_sym])
-        ::Pusher.send("#{config}=", value)
-      end
-      true
+      ::Pusher['guard-pusher'].trigger(@options[:event] || 'guard', { :paths => paths })
     end
 
   end

data/spec/guard/pusher_spec.rb

@@ -2,70 +2,103 @@ require 'spec_helper'
 
 describe Guard::Pusher do
 
+  def with_yaml(config = nil)
+    config ||= {
+      'development' => {
+        'app_id' => 42,
+        'key'    => 'fake_key',
+        'secret' => 'fake_secret'
+      }
+    }
+
+    File.should_receive(:file?).with('config/pusher.yml').and_return(true)
+    File.should_receive(:read).with('config/pusher.yml')
+    ERB.should_receive(:new).and_return(double('erb', :result => 'erb_foo'))
+    YAML.should_receive(:load).with('erb_foo').and_return(config)
+  end
+
+  def without_yaml
+    File.should_receive(:file?).with('config/pusher.yml').and_return(false)
+  end
+
   describe "configuration" do
-    context "provided through YAML file" do
-      before(:each) do
-        File.should_receive(:file?).
-          with('config/pusher.yml').
-          and_return(true)
-
-        YAML.should_receive(:load_file).
-          with('config/pusher.yml').
-          and_return({ "development" => { "app_id" => 42, "key" => "fake_key", "secret" => "fake_secret" }})
+
+    context "via YAML file" do
+      context "when credentials are complete" do
+        before(:each) do
+          with_yaml
+        end
+
+        it "is successful" do
+          Guard::UI.should_receive(:info).with(/.*Pusher is ready.*/, :reset => true)
+          Guard::Pusher.new([])
+        end
       end
 
-      it "requires 'app_id', 'key' and 'secret'" do
-        Pusher.should_receive(:app_id=).with(42)
-        Pusher.should_receive(:key=).with('fake_key')
-        Pusher.should_receive(:secret=).with('fake_secret')
-        Guard::UI.should_receive(:info).with(/.*Pusher is ready.*/, :reset => true)
-        Guard::Pusher.new([])
+      context "when credentials are incomplete" do
+        before(:each) do
+          with_yaml({ 'development' => { 'key' => 'fake_key', 'secret' => 'fake_secret' }})
+          Pusher.app_id = nil
+        end
+
+        it "issues a warning" do
+          Guard::UI.should_receive(:info).with(/.*Pusher not properly configured.*/, :reset => true)
+          Guard::Pusher.new([])
+        end
       end
     end
 
-    context "provided through options" do
-      before(:each) do
-        File.should_receive(:file?).
-          with('config/pusher.yml').
-          and_return(false)
+    context "via options" do
+      context "when credentials are complete" do
+        before(:each) do
+          without_yaml
+        end
+
+        it "is successful" do
+          Guard::UI.should_receive(:info).with(/.*Pusher is ready.*/, :reset => true)
+          Guard::Pusher.new([], {
+            :app_id => 42,
+            :key    => 'fake_key',
+            :secret => 'fake_secret'
+          })
+        end
       end
 
-      it "requires 'app_id', 'key' and 'secret'" do
-        Pusher.should_receive(:app_id=).with(42)
-        Pusher.should_receive(:key=).with('fake_key')
-        Pusher.should_receive(:secret=).with('fake_secret')
-        Guard::UI.should_receive(:info).with(/.*Pusher is ready.*/, :reset => true)
-        Guard::Pusher.new([], {
-          :app_id => 42,
-          :key    => 'fake_key',
-          :secret => 'fake_secret'
-        })
+      context "when credentials are incomplete" do
+        before(:each) do
+          without_yaml
+        end
+
+        it "issues a warning" do
+          Guard::UI.should_receive(:info).with(/.*Pusher not properly configured.*/, :reset => true)
+          Guard::Pusher.new([], {
+            :key    => 'fake_key',
+            :secret => 'fake_secret'
+          })
+        end
       end
     end
 
-    context "missing the necessery keys" do
-      before(:each) do
-        File.should_receive(:file?).
-          with('config/pusher.yml').
-          and_return(false)
-      end
+  end
 
-      it "does not attempt to configure Pusher and issues a warning" do
-        Pusher.should_not_receive(:app_id=)
-        Guard::UI.should_receive(:info).with(/.*Pusher not properly configured.*/, :reset => true)
-        Guard::Pusher.new([], {
-          :key    => 'fake_key',
-          :secret => 'fake_secret'
-        })
-      end
+  describe "options" do
+    before(:each) do
+      with_yaml
+    end
+
+    it ":event" do
+      channel = mock(Pusher::Channel)
+      Pusher.stub(:[]).and_return(channel)
+      channel.should_receive(:trigger).with('custom', { :paths => ['foo'] })
+      Guard::Pusher.new([], { :event => 'custom' }).run_on_change(['foo'])
     end
   end
 
-  describe "run_on_change" do
+  describe "#run_on_change" do
     it "sends Pusher message" do
       channel = mock(Pusher::Channel)
-      Pusher.should_receive(:[]).with('guard-pusher').and_return(channel)
-      channel.should_receive(:trigger).with('guard', {})
+      Pusher.should_receive(:[]).with('guard-pusher').twice.and_return(channel)
+      channel.should_receive(:trigger).with('guard', { :paths => ['foo'] })
       subject.run_on_change(['foo'])
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-pusher
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: !!null 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: !!null 
 bindir: bin
 cert_chain: []
-date: 2011-03-01 00:00:00.000000000 +01:00
+date: 2011-06-16 00:00:00.000000000 +02:00
 default_executable: !!null 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2156752380 !ruby/object:Gem::Requirement
+  requirement: &2165084760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2156752380
+  version_requirements: *2165084760
 - !ruby/object:Gem::Dependency
   name: pusher
-  requirement: &2156751880 !ruby/object:Gem::Requirement
+  requirement: &2165084260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *2156751880
+  version_requirements: *2165084260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156751420 !ruby/object:Gem::Requirement
+  requirement: &2165083800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156751420
+  version_requirements: *2165083800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156750960 !ruby/object:Gem::Requirement
+  requirement: &2165083340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2156750960
+  version_requirements: *2165083340
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2156750580 !ruby/object:Gem::Requirement
+  requirement: &2165082960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156750580
+  version_requirements: *2165082960
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2156750120 !ruby/object:Gem::Requirement
+  requirement: &2165082500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156750120
+  version_requirements: *2165082500
 description: Pusher guard allows to automatically send a Pusher message to any number
   of browsers.
 email: