slack-notify 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bb78e8f557ad72bf40e7dada483c74f363eb9b5
-  data.tar.gz: a53d66d0b94c5bbb8b88ddeacfb3bf9abb4cf711
+  metadata.gz: 57d6d5e9bc2495e9e867ebb9c15123cbff6432a0
+  data.tar.gz: ece231fb7b78c6b715dacdfadf4b622d9697dca8
 SHA512:
-  metadata.gz: 3c1ffa1661501b852ac68c44dfe1b1a88fb0fbfa240c3e09e024a597bff004e6d1c6a9e4f4244f3e2e3b957e50e8d9bfb2cd9d103ac62a2a160448f327b9b6a8
-  data.tar.gz: ca8cac631640524704dbbe5ef810f3ab8d04ef41f87b263229e8ed148030696dfbe9b0eeab1c127dd354ece20388b01811858438ab67dcfdbbeda9d1cb7cde51
+  metadata.gz: d5ae0948e81205f17980748fed744f81e218db8105675696a7c421205980f592cb57f3f3a59310330397ed30b70021f17a9753bfa2bde4967c467bb76819414a
+  data.tar.gz: 0c688b5b481e6c43a7bf6589085aef0ac4284e73709348f34c0b6dfa659f8652c16133aefd9319b85cb730b1625d2c5201f19e7d861805738a465a4b838e0511

data/README.md

@@ -33,13 +33,13 @@ require "slack-notify"
 Initialize client:
 
 ```ruby
-client = SlackNotify::Client.new("subdomain", "token")
+client = SlackNotify::Client.new("team", "token")
 ```
 
 Initialize with options:
 
 ```ruby
-client = SlackNotify::Client.new("subdomain", "token", {
+client = SlackNotify::Client.new("team", "token", {
   channel: "#development",
   username: "mybot"
 })
@@ -56,6 +56,7 @@ Send message:
 ```ruby
 client.notify("Hello There!")
 client.notify("Another message", "#channel2")
+client.notify("Message", ["#channel1", "#channel2"])
 ```
 
 ## Gotchas

data/lib/slack-notify/version.rb

@@ -1,3 +1,3 @@
 module SlackNotify
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/slack-notify.rb

@@ -6,13 +6,13 @@ require "faraday"
 
 module SlackNotify
   class Client
-    def initialize(subdomain, token, options={})
-      @subdomain = subdomain
-      @token     = token
-      @username  = options[:username] || "webhookbot"
-      @channel   = options[:channel] || "#general"
+    def initialize(team, token, options={})
+      @team     = team
+      @token    = token
+      @username = options[:username] || "webhookbot"
+      @channel  = options[:channel] || "#general"
 
-      raise ArgumentError, "Subdomain required" if @subdomain.nil?
+      raise ArgumentError, "Team name required" if @team.nil?
       raise ArgumentError, "Token required"     if @token.nil?
     end
 
@@ -21,20 +21,20 @@ module SlackNotify
     end
 
     def notify(text, channel=nil)
-      send_payload(
-        text: text,
-        channel: channel || @channel,
-        username: @username
-      )
+      channels = [channel || @channel].flatten.compact.uniq
+
+      channels.each do |chan|
+        chan.prepend("#") if chan[0] != "#"
+        send_payload(text: text, username: @username, channel: chan)
+      end
+
+      true
     end
 
     private
 
     def send_payload(payload)
-      url = "https://#{@subdomain}.slack.com/services/hooks/incoming-webhook"
-      url << "?token=#{@token}"
-
-      response = Faraday.post(url) do |req|
+      response = Faraday.post(hook_url) do |req|
         req.body = JSON.dump(payload)
       end
 
@@ -48,5 +48,9 @@ module SlackNotify
         end
       end
     end
+
+    def hook_url
+      "https://#{@team}.slack.com/services/hooks/incoming-webhook?token=#{@token}"
+    end
   end
 end

data/slack-notify.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler",   "~> 1.3"
   spec.add_development_dependency "rake",      "~> 10"
-  spec.add_development_dependency "simplecov", "~> 0.8"
+  spec.add_development_dependency "simplecov", "~> 0.7"
   spec.add_development_dependency "rspec",     "~> 2.13"
   spec.add_development_dependency "webmock",   "~> 1.0"
 

data/spec/slack-notify/client_spec.rb

@@ -2,9 +2,9 @@ require "spec_helper"
 
 describe SlackNotify::Client do
   describe "#initialize" do
-    it "requires subdomain" do
+    it "requires team name" do
       expect { described_class.new(nil, nil) }.
-        to raise_error ArgumentError, "Subdomain required"
+        to raise_error ArgumentError, "Team name required"
     end
 
     it "requires token" do
@@ -79,19 +79,39 @@ describe SlackNotify::Client do
 
     it "delivers payload" do
       stub_request(:post, "https://foo.slack.com/services/hooks/incoming-webhook?token=token").
-         with(:body => {"{\"text\":\"Message\",\"channel\":\"#general\",\"username\":\"webhookbot\"}"=>true},
+         with(:body => {"{\"text\":\"Message\",\"username\":\"webhookbot\",\"channel\":\"#general\"}"=>true},
               :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Faraday v0.8.8'}).
          to_return(:status => 200, :body => "", :headers => {})
 
       expect(client.notify("Message")).to eq true
     end
 
-    context "invalid subdomain" do
+    context "with multiple channels" do
+      before do
+        client.stub(:send_payload) { true }
+      end
+
+      it "delivers payload to multiple channels" do
+        expect(client).to receive(:send_payload).exactly(2).times
+        client.notify("Message", ["#channel1", "#channel2"])
+      end
+    end
+
+    context "when pound symbol is missing" do
+      before { client.stub(:send_payload).and_return(true) }
+
+      it "adds pound symbol to channel name" do
+        expect(client).to receive(:send_payload).with(text: "Message", username: "webhookbot", channel: "#foobar")
+        client.notify("Message", "foobar")
+      end
+    end
+
+    context "when team name is invalid" do
       before do
         stub_request(:post, "https://foo.slack.com/services/hooks/incoming-webhook?token=token").
-         with(:body => {"{\"text\":\"Message\",\"channel\":\"#general\",\"username\":\"webhookbot\"}"=>true},
+         with(:body => {"{\"text\":\"Message\",\"username\":\"webhookbot\",\"channel\":\"#general\"}"=>true},
               :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Faraday v0.8.8'}).
-         to_return(:status => 404, :body => "Multi line\ncontent\nhtml stuff", :headers => {})
+         to_return(:status => 404, :body => "Line 1\nLine 2\nLine 3", :headers => {})
       end
 
       it "raises error" do
@@ -99,12 +119,12 @@ describe SlackNotify::Client do
       end
     end
 
-    context "invalid token" do
+    context "when token is invalid" do
       before do
         stub_request(:post, "https://foo.slack.com/services/hooks/incoming-webhook?token=token").
-         with(:body => {"{\"text\":\"Message\",\"channel\":\"#general\",\"username\":\"webhookbot\"}"=>true},
+         with(:body => {"{\"text\":\"Message\",\"username\":\"webhookbot\",\"channel\":\"#general\"}"=>true},
               :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Faraday v0.8.8'}).
-         to_return(:status => 404, :body => "No hooks", :headers => {})
+         to_return(:status => 400, :body => "No hooks", :headers => {})
       end
 
       it "raises error" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-notify
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -154,4 +154,3 @@ summary: Send notifications to Slack channel
 test_files:
 - spec/slack-notify/client_spec.rb
 - spec/spec_helper.rb
-has_rdoc: