Updated the PathType and StorePathAction classes to allow for asserting if a path contains an executable.

Author: Rostepher

utils/build_swift/argparse/actions.py

@@ -180,7 +180,7 @@ def __init__(self, option_strings, **kwargs):
 
         if 'choices' in kwargs:
             kwargs['nargs'] = Nargs.OPTIONAL
-        if 'const' in kwargs:
+        elif 'const' in kwargs:
             kwargs['nargs'] = Nargs.ZERO
 
         super(StoreAction, self).__init__(
@@ -242,8 +242,11 @@ class StorePathAction(StoreAction):
     """
 
     def __init__(self, option_strings, **kwargs):
+        assert_exists = kwargs.pop('exists', False)
+        assert_executable = kwargs.pop('executable', False)
+
         kwargs['nargs'] = Nargs.SINGLE
-        kwargs['type'] = PathType()
+        kwargs['type'] = PathType(assert_exists, assert_executable)
         kwargs.setdefault('metavar', 'PATH')
 
         super(StorePathAction, self).__init__(

utils/build_swift/argparse/types.py

@@ -62,19 +62,30 @@ class PathType(object):
     by the path exists.
     """
 
-    def __init__(self, assert_exists=False):
+    def __init__(self, assert_exists=False, assert_executable=False):
+        if assert_executable:
+            assert_exists = True
+
         self.assert_exists = assert_exists
+        self.assert_executable = assert_executable
 
     def __call__(self, path):
         path = os.path.expanduser(path)
         path = os.path.abspath(path)
         path = os.path.realpath(path)
 
-        if self.assert_exists:
-            assert os.path.exists(path)
+        if self.assert_exists and not os.path.exists(path):
+            raise ArgumentTypeError('{} does not exists'.format(path))
+
+        if self.assert_executable and not PathType._is_executable(path):
+            raise ArgumentTypeError('{} is not an executable'.format(path))
 
         return path
 
+    @staticmethod
+    def _is_executable(path):
+        return os.path.isfile(path) and os.access(path, os.X_OK)
+
 
 class RegexType(object):
     """Argument type used to validate an input string against a regular

utils/build_swift/tests/argparse/test_actions.py

@@ -7,9 +7,11 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
+import os
+
 from ..utils import TestCase, redirect_stderr
-from ...argparse import (ArgumentParser, BoolType, Nargs, PathType, SUPPRESS,
-                         actions)
+from ...argparse import (ArgumentParser, ArgumentTypeError, BoolType, Nargs,
+                         PathType, SUPPRESS, actions)
 
 
 # -----------------------------------------------------------------------------
@@ -252,6 +254,22 @@ def test_default_attributes(self):
         self.assertEqual(action.nargs, Nargs.SINGLE)
         self.assertIsInstance(action.type, PathType)
 
+    def test_exists(self):
+        pass
+
+    def test_executable(self):
+        parser = ArgumentParser()
+        parser.add_argument('--foo', action=actions.StorePathAction,
+                            executable=True)
+
+        bash_path = '/bin/bash'
+        if os.path.exists(bash_path) and os.access(bash_path, os.X_OK):
+            with self.assertNotRaises(ArgumentTypeError):
+                parser.parse_args(['--foo', bash_path])
+
+        with self.assertRaises(SystemExit):
+            parser.parse_args(['--foo', __file__])
+
 
 class TestToggleTrueAction(TestCase):
 

utils/build_swift/tests/argparse/test_types.py

@@ -90,13 +90,26 @@ def test_expands_path(self):
     def test_assert_exists(self):
         path_type = types.PathType(assert_exists=True)
 
-        with self.assertNotRaises(AssertionError):
+        with self.assertNotRaises(ArgumentTypeError):
             path_type(__file__)
 
-        with self.assertRaises(AssertionError):
+        with self.assertRaises(ArgumentTypeError):
             path_type('/nonsensisal/path/')
             path_type('~/not-a-real/path to a file')
 
+    def test_assert_executable(self):
+        path_type = types.PathType(assert_executable=True)
+
+        self.assertTrue(path_type.assert_exists)
+
+        bash_path = '/bin/bash'
+        if os.path.isfile(bash_path) and os.access(bash_path, os.X_OK):
+            with self.assertNotRaises(ArgumentTypeError):
+                path_type(bash_path)
+
+        with self.assertRaises(ArgumentTypeError):
+            path_type(__file__)
+
 
 class TestRegexType(TestCase):