slack-ruby-bot 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83ecb7fe802af333ec3950f148959ce2c19095cc
-  data.tar.gz: da223c787bfe98e74543f1cc878ae04272c9b554
+  metadata.gz: e767ee739a4eb2e86b7b03affd315f7d20fdc866
+  data.tar.gz: 5123671ea14bf10c590955d6a2391b436d3578bf
 SHA512:
-  metadata.gz: 0a29f81647a5b1b1d4156f4d51668697ce44ac6c80cba4ac4feb2f375c2d3eb4c31ac9af952dbae030e0c9646e4ec59ac3818d9bbfb2d989cbe24f0796453080
-  data.tar.gz: bd3d763b1334da9ccc10712f5b26bfc7f2f6942cdea9f9013edfeb3304881eca2bf8ad12cfd1e154339cd683bc365a24bb51ce4b6f8027064d3dfbe5d5dbc1ab
+  metadata.gz: d13566b081e81835c685886917ba096bc0ec3c525287feab3ca50c6691f48139710ed4d0fb65c7e7369aee9a8608d83099f5e14b28c8a7d3fe5f85380beac3f4
+  data.tar.gz: 4b6ed30645c1a9cc2ffaecd1924db4fd71bf6d4c845bc716e6107e76876066964f1f711ed0fc380d546ae192ab4ca1ca080fb89b15d95a59b02274a65d4b2d9b

data/.rubocop_todo.yml

@@ -1,5 +1,5 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-07-10 08:49:06 -0400 using RuboCop version 0.32.1.
+# on 2015-07-19 12:16:52 -0400 using RuboCop version 0.32.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -10,18 +10,22 @@ Lint/HandleExceptions:
   Enabled: false
 
 # Offense count: 1
+Lint/UselessAccessModifier:
+  Enabled: false
+
+# Offense count: 2
 Metrics/AbcSize:
   Max: 21
 
-# Offense count: 24
+# Offense count: 37
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 142
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 17
+  Max: 18
 
 # Offense count: 15
 Style/Documentation:
