Added an improved command line interface

Author: borntyping

dice/__init__.py

@@ -2,17 +2,35 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
-from sys import argv
+import sys
+import argparse
 
-from pyparsing import ParseException
+import dice.grammar
+import dice.utilities
+
+__all__ = ['roll', 'main', 'Dice', 'Roll', 'Bag', 'ParseException']
+__author__ = "Sam Clements <[email protected]>"
+__version__ = "0.2.0"
 
+from pyparsing import ParseException
 from dice.elements import Dice, Roll, Bag
-from dice.grammar import expression
 
-__all__ = ['roll', 'main', 'Dice', 'Roll', 'Bag', 'ParseException']
+parser = argparse.ArgumentParser()
+parser.add_argument(
+    '-v', '--version', action='version',
+    version='dice v{0} by {1}'.format(__version__, __author__))
+parser.add_argument(
+    '-s', '--single', action='store_true', dest='single',
+    help="if a single element is returned, extract it from the list")
+parser.add_argument(
+    'expression',
+    help="the expression to parse and roll")
+
+def roll(string, single=False):
+    result = dice.grammar.notation.parseString(string, parseAll=True)
+    return dice.utilities.single(result) if single else result
 
-def roll(string):
-    return expression.parseString(string, parseAll=True)
+def main(*argv):
+    args = parser.parse_args(sys.argv if len(argv) == 0 else argv)
 
-def main(argv=argv):
-    return roll(argv)
+    return roll(args.expression, single=args.single)

dice/utilities.py

@@ -8,6 +8,10 @@ def classname(obj):
     """Returns the name of an objects class"""
     return obj.__class__.__name__
 
+def single(iterable):
+    """Returns a single item if the iterable has only one item"""
+    return iterable[0] if len(iterable) == 1 else list(iterable)
+
 def patch_pyparsing(packrat=True, arity=True, verbose=True):
     """Applies monkey-patches to pyparsing"""
     if packrat:

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name             = 'dice',
-    version          = '0.1.7',
+    version          = '0.2.0',
 
     author           = "Sam Clements",
     author_email     = "[email protected]",
@@ -16,12 +16,16 @@
 
     packages         = find_packages(),
     install_requires = [
+        'argparse==1.2.1',
         'pyparsing==2.0.1',
         'six==1.3.0'
     ],
 
     entry_points     = {
-        'console_scripts': ['roll = dice:main']
+        'console_scripts': [
+            'dice = dice:main',
+            'roll = dice:main'
+        ]
     },
 
     classifiers     = [

tox.ini

@@ -30,7 +30,6 @@ basepython=python2.7
 commands=
     coverage run --rcfile tox.ini --source dice -m py.test
     coverage html --rcfile tox.ini
-    coverage report --rcfile tox.ini
 deps=
     {[testenv]deps}
     coverage