hipbot 0.2.0 → 1.0.0.rc1

data/spec/integration/my_hipbot.rb

@@ -0,0 +1,104 @@
+module HipbotHelpers
+  def project_name
+    "Project: #{room.name}"
+  end
+
+  def sender_first_name
+    "you are #{message.sender.split[0]}"
+  end
+end
+
+class AwesomePlugin
+  include Hipbot::Plugin
+
+  desc 'respond awesome - responds with awesome'
+  on /respond awesome/ do
+    reply('awesome responded')
+  end
+end
+
+class CoolPlugin
+  include Hipbot::Plugin
+
+  desc 'respond cool - responds with cool'
+  on /respond cool/ do
+    reply('cool responded')
+  end
+end
+
+class MyHipbot < Hipbot::Bot
+  configure do |config|
+    config.jid     = 'robbot@chat.hipchat.com'
+    config.helpers = HipbotHelpers
+    config.plugins = [CoolPlugin.instance, AwesomePlugin.instance]
+    config.teams   = { vip: ['John Doe', 'Jane Doe'] }
+    config.rooms   = { project_rooms: ['Project 1', 'Project 2'] }
+  end
+
+  default from: 'Other Guy' do
+    reply('What do you mean, Other Guy?')
+  end
+
+  default do
+    reply("I didn't understand you")
+  end
+
+  desc 'greets the user'
+  on /^hello hipbot!$/ do
+    reply('hello!')
+  end
+
+  desc 'he already knows that'
+  on /you're (.*), robot/ do |adj|
+    reply("I know I'm #{adj}")
+  end
+
+  desc 'says hello'
+  on /hi everyone!/, global: true do
+    reply('hello!')
+  end
+
+  desc 'returns project name'
+  on /tell me the project name/ do
+    reply(project_name)
+  end
+
+  desc 'returns sender\'s name'
+  on /tell me my name/ do
+    reply("you are #{sender.first_name}")
+  end
+
+  scope from: 'John Doe' do
+    desc 'does John thing'
+    on /John Doe thing/ do
+      reply('doing John Doe thing')
+    end
+
+    scope room: 'Project 1' do
+      desc 'does John project thing'
+      on /John Doe project thing/ do
+        reply('doing John Doe project thing')
+      end
+    end
+  end
+
+  desc 'deploys project'
+  on /deploy/, room: :project_rooms do
+    reply('deploying')
+  end
+
+  desc 'restarts server'
+  on /restart/, from: :vip do
+    reply('restarting')
+  end
+
+  desc 'does room thing'
+  on /room thing/, room: true do
+    reply('doing room thing')
+  end
+
+  desc 'does private thing'
+  on /private thing/, room: false do
+    reply('doing private thing')
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
 require_relative '../lib/hipbot'
 
+require 'coveralls'
+Coveralls.wear!
+
 RSpec.configure do |config|
   config.mock_with :mocha
 end
-
-Hipbot.logger.level = Logger::FATAL

data/spec/unit/hipbot_spec.rb

@@ -2,14 +2,19 @@ require 'spec_helper'
 
 describe "a class that inherits", Hipbot::Bot do
   let(:described_class) { Class.new(Hipbot::Bot) }
+
+  before(:each) do
+    described_class.instance.plugins.clear
+    described_class.instance.setup
+  end
   subject { described_class.instance }
 
   context "#on" do
-    let(:sender) { stub_everything(name: 'Tom Smith') }
+    let(:sender) { stub_everything(name: 'Tom Smith', reactions: []) }
     let(:room)   { stub_everything }
 
     it "should reply to no arguments" do
-      subject.on /^hello there$/ do
+      described_class.on /^hello there$/ do
         reply('hi!')
       end
       subject.expects(:send_to_room).with(room, 'hi!')
@@ -17,7 +22,7 @@ describe "a class that inherits", Hipbot::Bot do
     end
 
     it "should reply with one argument" do
-      subject.on /^you are (.*), robot$/ do |adj|
+      described_class.on /^you are (.*), robot$/ do |adj|
         reply("i know i'm #{adj}!")
       end
       subject.expects(:send_to_room).with(room, "i know i'm cool!")
