twibot 0.1.5 → 0.1.6

data/History.txt

@@ -1,3 +1,8 @@
+== 0.1.6 / 2009-04-13
+
+* Fixed configure block not actually working for username and password (Bodaniel Jeanes)
+* Minor updates in tests
+
 == 0.1.5 / 2009-04-12
 
 * Added support for regular expression routes

data/Rakefile

@@ -21,7 +21,7 @@ task :default => 'test:run'
 PROJ.name = 'twibot'
 PROJ.authors = 'Christian Johansen'
 PROJ.email = 'christian@cjohansen.no'
-PROJ.url = 'http://github.com/cjohansen/twibot/'
+PROJ.url = 'http://github.com/bjeanes/twibot/'
 PROJ.version = Twibot::VERSION
 PROJ.rubyforge.name = 'twibot'
 PROJ.readme_file = 'Readme.rdoc'

data/Readme.rdoc

@@ -148,6 +148,7 @@ reaches max_interval, where it will stay until Twibot finds anything.
 * Ben Vandgrift (Twitter downtime error handling) - http://neovore.com/
 * Jens Ohlig (warnings)
 * Wilco van Duinkerken (bug fixes) - http://www.sparkboxx.com/
+* Bodaniel Jeanes (configure block fix) - http://bjeanes.github.com/
 
 == License
 

data/lib/twibot/bot.rb

@@ -15,21 +15,26 @@ module Twibot
       @prompt = prompt
       @conf = nil
       @config = options || Twibot::Config.default << Twibot::FileConfig.new << Twibot::CliConfig.new
-      @twitter = Twitter::Client.new :login => config[:login], :password => config[:password]
       @log = nil
       @abort = false
+    rescue Exception => krash
+      raise SystemExit.new(krash.message)
+    end
 
-      @processed = {
+    def prompt?
+      @prompt
+    end
+
+    def processed
+      @processed ||= {
         :message => nil,
         :reply => nil,
         :tweet => nil
       }
-    rescue Exception => krash
-      raise SystemExit.new(krash.message)
     end
 
-    def prompt?
-      @prompt
+    def twitter
+      @twitter ||= Twitter::Client.new :login => config[:login], :password => config[:password]
     end
 
     #
@@ -44,21 +49,21 @@ module Twibot
       end
 
       # Make sure we don't process messages and tweets received prior to bot launch
-      messages = @twitter.messages(:received, { :count => 1 })
-      @processed[:message] = messages.first.id if messages.length > 0
+      messages = twitter.messages(:received, { :count => 1 })
+      processed[:message] = messages.first.id if messages.length > 0
 
       handle_tweets = !@handlers.nil? && @handlers[:tweet].length + @handlers[:reply].length > 0
       tweets = []
 
       begin
-        tweets = handle_tweets ? @twitter.timeline_for(@config.to_hash[:timeline_for], { :count => 1 }) : []
+        tweets = handle_tweets ? twitter.timeline_for(config[:timeline_for], { :count => 1 }) : []
       rescue Twitter::RESTError => e
         log.error("Failed to connect to Twitter.  It's likely down for a bit:")
         log.error(e.to_s)
       end
 
-      @processed[:tweet] = tweets.first.id if tweets.length > 0
-      @processed[:reply] = tweets.first.id if tweets.length > 0
+      processed[:tweet] = tweets.first.id if tweets.length > 0
+      processed[:reply] = tweets.first.id if tweets.length > 0
 
       poll
     end
@@ -91,9 +96,9 @@ module Twibot
       type = :message
       return false unless handlers[type].length > 0
       options = {}
-      options[:since_id] = @processed[type] if @processed[type]
+      options[:since_id] = processed[type] if processed[type]
       begin
-        dispatch_messages(type, @twitter.messages(:received, options), %w{message messages})
+        dispatch_messages(type, twitter.messages(:received, options), %w{message messages})
       rescue Twitter::RESTError => e
         log.error("Failed to connect to Twitter.  It's likely down for a bit:")
         log.error(e.to_s)
@@ -108,9 +113,9 @@ module Twibot
       type = :tweet
       return false unless handlers[type].length > 0
       options = {}
-      options[:since_id] = @processed[type] if @processed[type]
+      options[:since_id] = processed[type] if processed[type]
       begin
-        dispatch_messages(type, @twitter.timeline_for(@config.to_hash[:timeline_for], options), %w{tweet tweets})
+        dispatch_messages(type, twitter.timeline_for(config.to_hash[:timeline_for] || :public, options), %w{tweet tweets})
       rescue Twitter::RESTError => e
         log.error("Failed to connect to Twitter.  It's likely down for a bit:")
         log.error(e.to_s)
@@ -125,9 +130,9 @@ module Twibot
       type = :reply
       return false unless handlers[type].length > 0
       options = {}
-      options[:since_id] = @processed[type] if @processed[type]
+      options[:since_id] = processed[type] if processed[type]
       begin
-        dispatch_messages(type, @twitter.status(:replies, options), %w{reply replies})
+        dispatch_messages(type, twitter.status(:replies, options), %w{reply replies})
       rescue Twitter::RESTError => e
         log.error("Failed to connect to Twitter.  It's likely down for a bit:")
         log.error(e.to_s)
@@ -142,7 +147,7 @@ module Twibot
     def dispatch_messages(type, messages, labels)
       messages.each { |message| dispatch(type, message) }
       # Avoid picking up messages over again
-      @processed[type] = messages.first.id if messages.length > 0
+      processed[type] = messages.first.id if messages.length > 0
 
       num = messages.length
       log.info "Received #{num} #{num == 1 ? labels[0] : labels[1]}"
@@ -166,6 +171,7 @@ module Twibot
     def configure
       yield @config
       @conf = nil
+      @twitter = nil
     end
 
    private

data/lib/twibot.rb

@@ -7,7 +7,7 @@ require File.join(File.dirname(__FILE__), 'hash')
 module Twibot
 
   # :stopdoc:
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/test/test_bot.rb

@@ -76,13 +76,13 @@ class TestBot < Test::Unit::TestCase
   should "receive tweet" do
     bot = Twibot::Bot.new(Twibot::Config.new(:log_level => "error"))
     bot.add_handler(:tweet, Twibot::Handler.new)
-    Twitter::Client.any_instance.expects(:timeline_for).with(:me, {}).returns([tweet("cjno", "Hei der!")])
+    Twitter::Client.any_instance.expects(:timeline_for).with(:public, {}).returns([tweet("cjno", "Hei der!")])
 
     assert_equal 1, bot.receive_tweets
   end
 
   should "receive friend tweets if configured" do
-    bot = Twibot::Bot.new(Twibot::Config.new({:log_level => "error", :include_friends => true}))
+    bot = Twibot::Bot.new(Twibot::Config.new({:log_level => "error", :timeline_for => :friends}))
     bot.add_handler(:tweet, Twibot::Handler.new)
     Twitter::Client.any_instance.expects(:timeline_for).with(:friends, {}).returns([tweet("cjno", "Hei der!")])
 
@@ -92,10 +92,10 @@ class TestBot < Test::Unit::TestCase
   should "remember received tweets" do
     bot = Twibot::Bot.new(Twibot::Config.new(:log_level => "error"))
     bot.add_handler(:tweet, Twibot::Handler.new)
-    Twitter::Client.any_instance.expects(:timeline_for).with(:me, {}).returns([tweet("cjno", "Hei der!")])
+    Twitter::Client.any_instance.expects(:timeline_for).with(:public, {}).returns([tweet("cjno", "Hei der!")])
     assert_equal 1, bot.receive_tweets
 
-    Twitter::Client.any_instance.expects(:timeline_for).with(:me, { :since_id => 1 }).returns([])
+    Twitter::Client.any_instance.expects(:timeline_for).with(:public, { :since_id => 1 }).returns([])
     assert_equal 0, bot.receive_tweets
   end
 

data/test/test_helper.rb

@@ -1,7 +1,8 @@
+require 'rubygems'
 require 'test/unit'
 require 'shoulda'
 require 'mocha'
-require File.join(File.dirname(__FILE__), '../lib/twibot')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'twibot')
 
 module Test::Unit::Assertions
   def assert_hashes_equal(expected, actual, message = nil)

