capistrano-slackbot 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 384addccafa0a1cb47ff41e7cbff3d6604479415
-  data.tar.gz: 8db3c255f7a235fdd1b427ffec76c288e9924ec1
+  metadata.gz: 48a13788c76db0aa856377fffc7eaacd683589ad
+  data.tar.gz: aef72e8a9319332ea969d300db75d75e08c83b46
 SHA512:
-  metadata.gz: 05b5e4be63672b2d3bec4e2396a7b3bb2171371569a7e4e7431a3d741c0ca842afc8c783c02d3c5ec2a009e92fc617ef579e249b2a0a00e3150e9f6925a2da1a
-  data.tar.gz: d68acea98795895ebb5fbaa32da160937f2a9d02296febd0078f4466e25a84fb8d8fe2717569e86d4e32dc7f92248d41643d2863f522bd4bd8b72e887f5c07a6
+  metadata.gz: fe37a2e7fea60a399db1f7578bd617c05070475c9244bfabb52fe45c4febb1fb449d3cf121dce7da3f6bd36b9cb7c45efe8fc5907a101f7e873326ab3a463e68
+  data.tar.gz: 2bf3165e4fcf5c3ff505005c38dca37acb2a2d0cfb734c2f8a4e93560b9d7c714fba807d4f75037b0475ea8ac78d88578b56e69ad0a5529b78c57af4632e8fc0

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
 rvm:
-  - 2.1.1
-  - 2.1.0
+  - 2.1.5
+  - 2.0.0
   - 1.9.3
+
+sudo: false

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# capistrano-slackbot Changelog
+
+### 0.1.0
+
+* __[BREAKING]__ Add `slack_webhook_url` option to replace `slack_team` and `slack_token`. [#2
+](https://github.com/whatthewhat/capistrano-slackbot/pull/2)

data/README.md

@@ -2,6 +2,8 @@
 
 Slack intergation for Capistrano 3.
 
+![capistrano-slackbot](https://googledrive.com/host/0B03_MIH-1qgoX3A4OWh5djFWUmc/capistrano-slackbot.png)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -27,15 +29,12 @@ Then add some configuation options to your deploy.rb:
 ```ruby
 # deploy.rb
 
-set :slack_team, "your-team"
-set :slack_token, ENV["SLACK_TOKEN"] # from your "Incoming Webhook" integration
+set :slack_webhook_url, ENV["SLACK_WEBHOOK"] # from your "Incoming Webhook" integration
 set :slack_options, { channel: "#general", icon_emoji: ":shipit:" } # arbitrary additional options passed to slack
 ```
 
 And deploy away!
 
-![capistrano-slackbot](https://googledrive.com/host/0B03_MIH-1qgoX3A4OWh5djFWUmc/capistrano-slackbot.png)
-
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/capistrano-slackbot/fork )

data/capistrano-slackbot.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "> 1.0"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.0.0.beta2"
+  spec.add_development_dependency "rspec", "~> 3.1.0"
   spec.add_development_dependency "webmock", "~> 1.17.4"
 end

data/lib/capistrano/slackbot/slack_notifier.rb

@@ -2,22 +2,22 @@ require "json"
 require "faraday"
 
 class SlackNotifier
+  attr_reader :webhook_url
+
   def initialize(args = {})
-    @team = args.fetch(:team) { raise ArgumentError, "slack team not set!" }
-    @token = args.fetch(:token) { raise ArgumentError, "slack token not set!" }
+    @webhook_url = args.fetch(:webhook_url) {
+      raise ArgumentError, "[capistrano-slackbot] webhook_url not set!"
+    }
     @options = args.fetch(:options) { {} }
   end
 
   def notify(text)
     payload = { text: text }.merge(@options)
 
-    connection.post url, payload.to_json
+    connection.post webhook_url, payload.to_json
   end
 
   private
-  def url
-    "https://#{ @team }.slack.com/services/hooks/incoming-webhook?token=#{ @token }"
-  end
 
   def connection
     Faraday.new do |faraday|

data/lib/capistrano/slackbot/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Slackbot
-    VERSION = "0.0.3"
+    VERSION = "0.1.0"
   end
 end

data/lib/capistrano/tasks/slack.rake

@@ -3,8 +3,7 @@ namespace :slack do
   task :finished do
     run_locally do
       SlackNotifier.new(
-        team: fetch(:slack_team),
-        token: fetch(:slack_token),
+        webhook_url: fetch(:slack_webhook_url),
         options: fetch(:slack_options, {})
       ).notify(revision_log_message)
     end

data/spec/slack_notifier_spec.rb

@@ -3,24 +3,24 @@ require "capistrano/slackbot/slack_notifier"
 
 describe SlackNotifier do
   before(:each) do
-    stub_request(:post, /slack.com/)
+    stub_request(:post, /webhook.example.com/)
   end
 
   describe "#notify" do
-    subject {
+    it "posts to slack's webhook with right params" do
       SlackNotifier.new(
-        team: "some-team",
-        token: "secret_token",
+        webhook_url: "https://webhook.example.com/",
         options: { custom_option: "hello there" }
-      )
-    }
+      ).notify("Oh Hai!")
 
-    it "posts to slack's webhook with right params" do
-      subject.notify("Oh Hai!")
+      expect(WebMock).to have_requested(:post, "https://webhook.example.com/")
+        .with( body: { text: "Oh Hai!", custom_option: "hello there" }.to_json )
+    end
 
-      expect(WebMock).to have_requested(:post,
-        "https://some-team.slack.com/services/hooks/incoming-webhook?token=secret_token"
-      ).with( body: { text: "Oh Hai!", custom_option: "hello there" }.to_json )
+    it "raises ArgumentError if webhook_url is not set" do
+      expect {
+        SlackNotifier.new
+      }.to raise_error(ArgumentError)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-slackbot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Mikhail Topolskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -135,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Slack integration for Capistrano 3