chatterbot 1.0.2 → 2.0.0.pre

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatterbot
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0.pre
 platform: ruby
 authors:
 - Colin Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-27 00:00:00.000000000 Z
+date: 2015-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -28,14 +28,14 @@ dependencies:
   name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.7
 - !ruby/object:Gem::Dependency
@@ -196,9 +196,7 @@ description: A ruby framework for writing bots that run on Twitter. Comes with a
   DSL for easy coding.
 email: colin@muffinlabs.com
 executables:
-- chatterbot-blacklist
 - chatterbot-register
-- chatterbot-status
 extensions: []
 extra_rdoc_files: []
 files:
@@ -209,50 +207,50 @@ files:
 - LICENSE.txt
 - README.markdown
 - Rakefile
-- bin/chatterbot-blacklist
 - bin/chatterbot-register
-- bin/chatterbot-status
 - chatterbot.gemspec
 - examples/class_bot.rb
 - examples/config.yml.example
 - examples/dsl_test.rb
 - examples/echoes_bot.rb
-- examples/loop_bot.rb
 - examples/search_bot.rb
 - examples/streaming_bot.rb
 - examples/tweet_logger.rb
 - lib/chatterbot.rb
-- lib/chatterbot/blacklist.rb
+- lib/chatterbot/blocklist.rb
 - lib/chatterbot/bot.rb
 - lib/chatterbot/client.rb
 - lib/chatterbot/config.rb
-- lib/chatterbot/db.rb
+- lib/chatterbot/config_manager.rb
+- lib/chatterbot/direct_messages.rb
 - lib/chatterbot/dsl.rb
 - lib/chatterbot/favorite.rb
 - lib/chatterbot/followers.rb
+- lib/chatterbot/handler.rb
 - lib/chatterbot/helpers.rb
 - lib/chatterbot/home_timeline.rb
 - lib/chatterbot/logging.rb
 - lib/chatterbot/profile.rb
 - lib/chatterbot/reply.rb
 - lib/chatterbot/retweet.rb
+- lib/chatterbot/safelist.rb
 - lib/chatterbot/search.rb
 - lib/chatterbot/skeleton.rb
 - lib/chatterbot/streaming.rb
-- lib/chatterbot/streaming_handler.rb
 - lib/chatterbot/tweet.rb
 - lib/chatterbot/ui.rb
 - lib/chatterbot/utils.rb
 - lib/chatterbot/version.rb
-- lib/chatterbot/whitelist.rb
-- spec/blacklist_spec.rb
+- spec/blocklist_spec.rb
 - spec/bot_spec.rb
 - spec/client_spec.rb
+- spec/config_manager_spec.rb
 - spec/config_spec.rb
-- spec/db_spec.rb
+- spec/direct_messages_spec.rb
 - spec/dsl_spec.rb
 - spec/favorite_spec.rb
 - spec/followers_spec.rb
+- spec/handler_spec.rb
 - spec/helpers_spec.rb
 - spec/home_timeline_spec.rb
 - spec/logging_spec.rb
@@ -262,7 +260,6 @@ files:
 - spec/search_spec.rb
 - spec/skeleton_spec.rb
 - spec/spec_helper.rb
-- spec/streaming_handler_spec.rb
 - spec/streaming_spec.rb
 - spec/tweet_spec.rb
 - spec/utils_spec.rb
@@ -271,7 +268,7 @@ files:
 - templates/skeleton.txt
 homepage: http://github.com/muffinista/chatterbot
 licenses:
-- WTFPL
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -284,9 +281,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: chatterbot
 rubygems_version: 2.2.2
@@ -294,14 +291,16 @@ signing_key:
 specification_version: 4
 summary: A ruby framework for writing Twitter bots
 test_files:
-- spec/blacklist_spec.rb
+- spec/blocklist_spec.rb
 - spec/bot_spec.rb
 - spec/client_spec.rb
+- spec/config_manager_spec.rb
 - spec/config_spec.rb
-- spec/db_spec.rb
+- spec/direct_messages_spec.rb
 - spec/dsl_spec.rb
 - spec/favorite_spec.rb
 - spec/followers_spec.rb
+- spec/handler_spec.rb
 - spec/helpers_spec.rb
 - spec/home_timeline_spec.rb
 - spec/logging_spec.rb
