Merge pull request #17 from thijsdezoete/dev/versioning

Fix pypi packaging

Author: spil-jasper

.travis.yml

@@ -4,11 +4,11 @@ language: python
 
 python:
   - "2.7"
-  - "2.6"
-  - "pypy"
+#  - "2.6" we're using argparse which isn't compatible with py2.6
+#  - "pypy" also not there for pypy apparently..
 
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install: pip install -r requirements.txt
 
 # command to run tests, e.g. python setup.py test
-script: python setup.py test
+script: python setup.py test

HISTORY.rst

@@ -3,7 +3,12 @@
 History
 -------
 
+0.1.1 (2013-08-30)
+++++++++++++++++++
+
+* Preparing package for sdist releases
+
 0.1.0 (2013-08-30)
 ++++++++++++++++++
 
-* First release on PyPI.
+* First release on PyPI.

MANIFEST.in

@@ -2,4 +2,5 @@ include AUTHORS.rst
 include CONTRIBUTING.rst
 include HISTORY.rst
 include LICENSE
-include README.rst
+include README.rst
+include mysql_statsd/preprocessors/*

mysql_statsd/__init__.py

@@ -3,4 +3,5 @@
 
 __author__ = 'Jasper Capel'
 __email__ = '[email protected]'
-__version__ = '0.1.0'
+__version__ = '0.1.1'
+from mysql_statsd import MysqlStatsd 

mysql_statsd/mysql_statsd.py

@@ -23,16 +23,24 @@ class MysqlStatsd():
     def __init__(self):
         """Program entry point"""
         op = argparse.ArgumentParser()
-        op.add_argument("-c", "--config", dest="file", default="/etc/mysql-statsd.conf", help="Configuration file")
+        op.add_argument("-c", "--config", dest="cfile", default="/etc/mysql-statsd.conf", help="Configuration file")
         op.add_argument("-d", "--debug", dest="debug", help="Debug mode", default=False, action="store_true")
 
         # TODO switch the default to True, and make it fork by default in init script.
         op.add_argument("-f", "--foreground", dest="foreground", help="Dont fork main program", default=False, action="store_true")
 
         opt = op.parse_args()
-        self.get_config(opt.file)
+        self.get_config(opt.cfile)
+
+        if not self.config:
+            sys.exit(op.print_help())
+
+        try:
+            logfile = self.config.get('daemon').get('logfile', '/tmp/daemon.log')
+        except AttributeError:
+            logfile = sys.stdout
+            pass
 
-        logfile = self.config.get('daemon').get('logfile', '/tmp/daemon.log')
         if not opt.foreground:
             self.daemonize(stdin='/dev/null', stdout=logfile, stderr=logfile)
 
@@ -58,7 +66,13 @@ def __init__(self):
 
     def get_config(self, config_file):
         cnf = ConfigParser()
-        cnf.read(config_file)[0]
+        try:
+            cnf.read(config_file)[0]
+        except IndexError:
+            # Return None so we can display help...
+            self.config = None  # Just to be safe..
+            return None
+
         self.config = {}
         for section in cnf.sections():
             self.config[section] = {}

setup.py

@@ -19,7 +19,7 @@
 
 setup(
     name='mysql-statsd',
-    version='0.1.0',
+    version='0.1.1',
     description='Daemon that gathers statistics from MySQL and sends them to statsd.',
     long_description=readme + '\n\n' + history,
     author='Jasper Capel, Thijs de Zoete',
@@ -29,8 +29,15 @@
         'mysql_statsd',
     ],
     package_dir={'mysql_statsd': 'mysql_statsd'},
+    entry_points={
+        'console_scripts': [
+            'mysql_statsd = mysql_statsd:mysql_statsd.MysqlStatsd'
+        ]
+    },
     include_package_data=True,
     install_requires=[
+        'MySQL-python==1.2.5',
+        'pystatsd==0.1.10',
     ],
     license="BSD",
     zip_safe=False,