Rev 5: Add a location field to plugin info. in http://people.ubuntu.com/~robertc/baz2.0/plugins/plugin_info/trunk

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/plugins/plugin_info/trunk

------------------------------------------------------------
revno: 5
revision-id:robertc at robertcollins.net-20080229163617-7lrd2v0i22pgbobj
parent: robertc at robertcollins.net-20080229162558-1e0du5ryizp1jblc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Sat 2008-03-01 03:36:17 +1100
message:
  Add a location field to plugin info.
modified:
  extract.py                     extract.py-20080229115650-cgv523um54o9zvew-1
  tests/test_extract.py          test_extract.py-20080229115650-cgv523um54o9zvew-2
=== modified file 'extract.py'
--- a/extract.py	2008-02-29 16:25:58 +0000
+++ b/extract.py	2008-02-29 16:36:17 +0000
@@ -32,12 +32,13 @@
     treedir = tempdir + '/plugin'
     try:
         branch.create_checkout(treedir, lightweight=True)
-        return extract_info_local(treedir)
+        result = extract_info_local(treedir)
+        result.location = branch.base
+        return result
     finally:
         osutils.rmtree(tempdir, ignore_errors=True)
 
 
-
 def extract_info_local(path):
     """Extract plugin info from a plugin directory on disk.
 
@@ -62,6 +63,7 @@
     result.checkout_formats = eval_globals.get('bzr_checkout_formats', {})
     result.branch_formats = eval_globals.get('bzr_branch_formats', {})
     result.repository_formats = eval_globals.get('bzr_repository_formats', {})
+    result.location = path
     return result
 
 
@@ -71,6 +73,7 @@
     def __init__(self):
         """Create a PluginInfo instance."""
         self.name = None
+        self.location = None
         self.commands = []
         self.version_info = None
         self.minimum_bzr_version = None

=== modified file 'tests/test_extract.py'
--- a/tests/test_extract.py	2008-02-29 16:25:58 +0000
+++ b/tests/test_extract.py	2008-02-29 16:36:17 +0000
@@ -31,6 +31,7 @@
     def test_defaults(self):
         plugin = PluginInfo()
         self.assertEqual(None, plugin.name)
+        self.assertEqual(None, plugin.location)
         self.assertEqual([], plugin.commands)
         self.assertEqual(None, plugin.version_info)
         self.assertEqual(None, plugin.minimum_bzr_version)
@@ -51,6 +52,7 @@
         plugin_expected.checkout_formats = "7"
         plugin_expected.branch_formats = "8"
         plugin_expected.repository_formats = "9"
+        plugin_expected.location = "10"
         plugin = copy(plugin_expected)
         self.assertEqual(plugin_expected, plugin)
         plugin.name = None
@@ -88,6 +90,10 @@
         plugin.repository_formats = None
         self.assertNotEqual(plugin_expected, plugin)
 
+        plugin = copy(plugin_expected)
+        plugin.location = None
+        self.assertNotEqual(plugin_expected, plugin)
+
 
 class TestExtraction(TestCaseWithTransport):
 
@@ -95,7 +101,9 @@
         self.build_tree(['foo-bar/'])
         self.build_tree_contents([('foo-bar/setup.py', '')])
         plugin = extract_info_local('foo-bar')
-        self.assertEqual(PluginInfo(), plugin)
+        expected_plugin = PluginInfo()
+        expected_plugin.location = 'foo-bar'
+        self.assertEqual(expected_plugin, plugin)
 
     def sample_setup(self):
         return """
@@ -129,10 +137,11 @@
         return expected_plugin
 
     def test_extract_all_variables(self):
-        self.build_tree(['foo-bar/'])
-        self.build_tree_contents([('foo-bar/setup.py', self.sample_setup())])
-        plugin = extract_info_local('foo-bar')
+        self.build_tree(['foo--bar/'])
+        self.build_tree_contents([('foo--bar/setup.py', self.sample_setup())])
+        plugin = extract_info_local('foo--bar')
         expected_plugin = self.expected_plugin()
+        expected_plugin.location = 'foo--bar'
         self.assertEqual(expected_plugin, plugin)
 
     def test_extract_info_branch(self):
@@ -141,4 +150,5 @@
         tree.add(['setup.py'])
         tree.commit('yay history')
         expected_plugin = self.expected_plugin()
+        expected_plugin.location = tree.branch.base
         self.assertEqual(expected_plugin, extract_info_branch(tree.branch))