flic 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae762531f46f32f4d88e0d006bf08c7c804e1a9f
-  data.tar.gz: 470cd52b6b01ee89bb423df22d6847d6bfdfef9c
+  metadata.gz: 30e6a6023c2fe3f2a83299ce7358050ef07195c8
+  data.tar.gz: f1ac706e5cfca806615de68e6bf147893225662e
 SHA512:
-  metadata.gz: bffa799520a877ab2924f84af76a1ae91acb5c860c1881c383ba7c8755c359d448ec0fdd7b02843dc44616e3cbc73778244da06253859ff8b32cdc7e8134ee2d
-  data.tar.gz: 24481590f130a83cca420f172a0cf43d6832e45f2aa81bee9bea94d1b7d5dcc084915f4e072f991a05a37bd5ed43da2cc9cf5aaa77b7b554e73ff80bca849f1b
+  metadata.gz: a9bc7ad01daea014be21f5214cb15a5cd4d4a2cb0ae6a7cc69b8da408fed1153279475607d1267172f6f1a2bb6e13fe391829f596989189af3f449a3030b257b
+  data.tar.gz: a1263c875e8c918b4cd100d65d91964dda1a3d08c3ea613468556ac1eb6dcad6d25ec3c9e8a8fb074d445249358646dd4c1a2ca8b945712ea6065048fb9e84d0

data/lib/flic/protocol/primitives/disconnect_time.rb

@@ -1,27 +1,29 @@
 require 'flic/protocol/primitives'
 
 module Flic
-  module Primitives
-    class DisconnectTime < BinData::Primitive
-      endian :little
+  module Protocol
+    module Primitives
+      class DisconnectTime < BinData::Primitive
+        endian :little
 
-      uint16 :time, initial_value: 512
+        uint16 :time, initial_value: 512
 
-      def get
-        if time == 512
-          nil
-        else
-          time
+        def get
+          if time == 512
+            nil
+          else
+            time
+          end
         end
-      end
 
-      def set(value)
-        if value == 512
-          raise RangeError, '512 is a special value that cannot be used for disconnect_time'
-        elsif value
-          self.time = value
-        else
-          self.time = 512
+        def set(value)
+          if value == 512
+            raise RangeError, '512 is a special value that cannot be used for disconnect_time'
+          elsif value
+            self.time = value
+          else
+            self.time = 512
+          end
         end
       end
     end

data/lib/flic/protocol/primitives/uuid.rb

@@ -4,19 +4,21 @@ require 'bindata'
 require 'scanf'
 
 module Flic
-  module Primitives
-    class Uuid < BinData::Primitive
-      PRINTF_FORMAT_STRING = '%.2X%.2X%.2X%.2X-%.2X%.2X-%.2X%.2X-%.2X%.2X-%.2X%.2X%.2X%.2X%.2X%.2X'.freeze
-      SCANF_FORMAT_STRING = '%X%X%X%X-%X%X-%X%X-%X%X-%X%X%X%X%X%X'.freeze
+  module Protocol
+    module Primitives
+      class Uuid < BinData::Primitive
+        PRINTF_FORMAT_STRING = '%.2X%.2X%.2X%.2X-%.2X%.2X-%.2X%.2X-%.2X%.2X-%.2X%.2X%.2X%.2X%.2X%.2X'.freeze
+        SCANF_FORMAT_STRING = '%X%X%X%X-%X%X-%X%X-%X%X-%X%X%X%X%X%X'.freeze
 
-      array :octets, type: :uint8, initial_length: 16
+        array :octets, type: :uint8, initial_length: 16
 
-      def get
-        sprintf(PRINTF_FORMAT_STRING, *octets)
-      end
+        def get
+          sprintf(PRINTF_FORMAT_STRING, *octets)
+        end
 
-      def set(value)
-        self.octets = value.scanf(SCANF_FORMAT_STRING)
+        def set(value)
+          self.octets = value.scanf(SCANF_FORMAT_STRING)
+        end
       end
     end
   end

data/lib/flic/simple_client.rb

@@ -6,90 +6,100 @@ module Flic
   class SimpleClient
     class Error < StandardError; end
     class ConnectionChannelRemoved; end