@@ -32,6 +36,11 @@ Style/Documentation:
 Style/FileName:
   Enabled: false
 
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/MethodName:
+  Enabled: false
+
 # Offense count: 1
 Style/ModuleFunction:
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.3.0 (7/19/2015)
+
+* [#5](https://github.com/dblock/slack-ruby-bot/issues/5): Added support for free-formed routes via `match` - [@dblock](https://github.com/dblock).
+* [#6](https://github.com/dblock/slack-ruby-bot/issues/6): Commands and operators take blocks - [@dblock](https://github.com/dblock).
+* [#4](https://github.com/dblock/slack-ruby-bot/issues/4): Messages are posted with `as_user: true` by default - [@dblock](https://github.com/dblock).
+
 ### 0.2.0 (7/10/2015)
 
 * Sending `send_message` with nil or empty text will yield `Nothing to see here.` with a GIF instead of `no_text` - [@dblock](https://github.com/dblock).

data/README.md

@@ -28,7 +28,7 @@ module PongBot
   end
 
   class Ping < SlackRubyBot::Commands::Base
-    def self.call(data, command, arguments)
+    command 'ping' do |data, _match|
       send_message data.channel, 'pong'
     end
   end
@@ -54,23 +54,69 @@ 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`. To respond to custom commands and to disable automatic class name matching, use the `command` keyword. The following command responds to `call` and `呼び出し` (call in Japanese).
+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.
+
+```ruby
+class Phone < SlackRubyBot::Commands::Base
+  command 'call'
+
+  def self.call(data, _match)
+    send_message data.channel, 'called'
+  end
+end
+```
+
+To respond to custom commands and to disable automatic class name matching, use the `command` keyword. The following command responds to `call` and `呼び出し` (call in Japanese).
 
 ```ruby
 class Phone < SlackRubyBot::Commands::Base
   command 'call'
   command '呼び出し'
+
+  def self.call(data, _match)
+    send_message data.channel, 'called'
+  end
+end
+```
+
+You can combine multiple commands and use a block to implement them.
+
+```ruby
+class Phone < SlackRubyBot::Commands::Base
+  command 'call', '呼び出し' do |data, _match|
+    send_message data.channel, 'called'
+  end
 end
 ```
 
+Command match data includes `match['bot']`, `match['command']` and `match['expression']`. The `bot` match always checks against the `SlackRubyBot::Config.user` setting.
+
 Operators are 1-letter long and are similar to commands. They don't require addressing a bot nor separating an operator from its arguments. The following class responds to `=2+2`.
 
 ```ruby
 class Calculator < SlackRubyBot::Commands::Base
-  operator '='
+  operator '=' do |_data, _match|
+    # implementation detail
+  end
+end
+```
+
+Operator match data includes `match['operator']` and `match['expression']`. The `bot` match always checks against the `SlackRubyBot::Config.user` setting.
+
+### Generic Routing
+
+Commands and operators are generic versions of bot routes. You can respond to just about anything by defining a custom route.
+
+```ruby
+class Weather < SlackRubyBot::Commands::Base
+  match /^How is the weather in (<?location>\w*)\?$/ do |data, match|
+    send_message data.channel, "The weather in #{match[:location]} is nice."
+  end
 end
 ```
 
+![](screenshots/weather.gif)
+
 ### Built-In Commands
 
 Slack-ruby-bot comes with several built-in commands. You can re-define built-in commands, normally, as described above.
@@ -87,6 +133,14 @@ Politely says 'hi' back.
 
 Get help.
 
+### RSpec Shared Behaviors
+
+Slack-ruby-bot ships with a number of shared RSpec behaviors that can be used in your RSpec tests. Require 'slack-ruby-bot/rspec' in your `spec_helper.rb`.
+
+* [behaves like a slack bot](lib/slack-ruby-bot/rspec/support/slack-ruby-bot/it_behaves_like_a_slack_bot.rb): A bot quacks like a Slack Ruby bot.
+* [respond with slack message](lib/slack-ruby-bot/rspec/support/slack-ruby-bot/respond_with_slack_message.rb): The bot responds with a message.
+* [respond with error](lib/slack-ruby-bot/rspec/support/slack-ruby-bot/respond_with_error.rb): An exception is raised inside a bot command.
+
 ## Contributing
 
 See [CONTRIBUTING](CONTRIBUTING.md).

data/RELEASING.md

@@ -0,0 +1,67 @@
+# Releasing Slack-Ruby-Bot
+
+There're no particular rules about when to release slack-ruby-bot. Release bug fixes frequenty, features not so frequently and breaking API changes rarely.
+
+### Release
+
+Run tests, check that all tests succeed locally.
+
+```
+bundle install
+rake
+```
+
+Check that the last build succeeded in [Travis CI](https://travis-ci.org/dblock/slack-ruby-bot) for all supported platforms.
+
+Increment the version, modify [lib/slack-ruby-bot/version.rb](lib/slack-ruby-bot/version.rb).
+
+*  Increment the third number if the release has bug fixes and/or very minor features, only (eg. change `0.2.1` to `0.2.2`).
+*  Increment the second number if the release contains major features or breaking API changes (eg. change `0.2.1` to `0.3.0`).
+
+Change "Next Release" in [CHANGELOG.md](CHANGELOG.md) to the new version.
+
+```
+### 0.2.2 (7/10/2015)
+```
+
+Remove the line with "Your contribution here.", since there will be no more contributions to this release.
+
+Commit your changes.
+
+```
+git add CHANGELOG.md lib/slack-ruby-bot/version.rb
+git commit -m "Preparing for release, 0.2.2."
+git push origin master
+```
+
+Release.
+
+```
+$ rake release
+
+slack-ruby-bot 0.2.2 built to pkg/slack-ruby-bot-0.2.2.gem.
+Tagged v0.2.2.
+Pushed git commits and tags.
+Pushed slack-ruby-bot 0.2.2 to rubygems.org.
+```
+
+### Prepare for the Next Version
+
+Add the next release to [CHANGELOG.md](CHANGELOG.md).
+
+```
+Next Release
+============
+
+* Your contribution here.
+```
+
+Increment the third version number in [lib/slack-ruby-bot/version.rb](lib/slack-ruby-bot/version.rb).
+
+Comit your changes.
+
+```
+git add CHANGELOG.md lib/slack-ruby-bot/version.rb
+git commit -m "Preparing for next development iteration, 0.2.3."
+git push origin master
+```

data/TUTORIAL.md

@@ -51,7 +51,7 @@ Create a folder called `slack-mathbot/commands` and inside of it create `calcula
 module SlackMathbot
   module Commands
     class Calculate < SlackRubyBot::Commands::Base
-      def self.call(data, command, arguments)
+      command 'calculate' do |data, _match|
         send_message data.channel, '4'
       end
     end
@@ -139,10 +139,57 @@ Run `foreman start`. Your bot should be running.
 14:32:36 web.1  | I, [2015-07-10T14:32:36.766955 #98948]  INFO -- : Successfully connected to https://xyz.slack.com/.
 ```
 
-### Test
+### Try
 
 Invite the bot to a channel via `/invite [bot name]` and send it a `calculate` command with `[bot name] calculate 2+2`. It will respond with `4` from the code above.
 
+### Write Tests
+
+#### Spec Helper
+
+Create `spec/spec_helper.rb` that includes the bot files and shared RSpec support from slack-ruby-bot.
+
+```ruby
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..'))
+
+require 'slack-ruby-bot/rspec'
+require 'slack-mathbot'
+```
+
+#### Test the Bot Application
+
+Create a test for the bot application itself in `spec/slack-mathbot/app_spec.rb`.
+
+```ruby
+require 'spec_helper'
+
+describe SlackMathbot::App do
+  def app
+    SlackMathbot::App.new
+  end
+  it_behaves_like 'a slack ruby bot'
+end
+```
+
+#### Test a Command
+
+Create a test for the `calculate` command in `spec/slack-mathbot/commands/calculate_spec.rb`. The bot is addressed by its user name.
+
+```ruby
+require 'spec_helper'
+
+describe SlackMathbot::Commands::Calculate do
+  def app
+    SlackMathbot::App.new
+  end
+  it 'returns 4' do
+    expect(message: "#{SlackRubyBot.config.user} calculate 2+2", channel: 'channel').to respond_with_slack_message('4')
+  end
+end
+```
+
+See [lib/slack-ruby-bot/rspec/support/slack-ruby-bot](lib/slack-ruby-bot/rspec/support/slack-ruby-bot) for other shared RSpec behaviors.
+
 ### Deploy
 
 See [DEPLOYMENT](DEPLOYMENT.md) for how to deploy your bot to production.

data/examples/minimal/pongbot.rb

@@ -5,7 +5,7 @@ module PongBot
   end
 
   class Ping < SlackRubyBot::Commands::Base
-    def self.call(data, _command, _arguments)
+    def self.call(data, _match)
       send_message data.channel, 'pong'
     end
   end

data/examples/weather/Gemfile

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+
+gem 'slack-ruby-bot', path: '../..'

data/examples/weather/weatherbot.rb

@@ -0,0 +1,14 @@
+require 'slack-ruby-bot'
+
+module WeatherBot
+  class App < SlackRubyBot::App
+  end
+
+  class Weather < SlackRubyBot::Commands::Base
+    match(/^How is the weather in (?<location>\w*)\?$/i) do |data, match|
+      send_message data.channel, "The weather in #{match[:location]} is nice."
+    end
+  end
+end
+
+WeatherBot::App.instance.run

data/lib/slack-ruby-bot.rb

@@ -4,8 +4,6 @@ require 'slack-ruby-bot/version'
 require 'slack-ruby-bot/about'
 require 'slack-ruby-bot/config'
 require 'slack-ruby-bot/hooks'
-require 'slack-ruby-bot/commands'
-require 'slack-ruby-bot/app'
 
 module SlackRubyBot
   class << self
@@ -18,3 +16,6 @@ module SlackRubyBot
     end
   end
 end
+
+require 'slack-ruby-bot/commands'
+require 'slack-ruby-bot/app'

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

@@ -57,7 +57,7 @@ module SlackRubyBot
             rescue StandardError => e
               logger.error e
               begin
-                Slack.chat_postMessage(channel: data['channel'], text: e.message) if data.key?('channel')
+                Slack.chat_postMessage(channel: data['channel'], text: e.message, as_user: true) if data.key?('channel')
               rescue
                 # ignore
               end

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

@@ -1,10 +1,10 @@
 module SlackRubyBot
   module Commands
     class Default < Base
-      command 'default'
       command 'about'
+      match(/^(?<bot>\w*)$/)
 
-      def self.call(data, _command, _arguments)
+      def self.call(data, _match)
         send_message_with_gif data.channel, SlackRubyBot::ABOUT, 'selfie'
       end
     end

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

@@ -1,18 +1,17 @@
 module SlackRubyBot
   module Commands
     class Base
-      class_attribute :operators
-      class_attribute :commands
+      class_attribute :routes
 
-      def self.send_message(channel, text)
+      def self.send_message(channel, text, options = { as_user: true })
         if text && text.length > 0
-          Slack.chat_postMessage(channel: channel, text: text)
+          chat_postMessage({ channel: channel, text: text }.merge(options))
         else
-          send_message_with_gif channel, 'Nothing to see here.', 'nothing'
+          send_message_with_gif channel, 'Nothing to see here.', 'nothing', options
         end
       end
 
-      def self.send_message_with_gif(channel, text, keywords)
+      def self.send_message_with_gif(channel, text, keywords, options = { as_user: true })
         gif = begin
           Giphy.random(keywords)
         rescue StandardError => e
@@ -20,7 +19,7 @@ module SlackRubyBot
           nil
         end
         text = text + "\n" + gif.image_url.to_s if gif
-        send_message channel, text
+        send_message channel, text, options
       end
 
       def self.logger
@@ -30,26 +29,58 @@ module SlackRubyBot
         end
       end
 
-      def self.responds_to_command?(command)
-        commands ? commands.include?(command) : command == default_command_name
-      end
-
       def self.default_command_name
         name && name.split(':').last.downcase
       end
 
-      def self.responds_to_operator?(operator)
-        operators && operators.include?(operator)
+      def self.operator(*values, &block)
+        values.each do |value|
+          match Regexp.new("^(?<operator>\\#{value})(?<expression>.*)$", Regexp::IGNORECASE), &block
+        end
+      end
+
+      def self.command(*values, &block)
+        values.each do |value|
+          match Regexp.new("^(?<bot>\\w*)[\\s]+(?<command>#{value})$", Regexp::IGNORECASE), &block
+          match Regexp.new("^(?<bot>\\w*)[\\s]+(?<command>#{value})[\\s]+(?<expression>.*)$", Regexp::IGNORECASE), &block
+        end
+      end
+
+      def self.invoke(data)
+        self.finalize_routes!
+        expression = data.text
+        called = false
+        routes.each_pair do |route, method|
+          match = route.match(expression)
+          next unless match
+          next if match.names.include?('bot') && match['bot'].downcase != SlackRubyBot.config.user
+          called = true
+          if method
+            method.call(data, match)
+          elsif self.respond_to?(:call)
+            send(:call, data, match)
+          else
+            fail NotImplementedError, data.text
+          end
+          break
+        end
+        called
+      end
+
+      def self.match(match, &block)
+        self.routes ||= {}
+        self.routes[match] = block
       end
 
-      def self.operator(value)
-        self.operators ||= []
-        self.operators << value.to_s
+      private
+
+      def self.chat_postMessage(message)
+        Slack.chat_postMessage(message)
       end
 
-      def self.command(value)
-        self.commands ||= []
-        self.commands << value.to_s
+      def self.finalize_routes!
+        return if self.routes && self.routes.any?
+        command default_command_name
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module SlackRubyBot
   module Commands
     class Help < Base
-      def self.call(data, _command, _arguments)
+      def self.call(data, _match)
         send_message_with_gif data.channel, 'See https://github.com/dblock/slack-ruby-bot, please.', 'help'
       end
     end

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

@@ -1,7 +1,7 @@
 module SlackRubyBot
   module Commands
     class Hi < Base
-      def self.call(data, _command, _arguments)
+      def self.call(data, _match)
         send_message_with_gif data.channel, "Hi <@#{data.user}>!", 'hi'
       end
     end

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

@@ -1,7 +1,9 @@
 module SlackRubyBot
   module Commands
     class Unknown < Base
-      def self.call(data, _command, _arguments)
+      match(/^(?<bot>\w*)[\s]*(?<expression>.*)$/)
+
+      def self.call(data, _match)
         send_message_with_gif data.channel, "Sorry <@#{data.user}>, I don't understand that command!", 'idiot'
       end
     end

data/lib/slack-ruby-bot/hooks/message.rb

@@ -5,62 +5,15 @@ module SlackRubyBot
 
       def message(data)
         data = Hashie::Mash.new(data)
-        klass, command, arguments = text_to_class(data.text)
-        return unless klass
-        klass.call(data, command, arguments)
+        data.text.strip!
+        result = child_command_classes.detect { |d| d.invoke(data) }
+        result ||= built_in_command_classes.detect { |d| d.invoke(data) }
+        result ||= SlackRubyBot::Commands::Unknown.tap { |d| d.invoke(data) }
+        result
       end
 
       private
 
-      #
-      # Lookup a class that can execute a command or an operator.
-      #
-      # @param [String] text Free-formed text from Slack.
-      #
-      # @return [SlackRubyBot::Commands::Base] A child class of SlackRubyBot::Commands::Base.
-      #
-      def text_to_class(text)
-        return unless text
-        command, arguments = parse_command(text)
-        if command
-          [command_to_class(command) || SlackRubyBot::Commands::Unknown, command, arguments]
-        else
-          command, arguments = parse_operator(text)
-          [operator_to_class(command), command, arguments]
-        end
-      end
-
-      #
-      # Split text into a command and its arguments.
-      #
-      # @param [String] text Free-formed text from Slack, eg. `bot do something`.
-      #
-      # @return [Array] An array of command and arguments or nil.
-      #
-      def parse_command(text)
-        return unless text
-        parts = text.split.reject(&:blank?)
-        return unless parts && parts.any?
-        # command is [bot] <command> (argument1, ...)
-        bot_or_operator = parts.first.downcase
-        return unless SlackRubyBot.config.user == bot_or_operator
-        command = parts[1].try(:downcase) || 'default'
-        arguments = parts[2..parts.length]
-        [command, arguments]
-      end
-
-      #
-      # Split text into an operator and its arguments.
-      #
-      # @param [String] text Free-formed text from Slack, eg. =2+2.
-      #
-      # @return [Array] An array and arguments or nil.
-      #
-      def parse_operator(text)
-        return unless text && text.length > 0
-        [text[0], text[1..text.length].split.reject(&:blank?)]
-      end
-
       #
       # All commands.
       #
@@ -88,34 +41,7 @@ module SlackRubyBot
       #
       def built_in_command_classes
         command_classes.select do |k|
-          k.name && k.name.starts_with?('SlackRubyBot::Commands::')
-        end
-      end
-
-      #
-      # Converts a command to a class.
-      #
-      # @param [String] command Command tet.
-      #
-      # @return [SlackRubyBot::Commands::Base] A command implementation.
-      #
-      def command_to_class(command)
-        # prioritize implementations to built-in classes
-        klass = child_command_classes.detect { |d| d.responds_to_command?(command) }
-        klass ||= built_in_command_classes.detect { |d| d.responds_to_command?(command) }
-        klass
-      end
-
-      #
-      # Converts an operator to a class.
-      #
-      # @param [String] operator Operator text.
-      #
-      # @return [<type>] An operator implementation.
-      #
-      def operator_to_class(operator)
-        command_classes.detect do |k|
-          k.responds_to_operator?(operator)
+          k.name && k.name.starts_with?('SlackRubyBot::Commands::') && k != SlackRubyBot::Commands::Unknown
         end
       end
     end

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

@@ -1,14 +1,13 @@
 require 'rspec/expectations'
 
-RSpec::Matchers.define :respond_with_error do |expected|
+RSpec::Matchers.define :respond_with_error do |error, error_message|
   match do |actual|
     channel, user, message = parse(actual)
-    app = SlackRubyBot::App.new
     allow(Giphy).to receive(:random)
     begin
       expect do
         app.send(:message, text: message, channel: channel, user: user)
-      end.to raise_error ArgumentError, expected
+      end.to raise_error error, error_message
     rescue RSpec::Expectations::ExpectationNotMetError => e
       @error_message = e.message
       raise e

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

@@ -4,7 +4,7 @@ RSpec::Matchers.define :respond_with_slack_message do |expected|
   match do |actual|
     channel, user, message = parse(actual)
     allow(Giphy).to receive(:random)
-    expect(SlackRubyBot::Commands::Base).to receive(:send_message).with(channel, expected)
+    expect(SlackRubyBot::Commands::Base).to receive(:chat_postMessage).with(channel: channel, text: expected, as_user: true)
     app.send(:message, text: message, channel: channel, user: user)
     true
   end

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

@@ -1,3 +1,3 @@
 module SlackRubyBot
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/slack-ruby-bot.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.homepage = 'http://github.com/dblock/slack-ruby-bot'
   s.licenses = ['MIT']
-  s.summary = 'Generic bot framework written in Ruby.'
+  s.summary = 'The easiest way to write a Slack bot in Ruby.'
   s.add_dependency 'hashie'
   s.add_dependency 'slack-api', '~> 1.1.6'
   s.add_dependency 'activesupport'

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

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe SlackRubyBot::Commands do
+  let! :command do
+    Class.new(SlackRubyBot::Commands::Base) do
+      command 'tomato' do |data, match|
+        send_message data.channel, "#{match[:command]}: #{match[:expression]}", as_user: true
+      end
+
+      command 'tomatoes' do |data, match|
+        send_message data.channel, "#{match[:command]}: #{match[:expression]}", as_user: true
+      end
+    end
+  end
+  def app
+    SlackRubyBot::App.new
+  end
+  it 'matches commands' do
+    expect(message: "#{SlackRubyBot.config.user} tomato red").to respond_with_slack_message('tomato: red')
+    expect(message: "#{SlackRubyBot.config.user} tomatoes green").to respond_with_slack_message('tomatoes: green')
+  end
+end

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

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe SlackRubyBot::Commands do
+  let! :command do
+    Class.new(SlackRubyBot::Commands::Base) do
+      command 'space' do |data, match|
+        send_message data.channel, "#{match[:command]}: #{match[:expression]}", as_user: true
+      end
+    end
+  end
+  def app
+    SlackRubyBot::App.new
+  end
+  it 'matches leading spaces' do
+    expect(message: "  #{SlackRubyBot.config.user}   space red").to respond_with_slack_message('space: red')
+  end
+  it 'matches trailing spaces' do
+    expect(message: "#{SlackRubyBot.config.user}   space    red   ").to respond_with_slack_message('space: red')
+  end
+end

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

@@ -6,8 +6,8 @@ describe SlackRubyBot::Commands do
       command 'sayhi'
       command 'saybye'
 
-      def self.call(data, command, arguments)
-        send_message data.channel, "#{command}: #{arguments}"
+      def self.call(data, match)
+        send_message data.channel, "#{match[:command]}: #{match[:expression]}", as_user: true
       end
     end
   end
@@ -15,7 +15,7 @@ describe SlackRubyBot::Commands do
     SlackRubyBot::App.new
   end
   it 'supports multiple commands' do
-    expect(message: "#{SlackRubyBot.config.user} sayhi arg1 arg2").to respond_with_slack_message('sayhi: ["arg1", "arg2"]')
-    expect(message: "#{SlackRubyBot.config.user} saybye arg1 arg2").to respond_with_slack_message('saybye: ["arg1", "arg2"]')
+    expect(message: "#{SlackRubyBot.config.user} sayhi arg1 arg2").to respond_with_slack_message('sayhi: arg1 arg2')
+    expect(message: "#{SlackRubyBot.config.user} saybye arg1 arg2").to respond_with_slack_message('saybye: arg1 arg2')
   end
 end

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

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe SlackRubyBot::Commands do
+  let! :command do
+    Class.new(SlackRubyBot::Commands::Base) do
+      command 'sayhi' do |data, match|
+        send_message data.channel, "#{match[:command]}: #{match[:expression]}", as_user: true
+      end
+
+      command 'one', 'two' do |data, match|
+        send_message data.channel, "#{match[:command]}: #{match[:expression]}", as_user: true
+      end
+    end
+  end
+  def app
+    SlackRubyBot::App.new
+  end
+  it 'supports multiple commands' do
+    expect(message: "#{SlackRubyBot.config.user} sayhi arg1 arg2").to respond_with_slack_message('sayhi: arg1 arg2')
+    expect(message: "#{SlackRubyBot.config.user} one arg1 arg2").to respond_with_slack_message('one: arg1 arg2')
+    expect(message: "#{SlackRubyBot.config.user} two arg1 arg2").to respond_with_slack_message('two: arg1 arg2')
+  end
+end

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

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe SlackRubyBot::Commands do
   let! :command do
     Class.new(SlackRubyBot::Commands::Base) do
-      command 'test'
+      command 'empty_text'
 
-      def self.call(data, _command, _arguments)
+      def self.call(data, _match)
         send_message data.channel, nil
       end
     end
@@ -15,7 +15,7 @@ describe SlackRubyBot::Commands do
   end
   it 'sends default text' do
     allow(Giphy).to receive(:random)
-    expect(SlackRubyBot::Commands::Base).to receive(:send_message_with_gif).with('channel', 'Nothing to see here.', 'nothing')
-    app.send(:message, text: "#{SlackRubyBot.config.user} test", channel: 'channel', user: 'user')
+    expect(SlackRubyBot::Commands::Base).to receive(:send_message_with_gif).with('channel', 'Nothing to see here.', 'nothing', as_user: true)
+    app.send(:message, text: "#{SlackRubyBot.config.user} empty_text", channel: 'channel', user: 'user')
   end
 end

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

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe SlackRubyBot::Commands::Base do
+  let! :command do
+    Class.new(SlackRubyBot::Commands::Base) do
+      command 'not_implemented'
+    end
+  end
+  def app
+    SlackRubyBot::App.new
+  end
+  it 'raises not implemented' do
+    expect(message: "#{SlackRubyBot.config.user} not_implemented").to respond_with_error(NotImplementedError, 'rubybot not_implemented')
+  end
+end

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

@@ -6,8 +6,8 @@ describe SlackRubyBot::Commands do
       operator '='
       operator '-'
 
-      def self.call(data, command, arguments)
-        send_message data.channel, "#{command}: #{arguments}"
+      def self.call(data, match)
+        send_message data.channel, "#{match[:operator]}: #{match[:expression]}", as_user: true
       end
     end
   end
@@ -15,6 +15,6 @@ describe SlackRubyBot::Commands do
     SlackRubyBot::App.new
   end
   it 'supports operators' do
-    expect(message: '=2+2').to respond_with_slack_message('=: ["2+2"]')
+    expect(message: '=2+2').to respond_with_slack_message('=: 2+2')
   end
 end

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

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe SlackRubyBot::Commands do
+  let! :command do
+    Class.new(SlackRubyBot::Commands::Base) do
+      operator '=' do |data, match|
+        send_message data.channel, "#{match[:operator]}: #{match[:expression]}", as_user: true
+      end
+
+      operator '+', '-' do |data, match|
+        send_message data.channel, "#{match[:operator]}: #{match[:expression]}", as_user: true
+      end
+    end
+  end
+  def app
+    SlackRubyBot::App.new
+  end
+  it 'supports operator blocks' do
+    expect(message: '=2+2').to respond_with_slack_message('=: 2+2')
+    expect(message: '+2+2').to respond_with_slack_message('+: 2+2')
+    expect(message: '-2+2').to respond_with_slack_message('-: 2+2')
+  end
+end

data/spec/slack-ruby-bot/rspec/respond_with_error_spec.rb

@@ -5,8 +5,8 @@ describe RSpec do
     Class.new(SlackRubyBot::Commands::Base) do
       command 'raise'
 
-      def self.call(_data, command, _arguments)
-        fail ArgumentError, command
+      def self.call(_data, match)
+        fail ArgumentError, match[:command]
       end
     end
   end
@@ -14,6 +14,6 @@ describe RSpec do
     SlackRubyBot::App.new
   end
   it 'respond_with_error' do
-    expect(message: "#{SlackRubyBot.config.user} raise").to respond_with_error('raise')
+    expect(message: "#{SlackRubyBot.config.user} raise").to respond_with_error(ArgumentError, 'raise')
   end
 end

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-19 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-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.6
 - !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,22 +170,25 @@ 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
 - Gemfile
 - LICENSE.md
 - README.md
+- RELEASING.md
 - Rakefile
 - TUTORIAL.md
 - examples/minimal/Gemfile
 - examples/minimal/Gemfile.lock
 - examples/minimal/pongbot.rb
+- examples/weather/Gemfile
+- examples/weather/weatherbot.rb
 - lib/config/application.rb
 - lib/config/boot.rb
 - lib/config/environment.rb
@@ -217,14 +220,20 @@ files:
 - lib/slack_ruby_bot.rb
 - screenshots/demo.gif
 - screenshots/register-bot.png
+- screenshots/weather.gif
 - slack-ruby-bot.gemspec
 - spec/slack-ruby-bot/app_spec.rb
 - spec/slack-ruby-bot/commands/about_spec.rb
+- spec/slack-ruby-bot/commands/commands_precedence_spec.rb
+- spec/slack-ruby-bot/commands/commands_spaces_spec.rb
 - spec/slack-ruby-bot/commands/commands_spec.rb
+- spec/slack-ruby-bot/commands/commands_with_block_spec.rb
 - spec/slack-ruby-bot/commands/empty_text_spec.rb
 - spec/slack-ruby-bot/commands/help_spec.rb
 - spec/slack-ruby-bot/commands/hi_spec.rb
+- spec/slack-ruby-bot/commands/not_implemented_spec.rb
 - spec/slack-ruby-bot/commands/operators_spec.rb
+- spec/slack-ruby-bot/commands/operators_with_block_spec.rb
 - spec/slack-ruby-bot/commands/unknown_spec.rb
 - spec/slack-ruby-bot/rspec/respond_with_error_spec.rb
 - spec/slack-ruby-bot/version_spec.rb
@@ -239,28 +248,33 @@ 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: Generic bot framework written in Ruby.
+summary: The easiest way to write a Slack bot in Ruby.
 test_files:
 - spec/slack-ruby-bot/app_spec.rb
 - spec/slack-ruby-bot/commands/about_spec.rb
+- spec/slack-ruby-bot/commands/commands_precedence_spec.rb
+- spec/slack-ruby-bot/commands/commands_spaces_spec.rb
 - spec/slack-ruby-bot/commands/commands_spec.rb
+- spec/slack-ruby-bot/commands/commands_with_block_spec.rb
 - spec/slack-ruby-bot/commands/empty_text_spec.rb
 - spec/slack-ruby-bot/commands/help_spec.rb
 - spec/slack-ruby-bot/commands/hi_spec.rb
+- spec/slack-ruby-bot/commands/not_implemented_spec.rb
 - spec/slack-ruby-bot/commands/operators_spec.rb
+- spec/slack-ruby-bot/commands/operators_with_block_spec.rb
 - spec/slack-ruby-bot/commands/unknown_spec.rb
 - spec/slack-ruby-bot/rspec/respond_with_error_spec.rb
 - spec/slack-ruby-bot/version_spec.rb