Finallize first prod release

Author: codingjoe

.travis.yml

@@ -3,14 +3,13 @@ sudo: false
 cache:
 - pip
 python:
-- '3.4'
 - '3.5'
 - '3.6'
-- '3.7-dev'
+- 'nightly'
 matrix:
   fast_finish: true
   allow_failures:
-  - python: '3.7-dev'
+  - python: 'nightly'
 install:
 - pip install -r requirements-dev.txt
 - pip install -U codecov

README.rst

@@ -55,37 +55,6 @@ The following script does the same thing, but note how you can define the bulbs
 prior calling the ``search_bulbs`` context manager. This works due to the fact
 that dictionaries are mutable in Python.
 
-.. code:: python
-
-    import asyncio
-
-    from yeelib import search_bulbs
-
-
-    @asyncio.coroutine
-    def turn_all_lights_on(bulbs):
-        while True:
-            print(bulbs)
-            for b in bulbs.values():
-                asyncio.Task(b.send_command("set_power",
-                                            ["off", "sudden", 40]))
-            yield from asyncio.sleep(10)
-
-
-    def main():
-        bulbs = {}
-        asyncio.Task(turn_all_lights_on(bulbs))
-        loop = asyncio.get_event_loop()
-        try:
-            with search_bulbs(bulbs):
-                loop.run_forever()
-        except KeyboardInterrupt:
-            loop.stop()
-
-
-    if __name__ == '__main__':
-        main()
-
 
 Specifications
 --------------

requirements.txt

@@ -0,0 +1 @@
+ssdp>=1.0.1

setup.cfg

@@ -8,16 +8,23 @@ description-content-type = text/x-rst; charset=UTF-8
 home-page = https://github.com/codingjoe/yeelib
 license = Apache-2
 classifier =
-    Development Status :: 4 - Beta
+    Development Status :: 5 - Production/Stable
     Environment :: Console
     Intended Audience :: Developers
     Intended Audience :: Information Technology
     License :: OSI Approved :: Apache Software License
     Operating System :: OS Independent
     Programming Language :: Python
+    Framework :: AsyncIO
+    Topic :: System :: Networking
+    Topic :: Software Development :: Libraries
+    Topic :: Home Automation
 keywords =
     light
     yeelight
+    iot
+    asyncio
+    home-automation
 
 [files]
 packages =

tests/test_bulbs.py

@@ -11,7 +11,7 @@ class TestBulb:
     @mocketize
     def test_send_command(self):
         Mocket.register(MocketEntry(self.bulb_addr, [b'{"id":1, "result":["ok"]}\r\n']))
-        with Bulb(*self.bulb_addr) as b:
+        with Bulb(*self.bulb_addr, id=1, support=['set_ct_abx']) as b:
             loop = asyncio.get_event_loop()
             response = loop.run_until_complete(b.send_command('set_ct_abx', [3500, 'smooth', 500]))
 

tests/test_discover.py

@@ -4,36 +4,33 @@
 
 from yeelib.discover import YeelightProtocol, search_bulbs
 from yeelib.exceptions import YeelightError
+from yeelib import bulbs
 
 from . import fixtures
 
 
 class TestYeelightProtocoll:
     def test_notify(self, ):
-        bulbs = {}
-        p = YeelightProtocol(bulbs=bulbs)
+        p = YeelightProtocol()
         p.datagram_received(data=fixtures.request, addr=('192.168.1.239', 1982))
         assert len(bulbs) == 1
         assert bulbs['0x000000000015243f'].ip == '192.168.1.239'
 
     def test_mcast(self, ):
-        bulbs = {}
-        p = YeelightProtocol(bulbs=bulbs)
+        p = YeelightProtocol()
         p.datagram_received(data=fixtures.response, addr=('192.168.1.239', 1982))
         assert len(bulbs) == 1
         assert bulbs['0x000000000015243f'].ip == '192.168.1.239'
 
     def test_duplicate(self):
-        bulbs = {}
-        p = YeelightProtocol(bulbs=bulbs)
+        p = YeelightProtocol()
         p.datagram_received(data=fixtures.request, addr=('192.168.1.239', 1982))
         p.datagram_received(data=fixtures.request, addr=('192.168.1.239', 1982))
         assert len(bulbs) == 1
         assert bulbs['0x000000000015243f'].ip == '192.168.1.239'
 
     def test_wrong_location(self):
-        bulbs = {}
-        p = YeelightProtocol(bulbs=bulbs)
+        p = YeelightProtocol()
         with pytest.raises(YeelightError) as e:
             p.datagram_received(data=fixtures.response_wrong_location,
                                 addr=('192.168.1.239', 1982))

tests/test_upnp.py

@@ -1,2 +1,2 @@
 from .discover import *  # NoQA
-from .bulbs import *  # NoQA
+from .devices import *  # NoQA

yeelib/__init__.py

@@ -4,13 +4,16 @@
 import socket
 import time
 
+from yeelib.exceptions import YeelightError
+
 __all__ = ('Bulb', )
 
 logger = logging.getLogger('yeelib')
 
 
 class Bulb:
-    def __init__(self, ip, port=55443, status_refresh_interval=3600, **kwargs):
+    def __init__(self, ip, port=55443, status_refresh_interval=3600, _registry=None, **kwargs):
+        self._registry = _registry
         self.ip = ip
         self.port = port
         self.status_refresh_interval = status_refresh_interval
@@ -37,10 +40,9 @@ def __repr__(self):
         return "<%s: %s>" % (type(self).__name__, self.ip)
 
     @property
-    @asyncio.coroutine
-    def socket(self):
+    async def socket(self):
         if self.__socket is None:
-            self.__socket = yield from asyncio.open_connection(
+            self.__socket = await asyncio.open_connection(
                 self.ip, self.port)
         return self.__socket
 
@@ -52,18 +54,22 @@ def socket(self, value):
             pass
         else:
             writer.close()
+            if self._registry:
+                del self._registry[self.id]
         self.__socket = value
 
-    @asyncio.coroutine
-    def send_command(self, method, params):
+    async def send_command(self, method, params):
+        if method not in self.support:
+            msg = "The method '%s' is not supported by this bulb." % method
+            raise YeelightError(msg)
         self.__command_id += 1
         data = {
             'id': self.__command_id,
             'method': method,
             'params': params,
         }
         msg = json.dumps(data) + '\r\n'
-        reader, writer = yield from self.socket
+        reader, writer = await self.socket
         try:
             writer.write(msg.encode())
             logger.debug("%s: >>> %s", self.ip, msg.strip())
@@ -72,7 +78,7 @@ def send_command(self, method, params):
             self.socket = None
         else:
             try:
-                response = (yield from reader.readline()).decode()
+                response = (await reader.readline()).decode()
             except ConnectionError:
                 logger.exception("Connection error")
                 socket.socket = None