Renamed module from riemann to riemann_client

Author: Sam Clements

riemann/__init__.py riemann_client/__init__.pyriemann/__init__.py renamed to riemann_client/__init__.py

@@ -1,4 +1,4 @@
 """A Python Riemann client and command line tool"""
 
-__version__ = '2.1.0'
+__version__ = '3.0.0-beta'
 __author__ = 'Sam Clements <sam.clements@datasift.com>'

riemann/client.py riemann_client/client.pyriemann/client.py renamed to riemann_client/client.py

@@ -4,16 +4,16 @@
 
 import socket
 
-import riemann.riemann_pb2
-import riemann.transport
+import riemann_client.riemann_pb2
+import riemann_client.transport
 
 
 class Client(object):
     """An abstract Riemann client"""
 
     def __init__(self, transport=None):
         if transport is None:
-            transport = riemann.transport.TCPTransport()
+            transport = riemann_client.transport.TCPTransport()
         self.transport = transport
 
     def __enter__(self):
@@ -28,7 +28,7 @@ def create_event(data):
         """Creates an Event from a dictionary"""
         data.setdefault('host', socket.gethostname())
         data.setdefault('tags', list())
-        event = riemann.riemann_pb2.Event()
+        event = riemann_client.riemann_pb2.Event()
         event.tags.extend(data.pop('tags'))
         for name, value in data.items():
             if value is not None:
@@ -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.riemann_pb2.Msg()
+        message = riemann_client.riemann_pb2.Msg()
         message.events.extend([event])
         self.transport.send(message)
         return event
@@ -63,7 +63,7 @@ def create_dict(event):
         }
 
     def send_query(self, query):
-        message = riemann.riemann_pb2.Msg()
+        message = riemann_client.riemann_pb2.Msg()
         message.query.string = query
         self.transport.send(message)
         return self.transport.recv()
@@ -78,12 +78,12 @@ class QueuedClient(Client):
 
     def __init__(self, *args, **kwargs):
         super(QueuedClient, self).__init__(*args, **kwargs)
-        self.queue = riemann.riemann_pb2.Msg()
+        self.queue = riemann_client.riemann_pb2.Msg()
 
     def flush(self):
         """Sends the waiting message to Riemann"""
         self.transport.send(self.queue)
-        self.queue = riemann.riemann_pb2.Msg()
+        self.queue = riemann_client.riemann_pb2.Msg()
 
     def send_event(self, event):
         self.queue.events.extend([event])

riemann/command.py riemann_client/command.pyriemann/command.py renamed to riemann_client/command.py

@@ -5,12 +5,12 @@
 import argparse
 import json
 
-import riemann.client
-import riemann.transport
+import riemann_client.client
+import riemann_client.transport
 
 TRANSPORT_CLASSES = {
-    'udp': riemann.transport.UDPTransport,
-    'tcp': riemann.transport.TCPTransport
+    'udp': riemann_client.transport.UDPTransport,
+    'tcp': riemann_client.transport.TCPTransport
 }
 
 
