ruby_home 0.2.5 → 0.2.6

data/examples/humidity_sensor.rb

@@ -1,4 +1,4 @@
-require 'ruby_home'
+require "ruby_home"
 
 accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 humidity_sensor = RubyHome::ServiceFactory.create(:humidity_sensor,
@@ -7,8 +7,7 @@ humidity_sensor = RubyHome::ServiceFactory.create(:humidity_sensor,
   status_low_battery: 0, # optional
   status_tampered: 0, # optional
   status_fault: 0, # optional
-  status_active: true # optional
-)
+  status_active: true) # optional
 
 humidity_sensor.current_relative_humidity.after_update do |current_relative_humidity|
   puts "humidity sensor current relative humidity #{current_relative_humidity}"

data/examples/leak_sensor.rb

@@ -1,4 +1,4 @@
-require 'ruby_home'
+require "ruby_home"
 
 accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 leak_sensor = RubyHome::ServiceFactory.create(:leak_sensor,
@@ -7,8 +7,7 @@ leak_sensor = RubyHome::ServiceFactory.create(:leak_sensor,
   status_low_battery: 0, # optional
   status_tampered: 0, # optional
   status_fault: 0, # optional
-  status_active: true # optional
-)
+  status_active: true) # optional
 
 leak_sensor.leak_detected.after_update do |leak_detected|
   if leak_detected == 0

data/examples/light_sensor.rb

@@ -1,4 +1,4 @@
-require 'ruby_home'
+require "ruby_home"
 
 accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 light_sensor = RubyHome::ServiceFactory.create(:light_sensor,
@@ -7,8 +7,7 @@ light_sensor = RubyHome::ServiceFactory.create(:light_sensor,
   status_low_battery: 0, # optional
   status_tampered: 0, # optional
   status_fault: 0, # optional
-  status_active: true # optional
-)
+  status_active: true) # optional
 
 light_sensor.current_ambient_light_level.after_update do |current_ambient_light_level|
   # maximum_value: 100000

data/examples/lightbulb.rb

@@ -1,4 +1,4 @@
-require 'ruby_home'
+require "ruby_home"
 
 accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 lightbulb = RubyHome::ServiceFactory.create(:lightbulb,
@@ -6,8 +6,7 @@ lightbulb = RubyHome::ServiceFactory.create(:lightbulb,
   name: "lightbulb", # optional
   brightness: 100, # optional
   saturation: 100, # optional
-  hue: 360 # optional
-)
+  hue: 360) # optional
 
 lightbulb.on.after_update do |on|
   if on

data/examples/lock_mechanism.rb

@@ -1,11 +1,10 @@
-require 'ruby_home'
+require "ruby_home"
 
 accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 lock_mechanism = RubyHome::ServiceFactory.create(:lock_mechanism,
   lock_target_state: 1, # required
   lock_current_state: 1, # required
-  name: "lock" # optional
-)
+  name: "lock") # optional
 
 lock_mechanism.lock_target_state.after_update do |lock_target_state|
   if lock_target_state == 0
@@ -22,10 +21,10 @@ lock_mechanism.lock_target_state.after_update do |lock_target_state|
 end
 
 lock_current_state_values = {
-  0 => 'Unsecured',
-  1 => 'Secured',
-  2 => 'Jammed',
-  3 => 'Unknown'
+  0 => "Unsecured",
+  1 => "Secured",
+  2 => "Jammed",
+  3 => "Unknown"
 }
 lock_mechanism.lock_current_state.after_update do |lock_current_state|
   state = lock_current_state_values[lock_current_state]

data/examples/motion_sensor.rb

@@ -1,4 +1,4 @@
-require 'ruby_home'
+require "ruby_home"
 
 accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 motion_sensor = RubyHome::ServiceFactory.create(:motion_sensor,
@@ -7,8 +7,7 @@ motion_sensor = RubyHome::ServiceFactory.create(:motion_sensor,
   status_low_battery: 0, # optional
   status_tampered: 0, # optional
   status_fault: 0, # optional
-  status_active: true # optional
-)
+  status_active: true) # optional
 
 motion_sensor.motion_detected.after_update do |motion_detected|
   if motion_detected

