dog-bot 0.0.3 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dog-bot (0.0.1)
+    dog-bot (0.1.0)
       blather (~> 0.8.0)
       google_image_api (~> 0.0.1)
       rufus-scheduler (~> 2.0.17)
@@ -24,7 +24,7 @@ GEM
       connection_pool (~> 0.9.0)
     google_image_api (0.0.1)
     i18n (0.6.1)
-    multi_json (1.3.6)
+    multi_json (1.3.7)
     niceogiri (1.0.2)
       nokogiri (~> 1.4)
     nokogiri (1.5.5)

data/dog.gemspec

@@ -12,7 +12,7 @@
    gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
    gem.name          = "dog-bot"
    gem.require_paths = ["lib"]
-   gem.version       = "0.0.3"
+   gem.version       = "0.1.0"
 
    gem.add_dependency "blather", "~> 0.8.0"
    gem.add_dependency "google_image_api", "~> 0.0.1"

data/dog_config_example.rb

@@ -1,8 +1,8 @@
 chat_rooms "dog_test", "dog_test2"
 
-command "get body of tweet" do |c|
-  c.matches /twitter\.com/
-  c.action do |message|
+command "get body of tweet" do
+  matches /twitter\.com/
+  action do |message|
     id = message.split("/").last
     uri = URI.parse "https://api.twitter.com/1/statuses/show.json?id=#{id}"
     tweet = JSON.parse uri.open.read
@@ -11,30 +11,30 @@ command "get body of tweet" do |c|
   end
 end
 
-command "dog" do |c|
-  c.matches "dog"
-  c.action { "bark!" }
+command "dog" do
+  matches "dog"
+  action { "bark!" }
 
-  c.subcommand "xkcd" do |sc|
-    sc.matches "xkcd"
-    sc.action do
+  subcommand "xkcd" do
+    matches "xkcd"
+    action do
       uri = URI.parse "http://xkcd.com/info.0.json"
       comic = JSON.parse uri.open.read
       "#{comic["img"]}\n#{comic["alt"]}"
     end
   end
 
-  c.subcommand "fetch image" do |sc|
-    sc.matches "fetch", "image"
-    sc.action do |message|
+  subcommand "fetch image" do
+    matches "fetch", "image"
+    action do |message|
       query = message.split(" ")[2..-1].join(" ")
       GoogleImageApi.find(query).images.first["url"]
     end
   end
 
-  c.subcommand "ruby gems" do |sc|
-    sc.matches "gem"
-    sc.action do |message|
+  subcommand "ruby gems" do
+    matches "gem"
+    action do |message|
       begin
         gem_name = message.split(" ").last
         uri = URI.parse "http://rubygems.org/api/v1/gems/#{gem_name}.json"
@@ -47,13 +47,13 @@ command "dog" do |c|
     end
   end
 
-  c.subcommand "join channel" do |sc|
-    sc.matches "join"
-    sc.action { :join }
+  subcommand "join channel" do
+    matches "join"
+    action { :join }
   end
 
-  c.subcommand "reload config" do |sc|
-    sc.matches "reload"
-    sc.action { :reload }
+  subcommand "reload config" do
+    matches "reload"
+    action { :reload }
   end
 end

data/lib/dog/command.rb

@@ -25,9 +25,9 @@ module Dog
       end
     end
 
-    def subcommand title
+    def subcommand title, &block
       subcommand = Command.new title
-      yield subcommand
+      subcommand.instance_eval &block
       @subcommands << subcommand
     end
 

data/lib/dog/configure.rb

@@ -17,9 +17,9 @@ module Dog
       @chat_rooms = []
     end
 
-    def command title
+    def command title, &block
       command = Command.new title
-      yield command
+      command.instance_eval &block
       @commands << command
     end
 

data/spec/dog/bot_spec.rb

@@ -3,6 +3,7 @@ require "minitest/spec"
 require "minitest/autorun"
 
 require_relative "../../lib/dog/bot"
+require_relative "../../lib/dog/brain"
 require_relative "../../lib/dog/command"
 
 class FakeConnection

data/spec/dog/configure_spec.rb

@@ -5,13 +5,13 @@ require_relative "../../lib/dog/configure.rb"
 describe Dog::Configure do
   let :config_string do
 <<CONFIG
-command "greet" do |c|
-  c.matches "hello", "hi", "whats up"
-  c.action { "hello!" }
+command "greet" do
+  matches "hello", "hi", "whats up"
+  action { "hello!" }
 
-  c.subcommand "cool greet" do |subcommand|
-    subcommand.matches "yo"
-    subcommand.action { "yo yo yo, hello!" }
+  subcommand "cool greet" do
+    matches "yo"
+    action { "yo yo yo, hello!" }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dog-bot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blather
-  requirement: &12497640 !ruby/object:Gem::Requirement
+  requirement: &11215480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *12497640
+  version_requirements: *11215480
 - !ruby/object:Gem::Dependency
   name: google_image_api
-  requirement: &12496820 !ruby/object:Gem::Requirement
+  requirement: &11214640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *12496820
+  version_requirements: *11214640
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &12496160 !ruby/object:Gem::Requirement
+  requirement: &11212500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.17
   type: :runtime
   prerelease: false
-  version_requirements: *12496160
+  version_requirements: *11212500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12495680 !ruby/object:Gem::Requirement
+  requirement: &11211640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *12495680
+  version_requirements: *11211640
 description: Chatbot
 email:
 - ben@bmdev.org