Support single-hyphen flags.

dbieber · dbieber · commit 53a3498fd2d1 · 2018-10-05T16:30:19.000-07:00
PiperOrigin-RevId: 215983601 Change-Id: I7d7d1323b786bc93f3f311a609e7b8f836011ac4 Reviewed-on: https://team-review.git.corp.google.com/c/330493 Reviewed-by: David Bieber <dbieber@google.com>
diff --git a/fire/core.py b/fire/core.py
@@ -798,7 +798,7 @@ def _ParseKeywordArgs(args, fn_spec):
 
       keyword = ''
       if _IsSingleCharFlag(argument):
-        keychar = argument[1]
+        keychar = argument.lstrip('-')
         potential_args = [arg for arg in fn_args if arg[0] == keychar]
         if len(potential_args) == 1:
           keyword = potential_args[0]
@@ -807,7 +807,7 @@ def _ParseKeywordArgs(args, fn_spec):
                           "refer to any of the following arguments: {}".format(
                               argument, potential_args))
       else:
-        keyword = argument[2:]
+        keyword = argument.lstrip('-')
 
       contains_equals = '=' in keyword
       is_bool_syntax = (not contains_equals and
@@ -865,7 +865,7 @@ def _IsSingleCharFlag(argument):
 
 def _IsMultiCharFlag(argument):
   """Determines if the argument is a multi char flag (e.g. '--alpha')."""
-  return argument.startswith('--')
+  return argument.startswith('--') or re.match('^-[a-zA-Z]', argument)
 
 
 def _ParseValue(value, index, arg, metadata):
diff --git a/fire/fire_test.py b/fire/fire_test.py
@@ -92,12 +92,30 @@ def testFireNamedArgs(self):
         fire.Fire(tc.OldStyleWithDefaults, command=['triple', '--count', '5']),
         15)
 
+  def testFireNamedArgsSingleHyphen(self):
+    self.assertEqual(fire.Fire(tc.WithDefaults,
+                               command=['double', '-count', '5']), 10)
+    self.assertEqual(fire.Fire(tc.WithDefaults,
+                               command=['triple', '-count', '5']), 15)
+    self.assertEqual(
+        fire.Fire(tc.OldStyleWithDefaults, command=['double', '-count', '5']),
+        10)
+    self.assertEqual(
+        fire.Fire(tc.OldStyleWithDefaults, command=['triple', '-count', '5']),
+        15)
+
   def testFireNamedArgsWithEquals(self):
     self.assertEqual(fire.Fire(tc.WithDefaults,
                                command=['double', '--count=5']), 10)
     self.assertEqual(fire.Fire(tc.WithDefaults,
                                command=['triple', '--count=5']), 15)
 
+  def testFireNamedArgsWithEqualsSingleHyphen(self):
+    self.assertEqual(fire.Fire(tc.WithDefaults,
+                               command=['double', '-count=5']), 10)
+    self.assertEqual(fire.Fire(tc.WithDefaults,
+                               command=['triple', '-count=5']), 15)
+
   def testFireAllNamedArgs(self):
     self.assertEqual(fire.Fire(tc.MixedDefaults, command=['sum', '1', '2']), 5)
     self.assertEqual(fire.Fire(tc.MixedDefaults,
@@ -354,6 +372,23 @@ def testBoolParsingContinued(self):
         fire.Fire(tc.MixedDefaults, command=['identity', '10', '--beta']),
         (10, True))
 
+  def testBoolParsingSingleHyphen(self):
+    self.assertEqual(
+        fire.Fire(tc.MixedDefaults,
+                  command=['identity', '-alpha=False', '10']), (False, 10))
+    self.assertEqual(
+        fire.Fire(tc.MixedDefaults,
+                  command=['identity', '-alpha', '-beta', '10']), (True, 10))
+    self.assertEqual(
+        fire.Fire(tc.MixedDefaults,
+                  command=['identity', '-alpha', '-beta=10']), (True, 10))
+    self.assertEqual(
+        fire.Fire(tc.MixedDefaults,
+                  command=['identity', '-noalpha', '-beta']), (False, True))
+    self.assertEqual(
+        fire.Fire(tc.MixedDefaults,
+                  command=['identity', '-alpha', '-10', '-beta']), (-10, True))
+
   def testBoolParsingLessExpectedCases(self):
     # Note: Does not return (True, 10).
     self.assertEqual(
@@ -560,6 +595,11 @@ def testSeparatorForChaining(self):
                            '--separator', '$$']),
         True)
 
+  def testNegativeNumbers(self):
+    self.assertEqual(
+        fire.Fire(tc.MixedDefaults,
+                  command=['sum', '--alpha', '-3', '--beta', '-4']), -11)
+
   def testFloatForExpectedInt(self):
     self.assertEqual(
         fire.Fire(tc.MixedDefaults,