data/examples/occupancy_sensor.rb

@@ -1,4 +1,4 @@
-require 'ruby_home'
+require "ruby_home"
 
 accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 occupancy_sensor = RubyHome::ServiceFactory.create(:occupancy_sensor,
@@ -7,8 +7,7 @@ occupancy_sensor = RubyHome::ServiceFactory.create(:occupancy_sensor,
   status_low_battery: 0, # optional
   status_tampered: 0, # optional
   status_fault: 0, # optional
-  status_active: true # optional
-)
+  status_active: true) # optional
 
 occupancy_sensor.occupancy_detected.after_update do |occupancy_detected|
   if occupancy_detected == 0

data/examples/outlet.rb

@@ -1,11 +1,10 @@
-require 'ruby_home'
+require "ruby_home"
 
 accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 outlet = RubyHome::ServiceFactory.create(:outlet,
   outlet_in_use: false, # required
   on: false, # required
-  name: "occupancy sensor", # optional
-)
+  name: "occupancy sensor") # optional
 
 outlet.outlet_in_use.after_update do |outlet_in_use|
   if outlet_in_use

data/examples/security_system.rb

@@ -1,20 +1,19 @@
-require 'ruby_home'
+require "ruby_home"
 
 accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 security_system = RubyHome::ServiceFactory.create(:security_system,
   security_system_target_state: 0, # required
   security_system_current_state: 0, # required
-  name: 'security system', # optional
+  name: "security system", # optional
   security_system_alarm_type: 0, # optional
   status_tampered: 0, # optional
-  status_fault: 0 # optional
-)
+  status_fault: 0) # optional
 
 security_system_target_state_values = {
-  0 => 'Stay Arm',
-  1 => 'Away Arm',
-  2 => 'Night Arm',
-  3 => 'Disarm'
+  0 => "Stay Arm",
+  1 => "Away Arm",
+  2 => "Night Arm",
+  3 => "Disarm"
 }
 security_system.security_system_target_state.after_update do |security_system_target_state|
   state = security_system_target_state_values[security_system_target_state]
@@ -24,11 +23,11 @@ security_system.security_system_target_state.after_update do |security_system_ta
 end
 
 security_system_current_state_values = {
-  0 => 'Stay Arm',
-  1 => 'Away Arm',
-  2 => 'Night Arm',
-  3 => 'Disarmed',
-  4 => 'Alarm Triggered'
+  0 => "Stay Arm",
+  1 => "Away Arm",
+  2 => "Night Arm",
+  3 => "Disarmed",
+  4 => "Alarm Triggered"
 }
 security_system.security_system_current_state.after_update do |security_system_current_state|
   state = security_system_current_state_values[security_system_current_state]

data/examples/smoke_sensor.rb

@@ -1,4 +1,4 @@
-require 'ruby_home'
+require "ruby_home"
 
 accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 smoke_sensor = RubyHome::ServiceFactory.create(:smoke_sensor,
@@ -7,8 +7,7 @@ smoke_sensor = RubyHome::ServiceFactory.create(:smoke_sensor,
   status_low_battery: 0, # optional
   status_tampered: 0, # optional
   status_fault: 0, # optional
-  status_active: true # optional
-)
+  status_active: true) # optional
 
 smoke_sensor.smoke_detected.after_update do |smoke_detected|
   if smoke_detected == 0

data/examples/switch.rb

@@ -1,10 +1,9 @@
-require 'ruby_home'
+require "ruby_home"
 
 accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 switch = RubyHome::ServiceFactory.create(:switch,
   on: false, # required
-  name: 'switch', # optional
-)
+  name: "switch") # optional
 
 switch.on.after_update do |on|
   if on

data/examples/television.rb

@@ -1,31 +1,29 @@
-require 'ruby_home'
+require "ruby_home"
 
 RubyHome.configure do |c|
