dog-bot 0.1.2 → 0.1.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dog-bot (0.1.0)
+    dog-bot (0.1.2)
       blather (~> 0.8.0)
       google_image_api (~> 0.0.1)
       rufus-scheduler (~> 2.0.17)
@@ -9,29 +9,35 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.8)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    blather (0.8.0)
+    blather (0.8.5)
       activesupport (>= 2.3.11)
-      eventmachine (>= 0.12.6)
+      eventmachine (>= 1.0.0)
       girl_friday
       niceogiri (~> 1.0)
-      nokogiri (~> 1.5.5)
-    connection_pool (0.9.2)
-    eventmachine (0.12.10)
-    girl_friday (0.10.0)
-      connection_pool (~> 0.9.0)
+      nokogiri (~> 1.5, >= 1.5.6)
+    connection_pool (1.1.0)
+    eventmachine (1.0.3)
+    girl_friday (0.11.2)
+      connection_pool (~> 1.0)
+      rubinius-actor
     google_image_api (0.0.1)
     i18n (0.6.1)
-    multi_json (1.3.7)
-    niceogiri (1.0.2)
-      nokogiri (~> 1.4)
-    nokogiri (1.5.5)
+    mini_portile (0.5.0)
+    multi_json (1.7.7)
+    niceogiri (1.1.2)
+      nokogiri (~> 1.5)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     rake (0.9.2.2)
-    rufus-scheduler (2.0.17)
+    rubinius-actor (0.0.2)
+      rubinius-core-api
+    rubinius-core-api (0.0.1)
+    rufus-scheduler (2.0.19)
       tzinfo (>= 0.3.23)
-    tzinfo (0.3.33)
+    tzinfo (1.0.1)
 
 PLATFORMS
   ruby

data/bin/dog-test

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+require "ostruct"
+require "dog"
+require "dog/test_connection"
+
+unless ARGV.count >= 1
+  puts "Usage: dog [CONFIG PATH] [TEST MESSAGE]"
+  exit 1
+end
+
+config_path = ARGV.first
+message = ARGV[1..-1].join(" ")
+
+test_connection = Dog::TestConnection.new
+bot = Dog::Bot.new(test_connection, config_path)
+bot.config
+output = bot.process(message)
+
+if output.nil?
+  puts "no response for '#{message}'"
+else
+  puts output
+end

data/config_examples/default_rooms.rb

@@ -1 +1 @@
-chat_rooms "dog_test", "dog_test2"
+chat_rooms "dog_test", "dog_test2", "test"

data/dog.gemspec

@@ -12,11 +12,10 @@
    gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
    gem.name          = "dog-bot"
    gem.require_paths = ["lib"]
-   gem.version       = "0.1.2"
+   gem.version       = "0.1.3"
 
    gem.add_dependency "blather", "~> 0.8.0"
    gem.add_dependency "google_image_api", "~> 0.0.1"
-   gem.add_dependency "rufus-scheduler", "~> 2.0.17"
 
    gem.add_development_dependency "rake", "~> 0.9.2.2"
  end

data/lib/dog.rb

@@ -1,6 +1,5 @@
 require "rubygems"
 require "blather/client/client"
-require "rufus/scheduler"
 require "uri"
 require "open-uri"
 require "openssl"
@@ -15,4 +14,3 @@ require "dog/bot"
 require "dog/configure"
 require "dog/connection"
 require "dog/command"
-require "dog/scheduler"

data/lib/dog/bot.rb

@@ -1,13 +1,12 @@
 module Dog
   class Bot
-    attr_accessor :memory
+    attr_accessor :memory, :commands
 
     def initialize(connection, config_path)
       @config_path = config_path
       @connection = connection
       @commands = []
       @rooms = []
-      @scheduler = Scheduler.new(self)
       @memory = {}
     end
 
@@ -87,7 +86,6 @@ module Dog
 
       @commands = config.commands
       @tasks = config.scheduled_tasks
