rename to bzrirker everywhere. Add project name option

diff --git a/__init__.py b/__init__.py
index 31a26806f81ca9ab2087b1bfcfde5039105ac581..ca1768e45974a038c8c4f297352aa85c4df057a4 100644 (file)
--- a/__init__.py
+++ b/__init__.py
@@ -13,7 +13,7 @@ from bzrlib.lazy_import import lazy_import
 # lazy_import so that it doesn't get loaded if it isn't used
 # Approach borrowed from bzr-email
 lazy_import(globals(), """\
-from bzrlib.plugins.irkerhook import irkerhook as _irkerhook
+from bzrlib.plugins.bzrirker import irkerhook as _irkerhook
 """)
 
 
@@ -40,18 +40,20 @@ def branch_post_change_hook(params):
 
 def test_suite():
     from unittest import TestSuite
-    import bzrlib.plugins.irkerhook.tests
+    import bzrlib.plugins.bzrirker.tests
     result = TestSuite()
-    result.addTest(bzrlib.plugins.irkerhook.tests.test_suite())
+    result.addTest(bzrlib.plugins.bzrirker.tests.test_suite())
     return result
 
 
 option_registry.register_lazy("irker_channels",
-    "bzrlib.plugins.irkerhook.irkerhook", "opt_irker_channels")
+    "bzrlib.plugins.bzrirker.irkerhook", "opt_irker_channels")
 option_registry.register_lazy("irker_colours",
-    "bzrlib.plugins.irkerhook.irkerhook", "opt_irker_colours")
+    "bzrlib.plugins.bzrirker.irkerhook", "opt_irker_colours")
 option_registry.register_lazy("irker_url",
-    "bzrlib.plugins.irkerhook.irkerhook", "opt_irker_url")
+    "bzrlib.plugins.bzrirker.irkerhook", "opt_irker_url")
+option_registry.register_lazy("irker_project",
+    "bzrlib.plugins.bzrirker.irkerhook", "opt_irker_project")
 
 from bzrlib.hooks import install_lazy_named_hook
 install_lazy_named_hook("bzrlib.branch", "Branch.hooks", 'post_commit',

diff --git a/irkerhook.py b/irkerhook.py
index b2dd4fe4e776e6e90191917c774f28052feb3902..208c0d87911df2831d7f5bb78c4fee527566c430 100644 (file)
--- a/irkerhook.py
+++ b/irkerhook.py
@@ -112,3 +112,5 @@ opt_irker_channels = Option('irker_channels',
     help='Channel(s) to post commit messages to.')
 opt_irker_colours = Option('irker_colours',
     help='Colour option for irker.')
+opt_irker_project = Option('irker_project',
+    help='Project name to use.')

diff --git a/setup.py b/setup.py
index 867e24e7ebce69f2d6626d61cd03ba16ed3fb4e6..4b78ee576ed0ac383e256a2695cd89d601c98dc5 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -15,8 +15,8 @@ if __name__ == '__main__':
       long_description="""
       Hooks into Bazaar and sends commit notification messages via irker.
       """,
-      package_dir={'bzrlib.plugins.irkerhook':'.',
-                   'bzrlib.plugins.irkerhook.tests':'tests'},
-      packages=['bzrlib.plugins.irkerhook',
-                'bzrlib.plugins.irkerhook.tests']
+      package_dir={'bzrlib.plugins.bzrirker':'.',
+                   'bzrlib.plugins.bzrirker.tests':'tests'},
+      packages=['bzrlib.plugins.bzrirker',
+                'bzrlib.plugins.bzrirker.tests']
       )

diff --git a/tests/testirker.py b/tests/testirker.py
index 918edd2fa3f511b23f42195e691f2e628051cd4e..8bec6d0d065955ae1035b67ec09bbea634062c6c 100644 (file)
--- a/tests/testirker.py
+++ b/tests/testirker.py
@@ -10,7 +10,7 @@ from bzrlib import (
     )
 from bzrlib.bzrdir import BzrDir
 from bzrlib.tests import TestCaseInTempDir
-from bzrlib.plugins.irker.irkerhook import IrkerSender
+from bzrlib.plugins.bzrirker.irkerhook import IrkerSender
 
 
 def test_suite():