[KSS-checkins] r51991 - kukit/kss.base/trunk/src/kss/base

[jvloothuis at codespeak.net]

Author: jvloothuis
Date: Sat Mar  1 13:49:01 2008
New Revision: 51991

Modified:
   kukit/kss.base/trunk/src/kss/base/plugin.txt
   kukit/kss.base/trunk/src/kss/base/utils.py
   kukit/kss.base/trunk/src/kss/base/utils.txt
Log:

Fixed the listing of plugins for the ksspackage utility

Made the plugin test clean up after itself


Modified: kukit/kss.base/trunk/src/kss/base/plugin.txt
==============================================================================
--- kukit/kss.base/trunk/src/kss/base/plugin.txt	(original)
+++ kukit/kss.base/trunk/src/kss/base/plugin.txt	Sat Mar  1 13:49:01 2008
@@ -156,3 +156,12 @@
   >>> ExamplePlugin.priority = -99999
   >>> list(available_plugins())
   [('testing', <ExamplePlugin ...>), ('kss-core', <kss.base.config.KSSCore ...>)]
+
+
+Cleanup
+-------
+
+Finally we will cleanup the working set so that the next tests won't
+find our example plugin.
+
+  >>> pkg_resources.working_set.entry_keys['.'] = []

Modified: kukit/kss.base/trunk/src/kss/base/utils.py
==============================================================================
--- kukit/kss.base/trunk/src/kss/base/utils.py	(original)
+++ kukit/kss.base/trunk/src/kss/base/utils.py	Sat Mar  1 13:49:01 2008
@@ -3,7 +3,7 @@
 import optparse
  
 from kss.base import javascript
-from kss.base.plugin import activate, active_plugins
+from kss.base.plugin import activate, available_plugins
  
 def ksspackage():
     parser = optparse.OptionParser()
@@ -50,7 +50,8 @@
 
     elif options.list_plugins:
         print "Available plugins:"
-        for id, factory in active_plugins():
+
+        for id, factory in available_plugins():
             print "  %s" % id
             
     else:

Modified: kukit/kss.base/trunk/src/kss/base/utils.txt
==============================================================================
--- kukit/kss.base/trunk/src/kss/base/utils.txt	(original)
+++ kukit/kss.base/trunk/src/kss/base/utils.txt	Sat Mar  1 13:49:01 2008
@@ -41,10 +41,10 @@
 
 To find out which plugin we can use, let us ask for the available plugins.
 
-//  >>> sys.argv = ['ksspackage', '--list']
-//  >>> ksspackage()
-//  Available plugins:
-//    kss-core
+  >>> sys.argv = ['ksspackage', '--list']
+  >>> ksspackage()
+  Available plugins:
+    kss-core
 
 Now that we provide a plugin, its files are put into the dir.
 
@@ -59,10 +59,3 @@
 
   >>> sys.argv = old_argv
 
-The code hereunder should be removed : strangely, it only works after the code
-above.
-
-  >>> sys.argv = ['ksspackage', '--list']
-  >>> ksspackage()
-  Available plugins:
-    kss-core