Refactor adobe_only_user_list checks together

Also improve logic such that NO combo of users and adobe_only_user_list is allowed (previously certain combos between invocation defaults and command line were accepted)

Author: janssenda

user_sync/config.py

@@ -173,8 +173,10 @@ def load_invocation_options(self):
 
         # --users and --adobe-only-user-list conflict with each other, so we need to disambiguate.
         # Argument specifications override configuration options, so you must have one or the other
-        # either as an argument or as a configured default.
-        if self.args['users'] and (self.args['adobe_only_user_list'] or options['adobe_only_user_list']):
+        # either as an argument or as a configured default.  For a complete check, we need to compare against
+        # BOTH the args values AND the options values (in order to catch the invocation defaults).
+        if (self.args['users'] or (options['users'] and options['users'] != self.invocation_defaults['users'])) \
+                and (self.args['adobe_only_user_list'] or options['adobe_only_user_list']):
             # specifying both --users and --adobe-only-user-list is an error
             raise AssertionException('You cannot specify both a --users arg and an --adobe-only-user-list arg')
         elif self.args['users']:
@@ -188,14 +190,6 @@ def load_invocation_options(self):
                 raise AssertionException('You cannot specify --adobe-only-user-list when using "push" strategy')
             users_spec = None
             stray_list_input_path = self.args['adobe_only_user_list']
-
-        # Check both that options['users'] exists, AND that it is not the default value before checking against
-        # the adobe_only_user_list parameter -  otherwise, defaults cause exception to be thrown unconditionally when
-        # the user list option is specified
-        elif (options['users'] and options['users'] != self.invocation_defaults['users']) and options['adobe_only_user_list']:
-            raise AssertionException('You cannot configure both a default "users" option (%s) '
-                                     'and a default "adobe-only-user-list" option (%s)' %
-                                     (' '.join(options['users']), options['adobe_only_user_list']))
         elif options['adobe_only_user_list']:
             users_spec = None
             stray_list_input_path = options['adobe_only_user_list']