slackbotsy 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e49b61a429036ce7a3e0d23d9ad27bc4ce9fc7ce
-  data.tar.gz: 0e9fd9219149c3df0a00c80983245d6deff893d7
+  metadata.gz: 910fed46b24c5cbdd26621e27f3c7b6f28412af2
+  data.tar.gz: b9f2829280e0b156bcb615469f44f32808cdfb6e
 SHA512:
-  metadata.gz: f6d105f5b03b513547d0ff82cad73acf4076898094c4e2cf13ea8e8ed903edf196803a499490c73ba71d1976ba8d27a83b9e052bc03a6d572dd1c0057973e753
-  data.tar.gz: b58f7ec5d0b3fcd32e2b03ee3a8dfa4aabda2aa504ceb219ac8f1afd0a708d6c31e86cd5b9d9b70982d240b1a59b95f92b790b6139061f982874670c4f9cbcb3
+  metadata.gz: d4240abb745489c047587b99c8c8d5a7770ee3a9840f7665b4a99513fad6c492961bf2c3f1308ae2f737c4388684d543b843da3a534ae788cc4223135ab9377a
+  data.tar.gz: 9893b69fbbb8a4a9c1f349ed538dc7fdd8c45381b9cd196a8b3b1f57593ec3b0427eb20dd8d5e4b80089c864cfb0fbfb138ebfeb58c1029fd04b30c1a46539ac

data/lib/slackbotsy/bot.rb

@@ -21,6 +21,8 @@ module Slackbotsy
     ## use set of tokens for (more or less) O(1) lookup on multiple channels
     def parse_outgoing_tokens(tokens)
       case tokens
+      when NilClass
+        []
       when String
         tokens.split(/[,\s]+/)
       when Array
@@ -77,8 +79,12 @@ module Slackbotsy
         text:     text,
         as_user:  true
       }.merge(options)
-      payload[:channel] = payload[:channel].gsub(/^#?/, '#') # chat.postMessage needs leading # on channel
-      @api.join(payload[:channel])
+
+      unless direct_message?(payload[:channel])
+        payload[:channel] = enforce_leading_hash(payload[:channel])
+        @api.join(payload[:channel])
+      end
+
       @api.post_message(payload)
       return nil # be quiet in webhook reply
     end
@@ -95,6 +101,11 @@ module Slackbotsy
       return nil # be quiet in webhook reply
     end
 
+    ## simple wrapper on api.users (which calls users.list)
+    def users
+      @api.users
+    end
+
     ## record a description of the next hear block, for use in help
     def desc(command, description = nil)
       @last_desc = [ command, description ]
@@ -146,8 +157,8 @@ module Slackbotsy
       message = Slackbotsy::Message.new(self, msg)
       @listeners.map do |listener|
         text.match(listener.regex) do |mdata|
-          begin
-            message.instance_exec(mdata, &listener.proc)
+         begin
+            message.instance_exec(mdata, *mdata[1..-1], &listener.proc)
           rescue => err # keep running even with a broken script, but report the error
             err
           end
@@ -155,6 +166,16 @@ module Slackbotsy
       end
     end
 
+    private
+
+    def enforce_leading_hash(channel)
+      # chat.postMessage needs leading # on channel
+      channel.gsub(/^#?/, '#')
+    end
+
+    def direct_message?(channel)
+      channel.start_with?('@')
+    end
   end
 
 end

data/lib/slackbotsy/version.rb

@@ -1,3 +1,3 @@
 module Slackbotsy
-  VERSION = "0.4.2"
+  VERSION = '0.4.3'
 end

data/slackbotsy.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency 'json'
   spec.add_dependency 'sinatra'
   spec.add_dependency 'httmultiparty'
 end

data/test.rb

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+require_relative 'lib/slackbotsy/bot'
+require_relative 'lib/slackbotsy/helper'
+require_relative 'lib/slackbotsy/message'
+require 'sinatra'
+
+config = {
+  'channel'          => '#default',
+  'name'             => 'botsy',
+  # 'incoming_webhook' => 'https://hooks.slack.com/services/XXXXXXXXX/XXXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXX',
+  'outgoing_token'   => '123',
+  'slash_token'      => '123',
+}
+
+bot = Slackbotsy::Bot.new(config) do
+
+  hear /ping/i do
+    'pong'
+  end
+
+  hear /botsy ping/i do
+    'pang'
+  end
+
+  hear /test (.+)/ do |mdata, str|
+    "mdata: #{mdata}, str: #{str}"
+  end
+
+  hear /echo\s+(.+)/ do |_, str|
+    "I heard #{user_name} say '#{str}' in #{channel_name}"
+  end
+
+end
+
+post '/' do
+  if params[:command]
+    bot.handle_slash_command(params)
+  else
+    bot.handle_outgoing_webhook(params)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slackbotsy
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Richard Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +85,7 @@ files:
 - lib/slackbotsy/message.rb
 - lib/slackbotsy/version.rb
 - slackbotsy.gemspec
+- test.rb
 homepage: https://github.com/rlister/slackbotsy
 licenses:
 - MIT
@@ -119,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby bot for Slack chat.