MRG: Merge branch 'release/0.3.12'

* release/0.3.12:
  DOC: HISTORY.rst: git-changelog.py --hdr=+ --rev 'release/0.3.12' | pbcopy
  RLS,DOC: setup.py,pyline.py: version 0.3.12
  UBY,BUG: pyline.py: loglevels [WARN], -v/--verbose/DEBUG, -q/--quiet/ERROR
  TST,UBY: pyline.py, scripts/pyline.py: symlinks to pyline/pyline.py
  DOC: README.rst: add .. contents::

HISTORY.rst

@@ -7,16 +7,33 @@ History
 
 
 
-release/0.3.11 (2016-02-14 22:07:45 -0600)
+
+
+release/0.3.12 (2016-02-16 16:03:25 -0600)
 ++++++++++++++++++++++++++++++++++++++++++
 ::
 
-   git log --reverse --pretty=format:'* %s [%h]' v0.3.10..release/0.3.11
+   git log --reverse --pretty=format:'* %s [%h]' v0.3.11..release/0.3.12
+
+* MRG: Merge tag 'v0.3.11' into develop [98adc78]
+* DOC: README.rst: add .. contents:: [4416581]
+* TST,UBY: pyline.py, scripts/pyline.py: symlinks to pyline/pyline.py [2fda52e]
+* UBY,BUG: pyline.py: loglevels [WARN], -v/--verbose/DEBUG, -q/--quiet/ERROR [07fbc09]
+* RLS,DOC: setup.py,pyline.py: version 0.3.12 [0cb05f3]
+
+
+v0.3.11 (2016-02-14 22:29:55 -0600)
++++++++++++++++++++++++++++++++++++
+::
+
+   git log --reverse --pretty=format:'* %s [%h]' v0.3.10..v0.3.11
 
 * MRG: Merge tag 'v0.3.10' into develop [ed296ea]
 * BLD: tox.ini: testenv/deps/jinja2 [1a6c2f5]
 * BLD: tox.ini, requirements.txt: add jinja2 to requirements.txt [e267a1e]
 * RLS,DOC: setup.py,pyline.py: version 0.3.11 [21bd6e9]
+* DOC: HISTORY.rst: git-changelog.py --hdr=+ --rev 'release/0.3.11' | pbcopy [efc24ce]
+* MRG: Merge branch 'release/0.3.11' [9c05df0]
 
 
 v0.3.10 (2016-02-14 21:56:36 -0600)

README.rst

@@ -28,6 +28,7 @@ pyline
 Pyline is a grep-like, sed-like, awk-like command-line tool for
 line-based text processing in Python.
 
+.. contents:: 
 
 Features
 ==========

pyline.py

@@ -0,0 +1 @@
+pyline/pyline.py

pyline/pyline.py

@@ -71,7 +71,7 @@ def backwards(line):
 
 """
 
-__version__ = version = "0.3.11"
+__version__ = version = "0.3.12"
 
 import cgi
 import csv
@@ -115,8 +115,10 @@ def backwards(line):
 fmt = logging.Formatter('%(levelname)-5s %(name)s:%(lineno)5s: %(message)s')
 hdlr.setFormatter(fmt)
 log.addHandler(hdlr)
+# log.setLevel(logging.DEBUG)
 # log.setLevel(logging.INFO)
-log.setLevel(logging.DEBUG)
+log.setLevel(logging.WARN)
+
 
 Result = namedtuple('Result', ('n', 'result')) # , 'uri', 'meta'))
 
@@ -1125,15 +1127,18 @@ def main(args=None, iterable=None, output=None, results=None, opts=None):
     opts = optsdict
 
     log = logging.getLogger(DEFAULT_LOGGER)
+    # if -q/--quiet is not specified
     if not opts.get('quiet'):
         #logging.basicConfig(
         #)
-        log.setLevel(logging.INFO)
+        log.setLevel(logging.WARN)
 
+        # if -v/--verbose is specified
         if opts.get('verbose'):
             log.setLevel(logging.DEBUG)
+    # if -q/--quiet is specified
     else:
-        log.setLevel(logging.WARN)
+        log.setLevel(logging.ERROR)
     log.info(('pyline.version', __version__))
     log.info(('argv', argv))
     log.info(('args', args))

scripts/pyline.py

@@ -0,0 +1 @@
+../pyline/pyline.py

setup.py

@@ -73,7 +73,7 @@ def build_long_description():
 
 setup(
     name='pyline',
-    version='0.3.11',
+    version='0.3.12',
     description=(
         'Pyline is a grep-like, sed-like, awk-like command-line tool '
         'for line-based text processing in Python.'),