🚧 configuration loop can now configure custom services

Signed-off-by: Guyzmo <[email protected]>

Author: guyzmo

git_repo/repo.py

@@ -503,21 +503,54 @@ def loop_input(*args, method=input, **kwarg):
             return out
 
         def setup_service(service):
+            new_conf = dict(
+                    fqdn=None,
+                    remote=None,
+                    )
             conf = service.get_config(self.config)
             if 'token' in conf:
                 raise Exception('A token has been generated for this service. Please revoke and delete before proceeding.')
 
+            print('Is your service self-hosted?')
+            if 'y' in input('    [yN]> ').lower():
+                new_conf['type'] = service.name
+                print('What name do you want to give this service?')
+                new_conf['name'] = input('[{}]> '.format(service.name))
+                new_conf['command'] = new_conf['name']
+                service.name, service.command = new_conf['name'], new_conf['command']
+                print('Enter the service\'s domain name:')
+                new_conf['fqdn'] = input('[{}]> '.format(service.fqdn))
+                print('Enter the service\'s port:')
+                new_conf['port'] = input('[443]> ') or 443
+                print('Are you connecting using HTTPS? (you should):')
+                if 'n' in input('    [Yn]> ').lower():
+                    new_conf['scheme'] = 'http'
+                else:
+                    new_conf['scheme'] = 'https'
+                    print('Do you need to use an insecure connection? (you shouldn\'t):')
+                    new_conf['insecure'] = 'y' in input('    [yN]> ').lower()
+                    service.session_insecure = new_conf['insecure']
+                    if not new_conf['insecure']:
+                        print('Do you want to setup the path to custom certificate?:')
+                        if 'y' in input('    [yN]> ').lower():
+                            new_conf['server-cert'] = loop_input('/path/to/certbundle.pem []> ')
+                            service.session_certificate = new_conf['server-cert']
+
+                service.fqdn = new_conf['fqdn']
+                service.port = new_conf['port']
+                service.scheme = new_conf['scheme']
+
             print('Please enter your credentials to connect to the service:')
             username = loop_input('username> ')
             password = loop_input('password> ', method=getpass)
 
-            token = service.get_auth_token(username, password, prompt=loop_input)
+            new_conf['token'] = service.get_auth_token(username, password, prompt=loop_input)
             print('Great! You\'ve been identified 🍻')
 
             print('Do you want to give a custom name for this service\'s remote?')
             if 'y' in input('    [yN]> ').lower():
                 print('Enter the remote\'s name:')
-                loop_input('[{}]> '.format(service.name))
+                new_conf['remote'] = loop_input('[{}]> '.format(service.name))
 
             print('Do you want to configure a git alias?')
             print('N.B.: instead of typing `git repo {0}` you\'ll be able to type `git {0}`'.format(service.command))
@@ -526,7 +559,7 @@ def setup_service(service):
             else:
                 set_alias = True
 
-            service.store_config(self.config, token=token)
+            service.store_config(self.config, **new_conf)
             if set_alias:
                 service.set_alias(self.config)
 

git_repo/services/service.py

@@ -61,7 +61,8 @@ class RepositoryService:
 
     config_options = [
             'type', 'token', 'alias', 'fqdn', 'remote',
-            'port', 'scheme', 'insecure',
+            'port', 'scheme', 'insecure', 'name', 'command',
+            'server-cert'
             ]
 
     @classmethod
@@ -88,7 +89,7 @@ def get_config(cls, config):
     @classmethod
     def store_config(cls, config, **kwarg):
         with git_config.GitConfigParser(config, read_only=False) as config:
-            section = 'gitrepo "{}"'.format(cls.name)
+            section = 'gitrepo "{}"'.format(kwarg.get('name', cls.name))
             for option, value in kwarg.items():
                 if option not in cls.config_options:
                     raise ArgumentError('Option {} is invalid and cannot be setup.'.format(option))
@@ -109,13 +110,13 @@ def get_service(cls, repository, command):
         :return: instance for using the service
         '''
         if not repository:
-            config = git_config.GitConfigParser(self.get_config_path())
+            config = git_config.GitConfigParser(cls.get_config_path())
         else:
             config = repository.config_reader()
         target = cls.command_map.get(command, command)
         conf_section = list(filter(lambda n: 'gitrepo' in n and target in n, config.sections()))
 
-        http_section = [config._sections[scheme] for scheme in ('http', 'https')]
+        http_section = [config._sections[scheme] for scheme in ('http', 'https') if scheme in config.sections()]
 
         # check configuration constraints
         if len(conf_section) == 0:
@@ -146,7 +147,7 @@ def get_service(cls, repository, command):
     def get_auth_token(cls, login, password, prompt=None):
         raise NotImplementedError
 
-    def load_configuration(self, c, hc):
+    def load_configuration(self, c, hc=[]):
         CONFIG_TRUE=('on', 'true', 'yes', '1')
         # if there's a configuration file, update the names accordingly
         if c:
@@ -167,19 +168,18 @@ def load_configuration(self, c, hc):
                                                       c.get('privatekey', None))))
         self._alias = c.get('alias', self.name)
 
-        self.fqdn, port = c.get('fqdn', self.fqdn).split(':')
-        self.port = port or None
+        self.fqdn = c.get('fqdn', self.fqdn)
+        self.scheme = c.get('scheme', 'https')
+        self.port = c.get('port', '443')
 
-        self.default_create_private = c.get('default-create-private', 'false').lower() in CONFIG_TRUE
-        self.ssh_url = c.get('ssh-url', None) or self.fqdn
+        self.default_create_private = c.get('default-create-private', 'n').lower() in CONFIG_TRUE
+        self.ssh_url = c.get('ssh-url', self.fqdn)
 
         self.session_insecure = c.get('insecure', 'false').lower() in CONFIG_TRUE
         self.session_certificate = c.get('certificate', None)
         self.session_proxy = {cf['__name__']: cf['proxy'] for cf in hc if cf.get('proxy', None)}
 
-
-
-    def __init__(self, r=None, c=None, hc=None):
+    def __init__(self, r=None, c=None, hc=[]):
         '''
         :param r: git-python repository instance
         :param c: configuration data