-
+    
     attr_reader :client
 
     def initialize(*client_args)
+      @semaphore = Mutex.new
       @client = Client.new(*client_args)
     end
 
     def shutdown
-      client.shutdown
+      @semaphore.synchronize do
+        client.shutdown
+      end
     end
 
     def buttons
-      server_info = process_events_until do |callback|
-        client.get_info(&callback)
-      end
+      @semaphore.synchronize do
+        server_info = process_events_until do |callback|
+          client.get_info(&callback)
+        end
 
-      server_info.verified_buttons_bluetooth_addresses
+        server_info.verified_buttons_bluetooth_addresses
+      end
     end
 
     def connect_button
-      begin
+      @semaphore.synchronize do
         scan_wizard = Client::ScanWizard.new
 
-        process_events_until do |callback|
-          scan_wizard.removed do |result, bluetooth_address, *|
-            if result == :success
-              callback.call(bluetooth_address)
-            else
-              callback.call(nil)
+        begin
+          process_events_until do |callback|
+            scan_wizard.removed do |result, bluetooth_address, *|
+              if result == :success
+                callback.call(bluetooth_address)
+              else
+                callback.call(nil)
+              end
             end
-          end
 
-          client.add_scan_wizard(scan_wizard)
+            client.add_scan_wizard(scan_wizard)
+          end
+        ensure
+          client.remove_scan_wizard(scan_wizard)
         end
-      ensure
-        client.remove_scan_wizard(scan_wizard)
       end
     end
 
     def disconnect_button(button_bluetooth_address)
-      client.force_disconnect(button_bluetooth_address)
+      @semaphore.synchronize do
+        client.force_disconnect(button_bluetooth_address)
+      end
     end
 
     def listen(latency_mode, *button_bluetooth_addresses)
-      connection_channels = []
-      button_events = []
-      broken = false
+      @semaphore.synchronize do
+        connection_channels = []
+        button_events = []
+        broken = false
 
-      begin
-        button_bluetooth_addresses.each do |button_bluetooth_addresses|
-          connection_channel = Client::ConnectionChannel.new(button_bluetooth_addresses, latency_mode)
+        begin
+          button_bluetooth_addresses.each do |button_bluetooth_addresses|
+            connection_channel = Client::ConnectionChannel.new(button_bluetooth_addresses, latency_mode)
 
-          connection_channel.button_up_or_down do |click_type, latency|
-            button_events << [button_bluetooth_addresses, click_type, latency]
-          end
-
-          connection_channel.button_single_click_or_double_click_or_hold do |click_type, latency|
-            button_events << [button_bluetooth_addresses, click_type, latency]
-          end
+            connection_channel.button_up_or_down do |click_type, latency|
+              button_events << [button_bluetooth_addresses, click_type, latency]
+            end
 
-          connection_channel.removed do
-            broken = true
-          end
+            connection_channel.button_single_click_or_double_click_or_hold do |click_type, latency|
+              button_events << [button_bluetooth_addresses, click_type, latency]
+            end
 
-          connection_channels << connection_channel
+            connection_channel.removed do
+              broken = true
+            end
 
-          client.add_connection_channel connection_channel
-        end
+            connection_channels << connection_channel
 
+            client.add_connection_channel connection_channel
+          end
 
-        loop do
-          client.handle_next_event while !broken && button_events.empty?
+          loop do
+            client.handle_next_event while !broken && button_events.empty?
 
-          button_events.each do |button_event|
-            yield *button_event
-          end
+            button_events.each do |button_event|
+              yield *button_event
+            end
 
-          button_events.clear
+            button_events.clear
 
-          raise ConnectionChannelRemoved, 'A connection channel was removed' if broken
-        end
-      ensure
-        connection_channels.each do |connection_channel|
-          client.remove_connection_channel connection_channel
+            raise ConnectionChannelRemoved, 'A connection channel was removed' if broken
+          end
+        ensure
+          connection_channels.each do |connection_channel|
+            client.remove_connection_channel connection_channel
+          end
         end
       end
     end

data/lib/flic/version.rb

@@ -1,3 +1,3 @@
 module Flic
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flic
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alec Larsen