generalize smartdevice class and add bulb support for the cli tool (#50)

Fixes #48 and #51. The basic functionality should work on all types of supported devices, for bulb specific commands it is currently necessary to specify ```--bulb```.

pyHS100/cli.py

@@ -9,16 +9,18 @@ if sys.version_info < (3, 4):
           sys.version_info)
     sys.exit(1)
 
-from pyHS100 import SmartPlug, TPLinkSmartHomeProtocol  # noqa: E402
+from pyHS100 import (SmartDevice, SmartPlug, SmartBulb,
+                     TPLinkSmartHomeProtocol)  # noqa: E402
 
-pass_dev = click.make_pass_decorator(SmartPlug)
+pass_dev = click.make_pass_decorator(SmartDevice)
 
 
 @click.group(invoke_without_command=True)
 @click.option('--ip', envvar="PYHS100_IP", required=False)
 @click.option('--debug/--normal', default=False)
+@click.option('--bulb', default=False, is_flag=True)
 @click.pass_context
-def cli(ctx, ip, debug):
+def cli(ctx, ip, debug, bulb):
     """A cli tool for controlling TP-Link smart home plugs."""
     if debug:
         logging.basicConfig(level=logging.DEBUG)
@@ -32,8 +34,11 @@ def cli(ctx, ip, debug):
         click.echo("You must specify the IP!")
         sys.exit(-1)
 
-    plug = SmartPlug(ip)
-    ctx.obj = plug
+    if bulb:
+        dev = SmartBulb(ip)
+    else:
+        dev = SmartPlug(ip)
+    ctx.obj = dev
 
     if ctx.invoked_subcommand is None:
         ctx.invoke(state)
@@ -50,29 +55,31 @@ def discover(timeout):
 
 @cli.command()
 @pass_dev
-def sysinfo(plug):
+def sysinfo(dev):
     """Print out full system information."""
     click.echo(click.style("== System info ==", bold=True))
-    click.echo(pformat(plug.sys_info))
+    click.echo(pformat(dev.sys_info))
 
 
 @cli.command()
 @pass_dev
 @click.pass_context
-def state(ctx, plug):
+def state(ctx, dev):
     """Print out device state and versions."""
-    click.echo(click.style("== %s - %s ==" % (plug.alias, plug.model),
+    click.echo(click.style("== %s - %s ==" % (dev.alias, dev.model),
                            bold=True))
 
-    click.echo(click.style("Device state: %s" % plug.state,
-                           fg="green" if plug.is_on else "red"))
-    click.echo("LED state:    %s" % plug.led)
-    click.echo("Time:         %s" % plug.time)
-    click.echo("On since:     %s" % plug.on_since)
-    click.echo("Hardware:     %s" % plug.hw_info["hw_ver"])
-    click.echo("Software:     %s" % plug.hw_info["sw_ver"])
-    click.echo("MAC (rssi):   %s (%s)" % (plug.mac, plug.rssi))
-    click.echo("Location:     %s" % plug.location)
+    click.echo(click.style("Device state: %s" % "ON" if dev.is_on else "OFF",
+                           fg="green" if dev.is_on else "red"))
+    for k, v in dev.state_information.items():
+        click.echo("%s: %s" % (k, v))
+    click.echo(click.style("== Generic information ==", bold=True))
+    click.echo("Time:         %s" % dev.time)
+    click.echo("Hardware:     %s" % dev.hw_info["hw_ver"])
+    click.echo("Software:     %s" % dev.hw_info["sw_ver"])
+    click.echo("MAC (rssi):   %s (%s)" % (dev.mac, dev.rssi))
+    click.echo("Location:     %s" % dev.location)
+
     ctx.invoke(emeter)
 
 
@@ -83,37 +90,74 @@ def state(ctx, plug):
 @click.option('--month', type=Datetime(format='%Y-%m'),
               default=None, required=False)
 @click.option('--erase', is_flag=True)
-def emeter(plug, year, month, erase):
+def emeter(dev, year, month, erase):
     """Query emeter for historical consumption."""
     click.echo(click.style("== Emeter ==", bold=True))
-    if not plug.has_emeter:
+    if not dev.has_emeter:
         click.echo("Device has no emeter")
         return
 
     if erase:
         click.echo("Erasing emeter statistics..")
-        plug.erase_emeter_stats()
+        dev.erase_emeter_stats()
         return
 
-    click.echo("Current state: %s" % plug.get_emeter_realtime())
+    click.echo("Current state: %s" % dev.get_emeter_realtime())
     if year:
         click.echo("== For year %s ==" % year.year)
-        click.echo(plug.get_emeter_monthly(year.year))
+        click.echo(dev.get_emeter_monthly(year.year))
     elif month:
         click.echo("== For month %s of %s ==" % (month.month, month.year))
-        plug.get_emeter_daily(year=month.year, month=month.month)
+        dev.get_emeter_daily(year=month.year, month=month.month)
+
+
+@cli.command()
+@click.argument("brightness", type=click.IntRange(0, 100), default=None)
+@pass_dev
+def brightness(dev, value):
+    """Get or set brightness. (Bulb Only)"""
+    if value is None:
+        click.echo("Brightness: %s" % dev.brightness)
+    else:
+        click.echo("Setting brightness to %s" % value)
+        dev.brightness = value
+
+
+@cli.command()
+@click.argument("temperature", type=click.IntRange(2700, 6500), default=None)
+@pass_dev
+def temperature(dev, value):
+    """Get or set color temperature. (Bulb only)"""
+    if value is None:
+        click.echo("Color temperature: %s" % dev.color_temp)
+    else:
+        click.echo("Setting color temperature to %s" % value)
+        dev.color_temp = value
+
+
+@cli.command()
+@click.argument("h", type=click.IntRange(0, 255), default=None)
+@click.argument("s", type=click.IntRange(0, 255), default=None)
+@click.argument("v", type=click.IntRange(0, 255), default=None)
+def hsv(dev, h, s, v):
+    """Get or set color in HSV. (Bulb only)"""
+    if h is None or s is None or v is None:
+        click.echo("Current HSV: %s" % dev.hsv)
+    else:
+        click.echo("Setting HSV: %s %s %s" % (h, s, v))
+        dev.hsv = (h, s, v)
 
 
 @cli.command()
 @click.argument('state', type=bool, required=False)
 @pass_dev
-def led(plug, state):
-    """Get or set led state."""
+def led(dev, state):
+    """Get or set led state. (Plug only)"""
     if state is not None:
         click.echo("Turning led to %s" % state)
-        plug.led = state
+        dev.led = state
     else:
-        click.echo("LED state: %s" % plug.led)
+        click.echo("LED state: %s" % dev.led)
 
 
 @cli.command()