Merge lp:~jderose/microfiber/no-auth into lp:microfiber

[Jason Gerard DeRose]

Okay, done. You can now run live tests like this:

./setup.py test --auth=open

When auth can be 'open', 'basic', or 'oauth'. The default is 'basic'.

Also made some small changes to debian/control.

=== modified file 'debian/control'
--- debian/control	2011-11-10 20:11:45 +0000
+++ debian/control	2011-12-09 00:01:25 +0000
@@ -12,11 +12,12 @@
 Package: python3-microfiber
 Architecture: all
 Depends: ${misc:Depends}, python3 (>= 3.2)
+Suggests: python3-microfiber-doc, python3-usercouch
 Description: fabric for a lightweight Couch
- microfiber is an abstract adapter for making HTTP requests to an arbitrary JSON
+ Microfiber is an abstract adapter for making HTTP requests to an arbitrary JSON
  loving REST API like CouchDB.  Rather than wrapping the API in a bunch of
- one-off methods, microfiber just makes it super easy to call any part of the
- CouchDB REST API, current or future.  This approach allows microfiber to be
+ one-off methods, Microfiber just makes it super easy to call any part of the
+ CouchDB REST API, current or future.  This approach allows Microfiber to be
  very simple and basically maintenance free as it requires no changes to support
  new additions to the CouchDB API.
 
@@ -26,10 +27,10 @@
 Depends: ${misc:Depends}, libjs-jquery
 Suggests: python3-microfiber
 Description: documentation for python3-microfiber
- microfiber is an abstract adapter for making HTTP requests to an arbitrary JSON
+ Microfiber is an abstract adapter for making HTTP requests to an arbitrary JSON
  loving REST API like CouchDB.  Rather than wrapping the API in a bunch of
- one-off methods, microfiber just makes it super easy to call any part of the
- CouchDB REST API, current or future.  This approach allows microfiber to be
+ one-off methods, Microfiber just makes it super easy to call any part of the
+ CouchDB REST API, current or future.  This approach allows Microfiber to be
  very simple and basically maintenance free as it requires no changes to support
  new additions to the CouchDB API.
  .

=== modified file 'setup.py'
--- setup.py	2011-10-24 16:07:43 +0000
+++ setup.py	2011-12-09 00:01:25 +0000
@@ -44,12 +44,14 @@
 
     user_options = [
         ('no-live', None, 'skip live tests against tmp CouchDB instances'),
-        ('oauth', None, 'run live tests using oauth instead of basic auth'),
+        ('auth=', None,
+            "live test with 'open', 'basic', or 'oauth'; default is 'basic'"
+        ),
     ]
 
     def initialize_options(self):
         self.no_live = 0
-        self.oauth = 0
+        self.auth = 'basic'
 
     def finalize_options(self):
         pass
@@ -58,9 +60,8 @@
         # Possibly set environ variables for live test:
         if self.no_live:
             os.environ['MICROFIBER_TEST_NO_LIVE'] = 'true'
-
-        if self.oauth:
-            os.environ['MICROFIBER_TEST_OAUTH'] = 'true'
+        else:
+            os.environ['MICROFIBER_TEST_AUTH'] = self.auth
 
         pynames = ['microfiber', 'test_microfiber']
 

=== modified file 'test_microfiber.py'
--- test_microfiber.py	2011-10-23 03:58:25 +0000
+++ test_microfiber.py	2011-12-09 00:01:25 +0000
@@ -488,9 +488,9 @@
             self.skipTest('called with --no-live')
         if usercouch is None:
             self.skipTest('`usercouch` not installed')
-        self.oauth = (os.environ.get('MICROFIBER_TEST_OAUTH') == 'true')
+        self.auth = os.environ.get('MICROFIBER_TEST_AUTH', 'basic')
         self.tmpcouch = usercouch.misc.TempCouch()
-        self.env = self.tmpcouch.bootstrap(self.oauth)
+        self.env = self.tmpcouch.bootstrap(self.auth)
 
     def tearDown(self):
         self.tmpcouch = None