chatterbot 0.2.2 → 0.2.3

data/lib/chatterbot/config.rb

@@ -53,6 +53,10 @@ module Chatterbot
       has_config? && config.has_key?(:log_dest)
     end
 
+    def verbose?
+      config[:verbose] || false
+    end
+    
     #
     # destination for log entries
     def log_dest
@@ -197,6 +201,7 @@ module Chatterbot
       # let's not store these, they're just command-line options
       tmp.delete(:debug_mode)
       tmp.delete(:dry_run)
+      tmp.delete(:verbose)      
 
       
       # update the since_id now

data/lib/chatterbot/dsl.rb

@@ -27,8 +27,9 @@ module Chatterbot
       opts.on('-d', '--db [ARG]', "Specify a DB connection URI")    { |d| ENV["chatterbot_db"] = d }
       opts.on('-c', '--config [ARG]', "Specify a config file to use")    { |c| ENV["chatterbot_config"] = c }
       opts.on('-t', '--test', "Run the bot without actually sending any tweets") { params[:debug_mode] = true }
+      opts.on('-v', '--verbose', "verbose output to stdout")    { params[:verbose] = true }
       opts.on('--dry-run', "Run the bot in test mode, and also don't update the database")    { params[:debug_mode] = true ; params[:no_update] = true }
-      opts.on('-s', '--since_id [ARG]', "Check for tweets since tweet id #[ARG]")    { |s| params[:since_id] = s }
+      opts.on('-s', '--since_id [ARG]', "Check for tweets since tweet id #[ARG]")    { |s| params[:since_id] = s.to_i }
 
       opts.on_tail("-h", "--help", "Show this message") do
         puts opts

data/lib/chatterbot/logging.rb

@@ -10,6 +10,7 @@ module Chatterbot
     #
     # log a message
     def debug(s)
+      puts s if verbose?
       logger.debug s unless ! logging?
     end
 

data/lib/chatterbot/reply.rb

@@ -9,7 +9,8 @@ module Chatterbot
       return unless require_login
       debug "check for replies since #{since_id}"
       
-      results = client.replies(:since_id => since_id)
+      opts = since_id > 0 ? {:since_id => since_id} : {}
+      results = client.replies(opts)
 
       if results.is_a?(Hash) && results.has_key?("error")
         critical results["error"]

data/lib/chatterbot/version.rb

@@ -1,3 +1,3 @@
 module Chatterbot
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/reply_spec.rb

@@ -18,7 +18,6 @@ describe "Chatterbot::Reply" do
   # end
 
   it "iterates results" do
-    #bot = Chatterbot::Bot.new
     bot = test_bot
     bot.should_receive(:require_login).and_return(true)
     bot.stub!(:client).and_return(fake_replies(100, 3))
@@ -35,7 +34,6 @@ describe "Chatterbot::Reply" do
 
   it "checks blacklist" do
     bot = test_bot
-#    bot = Chatterbot::Bot.new
     bot.should_receive(:require_login).and_return(true)
     bot.stub!(:client).and_return(fake_replies(100, 3))
     
@@ -51,4 +49,29 @@ describe "Chatterbot::Reply" do
     indexes.should == [2,3]
   end
 
+
+  it "passes along since_id" do
+    bot = test_bot
+    bot.should_receive(:require_login).and_return(true)
+    bot.stub!(:client).and_return(fake_replies(100, 3))    
+    bot.stub!(:since_id).and_return(123)
+    
+    bot.client.should_receive(:replies).with({:since_id => 123})
+
+    bot.replies
+  end
+  
+
+  it "doesn't pass along invalid since_id" do
+    bot = test_bot
+    bot.should_receive(:require_login).and_return(true)
+    bot.stub!(:client).and_return(fake_replies(100, 3))    
+    bot.stub!(:since_id).and_return(0)
+    
+    bot.client.should_receive(:replies).with({ })
+
+    bot.replies
+  end
+    
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chatterbot
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-05-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter_oauth
-  requirement: &21124680 !ruby/object:Gem::Requirement
+  requirement: &11616680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21124680
+  version_requirements: *11616680
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &21124180 !ruby/object:Gem::Requirement
+  requirement: &11616180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21124180
+  version_requirements: *11616180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21123700 !ruby/object:Gem::Requirement
+  requirement: &11615700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21123700
+  version_requirements: *11615700
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21123220 !ruby/object:Gem::Requirement
+  requirement: &11657200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21123220
+  version_requirements: *11657200
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21122740 !ruby/object:Gem::Requirement
+  requirement: &11656720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21122740
+  version_requirements: *11656720
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &21122260 !ruby/object:Gem::Requirement
+  requirement: &11656240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21122260
+  version_requirements: *11656240
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &21121780 !ruby/object:Gem::Requirement
+  requirement: &11655760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21121780
+  version_requirements: *11655760
 description: A framework for writing bots that run on Twitter. Comes with a simple
   DSL for easy coding.
 email: colin@muffinlabs.com