Added events() and send_events() functions (closes #13, #14)

Author: borntyping

riemann_client/__init__.py

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

riemann_client/client.py

@@ -39,14 +39,23 @@ def create_event(data):
                 setattr(event, name, value)
         return event
 
-    def send_event(self, event):
-        """Wraps an event in a message and sends it to Riemann"""
+    def send_events(self, events):
+        """Wraps a list of events in a message and sends them to Riemann"""
         message = riemann_client.riemann_pb2.Msg()
-        message.events.add().MergeFrom(event)
+        for event in events:
+            message.events.add().MergeFrom(event)
         return self.transport.send(message)
 
+    def send_event(self, event):
+        """Sends a single event to Riemann using send_events()"""
+        return self.send_events((event,))
+
+    def events(self, *events):
+        """Sends multiple events, calling create_event() on each dict passed"""
+        return self.send_events(self.create_event(e) for e in events)
+
     def event(self, **data):
-        """Sends an event"""
+        """Sends an event, using keyword arguments to create an Event"""
         return self.send_event(self.create_event(data))
 
     @staticmethod

riemann_client/tests/test_riemann_client.py

@@ -63,6 +63,15 @@ def test_udp_query(self):
         with py.test.raises(Exception):
             client.query('true')
 
+    def test_events(self, client):
+        message = client.events({'service': 'one'}, {'service': 'two'})
+        assert message.events[0].service == 'one'
+        assert message.events[1].service == 'two'
+
+    def test_events_len(self, client):
+        message = client.events({'service': 'one'}, {'service': 'two'})
+        assert len(message.events) == 2
+
 
 @py.test.fixture
 def event(unique):

setup.py

@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name='riemann-client',
-    version='4.1.2',
+    version='5.0.0-dev',
 
     author="Sam Clements",
     author_email="sam.clements@datasift.com",