kallithea Changeset - e5cb0a4e061a

Changeset - e5cb0a4e061a

Parent rev.

Child rev.

[Not reviewed]

kallithea-2.2.5-rebrand

0 3 0

Bradley M. Kuhn - 11 years ago 2014-07-03 01:03:47
bkuhn@sfconservancy.org

Change command line tool config location to .config/kallithea

3 files changed with 2 insertions and 3 deletions:

.hgignore

rhodecode/bin/base.py

rhodecode/bin/rhodecode_gist.py

0 comments (0 inline, 0 general)

.hgignore

➞

Show inline comments

@@ @@ -2,26 +2,25 @@ syntax: glob @@
 *.pyc
 *.swp
 *.sqlite
 *.tox
 *.egg-info
 *.egg
 syntax: regexp
 ^rcextensions
 ^build
 ^dist/
 ^docs/build/
 ^docs/_build/
 ^data$
 ^sql_dumps/
 ^\.settings$
 ^\.project$
 ^\.pydevproject$
 ^\.coverage$
 ^rhodecode\.db$
 ^test\.db$
 ^RhodeCode\.egg-info$
 ^rc.*\.ini$
 ^fabfile.py
 ^\.rhodecode$
 ^\.idea$

rhodecode/bin/base.py

➞

Show inline comments

@@ @@ -16,49 +16,49 @@ rhodecode.bin.base @@
 ~~~~~~~~~~~~~~~~~~
 Base utils for shell scripts
 :created_on: May 09, 2013
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH.
 :license: GPLv3, see LICENSE for more details.
 """
 import os
 import sys
 import random
 import urllib2
 import pprint
 try:
     from rhodecode.lib.ext_json import json
 except ImportError:
     try:
         import simplejson as json
     except ImportError:
         import json
-CONFIG_NAME = '.rhodecode'
+CONFIG_NAME = '.config/kallithea'
 FORMAT_PRETTY = 'pretty'
 FORMAT_JSON = 'json'
 def api_call(apikey, apihost, 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:
     :returns: json response from server
     """
     def _build_data(random_id):
         """
         Builds API data with given random ID
         :param random_id:
         """
         return {
             "id": random_id,
             "api_key": apikey,

rhodecode/bin/rhodecode_gist.py

➞

Show inline comments

@@ @@ -27,49 +27,49 @@ from __future__ import with_statement @@
 import os
 import sys
 import stat
 import argparse
 import fileinput
 from rhodecode.bin.base import json, api_call, RcConf, FORMAT_JSON, FORMAT_PRETTY
 def argparser(argv):
     usage = (
       "rhodecode-gist [-h] [--format=FORMAT] [--apikey=APIKEY] [--apihost=APIHOST] "
       "[--config=CONFIG] [--save-config] [GIST OPTIONS] "
       "[filename or stdin use - for terminal stdin ]\n"
       "Create config file: rhodecode-gist --apikey=<key> --apihost=http://rhodecode.server --save-config"
+    )
     parser = argparse.ArgumentParser(description='RhodeCode Gist 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 path DEFAULT: ~/.rhodecode')
+    group.add_argument('--config', help='config file path DEFAULT: ~/.config/kallithea')
     group.add_argument('--save-config', action='store_true',
                        help='save the given config into a file')
     group = parser.add_argument_group('GIST')
     group.add_argument('-p', '--private', action='store_true',
                        help='create private Gist')
     group.add_argument('-f', '--filename',
                        help='set uploaded gist filename, '
                             'also defines syntax highlighting')
     group.add_argument('-d', '--description', help='Gist description')
     group.add_argument('-l', '--lifetime', metavar='MINUTES',
                        help='gist lifetime in minutes, -1 (DEFAULT) is forever')
     group.add_argument('--format', dest='format', type=str,
                        help='output format DEFAULT: `%s` can '
                        'be also `%s`' % (FORMAT_PRETTY, FORMAT_JSON),
             default=FORMAT_PRETTY
+    )
     args, other = parser.parse_known_args()
     return parser, args, other
 def _run(argv):
     conf = None
     parser, args, other = argparser(argv)

0 comments (0 inline, 0 general)