-      @scheduler.schedule_tasks(@tasks)
       join(*config.chat_rooms)
     end
 

data/lib/dog/connection.rb

@@ -19,7 +19,7 @@ module Dog
     end
 
     def say(to, text)
-      @client.write Blather::Stanza::Message.new(to, text, :chat)
+      @client.write(Blather::Stanza::Message.new(to, text, :chat))
     end
 
     def say_to_chat(room_name, text)

data/lib/dog/test_connection.rb

@@ -0,0 +1,22 @@
+module Dog
+  class TestConnection
+    attr_reader :joined_rooms, :sent_messages
+
+    def initialize(client=nil)
+      @joined_rooms = []
+      @sent_messages = []
+    end
+
+    def join(room_name)
+      @joined_rooms << room_name
+    end
+
+    def say(to, text)
+      @sent_messages << [to, text]
+    end
+
+    def say_to_chat(to, text)
+      @sent_messages << [to, text]
+    end
+  end
+end

data/spec/dog/bot_spec.rb

@@ -4,37 +4,8 @@ require "minitest/autorun"
 
 require_relative "../../lib/dog/bot"
 require_relative "../../lib/dog/command"
-require_relative "../../lib/dog/scheduler"
 require_relative "../../lib/dog/scheduled_task"
-
-class FakeConnection
-  attr_reader :output, :chat_output, :rooms
-
-  def initialize
-    @output = []
-    @chat_output = []
-    @rooms = []
-  end
-
-  def say from, response
-    @output << [from, response]
-  end
-
-  def say_to_chat from, response
-    @chat_output << [from, response]
-  end
-
-  def join room_name
-    @rooms << room_name
-  end
-
-  def jid
-    OpenStruct.new(
-      :jid => OpenStruct.new(:domain => "example.com"),
-      :node => "dog"
-    )
-  end
-end
+require_relative "../../lib/dog/test_connection"
 
 class Dog::Bot
   def config
@@ -51,7 +22,7 @@ class Dog::Bot
 end
 
 describe Dog::Bot do
-  let(:connection) { FakeConnection.new }
+  let(:connection) { Dog::TestConnection.new }
   subject { Dog::Bot.new(connection, "config") }
 
   before(:each) { subject.config }
@@ -61,19 +32,19 @@ describe Dog::Bot do
       message = OpenStruct.new(:from => "bob", :body => "hi dog")
       subject.process_chat_message(message)
 
-      connection.output.last.must_equal ["bob", "hello"]
+      connection.sent_messages.last.must_equal ["bob", "hello"]
     end
 
     it "doesn't process a non-matching message" do
       message = OpenStruct.new(:from => "bob", :body => "bad string")
       subject.process_chat_message(message)
 
-      connection.output.must_be_empty
+      connection.sent_messages.must_be_empty
     end
   end
 
   describe ".process_group_chat_message" do
-    it "processes a message that matches" do
+    it "processes a group message that matches" do
       message = OpenStruct.new(
         :from => OpenStruct.new(:node => "bob", :domain => "chat"),
         :body => "hi dog",
@@ -81,7 +52,7 @@ describe Dog::Bot do
       )
       subject.process_group_chat_message(message)
 
-      connection.chat_output.last.must_equal ["bob", "hello"]
+      connection.sent_messages.last.must_equal ["bob", "hello"]
     end
 
     it "doesn't process a non-matching message" do
@@ -91,7 +62,7 @@ describe Dog::Bot do
         :delayed? => false
       )
       subject.process_group_chat_message(message)
-      connection.chat_output.must_be_empty
+      connection.sent_messages.must_be_empty
     end
   end
 
@@ -100,7 +71,7 @@ describe Dog::Bot do
       output = subject.respond_to_action("dog join chatroom", :join)
 
       output.must_equal "joined chatroom"
-      connection.rooms.last.must_equal "chatroom"
+      connection.joined_rooms.last.must_equal "chatroom"
     end
 
     it "reloads" do