data/twibot.gemspec

@@ -0,0 +1,38 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{twibot}
+  s.version = "0.1.6"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Christian Johansen"]
+  s.date = %q{2009-04-13}
+  s.description = %q{Twibot (pronounced like "Abbot"), is a Ruby microframework for creating Twitter bots, heavily inspired by Sinatra.}
+  s.email = %q{christian@cjohansen.no}
+  s.extra_rdoc_files = ["History.txt", "Readme.rdoc"]
+  s.files = ["History.txt", "Rakefile", "Readme.rdoc", "lib/hash.rb", "lib/twibot.rb", "lib/twibot/bot.rb", "lib/twibot/config.rb", "lib/twibot/handlers.rb", "lib/twibot/macros.rb", "lib/twibot/tweets.rb", "test/test_bot.rb", "test/test_config.rb", "test/test_handler.rb", "test/test_hash.rb", "test/test_helper.rb", "test/test_twibot.rb", "twibot.gemspec"]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/bjeanes/twibot/}
+  s.rdoc_options = ["--main", "Readme.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{twibot}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{Twibot (pronounced like "Abbot"), is a Ruby microframework for creating Twitter bots, heavily inspired by Sinatra}
+  s.test_files = ["test/test_helper.rb", "test/test_config.rb", "test/test_hash.rb", "test/test_twibot.rb", "test/test_bot.rb", "test/test_handler.rb"]
+
+  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<mbbx6spp-twitter4r>, [">= 0.3.1"])
+      s.add_development_dependency(%q<bones>, [">= 2.4.0"])
+    else
+      s.add_dependency(%q<mbbx6spp-twitter4r>, [">= 0.3.1"])
+      s.add_dependency(%q<bones>, [">= 2.4.0"])
+    end
+  else
+    s.add_dependency(%q<mbbx6spp-twitter4r>, [">= 0.3.1"])
+    s.add_dependency(%q<bones>, [">= 2.4.0"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twibot
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Christian Johansen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-12 00:00:00 +02:00
+date: 2009-04-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,8 +70,9 @@ files:
 - test/test_hash.rb
 - test/test_helper.rb
 - test/test_twibot.rb
+- twibot.gemspec
 has_rdoc: true
-homepage: http://github.com/cjohansen/twibot/
+homepage: http://github.com/bjeanes/twibot/
 post_install_message: 
 rdoc_options: 
 - --main