Replaced argparse with docopt

Author: borntyping

dice/__init__.py

@@ -2,41 +2,20 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
-import argparse
+from pyparsing import ParseException
 
+import dice.elements
 import dice.grammar
 import dice.utilities
 
-__all__ = ['roll', 'main', 'ParseException']
+__all__ = ['roll', 'ParseException']
 __author__ = "Sam Clements <[email protected]>"
-__version__ = "0.2.1"
-
-from pyparsing import ParseException
-
-parser = argparse.ArgumentParser()
-parser.add_argument(
-    '-V', '--version', action='version',
-    version='dice v{0} by {1}'.format(__version__, __author__))
-parser.add_argument(
-    '-v', '--verbose', action='store_true',
-    help="show additional output")
-parser.add_argument(
-    'expression',
-    help="the expression to parse and roll")
-
+__version__ = '0.3.0'
 
 def roll(string, single=True, verbose=False):
-    """Parses and evaluates an expression"""
+    """Parses and evaluates a dice expression"""
     ast = dice.grammar.expression.parseString(string, parseAll=True)
     result = [element.evaluate(verbose=verbose) for element in ast]
     if single:
         return dice.utilities.single(result)
     return result
-
-
-def main(argv=None):
-    args = parser.parse_args(argv)
-    result = roll(args.expression, verbose=args.verbose)
-    if args.verbose:
-        print("Result:", end=" ")
-    return result

dice/command.py

@@ -0,0 +1,25 @@
+"""
+Usage:
+    roll [--verbose] <expression>
+
+Options:
+    -h --help       Show this help text
+    -v --verbose    Show additional output
+    -V --version    Show the package version
+"""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import docopt
+
+import dice
+
+__version__ = "dice v{0} by {1}".format(dice.__version__, dice.__author__)
+
+def main(argv=None):
+    """Run roll() from a command line interface"""
+    args = docopt.docopt(__doc__, argv=argv, version=__version__)
+    result = dice.roll(args['<expression>'], verbose=args['--verbose'])
+    if args['--verbose']:
+        print("Result:", end=" ")
+    return result

dice/tests/test_main.py dice/tests/test_command.pydice/tests/test_main.py renamed to dice/tests/test_command.py

@@ -1,12 +1,11 @@
 from __future__ import absolute_import
 
-from dice import roll, main
+from dice.command import main
 from dice.elements import Integer, Roll
 
 
-def test_roll():
-    assert isinstance(roll('2d6'), (Integer, Roll, list))
-
-
 def test_main():
     assert isinstance(main(['2d6']), (Integer, Roll, list))
+
+def test_main_verbose():
+    assert main(['1d6', '--verbose'])

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name             = 'dice',
-    version          = '0.2.1',
+    version          = '0.3.0',
 
     author           = "Sam Clements",
     author_email     = "[email protected]",
@@ -16,15 +16,14 @@
 
     packages         = find_packages(),
     install_requires = [
-        'argparse==1.2.1',
-        'pyparsing==2.0.1',
-        'six==1.3.0'
+        'docopt==0.6.1',
+        'pyparsing==2.0.1'
     ],
 
     entry_points     = {
         'console_scripts': [
-            'dice = dice:main',
-            'roll = dice:main'
+            'dice = dice.command:main',
+            'roll = dice.command:main'
         ]
     },