tests/helpers.py

@@ -46,7 +46,7 @@ def mockup_git(self, namespace, repository, url=None):
 class RepositoryMockup(RepositoryService):
     name = 'test_name'
     command = 'test_command'
-    fqdn = 'http://example.org'
+    fqdn = 'example.org'
     def __init__(self, *args, **kwarg):
         super(RepositoryMockup, self).__init__(*args, **kwarg)
         self._did_pull = None
@@ -359,6 +359,7 @@ def main_open(self, repo=None, rc=0, args={}):
         return RepositoryService._current._did_open
 
     def main_config(self, target, rc=0, args={}):
+        self.target = target
         assert rc == main(self.setup_args({
             'config': True,
             '--config': os.path.join(self.tempdir.name, 'gitconfig')

tests/integration/test_main.py

@@ -576,13 +576,82 @@ def test_request_create__no_repo_slug(self, capsys, caplog):
     def test_config(self, capsys, caplog):
         import sys, io, getpass
         getpass.getpass = input
-        sys.stdin = io.StringIO('\n'.join(['y', 'user', 'pass', 'y', 'fubar', 'y']))
+        sys.stdin = io.StringIO('\n'.join(['y', 'n', 'user', 'pass', 'y', 'fubar', 'y']))
         #
         conf = self.main_config(target='hub', rc=0)
-        assert ['[gitrepo "github"]\n',
+        assert sorted(['[gitrepo "github"]\n',
+                '\tremote = fubar\n',
                 '\ttoken = user:pass\n',
                 '[alias]\n',
-                '\ttest_command = repo test_command\n'] == conf
+                '\ttest_command = repo test_command\n']) == sorted(conf)
+        last_conf = conf
+
+        sys.stdin = io.StringIO('\n'.join([
+            'y', 'y', 'frama', 'framagit.org', '', '', '', '', 'user', 'pass', 'y', 'framagit', 'y']))
+        #
+        conf = self.main_config(target='lab', rc=0)
+        assert sorted(last_conf+[
+                '[gitrepo "frama"]\n',
+                '\tfqdn = framagit.org\n',
+                '\tremote = framagit\n',
+                '\ttype = gitlab\n',
+                '\tname = frama\n',
+                '\tcommand = frama\n',
+                '\tport = 443\n',
+                '\tscheme = https\n',
+                '\tinsecure = False\n',
+                '\ttoken = user:pass\n', ]) == sorted(conf)
+        last_conf = conf
+
+        sys.stdin = io.StringIO('\n'.join([
+            'y', 'y', 'test0r', 'localhost', '8080', 'n', 'user', 'pass', 'y', 'test', 'y']))
+        #
+        conf = self.main_config(target='lab', rc=0)
+        assert sorted(last_conf+[
+                '[gitrepo "test0r"]\n',
+                '\tfqdn = localhost\n',
+                '\tremote = test\n',
+                '\ttype = gitlab\n',
+                '\tname = test0r\n',
+                '\tcommand = test0r\n',
+                '\tport = 8080\n',
+                '\tscheme = http\n',
+                '\ttoken = user:pass\n', ]) == sorted(conf)
+        last_conf = conf
+
+        sys.stdin = io.StringIO('\n'.join([
+            'y', 'y', 'selfsigned', 'server.local', '8443',
+            '', '', 'y', '/etc/server.pem', 'user', 'pass', 'y', 'self', 'y']))
+        #
+        conf = self.main_config(target='lab', rc=0)
+        assert sorted(last_conf+['[gitrepo "selfsigned"]\n',
+                '\tfqdn = server.local\n',
+                '\tremote = self\n',
+                '\ttype = gitlab\n',
+                '\tname = selfsigned\n',
+                '\tcommand = selfsigned\n',
+                '\tport = 8443\n',
+                '\tscheme = https\n',
+                '\tinsecure = False\n',
+                '\tserver-cert = /etc/server.pem\n',
+                '\ttoken = user:pass\n', ]) == sorted(conf)
+        last_conf = conf
+
+        sys.stdin = io.StringIO('\n'.join([
+            'y', 'y', 'lamer', 'pwnme.com', '',
+            '', 'y', 'user', 'pass', 'y', 'l', 'y']))
+        #
+        conf = self.main_config(target='lab', rc=0)
+        assert sorted(last_conf+['[gitrepo "lamer"]\n',
+                '\tfqdn = pwnme.com\n',
+                '\tremote = l\n',
+                '\ttype = gitlab\n',
+                '\tname = lamer\n',
+                '\tcommand = lamer\n',
+                '\tport = 443\n',
+                '\tscheme = https\n',
+                '\tinsecure = True\n',
+                '\ttoken = user:pass\n', ]) == sorted(conf)
 
     def test_z_noop(self):
         self.main_noop('guyzmo/git-repo', 1)