@@ -311,7 +310,6 @@ test_files:
 - spec/search_spec.rb
 - spec/skeleton_spec.rb
 - spec/spec_helper.rb
-- spec/streaming_handler_spec.rb
 - spec/streaming_spec.rb
 - spec/tweet_spec.rb
 - spec/utils_spec.rb

data/bin/chatterbot-blacklist

@@ -1,65 +0,0 @@
-#!/usr/bin/env ruby
-#$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
-require 'chatterbot'
-require 'optparse'
-
-include Chatterbot::Helpers
-include Chatterbot::Blacklist
-include Chatterbot::Config
-include Chatterbot::DB
-include Chatterbot::Logging
-
-Chatterbot::from_helper = true
-
-@display_blacklist = false
-
-#
-# pull in any arguments and set them as env variables
-#
-opts = OptionParser.new
-opts.banner = "Usage: #{File.basename($0)} [options]"
-
-opts.separator ""
-opts.separator "Specific options:" 
-
-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('-p', '--print', "Print out the current blacklist")    { @display_blacklist = true }
-opts.on_tail("-h", "--help", "Show this message") do
-  puts opts
-  exit
-end      
-
-extra = opts.parse!(ARGV)
-
-if ! has_db?
-  puts "You need to specify a db connection!"
-  exit
-end
-
-
-if @display_blacklist
-  db[:blacklist].each do |u|
-    puts u.inspect
-  end
-  
-elsif extra.empty?
-  #
-  # iterate through STDIN and add anything to the blacklist.  nothing too shiny here.
-  #
-  $stdin.each_line do |l|
-    add_to_blacklist(l.chomp)
-  end 
-else
-  #
-  # add any users specified on the command-line
-  #
-  extra.each do |l|
-    add_to_blacklist(l.chomp)
-  end  
-  
-end
-
-
-

data/bin/chatterbot-status

@@ -1,55 +0,0 @@
-#!/usr/bin/env ruby
-#$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
-require 'chatterbot'
-require 'optparse'
-
-include Chatterbot::Helpers
-include Chatterbot::Config
-include Chatterbot::DB
-
-Chatterbot::from_helper = true
-
-@tweet_count = 5
-
-#
-# pull in any arguments and set them as env variables
-#
-opts = OptionParser.new
-opts.banner = "Usage: #{File.basename($0)} [options]"
-
-opts.separator ""
-opts.separator "Specific options:" 
-
-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', '--tweets [ARG]', "How many tweets to display")    { |t| @tweet_count = t.to_i }
-
-opts.on_tail("-h", "--help", "Show this message") do
-  puts opts
-  exit
-end      
-
-extra = opts.parse!(ARGV)
-
-#
-# will only work if user is tracking tweets in a db
-#
-if ! has_db?
-  puts "You need to specify a db connection!"
-  exit
-end
-
-#
-# return total number of tweets sent in last 'days' days
-#
-def count_for_period(bot, days=1)
-  db[:tweets].filter(:bot => bot[:id]).filter{created_at > (Time.now - (days*86400))}.count
-end
-
-db[:config].each do |bot|
-  puts "Tweets from #{bot[:id]} #{[1,7,30].collect{|d| count_for_period(bot, d)}.join("/")}"
-  db[:tweets].filter(:bot => bot[:id]).order(:created_at.desc).limit(@tweet_count).each do |t|
-    puts "#{t[:created_at]}: #{t[:txt]} (#{t[:source_tweet]})"
-  end
-end

data/examples/loop_bot.rb

@@ -1,44 +0,0 @@
-#!/usr/bin/env ruby
-
-#
-# simple example of how to run a bot in a loop. if you want to do
-# that, you need to call update_config to update the database at the
-# end of each iteration -- this will keep you from processing the same
-# tweets multiple times
-#
-
-
-#
-# require the dsl lib to include all the methods you see below.
-#
-require 'rubygems'
-require 'chatterbot/dsl'
-
-puts "Loading echoes_bot.rb"
-
-##
-## If I wanted to exclude some terms from triggering this bot, I would list them here.
-## For now, we'll block URLs to keep this from being a source of spam
-##
-exclude "http://"
-
-blacklist "mean_user, private_user"
-
-loop do
-
-  puts "run search #{since_id}"
-  search "twitter" do |tweet|
-    # here you could do something with a tweet
-  end
-  
-  puts "checking for replies to me"
-  replies do |tweet|
-    src = "#USER# it is very nice of you to say that!"  
-    reply src, tweet
-  end
-
-  # explicitly update our config
-  update_config
-
-  sleep 1
-end

