Merge "Fix broken --version command"

2 files changed, 94 insertions, 6 deletions

diff --git a/openstack/common/version.py b/openstack/common/version.py
index a19e422..dae88e3 100644
--- a/openstack/common/version.py
+++ b/openstack/common/version.py
@@ -24,17 +24,37 @@ import pkg_resources
 import setup
 
 
-class _deferred_version_string(object):
+class _deferred_version_string(str):
     """Internal helper class which provides delayed version calculation."""
-    def __init__(self, version_info, prefix):
-        self.version_info = version_info
-        self.prefix = prefix
+
+    def __new__(cls, version_info, prefix):
+        new_obj = str.__new__(cls, "")
+        new_obj._version_info = version_info
+        new_obj._prefix = prefix
+        new_obj._cached_version = None
+        return new_obj
+
+    def _get_cached_version(self):
+        if not self._cached_version:
+            self._cached_version = \
+                "%s%s" % (self._prefix,
+                self._version_info.version_string())
+        return self._cached_version
+
+    def __len__(self):
+        return self._get_cached_version().__len__()
+
+    def __contains__(self, item):
+        return self._get_cached_version().__contains__(item)
+
+    def __getslice__(self, i, j):
+        return self._get_cached_version().__getslice__(i, j)
 
     def __str__(self):
-        return "%s%s" % (self.prefix, self.version_info.version_string())
+        return self._get_cached_version()
 
     def __repr__(self):
-        return "%s%s" % (self.prefix, self.version_info.version_string())
+        return self._get_cached_version()
 
 
 class VersionInfo(object):
diff --git a/tests/unit/test_version.py b/tests/unit/test_version.py
new file mode 100644
index 0000000..8e60f51
--- /dev/null
+++ b/tests/unit/test_version.py
@@ -0,0 +1,68 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 Red Hat, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import os
+import shutil
+import sys
+import StringIO
+import tempfile
+import unittest
+
+import stubout
+
+from openstack.common.cfg import *
+from openstack.common import version
+
+
+class BaseTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.stubs = stubout.StubOutForTesting()
+
+    def tearDown(self):
+        self.stubs.UnsetAll()
+
+
+class DeferredVersionTestCase(BaseTestCase):
+
+    def setUp(self):
+        super(DeferredVersionTestCase, self).setUp()
+        self.conf = ConfigOpts()
+
+    def test_deferred_version(self):
+        class MyVersionInfo(version.VersionInfo):
+            def _generate_version(self):
+                return "5.5.5.5"
+
+        deferred_string = MyVersionInfo("openstack").\
+            deferred_version_string()
+        self.conf([], project="project", prog="prog", version=deferred_string)
+        self.assertEquals("5.5.5.5", str(self.conf.version))
+
+    def test_print_deferred_version(self):
+        class MyVersionInfo(version.VersionInfo):
+            def _generate_version(self):
+                return "5.5.5.5"
+
+        deferred_string = MyVersionInfo("openstack")\
+            .deferred_version_string()
+        self.stubs.Set(sys, 'stderr', StringIO.StringIO())
+        self.assertRaises(SystemExit,
+                          self.conf, ['--version'],
+                          project="project",
+                          prog="prog",
+                          version=deferred_string)
+        self.assertEquals("5.5.5.5", sys.stderr.getvalue().strip())