1
=== modified file 'ibid/__init__.py'
2
--- ibid/__init__.py	2010-01-31 15:38:34 +0000
3
+++ ibid/__init__.py	2010-02-05 19:55:18 +0000
4
@@ -84,7 +84,7 @@
5
84
dispatcher = None
84
dispatcher = None
6
85
processors = []
85
processors = []
7
86
reloader = None
86
reloader = None
9
87
databases = None
87
databases = {}
10
88
auth = None
88
auth = None
11
89
service = None
89
service = None
12
90
options = {}
90
options = {}
13
91
91
14
=== modified file 'ibid/db/__init__.py'
15
--- ibid/db/__init__.py	2010-02-03 16:06:30 +0000
16
+++ ibid/db/__init__.py	2010-02-05 19:55:18 +0000
17
@@ -1,5 +1,6 @@
18
1
# Copyright (c) 2009-2010, Stefano Rivera
1
# Copyright (c) 2009-2010, Stefano Rivera
19
2
# Released under terms of the MIT/X/Expat Licence. See COPYING for details.
2
# Released under terms of the MIT/X/Expat Licence. See COPYING for details.
20
3
import warnings as _warnings
21
3
4
22
4
from ibid.db.types import TypeDecorator, Integer, DateTime, Boolean, \
5
from ibid.db.types import TypeDecorator, Integer, DateTime, Boolean, \
23
5
                          IbidUnicode, IbidUnicodeText
6
                          IbidUnicode, IbidUnicodeText
24
@@ -10,7 +11,7 @@
25
10
from sqlalchemy.sql import func
11
from sqlalchemy.sql import func
26
11
from sqlalchemy.ext.declarative import declarative_base as _declarative_base
12
from sqlalchemy.ext.declarative import declarative_base as _declarative_base
27
12
13
29
13
from sqlalchemy.exceptions import IntegrityError
14
from sqlalchemy.exceptions import IntegrityError, SADeprecationWarning
30
14
15
31
15
metadata = _MetaData()
16
metadata = _MetaData()
32
16
Base = _declarative_base(metadata=metadata)
17
Base = _declarative_base(metadata=metadata)
33
@@ -18,4 +19,7 @@
34
18
from ibid.db.versioned_schema import VersionedSchema, SchemaVersionException, \
19
from ibid.db.versioned_schema import VersionedSchema, SchemaVersionException, \
35
19
                                     schema_version_check, upgrade_schemas
20
                                     schema_version_check, upgrade_schemas
36
20
21
37
22
# We use SQLAlchemy 0.4 compatible .save_or_update() functions
38
23
_warnings.filterwarnings('ignore', 'Use session.add\(\)', SADeprecationWarning)
39
24
40
21
# vi: set et sta sw=4 ts=4:
25
# vi: set et sta sw=4 ts=4:
41
22
26
42
=== modified file 'scripts/ibid-setup'
43
--- scripts/ibid-setup	2010-01-18 22:13:23 +0000
44
+++ scripts/ibid-setup	2010-02-05 19:55:18 +0000
45
@@ -3,15 +3,15 @@
46
3
# Released under terms of the MIT/X/Expat Licence. See COPYING for details.
3
# Released under terms of the MIT/X/Expat Licence. See COPYING for details.
47
4
4
48
5
import logging
5
import logging
49
6
from optparse import OptionParser
50
6
import sys
7
import sys
51
7
from sys import exit, stderr
8
from sys import exit, stderr
52
8
from sqlalchemy import create_engine
53
9
from sqlalchemy.orm import sessionmaker
54
10
from getpass import getpass
9
from getpass import getpass
55
10
from os import getenv
56
11
from os.path import exists
11
from os.path import exists
57
12
from shutil import copyfileobj
12
from shutil import copyfileobj
58
13
13
60
14
from pkg_resources import resource_stream
14
from pkg_resources import resource_filename, resource_stream
61
15
from twisted.python.modules import getModule
15
from twisted.python.modules import getModule
62
16
16
63
17
sys.path.insert(0, '.')
17
sys.path.insert(0, '.')
64
@@ -19,76 +19,128 @@
65
19
import ibid
19
import ibid
66
20
from ibid.config import FileConfig
20
from ibid.config import FileConfig
67
21
from ibid.core import DatabaseManager
21
from ibid.core import DatabaseManager
69
22
from ibid.db import metadata, upgrade_schemas
22
from ibid.db import upgrade_schemas
70
23
from ibid.db.models import Account, Identity, Permission, Credential
23
from ibid.db.models import Account, Identity, Permission, Credential
71
24
from ibid.auth import hash
24
from ibid.auth import hash
72
25
25
80
26
logging.basicConfig(level=logging.DEBUG)
26
parser = OptionParser(usage="%prog [options...]")
81
27
27
parser.add_option('-v', '--verbose', action='store_true', default=False,
82
28
for module in getModule('ibid.plugins').iterModules():
28
        help="Output debugging information")
