Drop docopt

Author: borntyping

README.md

@@ -24,7 +24,7 @@ The command line arguments are as follows:
 * `-V` `--version` Show the package version
 
 If your expression begins with a dash (`-`), then put a double dash (`--`)
-before it to prevent docopt from trying to process it as a command option.
+before it to prevent the parser from trying to process it as a command option.
 Example: `roll -- -10d6`. Alternatively, use parenthesis: `roll (-10d6)`.
 
 ### Python API
@@ -49,8 +49,7 @@ command-line tool, I recommend [pipx].
 
 A recent version of Python 3 (3.8 or above) is required. You can probably run
 it or easily adapt it for older versions of Python, but I don't support any
-end-of-life Python versions. Beyond that, the only dependencies are the
-`docopt` and `pyparsing` libraries.
+end-of-life Python versions. Beyond that, the only dependency is the `pyparsing` library.
 
 [pipx]: https://pypa.github.io/pipx/
 

dice/command.py

@@ -11,48 +11,51 @@
     -V --version          Show the package version
 """
 
-import docopt
+import argparse
 
 import dice
-from dice.exceptions import DiceBaseException
+import dice.exceptions
 
-__version__ = "dice v{0} by {1}".format(dice.__version__, dice.__author__)
+__version__ = "dice v{0} by {1}.".format(dice.__version__, dice.__author__)
 
+parser = argparse.ArgumentParser(prog="dice", description="Parse and evaluate dice notation.", epilog=__version__)
+parser.add_argument('-m', '--min', action="store_true", help="Make all rolls the lowest possible result.")
+parser.add_argument('-M', '--max', action="store_true", help="Make all rolls the highest possible result.")
+parser.add_argument('-D', '--max-dice', action="store", type=int, metavar='N', help="Set the maximum number of dice per element.")
+parser.add_argument('-v', '--verbose', action="store_true", help="Show additional output.")
+parser.add_argument('-V', '--version', action="version", version=__version__, help="Show the package version.")
+parser.add_argument('expression', nargs='+')
 
-def main(argv=None):
-    """Run roll() from a command line interface"""
-    args = docopt.docopt(__doc__, argv=argv, version=__version__)
-    verbose = bool(args["--verbose"])
 
-    f_roll = dice.roll
-    kwargs = {}
+def main(args=None):
+    """Run roll() from a command line interface"""
+    args = parser.parse_args(args=args)
+    f_kwargs = {}
 
-    if args["--min"]:
+    if args.min:
         f_roll = dice.roll_min
-    elif args["--max"]:
+    elif args.max:
         f_roll = dice.roll_max
+    else:
+        f_roll = dice.roll
 
-    if args["--max-dice"]:
-        try:
-            kwargs["max_dice"] = int(args["--max-dice"])
-        except ValueError:
-            print("Invalid value for --max-dice: '%s'" % args["--max-dice"])
-            exit(1)
+    if args.max_dice:
+        f_kwargs['max_dice'] = args.max_dice
 
-    expr = " ".join(args["<expression>"])
+    f_expr = " ".join(args.expression)
 
     try:
-        roll, kwargs = f_roll(expr, raw=True, return_kwargs=True, **kwargs)
+        roll, kwargs = f_roll(f_expr, raw=True, return_kwargs=True, **f_kwargs)
 
-        if verbose:
+        if args.verbose:
             print("Result: ", end="")
 
         print(str(roll.evaluate_cached(**kwargs)))
 
-        if verbose:
+        if args.verbose:
             print("Breakdown:")
             print(dice.utilities.verbose_print(roll, **kwargs))
-    except DiceBaseException as e:
+    except dice.exceptions.DiceBaseException as e:
         print("Whoops! Something went wrong:")
         print(e.pretty_print())
         exit(1)

pyproject.toml

@@ -39,7 +39,6 @@ classifiers = [
 ]
 keywords = ["dice"]
 dependencies = [
-    "docopt>=0.6.1",
     "pyparsing>=2.4.1",
 ]
 urls = { homepage = "https://github.com/borntyping/python-dice" }