@@ -25,7 +30,7 @@ describe "a class that inherits", Hipbot::Bot do
     end
 
     it "should reply with multiple arguments" do
-      subject.on /^send "(.*)" to (.*@.*)$/ do |message, recipient|
+      described_class.on /^send "(.*)" to (.*@.*)$/ do |message, recipient|
         reply("sent \"#{message}\" to #{recipient}")
       end
       subject.expects(:send_to_room).with(room, 'sent "hello!" to robot@robots.org')
@@ -41,15 +46,15 @@ describe "a class that inherits", Hipbot::Bot do
     end
 
     it "should choose first option when multiple options match" do
-      subject.on /hello there/ do reply('hello there') end
-      subject.on /hello (.*)/ do reply('hello') end
+      described_class.on /hello there/ do reply('hello there') end
+      described_class.on /hello (.*)/ do reply('hello') end
       subject.expects(:send_to_room).with(room, 'hello there')
       subject.react(sender, room, '@robot hello there')
     end
 
     context "multiple regexps" do
       before do
-        subject.on /hello (.*)/, /good morning (.*)/, /guten tag (.*)/ do |name|
+        described_class.on /hello (.*)/, /good morning (.*)/, /guten tag (.*)/ do |name|
           reply("hello #{name}")
         end
       end
@@ -72,7 +77,7 @@ describe "a class that inherits", Hipbot::Bot do
 
     context "global messages" do
       it "should reply if callback is global" do
-        subject.on /^you are (.*)$/, global: true do |adj|
+        described_class.on /^you are (.*)$/, global: true do |adj|
           reply("i know i'm #{adj}!")
         end
         subject.expects(:send_to_room).with(room, "i know i'm cool!")
@@ -80,7 +85,7 @@ describe "a class that inherits", Hipbot::Bot do
       end
 
       it "should not reply if callback not global" do
-        subject.on /^you are (.*)$/ do |adj|
+        described_class.on /^you are (.*)$/ do |adj|
           reply("i know i'm #{adj}!")
         end
         subject.expects(:send_to_room).never
@@ -89,30 +94,34 @@ describe "a class that inherits", Hipbot::Bot do
     end
 
     context "messages from particular sender" do
-      let(:other_user) { stub(name: "John") }
+      let(:other_user) { stub(name: "John", reactions: []) }
+
       it "should reply" do
-        subject.on /wazzup\?/, from: sender.name do
+        described_class.on /wazzup\?/, from: sender.name do
           reply('Wazzup, Tom?')
         end
         subject.expects(:send_to_room).with(room, 'Wazzup, Tom?')
         subject.react(sender, room, '@robot wazzup?')
       end
+
       it "should reply if sender acceptable" do
-        subject.on /wazzup\?/, from: [stub, sender.name] do
+        described_class.on /wazzup\?/, from: [stub, sender.name] do
           reply('wazzup, tom?')
         end
         subject.expects(:send_to_room).with(room, 'wazzup, tom?')
         subject.react(sender, room, '@robot wazzup?')
       end
+
       it "should not reply if sender unacceptable" do
-        subject.on /wazzup\?/, from: sender.name do
+        described_class.on /wazzup\?/, from: sender.name do
           reply('wazzup, tom?')
         end
         subject.expects(:send_to_room).never
         subject.react(other_user, room, '@robot wazzup?')
       end
+
       it "should not reply if sender does not match" do
-        subject.on /wazzup\?/, from: [sender.name] do
+        described_class.on /wazzup\?/, from: [sender.name] do
           reply('wazzup, tom?')
         end
         subject.expects(:send_to_room).never
@@ -123,29 +132,33 @@ describe "a class that inherits", Hipbot::Bot do
     context "messages in particular room" do
       let(:room)       { stub(:name => 'room') }
       let(:other_room) { stub(:name => 'other_room') }
+
       it "should reply" do
-        subject.on /wazzup\?/, room: 'room' do
+        described_class.on /wazzup\?/, room: 'room' do
           reply('Wazzup, Tom?')
         end
         subject.expects(:send_to_room).with(room, 'Wazzup, Tom?')
         subject.react(sender, room, '@robot wazzup?')
       end