data/lib/chatterbot/blacklist.rb

@@ -1,61 +0,0 @@
-module Chatterbot
-
-  #
-  # methods for preventing the bot from spamming people who don't want to hear from it
-  module Blacklist
-    attr_accessor :exclude, :blacklist
-
-    # return a list of text strings which we will check for in incoming tweets.
-    # If the text is listed, we won't use this tweet
-    def exclude
-      @exclude || []
-    end
-    
-    # A list of Twitter users that don't want to hear from the bot.
-    def blacklist
-      @blacklist || []
-    end
-    def blacklist=(b)
-      @blacklist = b
-    end
-    
-    #
-    # Based on the text of this tweet, should it be skipped?
-    def skip_me?(s)
-      search = s.respond_to?(:text) ? s.text : s
-      exclude.detect { |e| search.downcase.include?(e) } != nil
-    end
-    
-    #
-    # Is this tweet from a user on our blacklist?
-    def on_blacklist?(s)
-      search = (s.respond_to?(:user) ? from_user(s) : s).downcase
-      blacklist.any? { |b| search.include?(b.downcase) } ||
-        on_global_blacklist?(search)
-    end
-
-    #
-    # Is this user on our global blacklist?
-    def on_global_blacklist?(user)
-      return false if ! has_db?
-      db[:blacklist].where(:user => user).count > 0
-    end
-
-    #
-    # add the specified user to the global blacklist
-    def add_to_blacklist(user)    
-      user = user.is_a?(Hash) ? user[:from_user] : user
-      
-      # don't try and add if we don't have a DB connection, or if the
-      # user is already on the list
-      return if ! has_db? || on_global_blacklist?(user)
-
-      # make sure we don't have an @ at the beginning of the username
-      user.gsub!(/^@/, "")
-      debug "adding #{user} to blacklist"
-
-      db[:blacklist].insert({ :user => user, :created_at => Time.now }) # 
-    end
-    
-  end
-end

data/lib/chatterbot/db.rb

@@ -1,79 +0,0 @@
-module Chatterbot
-
-  #
-  # routines for optionally interacting with a database for logging
-  # tweets, and storing config data there. Uses Sequel to handle the
-  # heavy lifing.
-  module DB
-    #
-    # connect to the database, and generate any missing tables
-    def db
-      @_db ||= connect_and_validate
-    end
-
-    #:nocov:
-    def display_db_config_notice
-      puts "ERROR: You have specified a DB connection, but you need to install the sequel gem to use it"
-    end
-    #:nocov:
-
-    protected
-
-    #
-    # get a DB object from Sequel
-    def get_connection
-      if ! has_sequel? && config.has_key?(:db_uri)
-        display_db_config_notice
-      elsif has_sequel?
-        Sequel.connect(config[:db_uri])
-      end
-    end
-
-    #
-    # try and connect to the DB, and create tables that are missing.
-    def connect_and_validate
-      conn = get_connection
-      return if conn.nil?
-
-      if ! conn.tables.include?(:blacklist)
-        conn.create_table :blacklist do
-          String :user, :primary_key => true
-          DateTime :created_at
-        end
-      end
-
-      if ! conn.tables.include?(:tweets)
-        conn.create_table :tweets do
-          primary_key :id
-          String :txt
-          String :bot
-          String :user
-          String :source_id
-          String :source_tweet
-
-          DateTime :created_at
-        end
-      end
-
-      if ! conn.tables.include?(:config)
-        conn.create_table :config do
-          String :id, :primary_key => true
-
-          Bignum :since_id
-          Bignum :since_id_reply
-
-          String :secret
-          String :token
-          String :consumer_secret
-          String :consumer_key
-
-          DateTime :created_at
-          DateTime :updated_at
-        end
-      end
-
-      conn
-    end
-
-  end
-end