@@ -27,8 +27,8 @@ def wide_formatter(*args, **kwargs):
 parser.add_argument(
     '-v', '--version', action='version',
     version='python-riemann-client v{version} by {author}'.format(
-        version=riemann.__version__,
-        author=riemann.__author__),
+        version=riemann_client.__version__,
+        author=riemann_client.__author__),
     help="Show this program's version and exit")
 parser.add_argument(
     'host', type=str, nargs='?', default=None,
@@ -92,5 +92,5 @@ def query(args, client):
 def main():
     args = parser.parse_args()
     transport = TRANSPORT_CLASSES[args.transport](args.host, args.port)
-    with riemann.client.Client(transport=transport) as client:
+    with riemann_client.client.Client(transport=transport) as client:
         {'send': send, 'query': query}[args.subparser](args, client)

riemann/riemann.proto riemann_client/riemann.protoriemann/riemann.proto renamed to riemann_client/riemann.proto

@@ -5,20 +5,20 @@
 
 import py.test
 
-import riemann.client
-import riemann.riemann_pb2
-import riemann.transport
+import riemann_client.client
+import riemann_client.riemann_pb2
+import riemann_client.transport
 
 
-class StringTransport(riemann.transport.Transport):
+class StringTransport(riemann_client.transport.Transport):
     def connect(self):
         self.string = StringIO.StringIO()
 
     def send(self, message):
         self.string.write(message.SerializeToString())
 
     def recv(self):
-        message = riemann.riemann_pb2.Msg()
+        message = riemann_client.riemann_pb2.Msg()
         message.ok = True
         return message
 
@@ -28,7 +28,7 @@ def disconnect(self):
 
 @py.test.fixture
 def client(request):
-    client = riemann.client.Client(transport=StringTransport())
+    client = riemann_client.client.Client(transport=StringTransport())
     client.transport.connect()
 
     @request.addfinalizer
@@ -58,16 +58,15 @@ def test_tags(self, client):
         assert "tag-1" in client.transport.string.getvalue()
 
     def test_event_cls(self, client):
-        assert isinstance(client.create_event({}), riemann.riemann_pb2.Event)
-        assert isinstance(client.event(), riemann.riemann_pb2.Event)
+        assert isinstance(client.event(), riemann_client.riemann_pb2.Event)
 
     def test_query(self, client):
         assert client.query("true") == []
 
 
 @py.test.fixture
 def queued_client(request):
-    client = riemann.client.QueuedClient(transport=StringTransport())
+    client = riemann_client.client.QueuedClient(transport=StringTransport())
     client.transport.connect()
 
     @request.addfinalizer

riemann/riemann_pb2.py riemann_client/riemann_pb2.pyriemann/riemann_pb2.py renamed to riemann_client/riemann_pb2.py

@@ -7,7 +7,7 @@
 import socket
 import struct
 
-import riemann.riemann_pb2
+import riemann_client.riemann_pb2
 
 
 class RiemannError(Exception):
@@ -79,7 +79,7 @@ def send(self, message):
     def recv(self):
         length = struct.unpack('!I', self.socket.recv(4))[0]
 
-        response = riemann.riemann_pb2.Msg()
+        response = riemann_client.riemann_pb2.Msg()
         response.ParseFromString(self.recvall(length))
 
         if not response.ok:

riemann/tests/test_riemann.py riemann_client/test_riemann_client.pyriemann/tests/test_riemann.py renamed to riemann_client/test_riemann_client.py

@@ -3,7 +3,7 @@ minversion=1.6.0
 envlist=py26,py27,py26-flake8
 
 [testenv]
-commands=py.test riemann
+commands=py.test riemann_client
 deps=pytest
 
 [pytest]
@@ -14,12 +14,12 @@ addopts=-qq --strict --tb=short
 # pep8 checks python source code against the PEP8 style conventions
 
 [testenv:py26-flake8]
-commands=flake8 --config=tox.ini riemann
+commands=flake8 --config=tox.ini riemann_client
 basepython=python2.6
 deps=flake8
 
 [flake8]
-exclude=riemann/riemann_pb2.py
+exclude=riemann_client/riemann_pb2.py
 max-complexity=10
 
 # Coverage report
@@ -28,7 +28,7 @@ max-complexity=10
 [testenv:py26-coverage]
 basepython=python2.6
 commands=
-    coverage run --rcfile tox.ini --source riemann -m py.test
+    coverage run --rcfile tox.ini --source riemann_client -m py.test
     coverage html --rcfile tox.ini
 deps=
     {[testenv]deps}
@@ -37,7 +37,7 @@ deps=
 [run]
 data_file=.tox/py26-coverage/data
 omit=
-	riemann/tests/*
+	riemann_client/tests/*
 
 [report]
 exclude_lines=