+
       it "should reply if room acceptable" do
-        subject.on /wazzup\?/, room: ['other_room', 'room'] do
+        described_class.on /wazzup\?/, room: ['other_room', 'room'] do
           reply('wazzup, tom?')
         end
         subject.expects(:send_to_room).with(room, 'wazzup, tom?')
         subject.react(sender, room, '@robot wazzup?')
       end
+
       it "should not reply if room unacceptable" do
-        subject.on /wazzup\?/, room: 'room' do
+        described_class.on /wazzup\?/, room: 'room' do
           reply('wazzup, tom?')
         end
         subject.expects(:send_to_room).never
         subject.react(sender, other_room, '@robot wazzup?')
       end
+
       it "should not reply if room does not match" do
-        subject.on /wazzup\?/, room: ['other_room'] do
+        described_class.on /wazzup\?/, room: ['other_room'] do
           reply('wazzup, tom?')
         end
         subject.expects(:send_to_room).never
@@ -154,10 +167,10 @@ describe "a class that inherits", Hipbot::Bot do
     end
 
     context "response helper" do
-      let(:user){ stub(name: 'Tom Smith', first_name: 'Tom') }
+      let(:user){ stub(name: 'Tom Smith', first_name: 'Tom', reactions: []) }
 
       it "message" do
-        subject.on /.*/ do
+        described_class.on /.*/ do
           reply("you said: #{message.body}")
         end
         subject.expects(:send_to_room).with(room, "you said: hello")
@@ -165,7 +178,7 @@ describe "a class that inherits", Hipbot::Bot do
       end
 
       it "sender" do
-        subject.on /.*/ do
+        described_class.on /.*/ do
           reply("you are: #{sender.name}")
         end
         subject.expects(:send_to_room).with(room, "you are: Tom Smith")
@@ -173,7 +186,7 @@ describe "a class that inherits", Hipbot::Bot do
       end
 
       it "recipients" do
-        subject.on /.*/ do
+        described_class.on /.*/ do
           reply("recipients: #{message.recipients.join(', ')}")
         end
         subject.expects(:send_to_room).with(room, "recipients: robot, dave")
@@ -181,7 +194,7 @@ describe "a class that inherits", Hipbot::Bot do
       end
 
       it "sender name" do
-        subject.on /.*/ do
+        described_class.on /.*/ do
           reply(message.sender.first_name)
         end
         subject.expects(:send_to_room).with(room, 'Tom')
@@ -189,7 +202,7 @@ describe "a class that inherits", Hipbot::Bot do
       end
 
       it "mentions" do
-        subject.on /.*/ do
+        described_class.on /.*/ do
           reply(message.mentions.join(' '))
         end
         subject.expects(:send_to_room).with(room, 'dave rachel')
@@ -198,8 +211,10 @@ describe "a class that inherits", Hipbot::Bot do
     end
 
     context "plugins" do
