kallithea Changeset - 94a92bd832c5

Changeset - 94a92bd832c5

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-07-07 16:00:56
marcin@python-works.com

added --config option into rhodecode-api script for optional path for
config

1 file changed with 20 insertions and 8 deletions:

rhodecode/bin/rhodecode_api.py

0 comments (0 inline, 0 general)

rhodecode/bin/rhodecode_api.py

➞

Show inline comments

@@ @@ -45,26 +45,27 @@ FORMAT_PRETTY = 'pretty' @@
 FORMAT_JSON = 'json'
 class RcConf(object):
     """
     RhodeCode config for API
     conf = RcConf()
     conf['key']
     """
     def __init__(self, autoload=True, autocreate=False, config=None):
         self._conf_name = CONFIG_NAME
     def __init__(self, config_location=None, autoload=True, autocreate=False,
                  config=None):
         self._conf_name = CONFIG_NAME if not config_location else config_location
         self._conf = {}
         if autocreate:
             self.make_config(config)
         if autoload:
             self._conf = self.load_config()
     def __getitem__(self, key):
         return self._conf[key]
     def __nonzero__(self):
         if self._conf:
             return True
@@ @@ -74,27 +75,34 @@ class RcConf(object): @@
         return self._conf.__eq__()
     def __repr__(self):
         return 'RcConf<%s>' % self._conf.__repr__()
     def make_config(self, config):
         """
         Saves given config as a JSON dump in the _conf_name location
         :param config:
         :type config:
         """
         update = False
         if os.path.exists(self._conf_name):
             update = True
         with open(self._conf_name, 'wb') as f:
             json.dump(config, f, indent=4)
             sys.stdout.write('Updated conf\n')
         if update:
             sys.stdout.write('Updated config in %s\n' % self._conf_name)
         else:
             sys.stdout.write('Created new config in %s\n' % self._conf_name)
     def update_config(self, new_config):
         """
         Reads the JSON config updates it's values with new_config and
         saves it back as JSON dump
         :param new_config:
         """
         config = {}
         try:
             with open(self._conf_name, 'rb') as conf:
                 config = json.load(conf)
@@ @@ -157,34 +165,38 @@ def api_call(apikey, apihost, format, me @@
         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] [--format=FORMAT] [--apikey=APIKEY] [--apihost=APIHOST] "
              "_create_config or METHOD <key:val> <key2:val> ...")
     usage = (
       "rhodecode_api [-h] [--format=FORMAT] [--apikey=APIKEY] [--apihost=APIHOST] "
       " [--config=CONFIG] "
       "_create_config or METHOD <key:val> <key2:val> ..."
+    )
     parser = argparse.ArgumentParser(description='RhodeCode API cli',
                                      usage=usage)
     ## config
     group = parser.add_argument_group('config')
     group.add_argument('--apikey', help='api access key')
     group.add_argument('--apihost', help='api host')
     group.add_argument('--config', help='config file')
     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
@@ @@ -198,30 +210,30 @@ def main(argv=None): @@
     :type argv:
     """
     if argv is None:
         argv = sys.argv
     conf = None
     parser, args, other = argparser(argv)
     api_credentials_given = (args.apikey and args.apihost)
     if args.method == '_create_config':
         if not api_credentials_given:
             raise parser.error('_create_config requires --apikey and --apihost')
         conf = RcConf(autocreate=True, config={'apikey': args.apikey,
         conf = RcConf(config_location=args.config,
                       autocreate=True, config={'apikey': args.apikey,
                                                'apihost': args.apihost})
         sys.stdout.write('Create new config in %s\n' % CONFIG_NAME)
     if not conf:
         conf = RcConf(autoload=True)
+        conf = RcConf(config_location=args.config, autoload=True)
         if not conf:
             if not api_credentials_given:
                 parser.error('Could not find config file and missing '
                              '--apikey or --apihost in params')
     apikey = args.apikey or conf['apikey']
     host = args.apihost or conf['apihost']
     method = args.method
     if method == '_create_config':
         sys.exit()
     try:

0 comments (0 inline, 0 general)