bitbckt-botbckt 0.4.3 → 0.5.0

data/Rakefile

@@ -20,8 +20,6 @@ begin
     g.add_dependency('activesupport')
     g.add_dependency('json', '>= 1.1.2')
     g.add_dependency('hpricot', '>= 0.6')
-    g.add_dependency('em-redis', '>= 0.1.1')
-    g.add_dependency('em-http', '>= 0.1.6')
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 3
+:patch: 1
 :major: 0
 :minor: 4

data/lib/botbckt.rb

@@ -1,23 +1,3 @@
-%w{ rubygems eventmachine activesupport ostruct json cgi hpricot singleton optparse em-redis em-http }.each { |lib| require lib }
+%w{ rubygems eventmachine activesupport ostruct json open-uri cgi hpricot singleton optparse }.each { |lib| require lib }
 %w{ irc store bot utilities command cmd }.each { |lib| require File.dirname(__FILE__) + "/botbckt/#{ lib }" }
 Dir[File.dirname(__FILE__) + '/botbckt/commands/*'].each { |lib| require lib }
-
-module Kernel
-  private
-  alias open_uri_original_open open
-
-  def open(name, *rest, &block) #:nodoc:
-    if name.respond_to?(:open)
-      name.open(*rest, &block)
-    elsif name.respond_to?(:to_str) &&
-          %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ name
-      uri     = URI.parse(name)
-      http    = EventMachine::HttpRequest.new("#{uri.scheme}://#{uri.host}#{uri.path}").get :query => uri.query
-      http.callback { |request| yield request.response }
-    else
-      open_uri_original_open(name, *rest, &block)
-    end
-  end
-  module_function :open
-
-end

data/lib/botbckt/bot.rb

@@ -6,8 +6,8 @@ module Botbckt #:nodoc:
     include Singleton
     include ActiveSupport::BufferedLogger::Severity
     
-    AFFIRMATIVE = ["'Sea, mhuise.", "In Ordnung", "Ik begrijp het", "Alles klar", "Ok.", "Roger.", "You don't have to tell me twice.", "Ack. Ack.", "C'est bon!"]
-    NEGATIVE    = ["Titim gan éirí ort.", "Gabh mo leithscéal?", "No entiendo", "excusez-moi", "Excuse me?", "Huh?", "I don't understand.", "Pardon?", "It's greek to me.", "Wat zeg je me nou?"]
+    AFFIRMATIVE = ["'Sea, mhuise.", "In Ordnung", "Ik begrijp", "Alles klar", "Ok.", "Roger.", "You don't have to tell me twice.", "Ack. Ack.", "C'est bon!"]
+    NEGATIVE    = ["Titim gan éirí ort.", "Gabh mo leithscéal?", "No entiendo", "excusez-moi", "Excuse me?", "Huh?", "I don't understand.", "Pardon?", "It's greek to me."]
 
     attr_accessor :logger
     attr_accessor :store
@@ -35,7 +35,7 @@ module Botbckt #:nodoc:
 
       if daemonize || daemonize.nil?
         EventMachine::fork_reactor do
-          start! options
+          start!
           
           if pid
             File.open(pid, 'w') { |file| file.write("#{Process.pid}") }
@@ -44,7 +44,7 @@ module Botbckt #:nodoc:
           
         end
       else
-        EventMachine::run { start! options }
+        EventMachine::run { start! }
       end
     end
     

data/lib/botbckt/commands/gooble.rb

@@ -89,9 +89,8 @@ module Botbckt #:nodoc:
       languages << LANGUAGES.values.sort_by{ rand }.slice(0...TRANSLATE_ATTEMPTS)
       languages << MAIN_LANGUAGE # always end with main 
       
-      gooble(text, languages.flatten) do |result|
-        say result, channel
-      end
+      result = gooble(text, languages.flatten)
+      say result, channel
     end
   
     private
@@ -99,16 +98,15 @@ module Botbckt #:nodoc:
     # args
     # text<String>: text to translate
     # langs<Array>: languages to translate from/to
-    def self.gooble(text, languages, &block) #:nodoc:
+    def self.gooble(text, languages) #:nodoc:
       if languages.length >= 2
         pair     = "#{languages[0]}|#{languages[1]}"
-        open("http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q=#{CGI.escape(text)}&langpair=#{CGI.escape(pair)}") do |json|
-          response = JSON.parse(json) # could check for failed response with response['responseStatus'] != 200 
-          languages.shift
-          gooble(response['responseData']['translatedText'], languages)
-        end
+        json     = open("http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q=#{CGI.escape(text)}&langpair=#{CGI.escape(pair)}")
+        response = JSON.parse(json.read) # could check for failed response with response['responseStatus'] != 200 
+        languages.shift
+        gooble(response['responseData']['translatedText'], languages)
       else