-  c.discovery_name = 'Television'
+  c.discovery_name = "Television"
   c.category_identifier = :television
 end
 
 accessory = RubyHome::Accessory.new
 
 RubyHome::ServiceFactory.create(:accessory_information,
-  accessory: accessory, # required
-)
+  accessory: accessory) # required
 
 television = RubyHome::ServiceFactory.create(:television,
   accessory: accessory, # required
   primary: true, # required
-  configured_name: 'Television', # required
+  configured_name: "Television", # required
   active: 1, # required
   active_identifier: 1, # required
   sleep_discovery_mode: 1, # required
   remote_key: nil, # required
-  name: 'Television', # optional
+  name: "Television", # optional
   power_mode_selection: true, # optional
   picture_mode: 4, # optional
   target_media_state: 0, # optional
   current_media_state: 0, # optional
-  brightness: 100 # optional
-)
+  brightness: 100) # optional
 
 television.active.after_update do |active|
   if active == 0
@@ -49,8 +47,7 @@ speaker = RubyHome::ServiceFactory.create(:television_speaker,
   name: "Television Volume", # optional
   active: 1, # optional
   volume_control_type: 1, # optional
-  volume_selector: 0, # optional
-)
+  volume_selector: 0) # optional
 speaker.volume_selector.after_update do |volume|
   if volume == 0
     puts "television volume up"
@@ -69,9 +66,7 @@ sources = (1..4).map do |index|
     is_configured: 1, # required
     current_visibility_state: 0, # required
     identifier: index, # optional
-    input_device_type: 1 # optional
-
-  )
+    input_device_type: 1) # optional
 end
 television.linked = [speaker] + sources
 

data/examples/temperature_sensor.rb

@@ -1,4 +1,4 @@
-require 'ruby_home'
+require "ruby_home"
 
 accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 temperature_sensor = RubyHome::ServiceFactory.create(:temperature_sensor,
@@ -7,8 +7,7 @@ temperature_sensor = RubyHome::ServiceFactory.create(:temperature_sensor,
   status_low_battery: 0, # optional
   status_tampered: 0, # optional
   status_fault: 0, # optional
-  status_active: true # optional
-)
+  status_active: true) # optional
 
 temperature_sensor.current_temperature.after_update do |current_temperature|
   puts "temperature sensor current_temperature #{current_temperature}"

data/examples/thermostat.rb

@@ -1,4 +1,4 @@
-require 'ruby_home'
+require "ruby_home"
 
 accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 thermostat = RubyHome::ServiceFactory.create(:thermostat,
@@ -11,8 +11,7 @@ thermostat = RubyHome::ServiceFactory.create(:thermostat,
   heating_threshold_temperature: 20, # optional
   cooling_threshold_temperature: 10, # optional
   target_relative_humidity: 0, # optional
-  current_relative_humidity: 0, # optional
-)
+  current_relative_humidity: 0) # optional
 
 thermostat.temperature_display_units.after_update do |temperature_display_unit|
   if temperature_display_unit == 0
@@ -47,16 +46,16 @@ thermostat.current_temperature.after_update do |current_temperature|
 end
 
 target_heating_cooling_state_values = {
-  0 => 'Off',
-  1 => 'Heat',
-  2 => 'Cool',
-  3 => 'Auto',
+  0 => "Off",
+  1 => "Heat",
+  2 => "Cool",
+  3 => "Auto"
 }
 thermostat.target_heating_cooling_state.after_update do |target_heating_cooling_state|
   state = target_heating_cooling_state_values[target_heating_cooling_state]
   puts "heater cooler target heating cooler state is #{state}"
 
-  return if thermostat.current_heating_cooling_state == target_heating_cooling_state
+  return true if thermostat.current_heating_cooling_state == target_heating_cooling_state
 
   if target_heating_cooling_state == 1
     thermostat.current_heating_cooling_state = 1
