chatterbot 2.0.0.pre → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7333d751e027fb23ffd45e3df6a2602d271af411
-  data.tar.gz: 29e07ecf21574c314f0603a16b6f7b65cf2af4ce
+SHA256:
+  metadata.gz: 6b63ff09167dad5630abae41f3734aa861d4b4ad96c1cb643497bfc9ddc93483
+  data.tar.gz: bb89622d8d90d9e43ee7dddff4bedbb9854bb529bbe523a201a082b7a5a6383a
 SHA512:
-  metadata.gz: 92e31e5c24e929fe2ecca7e9a8f01b1bfdc9dfb56754817bd44ce3dcf29a2bf3beb5c8e1a259059e31b4bb1d6f005e1c5f795ac573cef52478711005dd55c2b2
-  data.tar.gz: ae42ada56f4635ea488e3996e3f7643aa5fcac79fd724a88512e0b4c39d3683189a3f9b21803411227464265981fb051f2697750ba23b4d7b74e38ea25e9eb9a
+  metadata.gz: 1be88671b540eabdac657837ede78bc7ff376902fd3252fcde201bc5dac7d4e68153b875a611127eea83053c6d3e2434534c43b12ed265a578bd04cc8c09bc6c
+  data.tar.gz: fe5c7963868895b81ace0c6a9f66449442a8cc6d183b84107e7a6486ca674fb8433637cb3539b8ba694cd4caa46a48f90c247505fe6aea1e2b7b6592acc0a375

data/.github/workflows/ci.yml

@@ -0,0 +1,19 @@
+---
+name: Run tests
+on: [push, pull_request]
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        ruby: [2.5, 2.6, 2.7]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: rspec
+        run: bundle exec rake

data/Gemfile

@@ -2,29 +2,21 @@ source 'https://rubygems.org'
 
 gemspec
 
-#gem "twitter_oauth"
-#gem "sequel"
+gem 'rake'
+gem 'yard'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  #gem 'simplecov', :require => false, :group => :test
-
-  #gem "shoulda", ">= 0"
-  #gem "rspec"
-  #gem "rake"
-  #gem "twitter", "~> 4.4.0"
-
-  #gem "watchr"
+  gem 'pry'
 end
 
-gem "pry"
 
-#
-# couple extra gems for testing db connectivity
-#
 group :test do
-  gem "sequel"
-  gem "mysql"
-  gem "sqlite3"
+  gem 'rspec', '~> 3.10.0'
+  gem 'rspec-mocks', '~> 3.10.0'
+  gem 'simplecov', '>= 0'
+  gem 'observr', '>= 0'
 end
+
+

data/README.markdown

@@ -1,6 +1,11 @@
 Chatterbot
 ===========
 