-      let(:plugin) {
-        Class.new(Hipbot::Plugin) do
+      let!(:plugin) {
+        Class.new do
+          include Hipbot::Plugin
+
           on /plugin respond/ do
             reply("plugin ack")
           end
@@ -218,10 +233,6 @@ describe "a class that inherits", Hipbot::Bot do
         end
       }
 
-      before do
-        subject.configuration.plugins = [ plugin ]
-      end
-
       it "should respond to reaction defined in plugin" do
         subject.expects(:send_to_room).with(room, 'plugin ack')
         subject.react(sender, room, '@robot plugin respond')
@@ -232,15 +243,15 @@ describe "a class that inherits", Hipbot::Bot do
         subject.react(sender, room, '@robot blahblah')
       end
 
-      it "should respond to default defined in bot even if plugins define defaults" do
+      it "shouldn't respond to default defined in bot if plugins define own defaults" do
         described_class.default do
-          reply("bot default")
+          reply('bot default')
         end
-        subject.expects(:send_to_room).with(room, 'bot default')
+        subject.expects(:send_to_room).with(room, 'plugin default')
         subject.react(sender, room, '@robot blahblah')
       end
 
-      it "should have access to #plugin inside reaction" do
+      it 'should have access to #plugin inside reaction' do
         subject.expects(:send_to_room).with(room, 'some method')
         subject.react(sender, room, '@robot plugin method')
       end

data/spec/unit/message_spec.rb

@@ -3,57 +3,56 @@ require 'spec_helper'
 describe Hipbot::Message do
   subject { Hipbot::Message }
   let(:sender) { stub }
+  let(:room) { stub }
+  before(:all) do
+    Hipbot.bot = Hipbot::Bot.instance
+  end
 
   it "should have a body" do
-    message = subject.new('this is a message', sender)
+    message = subject.new('this is a message', room, sender)
     message.body.should == 'this is a message'
   end
 
   it "should have a sender" do
-    message = subject.new('this is a message', sender)
+    message = subject.new('this is a message', room, sender)
     message.sender.should == sender
   end
 
   it "should have no recipients" do
-    message = subject.new('this is a message', sender)
+    message = subject.new('this is a message', room, sender)
     message.recipients.should be_empty
   end
 
   it "should have one recipient" do
-    message = subject.new('this is a message for @tom', sender)
+    message = subject.new('this is a message for @tom', room, sender)
     message.recipients.should include('tom')
   end
 
-  it "should have one long recipient" do
-    message = subject.new('message for @"tom jones", deal with it', sender)
-    message.recipients.should include('tom jones')
-  end
-
   it "should have two recipients" do
-    message = subject.new('@dave, this is a message for @tom', sender)
+    message = subject.new('@dave, this is a message for @tom', room, sender)
     message.recipients.should include('tom')
     message.recipients.should include('dave')
   end
 
   it "should strip primary recipient from message" do
-    message = subject.new('@dave this is a message for @tom', sender)
+    message = subject.new('@dave this is a message for @tom', room, sender)
     message.body.should == 'this is a message for @tom'
   end
 
   it "should strip primary recipient from message with commma" do
-    message = subject.new('@dave, this is a message for @tom', sender)
+    message = subject.new('@dave, this is a message for @tom', room, sender)
     message.body.should == 'this is a message for @tom'
   end
 
   it "should be for bot" do
-    bot = stub(:to_s => 'robot')
-    message = subject.new('hello @robot!', sender)
-    message.for?(bot).should be_true
+    user = stub(:mention => 'robot')
+    message = subject.new('hello @robot!', room, sender)
+    message.for?(user).should be_true
   end
 
   it "should not be for bot" do
-    bot = stub(:to_s => 'robot')
-    message = subject.new('hello @tom!', sender)
-    message.for?(bot).should be_false
+    user = stub(:mention => 'robot')
+    message = subject.new('hello @tom!', room, sender)
+    message.for?(user).should be_false
   end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: hipbot
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 1.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
+- Bartosz Kopiński
 - Tomasz Pewiński
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -157,6 +158,7 @@ dependencies:
         version: 0.13.3
 description: Hipbot is a bot for HipChat, written in ruby & eventmachine.
 email:
+- bartosz.kopinski@netguru.pl
 - pewniak747@gmail.com
 executables:
 - hipbot
@@ -186,6 +188,7 @@ files:
 - lib/hipbot/configuration.rb
 - lib/hipbot/helpers.rb
 - lib/hipbot/logger.rb
+- lib/hipbot/match.rb
 - lib/hipbot/message.rb
 - lib/hipbot/patches/encoding.rb
 - lib/hipbot/patches/hipchat_client.rb
@@ -197,6 +200,7 @@ files:
 - lib/hipbot/user.rb
 - lib/hipbot/version.rb
 - spec/integration/hipbot_spec.rb
+- spec/integration/my_hipbot.rb
 - spec/spec_helper.rb
 - spec/unit/hipbot_spec.rb
 - spec/unit/message_spec.rb
@@ -215,9 +219,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -226,6 +230,7 @@ specification_version: 3
 summary: Hipbot is a bot for HipChat, written in ruby & eventmachine.
 test_files:
 - spec/integration/hipbot_spec.rb
+- spec/integration/my_hipbot.rb
 - spec/spec_helper.rb
 - spec/unit/hipbot_spec.rb
 - spec/unit/message_spec.rb