-        yield text
+        text
       end
     end
 

data/lib/botbckt/commands/google.rb

@@ -14,24 +14,22 @@ module Botbckt #:nodoc:
     trigger :google
     
     def call(sender, channel, query)
-      google(query) do |result|
-        say "First out of #{result.first} results:", channel
-        say result.last['titleNoFormatting'], channel
-        say result.last['unescapedUrl'], channel
-      end
+      result = google(query)
+      say "First out of #{result.first} results:", channel
+      say result.last['titleNoFormatting'], channel
+      say result.last['unescapedUrl'], channel
     end
   
     private
   
-    def google(term, &block) #:nodoc:
-      open("http://ajax.googleapis.com/ajax/services/search/web?v=1.0&q=#{CGI.escape(term)}") do |json|
-        response = JSON.parse(json)
+    def google(term) #:nodoc:
+      json     = open("http://ajax.googleapis.com/ajax/services/search/web?v=1.0&q=#{CGI.escape(term)}")
+      response = JSON.parse(json.read)
 
-        yield [
-          response['responseData']['cursor']['estimatedResultCount'],
-          response['responseData']['results'].first
-        ]
-      end
+      [
+        response['responseData']['cursor']['estimatedResultCount'],
+        response['responseData']['results'].first
+      ]
     end
 
   end

data/lib/botbckt/commands/meme.rb

@@ -10,17 +10,13 @@ module Botbckt #:nodoc:
     trigger :meme
 
     def call(sender, channel, *args)
-      meme do |msg|
-        say msg, channel
-      end
+      say meme, channel
     end
    
    private
    
-   def meme(&block) #:nodoc:
-     open("http://meme.boxofjunk.ws/moar.txt?lines=1") do |response|
-       yield response.chomp
-     end
+   def meme #:nodoc:
+     open("http://meme.boxofjunk.ws/moar.txt?lines=1").read.chomp
    end
     
   end

data/lib/botbckt/commands/ticker.rb

@@ -12,9 +12,7 @@ module Botbckt #:nodoc:
     
     def call(sender, channel, symbol)
       begin
-        stock_price(symbol.split(' ').first) do |ticker|
-          say ticker, channel
-        end
+        say stock_price(symbol.split(' ').first), channel
       # TODO: Log me.
       rescue OpenURI::HTTPError => e
         say Botbckt::Bot.befuddled, channel
@@ -23,14 +21,13 @@ module Botbckt #:nodoc:
     
     private
     
-    def stock_price(symbol, &block) #:nodoc:
-      open("http://www.google.com/finance/info?q=#{CGI.escape(symbol)}") do |json|
-        response = JSON.parse(json[4..-1]).first
+    def stock_price(symbol) #:nodoc:
+      json     = open("http://www.google.com/finance/info?q=#{CGI.escape(symbol)}")
+      response = JSON.parse(json.read[4..-1]).first
       
-        ticker, price, change = response['t'], response['l'], response['c']
+      ticker, price, change = response['t'], response['l'], response['c']
       
-        yield "#{ticker} - $#{price} (#{change})"
-      end
+      "#{ticker} - $#{price} (#{change})"
     end
   end
   

data/lib/botbckt/commands/weather.rb

@@ -13,9 +13,7 @@ module Botbckt #:nodoc:
     
     trigger :forecast do |sender, channel, query|
       begin
-        forecast(query) do |msg|
-          say msg, channel
-        end
+        say forecast(query), channel
       # TODO: Log me.
       rescue OpenURI::HTTPError => e
         say Botbckt::Bot.befuddled, channel
@@ -24,9 +22,7 @@ module Botbckt #:nodoc:
     
     trigger :conditions do |sender, channel, query|
       begin
-        conditions(query) do |msg|
-          say msg, channel
-        end
+        say conditions(query), channel
       # TODO: Log me.
       rescue OpenURI::HTTPError => e
         say Botbckt::Bot.befuddled, channel
@@ -35,28 +31,23 @@ module Botbckt #:nodoc:
     
     private
     
-    def self.conditions(query, &block) #:nodoc:
-      search(query) do |response|
-        xml     = (response/'txt_forecast')
-        daytime = (xml/'forecastday[1]')
-        evening = (xml/'forecastday[2]')
+    def self.conditions(query) #:nodoc:
+      xml     = (search(query)/'txt_forecast')
+      daytime = (xml/'forecastday[1]')
+      evening = (xml/'forecastday[2]')
       
-        yield "Today: #{(daytime/'fcttext').inner_html}\nTonight: #{(evening/'fcttext').inner_html}"
-      end
+      "Today: #{(daytime/'fcttext').inner_html}\nTonight: #{(evening/'fcttext').inner_html}"
     end
     
