From c699a22c843685ab53c3a7295cb72d2b6bac0f37 Mon Sep 17 00:00:00 2001
From: Jiri Stransky <jistr@redhat.com>
Date: Fri, 12 Jul 2013 10:54:20 +0200
Subject: [PATCH 1/2] Rename v1_0 module to v1

To be synced with Tuskar HTTP API versions.
---
 tuskarclient/shell.py                                  | 4 ++--
 tuskarclient/tests/{v1_0 => v1}/__init__.py            | 0
 tuskarclient/tests/{v1_0 => v1}/test_client.py         | 2 +-
 tuskarclient/tests/{v1_0 => v1}/test_racks.py          | 2 +-
 tuskarclient/tests/{v1_0 => v1}/test_resource_class.py | 2 +-
 tuskarclient/{v1_0 => v1}/__init__.py                  | 0
 tuskarclient/{v1_0 => v1}/argparsers.py                | 0
 tuskarclient/{v1_0 => v1}/client.py                    | 4 ++--
 tuskarclient/{v1_0 => v1}/racks.py                     | 0
 tuskarclient/{v1_0 => v1}/resource_classes.py          | 0
 10 files changed, 7 insertions(+), 7 deletions(-)
 rename tuskarclient/tests/{v1_0 => v1}/__init__.py (100%)
 rename tuskarclient/tests/{v1_0 => v1}/test_client.py (97%)
 rename tuskarclient/tests/{v1_0 => v1}/test_racks.py (97%)
 rename tuskarclient/tests/{v1_0 => v1}/test_resource_class.py (96%)
 rename tuskarclient/{v1_0 => v1}/__init__.py (100%)
 rename tuskarclient/{v1_0 => v1}/argparsers.py (100%)
 rename tuskarclient/{v1_0 => v1}/client.py (93%)
 rename tuskarclient/{v1_0 => v1}/racks.py (100%)
 rename tuskarclient/{v1_0 => v1}/resource_classes.py (100%)

diff --git a/tuskarclient/shell.py b/tuskarclient/shell.py
index 71f542b..066f745 100755
--- a/tuskarclient/shell.py
+++ b/tuskarclient/shell.py
@@ -19,7 +19,7 @@ from __future__ import print_function
 import logging
 import logging.handlers
 import sys
-import tuskarclient.v1_0.argparsers
+import tuskarclient.v1.argparsers
 
 logger = logging.getLogger(__name__)
 
@@ -30,7 +30,7 @@ class TuskarShell(object):
         self.raw_args = raw_args
 
     def run(self):
-        parser = tuskarclient.v1_0.argparsers.create_top_parser()
+        parser = tuskarclient.v1.argparsers.create_top_parser()
         args = parser.parse_args(self.raw_args)
 
         if args.help or not self.raw_args:
diff --git a/tuskarclient/tests/v1_0/__init__.py b/tuskarclient/tests/v1/__init__.py
similarity index 100%
rename from tuskarclient/tests/v1_0/__init__.py
rename to tuskarclient/tests/v1/__init__.py
diff --git a/tuskarclient/tests/v1_0/test_client.py b/tuskarclient/tests/v1/test_client.py
similarity index 97%
rename from tuskarclient/tests/v1_0/test_client.py
rename to tuskarclient/tests/v1/test_client.py
index 02563af..bc51cf6 100644
--- a/tuskarclient/tests/v1_0/test_client.py
+++ b/tuskarclient/tests/v1/test_client.py
@@ -11,7 +11,7 @@
 #    under the License.
 
 from tuskarclient.tests import utils as tutils
-from tuskarclient.v1_0 import client
+from tuskarclient.v1 import client
 
 
 class ClientTest(tutils.TestCase):
diff --git a/tuskarclient/tests/v1_0/test_racks.py b/tuskarclient/tests/v1/test_racks.py
similarity index 97%
rename from tuskarclient/tests/v1_0/test_racks.py
rename to tuskarclient/tests/v1/test_racks.py
index edc5da7..86658ed 100644
--- a/tuskarclient/tests/v1_0/test_racks.py
+++ b/tuskarclient/tests/v1/test_racks.py
@@ -12,7 +12,7 @@
 
 import mock
 
-from tuskarclient.v1_0 import racks
+from tuskarclient.v1 import racks
 import tuskarclient.tests.utils as tutils
 
 
diff --git a/tuskarclient/tests/v1_0/test_resource_class.py b/tuskarclient/tests/v1/test_resource_class.py
similarity index 96%
rename from tuskarclient/tests/v1_0/test_resource_class.py
rename to tuskarclient/tests/v1/test_resource_class.py
index 0c5e189..1a7f2d8 100644
--- a/tuskarclient/tests/v1_0/test_resource_class.py
+++ b/tuskarclient/tests/v1/test_resource_class.py
@@ -12,7 +12,7 @@
 
 import mock
 
-from tuskarclient.v1_0 import resource_classes
+from tuskarclient.v1 import resource_classes
 import tuskarclient.tests.utils as tutils
 
 
diff --git a/tuskarclient/v1_0/__init__.py b/tuskarclient/v1/__init__.py
similarity index 100%
rename from tuskarclient/v1_0/__init__.py
rename to tuskarclient/v1/__init__.py
diff --git a/tuskarclient/v1_0/argparsers.py b/tuskarclient/v1/argparsers.py
similarity index 100%
rename from tuskarclient/v1_0/argparsers.py
rename to tuskarclient/v1/argparsers.py
diff --git a/tuskarclient/v1_0/client.py b/tuskarclient/v1/client.py
similarity index 93%
rename from tuskarclient/v1_0/client.py
rename to tuskarclient/v1/client.py
index 8c4b385..917c014 100644
--- a/tuskarclient/v1_0/client.py
+++ b/tuskarclient/v1/client.py
@@ -11,8 +11,8 @@
 #    under the License.
 
 from tuskarclient.common import http
-from tuskarclient.v1_0 import racks
-from tuskarclient.v1_0 import resource_classes
+from tuskarclient.v1 import racks
+from tuskarclient.v1 import resource_classes
 
 
 class Client(http.HTTPClient):
diff --git a/tuskarclient/v1_0/racks.py b/tuskarclient/v1/racks.py
similarity index 100%
rename from tuskarclient/v1_0/racks.py
rename to tuskarclient/v1/racks.py
diff --git a/tuskarclient/v1_0/resource_classes.py b/tuskarclient/v1/resource_classes.py
similarity index 100%
rename from tuskarclient/v1_0/resource_classes.py
rename to tuskarclient/v1/resource_classes.py

From 00622fe2193722a90309baf76d8e64c9828c5335 Mon Sep 17 00:00:00 2001
From: Jiri Stransky <jistr@redhat.com>
Date: Fri, 12 Jul 2013 11:01:41 +0200
Subject: [PATCH 2/2] Gitignore coverage temp files

Sometimes the coverage tool generates temp files like
`.coverage.f18-tuskar.21667.397772`. They are now gitignored.
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f1629ff..90a6254 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,5 +12,5 @@
 /AUTHORS
 /ChangeLog
 
-.coverage
+/.coverage*
 /cover