Merge ~smoser/usd-importer:usd-clone-user-cleanup into usd-importer:master

[Scott Moser]

[Nish Aravamudan (nacc)]

review: Approve

diff --git a/usd/clone.py b/usd/clone.py
index 1dc0a4a..aa70201 100644
--- a/usd/clone.py
+++ b/usd/clone.py
@@ -6,13 +6,14 @@ import re
 from subprocess import CalledProcessError
 import sys
 from usd.git_repository import USDGitRepository
-from usd.run import decode_binary
+from usd.run import decode_binary, run
+
+LP_USER_NONE = 'NONE'
 
 class USDClone:
     def __init__(self):
         self.lpusi = 'usd-import-team'
         self.lpusd = 'ubuntu-server-dev'
-        self.LP_USER_NONE = 'NONE'
 
     def parse_args(self, subparsers=None):
         kwargs = dict(
@@ -63,69 +64,55 @@ Example:
             return parser.parse_args()
         return 'clone - %s' % kwargs['description']
 
-    def find_lp_user(self, user_in):
+    @staticmethod
+    def find_lp_user(user_in=None):
         # find a launchpad user.
         # return 1 on error, 2 on "just didn't find anything"
         if user_in is not None:
             return user_in
+        rmatch = re.compile(
+            r'^(url.*(git\+|)ssh://(.*)@git.launchpad.*).insteadof.*')
+        gitcmd = ['git', 'config', '--get-regexp', 'url.*ssh://.*.insteadof']
         try:
             # ideally could use self.local_repo.config.get_multivar
             # but it does not support getting by regex
-            cp = self.local_repo.git_run(['config', '--get-regexp',
-                                          'url.git.*.insteadof'
-                                         ]
-                                        )
-            instead_of_re = r'^(url.git\+ssh://(.*)@git.launchpad.*).insteadof.*'
-            for instead_of in decode_binary(cp.stdout).strip():
-                m = re.match(instead_of_re, instead_of)
+            cp = run(gitcmd)
+            for line in decode_binary(cp.stdout).splitlines():
+                m = rmatch.match(line)
                 if m is not None:
-                    logging.debug('found user %s in %s' % (m.group(1),
-                                                           m.group(0)
-                                                          )
-                                 )
-                    return m.group(1)
-                    break
+                    logging.debug("found user '%s' in '%s'",
+                                  m.group(3), m.group(1))
+                    return m.group(3)
         except CalledProcessError:
             # if no insteadof found
             logging.debug("Unable to find a launchpad user in git config.")
             return None
 
-    def prompt_for_lpuser(self):
+    @staticmethod
+    def prompt_for_lpuser(default=LP_USER_NONE):
         if not sys.stdin.isatty() or not sys.stdout.isatty():
-            logging.error('Input not a terminal, assuming user=%s' %
-                          self.LP_USER_NONE
-                         )
-            return self.LP_USER_NONE
+            logging.error('Input not a terminal, assuming user=%s', default)
+            return default
         user = input('What is your launchpad username? [Enter to skip] ')
         if len(user) == 0:
             logging.error("pass --no-launchpad-user to avoid this prompt.")
-            _RET="$none"
-            return self.LP_USER_NONE
+            return default
         url = 'ssh://[e-mail]/' % user
-        args = ['config', '--global', 'url.%s.insteadof' % url, 'lp:']
+        args = ['git', 'config', '--global', 'url.%s.insteadof' % url, 'lp:']
         logging.error('I can store this answer for next time by adding '
                       'a git config alias of "lp:" to "%s"\n'
-                      'Command to do that is:\n%s' %
-                      (url, ' '.join(args))
-                     ) 
-        add = input('Shall I do that now? [Y/n] ')
-        if len(add) == 0:
-            add = 'y'
-        if add == 'y' or add == 'Y' or add == 'yes' or add == 'Yes':
-            add = 'y'
-        if add == 'n' or add == 'N' or add == 'no' or add == 'No':
-            add = 'n'
-        if add != 'y' and add != 'n':
-            logging.error('Assuming "%s" meant no.' % add)
-            add='n'
-        if add == 'y':
+                      'Command to do that is:\n  %s',
+                      url, ' '.join(args))
+        add = input('Shall I do that now? [Y/n] ').lower()
+        if add in ("", "y", "yes"):
             try:
-                self.local_repo.git_run(args)
+                run(args)
             except CalledProcessError:
-                logging.error('failed to configure git with %s' %
-                              ' '.join(args)
-                             )
+                logging.error('failed to configure git with %s',
+                              ' '.join(args))
                 sys.exit(1)
+        elif add not in ("n", "no"):
+            logging.error('Assuming "%s" meant no.', add)
         return user
 
     def render_url(self, proto, user):
@@ -141,7 +128,7 @@ Example:
             logging.error('empty package')
             return None
         if proto == 'ssh':
-            if self.lp_user is None or self.lp_user == self.LP_USER_NONE:
+            if self.lp_user is None or self.lp_user == LP_USER_NONE:
                 logging.error("ssh requires lpuser")
                 return None
             return '%s://%s@%s' % (proto, self.lp_user, base)
@@ -154,7 +141,7 @@ Example:
         self.package = args.package
         self.proto = args.proto
         if args.no_launchpad_user:
-            self.lp_user = self.LP_USER_NONE
+            self.lp_user = LP_USER_NONE
         else:
             self.lp_user = args.launchpad_user
         self.directory = (
@@ -183,14 +170,14 @@ Example:
             self.lp_user = self.prompt_for_lpuser()
 
         usd_proto = 'ssh'
-        if self.lp_user == self.LP_USER_NONE:
+        if self.lp_user == LP_USER_NONE:
             usd_proto = self.proto
 
         remotes = [
             (self.proto, self.lpusi, 'importer'),
             (usd_proto, self.lpusd, 'lpusd')
                   ]
-        if self.lp_user != self.LP_USER_NONE:
+        if self.lp_user != LP_USER_NONE:
             remotes += [('ssh', self.lp_user, self.lp_user)]
 
         for proto, user, namespace in remotes: