slack-ruby-bot 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27ef75b4d9ac822b0386b61c6cb4f868e50ab886
-  data.tar.gz: 0935126c87fc8d94e6f0040bd5036d4aebbab722
+  metadata.gz: c792bd3959ae8c401a12e7f6c584fdae6c6cf144
+  data.tar.gz: 2ac80c543a90ea90f3f303cda1ef4c9d2612eafe
 SHA512:
-  metadata.gz: be49d4c6780e9c79189b9b8912ab11e4ef480c60aacb43a88b51c4dcfb3dbaedf427a20ec377ec9489c7fa93f995ac49c87560d25100fced8e219c26c5e0c02d
-  data.tar.gz: f5b292868182f92738cf452310edcab0ddbcb5ac3e4d2f9b1a331e171f56a6d0cca33c3c875d77d6ea01fd124d08159ebd7b531a66c1d24ebc6ef1a8a8449455
+  metadata.gz: 9a2464dbe62cffb08e8e3cbddf05180c38678bef1451249bb36fb5be539dff92ccadefa30d92c99ab41d537aceed4c07fd1af6b1ccdae10a32b03932f9768582
+  data.tar.gz: fe46f4aba9f1e5ff236447c617493010e8aa2e48133208eb2f8e614ed6143f53a23da63e86ddd54a1e4823790c12620e7d8eb60b5e23aa1072500d2098127866

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.4.3 (8/21/2015)
+
+* [#13](https://github.com/dblock/slack-ruby-bot/issues/13): You can now address the bot by its Slack @id - [@dblock](https://githubcom/dblock).
+
+* Your contribution here.
+
 ### 0.4.2 (8/20/2015)
 
 * [#12](https://github.com/dblock/slack-ruby-bot/issues/12): Added support for bot aliases - [@dblock](https://githubcom/dblock).

data/DEPLOYMENT.md

@@ -25,7 +25,7 @@ The bot replies with animated GIFs. While it's currently not necessary, you may
 Optional names for this bot.
 
 ```
-heroku config:add SLACK_RUBY_BOT_ALIASES=:pong: table-tennis ping-pong
+heroku config:add SLACK_RUBY_BOT_ALIASES=":pong: table-tennis ping-pong"
 ```
 
 ### Heroku Idling

data/README.md

@@ -56,7 +56,7 @@ The following examples of production-grade bots based on slack-ruby-bot are list
 
 ### Commands and Operators
 
-Bots are addressed by name and respond to commands and operators. By default a command class responds, case-insensitively, to its name. A class called `Phone` that inherits from `SlackRubyBot::Commands::Base` responds to `phone` and `Phone` and calls the `call` method when implemented.
+Bots are addressed by name and respond to commands and operators. By default a command class responds, case-insensitively, to its name and Slack ID. A class called `Phone` that inherits from `SlackRubyBot::Commands::Base` responds to `phone` and `Phone` and calls the `call` method when implemented.
 
 ```ruby
 class Phone < SlackRubyBot::Commands::Base
@@ -107,7 +107,7 @@ Operator match data includes `match['operator']` and `match['expression']`. The
 
 ### Bot Aliases
 
-A bot will always respond to its name, but you can specify multiple aliases via the `SLACK_RUBY_BOT_ALIASES` environment variable or via an explicit configuration.
+A bot will always respond to its name and Slack ID, but you can specify multiple aliases via the `SLACK_RUBY_BOT_ALIASES` environment variable or via an explicit configuration.
 
 ```
 SLACK_RUBY_BOT_ALIASES=:pp: table-tennis
@@ -121,7 +121,7 @@ end
 
 This is particularly fun with emoji.
 
-![](screenshots/alias.gif)
+![](screenshots/aliases.gif)
 
 ### Generic Routing
 

data/lib/slack-ruby-bot/commands/about.rb

@@ -2,7 +2,7 @@ module SlackRubyBot
   module Commands
     class Default < Base
       command 'about'
-      match(/^(?<bot>\w*)$/)
+      match(/^(?<bot>[\w[:punct:]@<>]*)$/)
 
       def self.call(client, data, _match)
         send_message_with_gif client, data.channel, SlackRubyBot::ABOUT, 'selfie'

data/lib/slack-ruby-bot/commands/base.rb

@@ -41,8 +41,8 @@ module SlackRubyBot
 
       def self.command(*values, &block)
         values.each do |value|
-          match Regexp.new("^(?<bot>[\\w[:punct:]]*)[\\s]+(?<command>#{value})$", Regexp::IGNORECASE), &block
-          match Regexp.new("^(?<bot>[\\w[:punct:]]*)[\\s]+(?<command>#{value})[\\s]+(?<expression>.*)$", Regexp::IGNORECASE), &block
+          match Regexp.new("^(?<bot>[\\w[:punct:]@<>]*)[\\s]+(?<command>#{value})$", Regexp::IGNORECASE), &block
+          match Regexp.new("^(?<bot>[\\w[:punct:]@<>]*)[\\s]+(?<command>#{value})[\\s]+(?<expression>.*)$", Regexp::IGNORECASE), &block
         end
       end
 

data/lib/slack-ruby-bot/config.rb

@@ -11,7 +11,7 @@ module SlackRubyBot
     attr_accessor :team_id
 
     def names
-      [user, aliases].compact.flatten
+      [user, aliases, "<@#{user_id.downcase}>", "<@#{user_id.downcase}>:"].compact.flatten
     end
 
     def name?(name)

data/lib/slack-ruby-bot/rspec/support/slack_ruby_bot_configure.rb

@@ -3,6 +3,7 @@ RSpec.configure do |config|
     SlackRubyBot.configure do |c|
       c.token = 'testtoken'
       c.user = 'rubybot'
+      c.user_id = 'DEADBEEF'
     end
   end
 end

data/lib/slack-ruby-bot/version.rb

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

data/spec/slack-ruby-bot/commands/about_spec.rb

@@ -10,4 +10,7 @@ describe SlackRubyBot::Commands::Default do
   it 'upcase' do
     expect(message: SlackRubyBot.config.user.upcase).to respond_with_slack_message(SlackRubyBot::ABOUT)
   end
+  it 'id' do
+    expect(message: "<@#{SlackRubyBot.config.user_id}>").to respond_with_slack_message(SlackRubyBot::ABOUT)
+  end
 end

data/spec/slack-ruby-bot/commands/hi_spec.rb

@@ -7,4 +7,10 @@ describe SlackRubyBot::Commands::Hi do
   it 'says hi' do
     expect(message: "#{SlackRubyBot.config.user} hi").to respond_with_slack_message('Hi <@user>!')
   end
+  it 'says hi to @bot' do
+    expect(message: "<@#{SlackRubyBot.config.user_id}> hi").to respond_with_slack_message('Hi <@user>!')
+  end
+  it 'says hi to @bot: ' do
+    expect(message: "<@#{SlackRubyBot.config.user_id}>: hi").to respond_with_slack_message('Hi <@user>!')
+  end
 end

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   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: slack-ruby-client
   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: activesupport
   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: giphy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -170,11 +170,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - DEPLOYMENT.md
@@ -251,17 +251,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The easiest way to write a Slack bot in Ruby.