@@ -117,13 +88,13 @@ describe Dog::Bot do
   describe ".join" do
     it "joins a room" do
       subject.join("my_room")
-      connection.rooms.last.must_equal "my_room"
+      connection.joined_rooms.last.must_equal "my_room"
     end
 
     it "can join many rooms" do
       rooms = ["my_room", "my_other_room"]
       subject.join(*rooms)
-      connection.rooms.must_equal rooms
+      connection.joined_rooms.must_equal rooms
     end
   end
 end

data/spec/dog/test_connection_spec.rb

@@ -0,0 +1,33 @@
+require "ostruct"
+
+require "minitest/spec"
+require "minitest/autorun"
+
+require_relative "../../lib/dog/test_connection"
+
+describe Dog::TestConnection do
+  subject do
+    Dog::TestConnection.new
+  end
+
+  describe ".join" do
+    it "adds the join stanza to a list of joined rooms" do
+      subject.join("my_room")
+      subject.joined_rooms.must_equal ["my_room"]
+    end
+  end
+
+  describe ".say" do
+    it "adds the message to the sent_messages array" do
+      subject.say("bob", "hello world")
+      subject.sent_messages.last.must_equal ["bob", "hello world"]
+    end
+  end
+
+  describe ".say_to_chat" do
+    it "adds the message to the sent_messages array" do
+      subject.say_to_chat("my_chat", "hello chat world")
+      subject.sent_messages.last.must_equal ["my_chat", "hello chat world"]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dog-bot
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blather
-  requirement: &10916520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *10916520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: google_image_api
-  requirement: &10915540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +37,15 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *10915540
-- !ruby/object:Gem::Dependency
-  name: rufus-scheduler
-  requirement: &10915000 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.17
-  type: :runtime
-  prerelease: false
-  version_requirements: *10915000
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10914240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +53,12 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *10914240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 description: Chatbot
 email:
 - ben@bmdev.org
@@ -70,6 +74,7 @@ files:
 - README.md
 - Rakefile
 - bin/dog
+- bin/dog-test
 - config_examples/default_rooms.rb
 - config_examples/dog.rb
 - config_examples/google_image.rb
@@ -85,11 +90,12 @@ files:
 - lib/dog/configure.rb
 - lib/dog/connection.rb
 - lib/dog/scheduled_task.rb
-- lib/dog/scheduler.rb
+- lib/dog/test_connection.rb
 - spec/dog/bot_spec.rb
 - spec/dog/command_spec.rb
 - spec/dog/configure_spec.rb
 - spec/dog/scheduled_task_spec.rb
+- spec/dog/test_connection_spec.rb
 homepage: https://github.com/benmills/dog
 licenses: []
 post_install_message: 
@@ -110,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Extensible XMPP chatbot
@@ -119,3 +125,4 @@ test_files:
 - spec/dog/command_spec.rb
 - spec/dog/configure_spec.rb
 - spec/dog/scheduled_task_spec.rb
+- spec/dog/test_connection_spec.rb

data/lib/dog/scheduler.rb

@@ -1,32 +0,0 @@
-require 'rubygems'
-require 'rufus/scheduler'
-
-module Dog
-  class Scheduler
-    def initialize(bot)
-      @bot = bot
-      @scheduler = Rufus::Scheduler.start_new
-    end
-
-    def schedule_tasks(scheduled_tasks)
-      restart
-
-      scheduled_tasks.each do |task|
-        @scheduler.every(task.frequency) do
-          if response = task.run(@bot)
-            @bot.say_to_all_chat_rooms(response)
-          end
-        end
-      end
-    end
-
-    def restart
-      @scheduler.all_jobs.each do |id, job|
-        job.unschedule
-      end
-
-      @scheduler.stop unless @scheduler.nil?
-      @scheduler = Rufus::Scheduler.start_new
-    end
-  end
-end