Merge lp:~stefanor/ibid/botdir-data into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

[Jonathan Hitchcock (vhata)]

review: Approve

[Keegan Carruthers-Smith (keegan-csmith)]

Looks good. I am not that familiar with ibid core, but i was wondering what would happen if we were running ibid from an egg. Would stuff like this break? (My guess is no since you will use defaultish type values)

review: Approve

[Stefano Rivera (stefanor)]

> (My guess is no since you will use defaultish type values)

At the moment, ibid isn't eggable

[Michael Gorven (mgorven)]

 review approve
 status approved

review: Approve

=== modified file 'ibid/config.py'
--- ibid/config.py	2010-01-17 20:17:23 +0000
+++ ibid/config.py	2010-02-06 10:03:13 +0000
@@ -5,9 +5,9 @@
 
 from configobj import ConfigObj
 from validate import Validator
-from pkg_resources import resource_stream
 
 import ibid
+from ibid.utils import locate_resource
 
 def monkeypatch(self, name):
     if self.has_key(name):
@@ -17,7 +17,7 @@
 ConfigObj.__getattr__ = monkeypatch
 
 def FileConfig(filename):
-    spec = resource_stream(__name__, 'configspec.ini')
+    spec = file(locate_resource('ibid', 'configspec.ini'), 'r')
     configspec = ConfigObj(spec, list_values=False, encoding='utf-8')
     config = ConfigObj(filename, configspec=configspec, interpolation='Template', encoding='utf-8')
     config.validate(Validator())

=== modified file 'ibid/plugins/meetings.py'
--- ibid/plugins/meetings.py	2010-01-18 23:20:33 +0000
+++ ibid/plugins/meetings.py	2010-02-06 10:03:13 +0000
@@ -17,12 +17,12 @@
 from ibid.compat import json
 from ibid.config import BoolOption, IntOption, Option
 from ibid.plugins import Processor, match, authorise
+from ibid.source.http import templates
 from ibid.utils import format_date, plural
 
 help = {}
 log = logging.getLogger('plugins.meetings')
 
-templates = Environment(loader=PackageLoader('ibid', 'templates'))
 meetings = {}
 
 help['meeting'] = u'Take minutes of an IRC Meeting'

=== modified file 'ibid/plugins/urlgrab.py'
--- ibid/plugins/urlgrab.py	2010-01-25 09:23:49 +0000
+++ ibid/plugins/urlgrab.py	2010-02-06 10:03:13 +0000
@@ -8,13 +8,12 @@
 import logging
 import re
 
-from pkg_resources import resource_exists, resource_stream
-
 import ibid
 from ibid.plugins import Processor, handler
 from ibid.config import Option
 from ibid.db import IbidUnicode, IbidUnicodeText, Integer, DateTime, \
                     Table, Column, ForeignKey, Base, VersionedSchema
+from ibid.utils import locate_resource
 from ibid.utils.html import get_html_parse_tree
 
 help = {}
@@ -61,13 +60,12 @@
                        'delicious')
 
     def setup(self):
-        if resource_exists(__name__, '../data/tlds-alpha-by-domain.txt'):
-            tlds = [tld.strip().lower() for tld
-                    in resource_stream(__name__, '../data/tlds-alpha-by-domain.txt')
-                        .readlines()
-                    if not tld.startswith('#')
-            ]
-
+        tldfile = locate_resource('ibid', 'data/tlds-alpha-by-domain.txt')
+        if tldfile:
+            f = file(tldfile, 'r')
+            tlds = [tld.strip().lower() for tld in f.readlines()
+                    if not tld.startswith('#')]
+            f.close()
         else:
             log.warning(u"Couldn't open TLD list, falling back to minimal default")
             tlds = 'com.org.net.za'.split('.')

=== modified file 'ibid/source/http.py'
--- ibid/source/http.py	2010-01-18 22:53:52 +0000
+++ ibid/source/http.py	2010-02-06 10:03:13 +0000
@@ -6,15 +6,16 @@
 from twisted.web import server, resource, static, xmlrpc, soap
 from twisted.application import internet
 from twisted.internet import reactor
-from pkg_resources import resource_filename
-from jinja import Environment, PackageLoader
+from jinja import Environment, FileSystemLoader
 
 import ibid
 from ibid.source import IbidSourceFactory
 from ibid.event import Event
 from ibid.config import Option, IntOption
+from ibid.utils import locate_resource
 
-templates = Environment(loader=PackageLoader('ibid', 'templates'))
+templates = Environment(loader=FileSystemLoader(
+                               locate_resource('ibid', 'templates')))
 
 class Index(resource.Resource):
 
@@ -101,7 +102,7 @@
         root = Plugin(name)
         root.putChild('', Index(name))
         root.putChild('message', Message(name))
-        root.putChild('static', static.File(resource_filename('ibid', 'static')))
+        root.putChild('static', static.File(locate_resource('ibid', 'static')))
         root.putChild('RPC2', XMLRPC())
         root.putChild('SOAP', SOAP())
         self.site = server.Site(root)

=== removed file 'ibid/templates/__init__.py'
=== modified file 'ibid/utils/__init__.py'
--- ibid/utils/__init__.py	2010-02-03 11:48:04 +0000
+++ ibid/utils/__init__.py	2010-02-06 10:03:13 +0000
@@ -17,6 +17,7 @@
 import zlib
 
 from dateutil.tz import tzlocal, tzutc
+from pkg_resources import resource_exists, resource_filename
 
 import ibid
 from ibid.compat import defaultdict, json
@@ -228,4 +229,15 @@
         return singular
     return plural
 
+def locate_resource(path, filename):
+    "Locate a resource either within the botdir or the source tree"
+    fspath = os.path.join(*(
+        [ibid.options['base']] + path.split('.') + [filename]
+    ))
+    if os.path.exists(fspath):
+        return fspath
+    if not resource_exists(path, filename):
+        return None
+    return resource_filename(path, filename)
+
 # vi: set et sta sw=4 ts=4:

=== modified file 'scripts/ibid-plugin'
--- scripts/ibid-plugin	2010-01-29 16:35:04 +0000
+++ scripts/ibid-plugin	2010-02-06 10:03:13 +0000
@@ -20,7 +20,6 @@
 sys.path.insert(0, '.')
 
 import ibid
-import ibid.plugins
 from ibid.config import FileConfig
 from ibid.db.models import Identity
 from ibid.event import Event
@@ -57,6 +56,7 @@
 
 #ibid.plugins.auth_responses = auth_responses
 ibid.options = {'base': '.'}
+import ibid.plugins
 
 logging.basicConfig(level=logging.DEBUG)
 ibid.config = FileConfig("ibid.ini")