-    def self.forecast(query, &block) #:nodoc:
-      search(query) do |response|
-        xml = (response/'simpleforecast/forecastday[1]')
+    def self.forecast(query) #:nodoc:
+      xml = (search(query)/'simpleforecast/forecastday[1]')
       
-        yield "Today's Forecast: #{(xml/'high/fahrenheit').inner_html}F/#{(xml/'low/fahrenheit').inner_html}F (#{(xml/'conditions').inner_html})"
-      end
+      "Today's Forecast: #{(xml/'high/fahrenheit').inner_html}F/#{(xml/'low/fahrenheit').inner_html}F (#{(xml/'conditions').inner_html})"
     end
     
-    def self.search(query, &block) #:nodoc:
-      open("http://api.wunderground.com/auto/wui/geo/ForecastXML/index.xml?query=#{CGI.escape(query)}") do |xml|
-        yield Hpricot.XML(xml)
-      end
+    def self.search(query) #:nodoc:
+      xml = open("http://api.wunderground.com/auto/wui/geo/ForecastXML/index.xml?query=#{CGI.escape(query)}")
+      Hpricot.XML(xml)
     end
     
   end

data/lib/botbckt/store.rb

@@ -1,3 +1,5 @@
+require 'em-redis'
+
 module Botbckt #:nodoc:
   
   # Implements a basic key/value store API for cross-session state storage.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bitbckt-botbckt
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors: 
 - Brandon Mitchell
@@ -52,26 +52,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.6"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: em-redis
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: em-http
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.6
-    version: 
 description: Boredom strikes on Sunday mornings.
 email: brandon@systemisdown.net
 executables: 
@@ -82,12 +62,9 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- .gitignore
-- README
 - Rakefile
 - VERSION.yml
 - bin/botbckt
-- botbckt.gemspec
 - lib/botbckt.rb
 - lib/botbckt/bot.rb
 - lib/botbckt/cmd.rb
@@ -104,6 +81,7 @@ files:
 - lib/botbckt/irc.rb
 - lib/botbckt/store.rb
 - lib/botbckt/utilities.rb
+- README
 has_rdoc: true
 homepage: http://github.com/bitbckt/botbckt
 post_install_message: 
@@ -128,7 +106,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Boredom strikes on Sunday mornings.
 test_files: []
 

data/.gitignore

@@ -1 +0,0 @@
-doc

data/botbckt.gemspec

@@ -1,74 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{botbckt}
-  s.version = "0.4.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Brandon Mitchell"]
-  s.date = %q{2009-06-24}
-  s.description = %q{Boredom strikes on Sunday mornings.}
-  s.email = %q{brandon@systemisdown.net}
-  s.executables = ["botbckt", "botbckt"]
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    ".gitignore",
-     "README",
-     "Rakefile",
-     "VERSION.yml",
-     "bin/botbckt",
-     "botbckt.gemspec",
-     "lib/botbckt.rb",
-     "lib/botbckt/bot.rb",
-     "lib/botbckt/cmd.rb",
-     "lib/botbckt/command.rb",
-     "lib/botbckt/commands/gooble.rb",
-     "lib/botbckt/commands/google.rb",
-     "lib/botbckt/commands/meme.rb",
-     "lib/botbckt/commands/ping.rb",
-     "lib/botbckt/commands/remind.rb",
-     "lib/botbckt/commands/snack.rb",
-     "lib/botbckt/commands/star_jar.rb",
-     "lib/botbckt/commands/ticker.rb",
-     "lib/botbckt/commands/weather.rb",
-     "lib/botbckt/irc.rb",
-     "lib/botbckt/store.rb",
-     "lib/botbckt/utilities.rb"
-  ]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/bitbckt/botbckt}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Boredom strikes on Sunday mornings.}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 1.1.2"])
-      s.add_runtime_dependency(%q<hpricot>, [">= 0.6"])
-      s.add_runtime_dependency(%q<em-redis>, [">= 0.1.1"])
-      s.add_runtime_dependency(%q<em-http>, [">= 0.1.6"])
-    else
-      s.add_dependency(%q<eventmachine>, [">= 0.12.0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 1.1.2"])
-      s.add_dependency(%q<hpricot>, [">= 0.6"])
-      s.add_dependency(%q<em-redis>, [">= 0.1.1"])
-      s.add_dependency(%q<em-http>, [">= 0.1.6"])
-    end
-  else
-    s.add_dependency(%q<eventmachine>, [">= 0.12.0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 1.1.2"])
-    s.add_dependency(%q<hpricot>, [">= 0.6"])
-    s.add_dependency(%q<em-redis>, [">= 0.1.1"])
-    s.add_dependency(%q<em-http>, [">= 0.1.6"])
-  end
-end