kallithea Changeset - e487d2a6aa38

Changeset - e487d2a6aa38

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-06-04 01:33:48
marcin@python-works.com

Added optional --format=json into api cli. That will return pure JSON data from server

1 file changed with 21 insertions and 7 deletions:

rhodecode/bin/rhodecode_api.py

0 comments (0 inline, 0 general)

rhodecode/bin/rhodecode_api.py

➞

Show inline comments

@@ @@ -38,12 +38,14 @@ except ImportError: @@
         import simplejson as json
     except ImportError:
         import json
 CONFIG_NAME = '.rhodecode'
 FORMAT_PRETTY = 'pretty'
 FORMAT_JSON = 'json'
 class RcConf(object):
     """
     RhodeCode config for API
@@ @@ -111,18 +113,20 @@ class RcConf(object): @@
                 return  json.load(conf)
         except IOError, e:
             #sys.stderr.write(str(e) + '\n')
             pass
 def api_call(apikey, apihost, method=None, **kw):
+def api_call(apikey, apihost, format, method=None, **kw):
     """
     Api_call wrapper for RhodeCode
     :param apikey:
     :param apihost:
     :param format: formatting, pretty means prints and pprint of json
      json returns unparsed json
     :param method:
     """
     def _build_data(random_id):
         """
         Builds API data with given random ID
@@ @@ -139,27 +143,33 @@ def api_call(apikey, apihost, method=Non @@
     if not method:
         raise Exception('please specify method name !')
     id_ = random.randrange(1, 200)
     req = urllib2.Request('%s/_admin/api' % apihost,
                       data=json.dumps(_build_data(id_)),
                       headers={'content-type': 'text/plain'})
     print 'calling %s to %s' % (req.get_data(), apihost)
     if format == FORMAT_PRETTY:
         sys.stdout.write('calling %s to %s \n' % (req.get_data(), apihost))
     ret = urllib2.urlopen(req)
     json_data = json.loads(ret.read())
     raw_json = ret.read()
     json_data = json.loads(raw_json)
     id_ret = json_data['id']
     _formatted_json = pprint.pformat(json_data)
     if id_ret == id_:
         print 'rhodecode said:\n%s' % (_formatted_json)
         if format == FORMAT_JSON:
             sys.stdout.write(str(raw_json))
         else:
             sys.stdout.write('rhodecode returned:\n%s\n' % (_formatted_json))
     else:
         raise Exception('something went wrong. '
                         'ID mismatch got %s, expected %s | %s' % (
                                             id_ret, id_, _formatted_json))
 def argparser(argv):
-    usage = ("rhodecode_api [-h] [--apikey APIKEY] [--apihost APIHOST] "
+    usage = ("rhodecode_api [-h] [--format=FORMAT] [--apikey=APIKEY] [--apihost=APIHOST] "
              "_create_config or METHOD <key:val> <key2:val> ...")
     parser = argparse.ArgumentParser(description='RhodeCode API cli',
                                      usage=usage)
     ## config
@@ @@ -168,13 +178,17 @@ def argparser(argv): @@
     group.add_argument('--apihost', help='api host')
     group = parser.add_argument_group('API')
     group.add_argument('method', metavar='METHOD', type=str,
             help='API method name to call followed by key:value attributes',
+    )
     group.add_argument('--format', dest='format', type=str,
             help='output format default: `pretty` can '
                  'be also `%s`' % FORMAT_JSON,
             default=FORMAT_PRETTY
+    )
     args, other = parser.parse_known_args()
     return parser, args, other
 def main(argv=None):
     """
@@ @@ -206,11 +220,11 @@ def main(argv=None): @@
     apikey = args.apikey or conf['apikey']
     host = args.apihost or conf['apihost']
     method = args.method
     margs = dict(map(lambda s: s.split(':', 1), other))
     api_call(apikey, host, method, **margs)
+    api_call(apikey, host, args.format, method, **margs)
     return 0
 if __name__ == '__main__':
     sys.exit(main(sys.argv))

0 comments (0 inline, 0 general)