83
29
    try:
29
84
30
        __import__(module.name)
30
(options, args) = parser.parse_args()
85
31
    except Exception, e:
31
86
32
        print >> stderr, u"Couldn't load %s plugin: %s" % (module.name.replace('ibid.plugins.', ''), unicode(e))
32
if options.verbose:
87
33
    logging.basicConfig(level=logging.DEBUG)
88
34
else:
89
35
    logging.basicConfig(level=logging.INFO)
90
36
91
37
try:
92
38
    encoding = getenv("LANG").split(".")[1]
93
39
except:
94
40
    encoding = "ascii"
95
41
96
42
def prompt(prompt, secret=False):
97
43
    if secret:
98
44
        r = getpass(prompt)
99
45
    else:
100
46
        r = raw_input(prompt)
101
47
    return unicode(r, encoding)
102
33
48
103
34
ibid.options = {'base': '.'}
49
ibid.options = {'base': '.'}
104
35
if exists('ibid.ini'):
50
if exists('ibid.ini'):
105
36
    ibid.config = FileConfig('ibid.ini')
51
    ibid.config = FileConfig('ibid.ini')
106
37
    ibid.config.merge(FileConfig('local.ini'))
52
    ibid.config.merge(FileConfig('local.ini'))
107
38
    sname = None
53
    sname = None
108
39
109
40
else:
54
else:
111
41
    sample_config = resource_stream('ibid', 'config.ini')
55
    sample_config = resource_filename('ibid', 'config.ini')
112
42
    ibid.config = FileConfig(sample_config)
56
    ibid.config = FileConfig(sample_config)
113
43
57
115
44
    botname = raw_input(u'What would you like to call your bot? ')
58
    botname = prompt(u'\nWhat would you like to call your bot? ')
116
45
    ibid.config['botname'] = botname
59
    ibid.config['botname'] = botname
117
46
60
122
47
    print u'Please enter the full URL of the database to use, or just press Enter for an SQLite database.'
61
print u'Loading plugins...'
123
48
    ibid.config.databases['ibid'] = raw_input(u'Database URL: ') or 'sqlite:///ibid.db'
62
for module in getModule('ibid.plugins').iterModules():
124
49
63
    try:
125
50
    print u"Please enter the details for the primary source. Press Enter for the default option."
64
        __import__(module.name)
126
65
    except Exception, e:
127
66
        if options.verbose:
128
67
            print >> stderr, u"Couldn't load %s plugin: %s" % (
129
68
                    module.name.replace('ibid.plugins.', ''), unicode(e))
130
69
131
70
if not exists('ibid.ini'):
132
71
    print u"""
133
72
Database configuration:
134
73
If you want to use the default SQLite database, just press Enter.
135
74
Otherwise please enter a SQLAlchemy database URL.
136
75
Supported databases:
137
76
* mysql://user:pass@host/database
138
77
* postgres://user:pass@host/database (load the CITEXT contrib module first)
139
78
* sqlite:///filename"""
140
79
    ibid.config.databases['ibid'] = prompt(
141
80
            u'Database URL [Default: sqlite:///ibid.db]: '
142
81
        ) or 'sqlite:///ibid.db'
143
82
144
83
    print u"""
145
84
Source configuration:
146
85
Your bot needs to connect to an IM service (in Ibid terminology, a source) like
147
86
an IRC server or jabber account. Please enter the details for the primary
148
87
source.
149
88
Note: This setup script currently only supports IRC and jabber. You can set up
150
89
other sources manually in ibid.ini.
151
90
152
91
The source name should be the IRC network name or a generic description for the
153
92
source like 'jabber'.
154
93
"""
155
51
    source = {'nick': '$botname'}
94
    source = {'nick': '$botname'}
162
52
    sname = raw_input(u'Source name (e.g. freenode, atrum, jabber): ')
95
    sname = prompt(u'Source name (e.g. freenode, jabber): ')
163
53
    source['server'] = raw_input(u'Server: ')
96
    source['type'] = prompt(u'Source type (irc, jabber) [Default: irc]: ')
158
54
    port = raw_input(u'Port: ')
159
55
    if port:
160
56
        source['port'] = port
161
57
    source['type'] = raw_input(u'Source type (irc or jabber): ')
164
58
97
167
59
    if source['type'].lower() == 'irc':
98
    if source['type'].lower() in (u'irc', u''):
168
60
        source['channels'] = [c.strip() for c in raw_input(u'Default channels to join (comma separated): ').split(',')]
99
        source['server'] = prompt(u'IRC Server: ')
169
100
        port = prompt(u'Port [Default: 6667]: ')
170
101
        if port:
171
102
            source['port'] = port
