You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by mc...@apache.org on 2014/04/23 19:16:49 UTC
[2/2] git commit: Add a "get version" API method. (This is needed for
a logging-related change for twitter.)
Add a "get version" API method. (This is needed for a logging-related change for twitter.)
While I'm in there, fix a bug in "job list".
Reviewed at https://reviews.apache.org/r/20490/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/760e5d3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/760e5d3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/760e5d3c
Branch: refs/heads/master
Commit: 760e5d3c0e2f1db5e29ee891423aea8c60043fcf
Parents: 1a4579f
Author: Mark Chu-Carroll <mc...@twopensource.com>
Authored: Wed Apr 23 13:13:04 2014 -0400
Committer: Mark Chu-Carroll <mc...@twitter.com>
Committed: Wed Apr 23 13:13:04 2014 -0400
----------------------------------------------------------------------
src/main/python/apache/aurora/client/cli/BUILD | 1 +
src/main/python/apache/aurora/client/cli/__init__.py | 13 ++++++++++++-
src/main/python/apache/aurora/client/cli/jobs.py | 2 --
src/test/python/apache/aurora/client/cli/test_help.py | 2 +-
4 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/760e5d3c/src/main/python/apache/aurora/client/cli/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/BUILD b/src/main/python/apache/aurora/client/cli/BUILD
index 02e061c..17cdc28 100644
--- a/src/main/python/apache/aurora/client/cli/BUILD
+++ b/src/main/python/apache/aurora/client/cli/BUILD
@@ -33,6 +33,7 @@ python_library(
dependencies = [
pants(':cli'),
pants(':bridge'),
+ pants('3rdparty/python:twitter.common.python'),
pants('src/main/python/apache/aurora/client/bin:aurora_client_lib')
]
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/760e5d3c/src/main/python/apache/aurora/client/cli/__init__.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/__init__.py b/src/main/python/apache/aurora/client/cli/__init__.py
index 10b1d1d..5a10328 100644
--- a/src/main/python/apache/aurora/client/cli/__init__.py
+++ b/src/main/python/apache/aurora/client/cli/__init__.py
@@ -39,6 +39,8 @@ import logging
import sys
from uuid import uuid1
+from twitter.common.python.pex import PexInfo
+from twitter.common.python.dirwrapper import PythonDirectoryWrapper
# Constants for standard return codes.
EXIT_OK = 0
@@ -70,6 +72,15 @@ def print_aurora_log(sev, msg, *args, **kwargs):
kwargs['extra'] = extra
logger.log(sev, msg, *args, **kwargs)
+def get_client_version():
+ try:
+ pexpath = sys.argv[0]
+ pex_info = PexInfo.from_pex(PythonDirectoryWrapper.get(pexpath))
+ return ("%s@%s" % (pex_info.build_properties.get('sha', 'unknown'),
+ pex_info.build_properties.get('date', 'unknown')))
+ except (IOError, PythonDirectoryWrapper.Error):
+ return "VersionUnknown"
+
class Context(object):
class Error(Exception): pass
@@ -266,7 +277,7 @@ class CommandLine(object):
@property
def composed_help(self):
"""Get a fully composed, well-formatted help message"""
- result = ["Usage:"]
+ result = ["Aurora Client version %s" % get_client_version(), "Usage:"]
for noun in self.registered_nouns:
result += ["==Commands for %ss" % noun]
result += [" %s" % s for s in self.nouns[noun].usage] + [""]
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/760e5d3c/src/main/python/apache/aurora/client/cli/jobs.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/jobs.py b/src/main/python/apache/aurora/client/cli/jobs.py
index 0793a1a..0534bdf 100644
--- a/src/main/python/apache/aurora/client/cli/jobs.py
+++ b/src/main/python/apache/aurora/client/cli/jobs.py
@@ -390,8 +390,6 @@ class ListJobsCommand(Verb):
jobs = context.get_jobs_matching_key(context.options.jobspec)
for j in jobs:
context.print_out('%s/%s/%s/%s' % (j.cluster, j.role, j.env, j.name))
- result = self.get_status_for_jobs(jobs, context)
- context.print_out(result)
return EXIT_OK
class OpenCommand(Verb):
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/760e5d3c/src/test/python/apache/aurora/client/cli/test_help.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_help.py b/src/test/python/apache/aurora/client/cli/test_help.py
index 6876bb7..12d8671 100644
--- a/src/test/python/apache/aurora/client/cli/test_help.py
+++ b/src/test/python/apache/aurora/client/cli/test_help.py
@@ -44,7 +44,7 @@ class TestHelp(unittest.TestCase):
side_effect=self.mock_print):
self.cmd.execute(['help'])
assert len(self.transcript) > 10
- assert self.transcript[0] == 'Usage:'
+ assert self.transcript[1] == 'Usage:'
assert '==Commands for jobs' in self.transcript
assert '==Commands for quotas' in self.transcript