cli: Import project info from config in setup.py, fix debug msgs

yadvr · yadvr · commit 19a290500e17 · 2013-03-19T16:05:11.000+05:30
Signed-off-by: Rohit Yadav &lt;bhaisaab@apache.org&gt;

lsdfjk

Signed-off-by: Rohit Yadav &lt;bhaisaab@apache.org&gt;
diff --git a/tools/cli/cloudmonkey/__init__.py b/tools/cli/cloudmonkey/__init__.py
@@ -16,6 +16,8 @@
 # under the License.
 
 try:
-    from config import __version__
+    from config import __version__, __description__
+    from config import __maintainer__, __maintaineremail__
+    from config import __project__, __projecturl__, __projectemail__
 except ImportError, e:
     print e
diff --git a/tools/cli/cloudmonkey/cloudmonkey.py b/tools/cli/cloudmonkey/cloudmonkey.py
@@ -484,8 +484,6 @@ def main():
                       help="prints cloudmonkey version information")
 
     (options, args) = parser.parse_args()
-    print 'args', args
-    print 'options', options
     if options.version:
         print "cloudmonkey", __version__
         print __description__, "(%s)" % __projecturl__
diff --git a/tools/cli/setup.py b/tools/cli/setup.py
@@ -22,34 +22,32 @@
     use_setuptools()
     from setuptools import setup, find_packages
 
-from cloudmonkey import __version__
-
-name = 'cloudmonkey'
-version = __version__
-requires = ['Pygments>=1.5',
-            'prettytable>=0.6',
-           ]
+from cloudmonkey import __version__, __description__
+from cloudmonkey import __maintainer__, __maintaineremail__
+from cloudmonkey import __project__, __projecturl__, __projectemail__
 
 try:
     import readline
 except ImportError:
     requires.append('readline')
 
 setup(
-    name = name,
-    version = version,
-    author = "The Apache CloudStack Team",
-    author_email = "cloudstack-dev@incubator.apache.org",
-    maintainer = "Rohit Yadav",
-    maintainer_email = "bhaisaab@apache.org",
-    url = "http://incubator.apache.org/cloudstack",
-    description = "Command Line Interface for Apache CloudStack",
-    long_description = "cloudmonkey is a command line interface for Apache "
-                     "CloudStack powered by CloudStack Marvin",
+    name = 'cloudmonkey',
+    version = __version__,
+    author = __project__,
+    author_email = __projectemail__,
+    maintainer = __maintainer__,
+    maintainer_email = __maintaineremail__,
+    url = __projecturl__,
+    description = __description__,
+    long_description = "cloudmonkey is a CLI for Apache CloudStack",
     platforms = ("Any",),
     license = 'ASL 2.0',
     packages = find_packages(),
-    install_requires = requires,
+    install_requires = [
+        'Pygments>=1.5',
+        'prettytable>=0.6',
+    ],
     include_package_data = True,
     zip_safe = False,
     classifiers = [