+Hey! This is Chatterbot 2.0. There have been some breaking changes
+from older versions of the library, and it doesn't support MySQL
+anymore. If you are looking for the old version, 
+you can try the [1.0 branch](https://github.com/muffinista/chatterbot/tree/1.0.2)
+
 Chatterbot is a Ruby library for making bots on Twitter.  It's
 great for rapid development of bot ideas. It handles all of the basic
 Twitter API features -- searches, replies, tweets, retweets, etc. and has
@@ -17,7 +22,6 @@ Features
 * Simple blocklist system to limit your annoyance of users
 * Avoid your bot making a fool of itself by ignoring tweets with
   certain bad words
-* Basic Streaming API support
 
 
 Using Chatterbot
@@ -51,7 +55,7 @@ A bot using chatterbot can be as simple as this:
 
 ```
 exclude "http://"
-blacklist "mean_user, private_user"
+blocklist "mean_user, private_user"
 
 puts "checking my timeline"
 home_timeline do |tweet|
@@ -71,14 +75,16 @@ end
 ```
 
 Or you can write a bot using more traditional ruby classes, extend it if needed, and use it like so:
-
-   class MyBot < Chatterbot::Bot
+```
+  class MyBot < Chatterbot::Bot
      def do_stuff
-       search("'surely you must be joking'") do |tweet|
-        reply "@#{tweet_user(tweet)} I am serious, and don't call me Shirley!", tweet
+       home_timeline do |tweet|
+         puts "I like to favorite things"
+         favorite tweet
        end
     end
   end
+```
 
 Chatterbot can actually generate a template bot file for you, and will
 walk you through process of getting a bot authorized with Twitter.
@@ -95,25 +101,12 @@ that you should just be using the Twitter gem directly.
 Streaming
 ---------
 
-Chatterbot has some basic support for the Streaming API. If you want
-to do something complicated, you should probably consider using the
-[Twitter gem](https://github.com/sferik/twitter#streaming) directly. 
-
-Basic usage is very straightforward:
-
-    streaming true
-    home_timeline do |tweet|
-      puts "someone i follow tweeted! #{tweet.text}"
-    end
-
-
-You can also run a search:
-
-    streaming true
-    search("pizza") do |tweet|
-      puts "someone is talking about pizza! #{tweet.text}"
-    end
-
+Chatterbot used to have some basic support for the Streaming API, but
+I've removed it because Twitter is removing and/or restricting access
+to those APIs. If you need the Streaming API, I highly recommend using
+the the [Twitter
+gem](https://github.com/sferik/twitter#streaming). Chatterbot is built
+on the Twitter gem, it works great, and has support for streaming.
 
 
 What Can I Do?
@@ -167,7 +160,7 @@ person who sent the original tweet.
 
 ```rb
   search "xyzzy" do |tweet|
-    retweet(tweet[:id])
+    retweet(tweet.id)
   end
 ```
 
@@ -177,11 +170,11 @@ person who sent the original tweet.
 
 (NOTE: you'll need to make sure your bot has permission to send DMs)
 
-**blacklist** -- you can use this to specify a list of users you don't
+**blocklist** -- you can use this to specify a list of users you don't
   want to interact with. If you put the following line at the top of
   your bot:
   
-    blacklist "user1, user2, user3"
+    blocklist "user1, user2, user3"
     
 None of those users will trigger your bot if they come up in a
 search. However, if a user replies to one of your tweets or mentions
@@ -307,7 +300,7 @@ loop do
   search "twitter" do |tweet|
     # here you could do something with a tweet
     # if you want to retweet
-    retweet(tweet[:id])
+    retweet(tweet.id)
   end
 
   replies do |tweet|
@@ -319,16 +312,16 @@ end
 ```
 
 
-Blacklists
+Blocklists
 ----------
 
 Not everyone wants to hear from your bot.  To keep annoyances to a
-minimum, Chatterbot has a simple blacklist tool. Using it is as simple as:
+minimum, Chatterbot has a simple blocklist tool. Using it is as simple as:
 
-    blacklist "mean_user, private_user"
+    blocklist "mean_user, private_user"
 
 You should really respect the wishes of users who don't want to hear
-from your bot, and add them to your blacklist whenever requested.
+from your bot, and add them to your blocklist whenever requested.
 
 There's also an 'exclude' method which can be used to add
 words/phrases you might want to ignore -- for example, if you wanted
@@ -348,7 +341,7 @@ I can work with you on that.
 Copyright/License
 -----------------
 
-Copyright (c) 2015 Colin Mitchell. Chatterbot is distributed under the
+Copyright (c) 2018 Colin Mitchell. Chatterbot is distributed under the
 MIT licence -- Please see LICENSE.txt for further details.
 
 http://muffinlabs.com

data/Rakefile

@@ -1,30 +1,12 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require "chatterbot/version"
-
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov_opts = %w{--exclude .bundler,.rvm}
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  rdoc.main = "README.rdoc"
-  rdoc.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "'chatterbot #{Chatterbot::VERSION}'"
-end
-
 task :console do
   require 'irb'
   require 'irb/completion'
@@ -32,3 +14,5 @@ task :console do
   ARGV.clear
   IRB.start
 end
+
+task :default => :spec

data/bin/chatterbot-register

@@ -58,6 +58,7 @@ end
 @bot.config.delete(:token)
 @bot.require_login(false)
 
+
 unless @bot.screen_name.nil?
   if @botname == "tmp_bot_name"
     puts "change botname to #{@bot.screen_name}"
@@ -66,8 +67,11 @@ unless @bot.screen_name.nil?
 
   puts "Storing config info"
   puts @bot.config.inspect
-  @bot.update_config
-  @bot.config = nil
+
+  config_src = File.join(Dir.getwd, "tmp_bot_name.yml")
+  config_dest = File.join(Dir.getwd, "#{@bot.botname}.yml")
+  File.rename(config_src, config_dest)
+  
   
   if @skeleton
     skel_dest = File.join(Dir.getwd, "#{@bot.botname}.rb")

data/chatterbot.gemspec

@@ -1,5 +1,8 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+#$:.push File.expand_path("../lib", __FILE__)
 require "chatterbot/version"
 
 Gem::Specification.new do |s|
@@ -20,18 +23,14 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.licenses = ["MIT"]
 
-  s.add_development_dependency(%q<redcarpet>, [">= 0"])
-  s.add_runtime_dependency(%q<oauth>, [">= 0.4.7"])
-  s.add_runtime_dependency(%q<twitter>, ["5.14.0"])
+  # load activesupport but check ruby version along the way
+  s.extensions << 'ext/mkrf_conf.rb'
+  
+  s.add_runtime_dependency(%q<oauth>, ["~> 0.5.6"])
+  s.add_runtime_dependency(%q<twitter>, ["~> 7"])
   s.add_runtime_dependency(%q<launchy>, [">= 2.4.2"])
   s.add_runtime_dependency(%q<colorize>, [">= 0.7.3"])
-  s.add_development_dependency(%q<yard>, [">= 0"])
-  s.add_development_dependency(%q<shoulda>, [">= 0"])
-  s.add_development_dependency(%q<rake>, [">= 0"])
-  s.add_development_dependency(%q<rspec>, ["~> 3.0.0"])
-  s.add_development_dependency(%q<rspec-mocks>, ["~> 3.0.2"])
-  s.add_development_dependency(%q<rdoc>, [">= 0"])
-  s.add_development_dependency(%q<simplecov>, [">= 0"])
-  s.add_development_dependency(%q<observr>, [">= 0"])
+
+  s.add_development_dependency 'bundler', '~> 2.0'
 end
 

data/docs/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+gem 'github-pages'
+

data/docs/README.md

@@ -0,0 +1,3 @@
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/bruth/jekyll-docs-template/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+
+Read the docs: http://bruth.github.io/jekyll-docs-template

data/docs/_config.yml

@@ -0,0 +1,37 @@
+# Site title and subtitle. This is used in _includes/header.html
+title: 'chatterbot'
+subtitle: 'twitter bots in ruby'
+
+# Enable/show navigation. There are there options:
+#   0 - always hide
+#   1 - always show
+#   2 - show only if posts are present
+navigation: 1
+
+# URL to source code, used in _includes/footer.html
+codeurl: 'https://github.com/muffinista/chatterbot'
+
+# Default categories (in order) to appear in the navigation
+sections: [
+    ['tut', 'Getting Started'],
+    ['doc', 'Documentation'],
+    ['dev', 'Developers'],
+    ['links', 'Resources']
+]
+
+# Keep as an empty string if served up at the root. If served up at a specific
+# path (e.g. on GitHub pages) leave off the trailing slash, e.g. /my-project
+baseurl: '/chatterbot'
+
+# Dates are not included in permalinks
+permalink: none
+
+# Syntax highlighting
+highlighter: 'rouge'
+
+# Since these are pages, it doesn't really matter
+future: true
+
+# Exclude non-site files
+exclude: ['bin', 'README.md']
+

data/docs/_includes/footer.html

@@ -0,0 +1,3 @@
+<!--
+Documentation for <a href="{% if site.codeurl %}{{ site.codeurl }}{% else %}{{ site.baseurl }}{% endif %}">{{ site.title }}</a>
+-->

data/docs/_includes/header.html

@@ -0,0 +1,4 @@
+<h4><a class=brand href="{{ site.baseurl }}/">{{ site.title }}</a>
+    {% if site.subtitle %}<small>{{ site.subtitle }}</small>{% endif %}
+</h4>
+

data/docs/_includes/navigation.html

@@ -0,0 +1,23 @@
+<ul class="nav nav-list">
+  <li><a href="{{ site.baseurl }}/">Home</a></li>
+  {% for section in site.sections %}
+    {% assign attr = section[0] %}
+    {% assign label = section[1] %}
+    <li class=nav-header>{{ label }}</li>
+    {% for page in site.pages %}
+{% if page.published != false %}
+      {% if page.category == attr %}     
+        <li data-order="{{ page.order }}">
+          {% if page.link %}
+            <a href="{{ page.link }}">{{ page.title }}</a>
+          {% else %}
+            <a href="{{ site.baseurl }}{{ page.url }}">{{ page.title }}</a>
+          {% endif %}
+        </li>
+      {% endif %}
+{% endif %}
+    {% endfor %}
+  {% endfor %}
+<!-- List additional links. It is recommended to add a divider
+    e.g. <li class=divider></li> first to break up the content. -->
+</ul>

data/docs/_layouts/default.html

@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width">
+
+        <title>{{ site.title }}{% if page.title %} : {{ page.title }}{% endif %}</title>
+        <meta name="description" content="{{ site.subtitle }}">
+
+        <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css" rel="stylesheet">
+        <link rel="stylesheet" href="{{ site.baseurl }}/css/syntax.css">
+        <link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
+    </head>
+    <body>
+
+        <div class="container">
+            <div class=row-fluid>
+                <div id=header class=span12>
+                    {% include header.html %}
+                </div>
+            </div>
+
+            <div class=row-fluid>
+                {% assign post_count = site.posts|size %}
+                {% if site.navigation != 0 and site.navigation == 1 or post_count > 0 %}
+                    <div id=navigation class=span2>
+                        {% include navigation.html %}
+                    </div>
+
+                    <div id=content class=span10>
+                        {{ content }}
+                    </div>
+                {% else %}
+                    <div id=content class=span12>
+                        {{ content }}
+                    </div>
+                {% endif %}
+            </div>
+
+            <div class=row-fluid>
+                <div id=footer class=span12>
+                    {% include footer.html %}
+                </div>
+            </div>
+        </div>
+
+        <script>
+            function orderNav() {
+                var list,
+                    section,
+                    header,
+                    sections = [],
+                    lists = {},
+                    headers = {};
+
+                var navUl = document.querySelectorAll('#navigation ul')[0],
+                    navLis = document.querySelectorAll('#navigation ul li');
+
+                if (!navUl) return;
+
+                for (var i = 0; i < navLis.length; i++) {
+                    var order, li = navLis[i];
+
+                    if (li.classList.contains('nav-header')) {
+                        section = li.textContent || li.innerText;
+                        sections.push(section);
+                        headers[section] = li;
+                        continue;
+                    }
+
+                    if (!lists[section]) {
+                        lists[section] = [];
+                    }
+
+                    order = parseFloat(li.getAttribute('data-order'))
+                    lists[section].push([order, li]);
+                }
+
+                for (var i = 0; i < sections.length; i++) {
+                    section = sections[i];
+                    list = lists[section].sort(function(a, b) {
+                        return a[0] - b[0];
+                    });
+
+                    if (header = headers[section]) {
+                        navUl.appendChild(header);
+                    }
+                    for (var j = 0; j < list.length; j++) {
+                        navUl.appendChild(list[j][1]);
+                    }
+                }
+            }
+
+            if (document.querySelectorAll) orderNav();
+        </script>
+    </body>
+</html>