172
103
        source['channels'] = [c.strip() for c in prompt(
173
104
            u'Channels to join (comma separated) [Default: none]: '
174
105
        ).split(u',')]
175
61
        source['auth'] = ['hostmask', 'nickserv']
106
        source['auth'] = ['hostmask', 'nickserv']
180
62
    elif source['type'].lower() == 'jabber':
107
    elif source['type'].lower() == u'jabber':
181
63
        source['jid'] = raw_input(u'JID: ')
108
        source['jid'] = prompt(u'JID (Jabber address): ')
182
64
        source['password'] = getpass(u'Password: ')
109
        source['password'] = prompt(u'Password: ', secret=True)
183
65
        source['rooms'] = [r.strip() for r in raw_input(u'Default rooms to join (comma separated): ').split(',')]
110
        source['rooms'] = [r.strip() for r in prompt(
184
111
            u'MUC rooms to join (comma separated) [Default: none]: '
185
112
        ).split(u',')]
186
66
        source['auth'] = ['implicit']
113
        source['auth'] = ['implicit']
187
67
        source['ssl'] = raw_input(u'SSL (Y/N): ').lower() in ('y', 'yes', 'true')
188
68
    else:
114
    else:
190
69
        print 'Invalid source type'
115
        print u'Invalid source type.'
191
70
        exit(1)
116
        exit(1)
192
71
117
193
72
    ibid.config.sources[sname] = source
118
    ibid.config.sources[sname] = source
194
73
119
195
74
    ibid.config.write(open('ibid.ini', 'w'))
120
    ibid.config.write(open('ibid.ini', 'w'))
196
75
    if not exists('logging.ini'):
121
    if not exists('logging.ini'):
198
76
        copyfileobj(resource_stream('ibid', 'logging.ini'), open('logging.ini', 'w'))
122
        copyfileobj(resource_stream('ibid', 'logging.ini'),
199
123
                    open('logging.ini', 'w'))
200
77
124
201
78
db = DatabaseManager(check_schema_versions=False)
125
db = DatabaseManager(check_schema_versions=False)
202
79
Session = db['ibid']
126
Session = db['ibid']
203
80
upgrade_schemas(Session)
127
upgrade_schemas(Session)
204
81
128
206
82
print u'Database tables created'
129
print u"""Database tables created
207
83
130
213
84
print u'Please enter the details for your account. This account will be given full admin permissions.'
131
Now we need to create an account for you in the bot so it knows who its
214
85
identity = unicode(raw_input('Nick/JID: '))
132
master is. This account will be given full admin permissions.
215
86
source = sname or unicode(raw_input('Source name: '))
133
Please enter the details for your account."""
216
87
pass1 = getpass('Password: ')
134
identity = prompt(u'Your IRC Nick/Jabber ID: ')
217
88
pass2 = getpass('Confirm password: ')
135
if not identity:
218
136
    print u'Skipping account creation'
219
137
    exit(0)
220
138
source = sname or prompt(u'Source name: ')
221
139
pass1 = prompt(u'Password to identify yourself to the bot: ', secret=True)
222
140
pass2 = prompt(u'Confirm password: ', secret=True)
223
89
141
224
90
if pass1 != pass2:
142
if pass1 != pass2:
226
91
    print 'Password do not match'
143
    print u'Password do not match'
227
92
    exit(1)
144
    exit(1)
228
93
145
229
94
session = Session()
146
session = Session()
230
@@ -97,7 +149,8 @@
231
97
account.identities.append(identity)
149
account.identities.append(identity)
232
98
150
233
99
for permission in (u'accounts', u'sources', u'plugins', u'core', u'admin',
151
for permission in (u'accounts', u'sources', u'plugins', u'core', u'admin',
235
100
    u'config', u'saydo', u'factoidadmin', u'karmaadmin', u'eval'):
152
    u'config', u'saydo', u'factoidadmin', u'karmaadmin', u'eval',
236
153
    u'chairmeeting'):
237
101
    perm = Permission(permission, u'auth')
154
    perm = Permission(permission, u'auth')
238
102
    account.permissions.append(perm)
155
    account.permissions.append(perm)
239
103
156
240
@@ -109,6 +162,6 @@
241
109
session.commit()
162
session.commit()
242
110
session.close()
163
session.close()
243
111
164
245
112
print 'Account created with admin permissions'
165
print u'Account created with admin permissions'
246
113
166
247
114
# vi: set et sta sw=4 ts=4:
167
# vi: set et sta sw=4 ts=4:
Reviewer	Date Requested	Status
Jonathan Hitchcock	2010-02-05	Approve on 2010-02-06
marcog (community)	2010-02-05	Approve on 2010-02-05
Michael Gorven	2010-02-05	Approve on 2010-02-05
Ibid Dev Team	2010-02-05	Pending
Ibid Core Team	2010-02-05	Pending
Review via email: mp+18699@code.launchpad.net