chatterbot 0.5.0 → 0.5.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -10,6 +10,7 @@ include Chatterbot::DB
10
10
  include Chatterbot::Logging
11
11
 
12
12
  @force = false
13
+ @skeleton = true
13
14
 
14
15
 
15
16
  #
@@ -25,17 +26,18 @@ Usage: #{File.basename($0)} [options]
25
26
  EOS
26
27
 
27
28
  opts.separator ""
28
- opts.separator "Options:"
29
+ opts.separator "Options:"
29
30
 
30
31
  opts.on('-d', '--db [ARG]', "Specify a DB connection URI") { |d| ENV["chatterbot_db"] = d }
31
32
  opts.on('-c', '--config [ARG]', "Specify a config file to load") { |c| ENV["chatterbot_config"] = c }
32
33
  opts.on('-b', '--bot [ARG]', "Name of the bot you want to register. If you don't specify this, it will be grabbed from twitter when you authenticate") { |b| @botname = b }
33
34
  opts.on('-f', '--force', "Overwrite existing config values") { @force = true }
35
+ opts.on('-s', '--skip-skeleton', "Don't write out a skeleton bot script") { @skeleton = false }
34
36
 
35
37
  opts.on_tail("-h", "--help", "Show this message") do
36
38
  puts opts
37
39
  exit
38
- end
40
+ end
39
41
 
40
42
  #
41
43
  # skeleton code for a bot -- pretty basic but covers the bases
@@ -96,17 +98,19 @@ if @bot.client.authorized?
96
98
  puts "Storing config info"
97
99
  @bot.update_config
98
100
 
99
- skel_dest = File.join(Dir.getwd, "#{@bot.botname}.rb")
100
- if File.exist?(skel_dest)
101
- puts "#{skel_dest} exists already, not doing anything"
102
- else
103
- puts "writing skeleton to #{skel_dest}"
101
+ if @skeleton
102
+ skel_dest = File.join(Dir.getwd, "#{@bot.botname}.rb")
103
+ if File.exist?(skel_dest)
104
+ puts "#{skel_dest} exists already, not doing anything"
105
+ else
106
+ puts "writing skeleton to #{skel_dest}"
104
107
 
105
- f = File.new(skel_dest, "w")
106
- f.write(skeleton)
107
- f.close
108
+ f = File.new(skel_dest, "w")
109
+ f.write(skeleton)
110
+ f.close
108
111
 
109
- File.chmod(0740, skel_dest)
112
+ File.chmod(0740, skel_dest)
113
+ end
110
114
  end
111
115
  else
112
116
  puts "Looks like something went wrong, better luck next time!"
data/lib/chatterbot/db.rb CHANGED
@@ -1,10 +1,10 @@
1
1
  module Chatterbot
2
-
2
+
3
3
  #
4
4
  # routines for optionally interacting with a database for logging
5
5
  # tweets, and storing config data there. Uses Sequel to handle the
6
6
  # heavy lifing.
7
- module DB
7
+ module DB
8
8
  #
9
9
  # connect to the database, and generate any missing tables
10
10
  def db
@@ -14,8 +14,8 @@ module Chatterbot
14
14
  def display_db_config_notice
15
15
  puts "ERROR: You have specified a DB connection, but you need to install the sequel gem to use it"
16
16
  end
17
-
18
- protected
17
+
18
+ protected
19
19
 
20
20
  #
21
21
  # get a DB object from Sequel
@@ -26,7 +26,7 @@ module Chatterbot
26
26
  Sequel.connect(config[:db_uri])
27
27
  end
28
28
  end
29
-
29
+
30
30
  #
31
31
  # try and connect to the DB, and create tables that are missing.
32
32
  def connect_and_validate
@@ -39,7 +39,7 @@ module Chatterbot
39
39
  DateTime :created_at
40
40
  end
41
41
  end
42
-
42
+
43
43
  if ! conn.tables.include?(:tweets)
44
44
  conn.create_table :tweets do
45
45
  primary_key :id
@@ -48,7 +48,7 @@ module Chatterbot
48
48
  String :user
49
49
  String :source_id
50
50
  String :source_tweet
51
-
51
+
52
52
  DateTime :created_at
53
53
  end
54
54
  end
@@ -63,12 +63,12 @@ module Chatterbot
63
63
  String :token
64
64
  String :consumer_secret
65
65
  String :consumer_key
66
-
66
+
67
67
  DateTime :created_at
68
68
  DateTime :updated_at
69
69
  end
70
70
  end
71
-
71
+
72
72
  conn
73
73
  end
74
74
 
@@ -1,3 +1,3 @@
1
1
  module Chatterbot
2
- VERSION = "0.5.0"
2
+ VERSION = "0.5.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chatterbot
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.0
4
+ version: 0.5.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-12-19 00:00:00.000000000Z
12
+ date: 2011-12-29 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: twitter_oauth
16
- requirement: &17236180 !ruby/object:Gem::Requirement
16
+ requirement: &19844900 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *17236180
24
+ version_requirements: *19844900
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: shoulda
27
- requirement: &17235680 !ruby/object:Gem::Requirement
27
+ requirement: &19844400 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *17235680
35
+ version_requirements: *19844400
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rspec
38
- requirement: &17235200 !ruby/object:Gem::Requirement
38
+ requirement: &19843920 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *17235200
46
+ version_requirements: *19843920
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rdoc
49
- requirement: &17234720 !ruby/object:Gem::Requirement
49
+ requirement: &19843440 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *17234720
57
+ version_requirements: *19843440
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: simplecov
60
- requirement: &17234240 !ruby/object:Gem::Requirement
60
+ requirement: &19868660 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *17234240
68
+ version_requirements: *19868660
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: watchr
71
- requirement: &17259500 !ruby/object:Gem::Requirement
71
+ requirement: &19868180 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *17259500
79
+ version_requirements: *19868180
80
80
  description: A framework for writing bots that run on Twitter. Comes with a simple
81
81
  DSL for easy coding.
82
82
  email: colin@muffinlabs.com