@@ -68,9 +67,9 @@ thermostat.target_heating_cooling_state.after_update do |target_heating_cooling_
 end
 
 current_heating_cooling_state_values = {
-  0 => 'Off',
-  1 => 'Heat',
-  2 => 'Cool',
+  0 => "Off",
+  1 => "Heat",
+  2 => "Cool"
 }
 thermostat.current_heating_cooling_state.after_update do |current_heating_cooling_state|
   state = current_heating_cooling_state_values[current_heating_cooling_state]

data/examples/window.rb

@@ -1,4 +1,4 @@
-require 'ruby_home'
+require "ruby_home"
 
 accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 window = RubyHome::ServiceFactory.create(:window,
@@ -6,8 +6,7 @@ window = RubyHome::ServiceFactory.create(:window,
   position_state: 1, # required
   current_position: 0, # required
   name: "window", # optional
-  obstruction_detected: false, # optional
-)
+  obstruction_detected: false) # optional
 
 window.target_position.after_update do |target_position|
   puts "window target position #{target_position}"
@@ -25,9 +24,9 @@ window.target_position.after_update do |target_position|
 end
 
 position_state_values = {
-  0 => 'Decreasing',
-  1 => 'Increasing',
-  2 => 'Stopped'
+  0 => "Decreasing",
+  1 => "Increasing",
+  2 => "Stopped"
 }
 window.position_state.after_update do |position_state|
   state = position_state_values[position_state]

data/examples/window_covering.rb

@@ -1,4 +1,4 @@
-require 'ruby_home'
+require "ruby_home"
 
 accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
 window_covering = RubyHome::ServiceFactory.create(:window_covering,
@@ -10,8 +10,7 @@ window_covering = RubyHome::ServiceFactory.create(:window_covering,
   current_vertical_tilt_angle: 0, # optional
   target_vertical_tilt_angle: 0, # optional
   current_horizontal_tilt_angle: 0, # optional
-  target_horizontal_tilt_angle: 0 # optional
-)
+  target_horizontal_tilt_angle: 0) # optional
 
 window_covering.target_position.after_update do |target_position|
   puts "window covering target position #{target_position}"
@@ -29,9 +28,9 @@ window_covering.target_position.after_update do |target_position|
 end
 
 position_state_values = {
-  0 => 'Decreasing',
-  1 => 'Increasing',
-  2 => 'Stopped'
+  0 => "Decreasing",
+  1 => "Increasing",
+  2 => "Stopped"
 }
 window_covering.position_state.after_update do |position_state|
   state = position_state_values[position_state]

data/lib/ruby_home.rb

@@ -1,25 +1,25 @@
-require 'dnssd'
-require 'facets/hash/slice'
-require 'hkdf'
-require 'oj'
-require 'rack'
-require 'rbnacl'
-require 'ruby_home/srp'
-require 'ruby_home/tlv'
-require 'securerandom'
-require 'sinatra/base'
-require 'socket'
-require 'webrick'
-require 'wisper'
-require 'yaml'
+require "dnssd"
+require "facets/hash/slice"
+require "hkdf"
+require "oj"
+require "rack"
+require "rbnacl"
+require "ruby_home/srp"
+require "ruby_home/tlv"
+require "securerandom"
+require "sinatra/base"
+require "socket"
+require "webrick"
+require "wisper"
+require "yaml"
 
 module RubyHome
   [
-    '/ruby_home/hap/**/*.rb',
-    '/ruby_home/http/**/*.rb',
-    '/ruby_home/factories/**/*.rb',
-    '/ruby_home/dns/**/*.rb',
-    '/ruby_home/*.rb'
+    "/ruby_home/hap/**/*.rb",
+    "/ruby_home/http/**/*.rb",
+    "/ruby_home/factories/**/*.rb",
+    "/ruby_home/dns/**/*.rb",
+    "/ruby_home/*.rb"
   ].each do |pattern|
     Dir[File.dirname(__FILE__) + pattern].each { |file| require file }
   end
@@ -36,8 +36,8 @@ module RubyHome
     end
 
     def run
-      trap 'INT'  do shutdown end
-      trap 'TERM' do shutdown end
+      trap("INT") { shutdown }
+      trap("TERM") { shutdown }
 
       greet
       start