slackbotsy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 062cd0cf380f316730fdc5ae366b47cd9e35cfda
-  data.tar.gz: 2374192ee2136ddf0d7f0387a7a56b3d23820716
+  metadata.gz: d5e6b3bf32c2daa8ecfc28fb616156d44cd94700
+  data.tar.gz: 2cb3c9397e8c4519737a7a81761932f0977eee7b
 SHA512:
-  metadata.gz: fbf40e41c8953d45fae2d29d088b3b379aa0dd3007026692405f913ac777a539355bec3367acb25db0329dd072e9bd683088fd3bf9574b213bfc6bc66966b101
-  data.tar.gz: 4f55803b9465f2299d144617f83791fc4296bdf043d230479115386377ce8b0e4f5d212641c8811c2ca7002362733b6cabcd9debe11ecf893a63d0e9b4efedc3
+  metadata.gz: d8ac391c4d8da142cd65d22c3e350f9b18296f6fe6ce95b909dcc8b7c687f38042040599460186ff2cacef3e0865419904a0d2dd2cd79c9a84f89b034a9a7845
+  data.tar.gz: 6a88337c439e1ee8f4424a2c91fac52cf44bfa0a37268595103e3198d0a7a3494b9269ef5b6789e0c016ac7d7d0d1f9411d40f4fa480e3bb636eb9d132b1d90a

data/README.md

@@ -6,28 +6,44 @@ Ruby bot for Slack chat, inspired by http://github.com/seejohnrun/botsy.
 
 Add this line to your application's Gemfile:
 
-    gem 'slackbotsy'
+```ruby
+gem 'slackbotsy'
+```
 
-And then execute:
+And then bundle:
 
-    $ bundle
+```sh
+bundle install
+```
 
 Or install it yourself as:
 
-    $ gem install slackbotsy
+```sh
+gem install slackbotsy
+```
+
+## Setup
+
+botsy requires (at least) two webhooks setup in slack:
+
+* outgoing webhook: for slack to send messages out to botsy
+* incoming webhook: for botsy `say` and `attach` methods to respond
+
+Set these up at https://your_team.slack.com/services/new and copy
+the webhook urls/tokens to botsy's config as below.
 
 ## Example usage
 
 ```ruby
 require 'slackbotsy'
 require 'sinatra'
+require 'open-uri'
 
 config = {
-  'team'           => 'your_team',
-  'channel'        => '#default',
-  'name'           => 'botsy',
-  'incoming_token' => 'secret',
-  'outgoing_token' => 'secret'
+  'channel'          => '#default',
+  'name'             => 'botsy',
+  'incoming_webhook' => 'https://hooks.slack.com/services/XXXXXXXXX/XXXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXX',
+  'outgoing_token'   => 'secret'
 }
 
 bot = Slackbotsy::Bot.new(config) do

data/lib/slackbotsy/bot.rb

@@ -2,7 +2,7 @@ require 'net/http'
 require 'net/https'
 require 'uri'
 require 'json'
-# require 'set'
+require 'set'
 
 module Slackbotsy
 
@@ -22,7 +22,9 @@ module Slackbotsy
 
     ## setup http connection for sending async incoming webhook messages to slack
     def setup_incoming_webhook
-      @uri  = URI.parse "https://#{@options['team']}.slack.com/services/hooks/incoming-webhook?token=#{@options['incoming_token']}"
+      ## incoming_webhook will be used if provided, otherwise fallback to old-style url with team and token
+      url = @options.fetch('incoming_webhook', false) || "https://#{@options['team']}.slack.com/services/hooks/incoming-webhook?token=#{@options['incoming_token']}"
+      @uri  = URI.parse(url)
       @http = Net::HTTP.new(@uri.host, @uri.port)
       @http.use_ssl = true
       @http.verify_mode = OpenSSL::SSL::VERIFY_PEER

data/lib/slackbotsy/version.rb

@@ -1,3 +1,3 @@
 module Slackbotsy
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slackbotsy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Richard Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-04 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,4 +109,3 @@ signing_key:
 specification_version: 4
 summary: Ruby bot for Slack chat.
 test_files: []
-has_rdoc: