Merge lp:~elopio/cloudspacesclient/tox into lp:cloudspacesclient

[Leo Arias]

Added the tox environment manager.

Changed configparser to configglue because it has a problem with virtualenv.

[lp:~elopio/cloudspacesclient/tox]

50. By Leo Arias on 2013-12-07

Reverted the requirements, added setup.py.

51. By Leo Arias on 2013-12-07

Changed the requirement to configglue.

52. By Leo Arias on 2013-12-07

Remove extra space.

[Richard Huddie (rhuddie)]

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-12-07 06:24:24 +0000
@@ -0,0 +1,1 @@
+src/cloudspacesclient/config/local.conf

=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2013-12-07 06:24:24 +0000
@@ -0,0 +1,17 @@
+Conformance tests for servers implementing the Cloudspaces API.
+
+Requirements:
+
+ python 3.3
+ tox >= 1.6.1
+
+Configure:
+
+ Create a file in src/cloudspacesclient/config/local.conf
+ You can see the expected config options and sample values in
+ src/cloudspacesclient/config/sample.conf
+
+Run the tests:
+
+ Run tox on the top-level directory:
+ $ tox

=== modified file 'requirements.txt'
--- requirements.txt	2013-11-21 15:16:25 +0000
+++ requirements.txt	2013-12-07 06:24:24 +0000
@@ -1,7 +1,8 @@
-configparser
+configglue
 requests
 requests-oauthlib
 ssoclient
+bzr+http://bazaar.launchpad.net/~chipaca/+junk/cloudspacer
 
 # For tests.
 dateutil

=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2013-12-07 06:24:24 +0000
@@ -0,0 +1,51 @@
+# Copyright (C) 2013 Canonical Ltd.
+#
+# This file is part of cloudspacesclient.
+#
+# cloudspacesclient is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cloudspacesclient is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cloudspacesclient.  If not, see <http://www.gnu.org/licenses/>.
+
+import setuptools
+
+
+VERSION = 0.1
+
+
+setuptools.setup(
+    name='cloudspacesprotocol',
+    version=VERSION,
+
+    author='Ubuntu One Hackers',
+    author_email='[e-mail]',
+    license='GPLv3+',
+
+    package_dir={'': 'src',},
+    packages=setuptools.find_packages(),
+    dependency_links=[
+        'bzr+http://bazaar.launchpad.net/~chipaca/+junk/cloudspacer'
+    ],
+    install_requires=[
+        'cloudspacer',
+        'configglue',
+        'requests',
+        'requests-oauthlib',
+        'ssoclient'
+    ],
+    tests_require=[
+        'python-dateutil',
+        'mock',
+        'testscenarios',
+        'validictory'
+    ],
+    test_suite='cloudspacesclient'
+)

=== modified file 'src/cloudspacesclient/config/__init__.py'
--- src/cloudspacesclient/config/__init__.py	2013-11-19 06:58:43 +0000
+++ src/cloudspacesclient/config/__init__.py	2013-12-07 06:24:24 +0000
@@ -17,10 +17,12 @@
 
 import os
 
-import configparser
-
-
-CONFIG_FILE = 'cloudspaces.conf'
+from configglue import glue
+
+from cloudspacesclient.config import schema
+
+
+CONFIG_FILE = 'local.conf'
 
 
 def get_config_file():
@@ -28,9 +30,8 @@
     return os.path.join(config_dir, CONFIG_FILE)
 
 
-_config = configparser.ConfigParser()
-_config.read(get_config_file())
+_glue = glue.configglue(schema.CloudspacesSchema, get_config_file())
 
 
 def get(section, option):
-    return _config.get(section, option)
+    return _glue.schema_parser.get(section, option)

=== renamed file 'src/cloudspacesclient/config/cloudspaces.conf' => 'src/cloudspacesclient/config/sample.conf'
--- src/cloudspacesclient/config/cloudspaces.conf	2013-12-05 23:30:32 +0000
+++ src/cloudspacesclient/config/sample.conf	2013-12-07 06:24:24 +0000
@@ -1,12 +1,15 @@
 [cloudspaces]
-#cloudspaces_server_url = http://u1.local:8003
-cloudspaces_server_url = http://u1-precise:38096
+cloudspaces_server_url = http://u1.local:8003
 cloudspaces_server_adapter = cloudspacesclient.ubuntuone.UbuntuOneServer
+# Use the existing user adapter if you can't create a new user for every test.
+# cloudspaces_server_adapter = cloudspacesclient.ubuntuone.UbuntuOneServerWithExistingUser
 
 [ubuntuone]
 sso_server_url = http://sso.local:8001
-#sso_server_url = http://u1-precise.local:8001
-#sso_server_url = https://login.staging.ubuntu.com
 ubuntuone_server_url = http://u1.local:8003
-#ubuntuone_server_url = http://u1-precise.local:8003
-#ubuntuone_server_url = https://staging.one.ubuntu.com
+# Set the oauth values if you are testing the Ubuntu One server with an
+# existing user.
+# token_key = 
+# token_secret =
+# consumer_key =
+# consumer_secret =

=== added file 'src/cloudspacesclient/config/schema.py'
--- src/cloudspacesclient/config/schema.py	1970-01-01 00:00:00 +0000
+++ src/cloudspacesclient/config/schema.py	2013-12-07 06:24:24 +0000
@@ -0,0 +1,33 @@
+# Copyright (C) 2013 Canonical Ltd.
+#
+# This file is part of cloudspacesclient.
+#
+# cloudspacesclient is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cloudspacesclient is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cloudspacesclient.  If not, see <http://www.gnu.org/licenses/>.
+
+from configglue import schema
+
+
+class CloudspacesSchema(schema.Schema):
+
+    class cloudspaces(schema.Section):
+        cloudspaces_server_url = schema.StringOption(default=None)
+        cloudspaces_server_adapter = schema.StringOption(default=None)
+
+    class ubuntuone(schema.Section):
+        sso_server_url = schema.StringOption(default=None)
+        ubuntuone_server_url = schema.StringOption(default=None)
+        token_key = schema.StringOption(default=None)
+        token_secret = schema.StringOption(default=None)
+        consumer_key = schema.StringOption(default=None)
+        consumer_secret = schema.StringOption(default=None)

=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2013-12-07 06:24:24 +0000
@@ -0,0 +1,25 @@
+# Copyright (C) 2013 Canonical Ltd.
+#
+# This file is part of cloudspacesclient.
+#
+# cloudspacesclient is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cloudspacesclient is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cloudspacesclient.  If not, see <http://www.gnu.org/licenses/>.
+
+[tox]
+envlist = py33
+
+[testenv]
+deps = -rrequirements.txt
+commands = 
+    {envpython} setup.py install
+    {envpython} setup.py test