milight-v6 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3af0d2759af9191fdeec66af91c2d183637470f5
-  data.tar.gz: 7a959f4f8018887a71a187c47321146f61909531
+  metadata.gz: 5e7c03ca492bd7f803408e17d36df53b078bd9ac
+  data.tar.gz: d0e7adb41c0bc5ff1c649ca93c69849addd86e8d
 SHA512:
-  metadata.gz: ab7573061d49cde08b90954fb8329c44358b3bbb58b8f8a2d9a3718d7236aac8ffcf9371abcd14f9790cc20998646af7e0a70de0dc7a8b2ea2f818ec1888e300
-  data.tar.gz: 45a69a1f9f34846cba4d0f96d71eaa716ee8db322c62e71504ee9bd13def67fcb601df81d5b7bf037b3931e606d2cde2428fca1af0686e3dabdc4d7c507cedb2
+  metadata.gz: f2480b71b8e1e6c31d7d41dd14052d856d5dfbe8f473e2250fdd533b2a404b096831e86601f6e9d520b69dc805e3fd73c2b93b80b83a5362fca6588efd135ad9
+  data.tar.gz: aa7c8814f18470f8623358b9d5366770159564a982c8f58e9ca2a0d14c558f87cc6e90e9c210d9f1b8979212cfa1d7d9f005c5e884b29ec4f4879df920391f20

data/.gitignore

@@ -9,3 +9,6 @@
 
 # rspec failure tracking
 .rspec_status
+
+.ruby-version
+.ruby-gemset

data/.rubocop.yml

@@ -4,6 +4,7 @@ AllCops:
   DisplayStyleGuide: true
   Exclude:
     - 'lib/milight/v6/api/version.rb'
+    - 'vendor/**/*'
 
 Metrics/BlockLength:
   Exclude:

data/.travis.yml

@@ -1,5 +1,10 @@
-sudo: false
 language: ruby
+sudo: false
+cache: bundler
+before_install:
+  - gem update --system
+  - gem install bundler
 rvm:
-  - 2.3.5
-before_install: gem install bundler -v 1.16.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    milight-v6 (0.1.0)
+    milight-v6 (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,5 +1,9 @@
 # Milight Wifi Bridge v6 Ruby API
 
+[![Gem Version](https://badge.fury.io/rb/milight-v6.svg)](https://badge.fury.io/rb/milight-v6)
+[![Build Status](https://travis-ci.org/ppostma/milight-v6-api.svg?branch=master)](https://travis-ci.org/ppostma/milight-v6-api)
+[![Code Climate](https://codeclimate.com/github/ppostma/milight-v6-api/badges/gpa.svg)](https://codeclimate.com/github/ppostma/milight-v6-api)
+
 This gem provides a Ruby API for the Milight Wifi Bridge (or Wifi iBOX controller) version 6.
 
 ## Installation
@@ -26,9 +30,9 @@ require "milight/v6"
 controller = Milight::V6::Controller.new("192.168.178.33")
 controller.zone(1).on
 
-controller.zone(2).on.brightness(70).warm_light
+controller.zone(2).warm_light.brightness(70).on
 
-controller.zone(3).on.saturation(80).hue(Milight::V6::Color::BLUE)
+controller.zone(3).hue(Milight::V6::Color::BLUE).saturation(10).on
 
 controller.all.off
 ```

data/lib/milight/v6/command.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
+require "milight/v6/exception"
 require "milight/v6/socket"
 
 module Milight
   module V6
-    # see http://www.limitlessled.com/dev/
+    # see https://github.com/Fantasmos/LimitlessLED-DevAPI
     class Command
       def initialize(host, port = 5987)
         @socket = Milight::V6::Socket.new(host, port)
@@ -83,6 +84,8 @@ module Milight
         @socket.send_bytes(request)
         response = @socket.receive_bytes
 
+        raise Exception, "Could not establish session with Wifi bridge." unless response
+
         @session_id1 = response[19]
         @session_id2 = response[20]
       end

data/lib/milight/v6/exception.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Milight
+  module V6
+    class Exception < StandardError
+    end
+  end
+end

data/lib/milight/v6/socket.rb

@@ -6,10 +6,11 @@ require "socket"
 module Milight
   module V6
     class Socket
+      READ_TIMEOUT = 5
+
       def initialize(host, port)
-        @host = host
-        @port = port
         @socket = UDPSocket.new
+        @socket.connect(host, port)
 
         @logger = Logger.new(STDOUT)
         @logger.level = Logger::INFO if ENV["MILIGHT_DEBUG"] != "1"
@@ -18,16 +19,21 @@ module Milight
       def send_bytes(bytes)
         @logger.debug("Sending: #{format_bytes_as_hex(bytes)}")
 
-        @socket.send bytes.pack('C*'), 0, @host, @port
+        @socket.send(bytes.pack('C*'), 0)
       end
 
       def receive_bytes
-        response = @socket.recvfrom(128).first
+        response = @socket.recvfrom_nonblock(128).first
         bytes = response.unpack('C*')
 
         @logger.debug("Received: #{format_bytes_as_hex(bytes)}")
 
         bytes
+      rescue IO::WaitReadable
+        ready = IO.select([@socket], nil, nil, READ_TIMEOUT)
+        retry if ready
+
+        return false
       end
 
       private

data/lib/milight/v6/version.rb

@@ -2,6 +2,6 @@
 
 module Milight
   module V6
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: milight-v6
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Peter Postma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2019-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,8 +64,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-gemset"
-- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -80,6 +78,7 @@ files:
 - lib/milight/v6/color.rb
 - lib/milight/v6/command.rb
 - lib/milight/v6/controller.rb
+- lib/milight/v6/exception.rb
 - lib/milight/v6/socket.rb
 - lib/milight/v6/version.rb
 - lib/milight/v6/zone.rb

data/.ruby-gemset

@@ -1 +0,0 @@
-milight

data/.ruby-version

@@ -1 +0,0 @@
-2.3.5