Merge branch 'feature/rpm'

Author: Sam Clements

MANIFEST.in

@@ -0,0 +1 @@
+include LICENSE

Makefile

@@ -0,0 +1,12 @@
+version=$(shell python setup.py --version)
+release=$(shell grep Release python-riemann-client.spec | awk '{ print $$2 }')
+
+package=python-riemann-client-${version}-${release}.noarch.rpm
+tarball=${HOME}/rpmbuild/SOURCES/python-riemann-client-${version}.tar.gz
+
+dist/${package}: python-riemann-client.spec ${tarball}
+	rpmbuild -ba python-riemann-client.spec
+	rsync -a ${HOME}/rpmbuild/RPMS/noarch/${package} dist/${package}
+
+${tarball}: $(shell find riemann_client)
+	tar -zcf ${tarball} . --exclude-vcs --transform='s/./python-riemann-client-${version}/'

README.rst

@@ -31,7 +31,7 @@ As a library::
 Installation
 ------------
 
-``riemann-client`` requires Python 2.6 or 2.7, and can be installed with ``pip install riemann-client``. Python 3 is not supported due to the dependency on the Google `protobuf <https://pypi.python.org/pypi/protobuf>`_ package.
+``riemann-client`` requires Python 2.6 or 2.7, and can be installed with ``pip install riemann-client``. Python 3 is not supported due to the dependency on the Google `protobuf <https://pypi.python.org/pypi/protobuf>`_ package. RPMs can be built using `rpmbuild` - run `make` to build an RPM and copy it to `dist/`.
 
 Requirements
 ^^^^^^^^^^^^
@@ -44,6 +44,12 @@ Changelog
 
 Version numbers use the `semver <http://semver.org/>`_ specification. A new major version indicates breaking changes.
 
+Version 3.1.0
+^^^^^^^^^^^^^
+
+* Relaxed version requirements to fit CentOS 6 packages
+* Added Makefile and specfile for building RPMs with rpmbuild
+
 Version 3.0.0
 ^^^^^^^^^^^^^
 

python-riemann-client.spec

@@ -0,0 +1,45 @@
+%define version %(python setup.py --version)
+
+Name: python-riemann-client
+Version: %{version}
+Release: 1
+
+Group: Development/Libraries
+Url: https://github.com/borntyping/python-riemann-client
+Summary: A Riemann client and command line tool
+Vendor: Sam Clements <[email protected]>
+License: MIT
+
+Source0: %{name}-%{version}.tar.gz
+
+Requires: python
+Requires: python-argparse
+Requires: protobuf-python
+BuildRequires: python-setuptools
+
+BuildArch: noarch
+
+
+%description
+A Riemann client library and command line tool for Python.
+
+https://github.com/borntyping/python-riemann-client
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+python setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+python setup.py install --no-compile --skip-build --root=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%doc README.rst LICENSE
+%{_bindir}/riemann-client
+%{python_sitelib}/*

riemann_client/__init__.py

@@ -1,4 +1,4 @@
 """A Python Riemann client and command line tool"""
 
-__version__ = '3.0.3'
+__version__ = '4.0.0'
 __author__ = 'Sam Clements <[email protected]>'

riemann_client/client.py

@@ -37,7 +37,7 @@ def create_event(data):
     def send_event(self, event):
         """Wraps an event in a message and sends it to Riemann"""
         message = riemann_client.riemann_pb2.Msg()
-        message.events.extend([event])
+        message.events.add().MergeFrom(event)
         return self.transport.send(message)
 
     def event(self, **data):
@@ -83,5 +83,5 @@ def flush(self):
         self.queue = riemann_client.riemann_pb2.Msg()
 
     def send_event(self, event):
-        self.queue.events.extend([event])
+        self.queue.events.add().MergeFrom(event)
         return event

riemann_client/riemann_pb2.py

@@ -2,31 +2,38 @@
 
 import setuptools
 
+DESCRIPTION = """
+A Riemann client library and command line tool for Python.
+
+https://github.com/borntyping/python-riemann-client
+"""
+
 setuptools.setup(
-    name = "riemann-client",
-    version = '3.0.3',
+    name='riemann-client',
+    version='4.0.0',
 
-    author = "Sam Clements",
-    author_email = "[email protected]",
+    author="Sam Clements",
+    author_email="[email protected]",
 
-    url = "https://github.com/borntyping/python-riemann-client",
-    description = "A Riemann client and command line tool",
-    long_description = open('README.rst').read(),
+    url="https://github.com/borntyping/python-riemann-client",
+    description="A Riemann client and command line tool",
+    long_description=DESCRIPTION.strip(),
+    license="MIT",
 
-    packages = setuptools.find_packages(),
+    packages=setuptools.find_packages(),
 
-    install_requires = [
-        'argparse==1.1',
-        'protobuf==2.5.0',
+    install_requires=[
+        'argparse>=1.1',
+        'protobuf>=2.3.0',
     ],
 
-    entry_points = {
+    entry_points={
         'console_scripts': [
             'riemann-client = riemann_client.command:main',
         ]
     },
 
-    classifiers = [
+    classifiers=[
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved',
         'License :: OSI Approved :: MIT License',