Merge pull request #15 from zodb/argparse

Argparse

Author: jamadden

.travis.yml

@@ -27,7 +27,7 @@ notifications:
   email: false
 
 install:
-  - pip install -U pip
+  - pip install -U pip setuptools
   - pip install -U tox coveralls zope.testing mock coverage
   - pip install -U -e .
   - .travis/setup-$ENV.sh

CHANGES.rst

@@ -1,23 +1,33 @@
+=========
+ Changes
+=========
+
 0.6 (Unreleased)
-----------------
+================
 
 - Add support for Python 3 and PyPy.
+- To specify multiple concurrency levels, specify the ``-c`` option
+  multiple times. Similarly, to specify multiple object counts,
+  specify the ``-n`` option multiple times. (For example, ``-c 1 -c 2 -n 100
+  -n 200`` would run four comparisons). The old way of separating numbers with
+  commas is no longer supported.
+
 
 0.5 (2012-09-08)
-----------------
+================
 
 - Updated to MySQL 5.1.65, PostgreSQL 9.1.5, memcached 1.4.15,
   and libmemcached 1.0.10.
 
 - Moved development to github.
 
 0.4 (2011-02-01)
-----------------
+================
 
 - Added the --object-size parameter.
 
 0.3 (2010-06-19)
-----------------
+================
 
 - Updated to memcached 1.4.5, libmemcached 0.40, and pylibmc 1.1+.
 
@@ -26,11 +36,11 @@
 - Updated to MySQL 5.1.47 and a new download url - the old was giving 401's.
 
 0.2 (2009-11-17)
-----------------
+================
 
 - Buildout now depends on a released version of RelStorage.
 
 0.1 (2009-11-17)
-----------------
+================
 
 - Initial release.

src/zodbshootout/main.py

@@ -27,7 +27,7 @@
 from zodbshootout.fork import distribute
 from zodbshootout.fork import run_in_child
 from ZODB._compat import dumps
-import optparse
+import argparse
 import os
 import sys
 import time
@@ -275,40 +275,42 @@ def main(argv=None):
     if argv is None:
         argv = sys.argv[1:]
 
-    parser = optparse.OptionParser(usage='%prog [options] config_file')
-    parser.add_option(
-        "-n", "--object-counts", dest="counts", default="1000",
-        help="Object counts to use, separated by commas (default 1000)",
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-n", "--object-counts", dest="counts",
+        type=int,
+        action="append",
+        help="Object counts to use (default 1000). Use this option as many times as you want.",
         )
-    parser.add_option(
-        "-s", "--object-size", dest="object_size", default="115",
+    parser.add_argument(
+        "-s", "--object-size", dest="object_size", default=115,
+        type=int,
         help="Size of each object in bytes (estimated, default approx. 115)",
         )
-    parser.add_option(
-        "-c", "--concurrency", dest="concurrency", default="2",
-        help="Concurrency levels to use, separated by commas (default 2)",
+    parser.add_argument(
+        "-c", "--concurrency", dest="concurrency",
+        type=int,
+        action="append",
+        help="Concurrency levels to use. Default is 2. Use this option as many times as you want."
         )
-    parser.add_option(
+    parser.add_argument(
         "-p", "--profile", dest="profile_dir", default="",
         help="Profile all tests and output results to the specified directory",
         )
+    parser.add_argument("config_file", type=argparse.FileType())
 
-    options, args = parser.parse_args(argv)
-    if len(args) != 1:
-        parser.error("exactly one database configuration file is required")
-    conf_fn = args[0]
+    options = parser.parse_args(argv)
+    conf_fn = options.config_file
 
-    object_counts = [int(x.strip())
-                     for x in options.counts.split(',')]
-    object_size = max(int(options.object_size), pobject_base_size)
-    concurrency_levels = [int(x.strip())
-                          for x in options.concurrency.split(',')]
+    object_counts = options.counts or [1000]
+    object_size = max(options.object_size, pobject_base_size)
+    concurrency_levels = options.concurrency or [2]
     profile_dir = options.profile_dir
     if profile_dir and not os.path.exists(profile_dir):
         os.makedirs(profile_dir)
 
     schema = ZConfig.loadSchemaFile(StringIO(schema_xml))
-    config, _handler = ZConfig.loadConfig(schema, conf_fn)
+    config, _handler = ZConfig.loadConfigFile(schema, conf_fn)
     contenders = [(db.name, db) for db in config.databases]
 
     txn_descs = (

tox.ini

@@ -0,0 +1,10 @@
+[tox]
+envlist = py27,py34,pypy
+
+[testenv]
+deps =
+     coverage
+     mock
+     zope.testing
+commands =
+    coverage run -m zodbshootout.main -c 1 -n 100 .travis/file.conf