ruby_home 0.2.1 → 0.2.2

data/lib/ruby_home/config/characteristics.yml

@@ -1690,3 +1690,19 @@
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
+- :name: :color_temperature
+  :description: Color Temperature
+  :uuid: 000000CE-0000-1000-8000-0026BB765291
+  :format: uint32
+  :unit: nil
+  :permissions:
+  - securedRead
+  - securedWrite
+  :properties:
+  - read
+  - write
+  - cnotify
+  :constraints:
+    :MaximumValue: 400
+    :MinimumValue: 50
+    :StepValue: 1

data/lib/ruby_home/config/services.yml

@@ -236,6 +236,7 @@
   - 00000013-0000-1000-8000-0026BB765291
   - 0000002F-0000-1000-8000-0026BB765291
   - 00000023-0000-1000-8000-0026BB765291
+  - 000000CE-0000-1000-8000-0026BB765291
   :required_characteristics_uuids:
   - 00000025-0000-1000-8000-0026BB765291
 - :name: :lock_management

data/lib/ruby_home/version.rb

@@ -1,3 +1,3 @@
 module RubyHome
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/rubyhome.gemspec

@@ -30,11 +30,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dnssd', '~> 3.0'
   spec.add_dependency 'facets', '~> 3.1'
   spec.add_dependency 'hkdf', '~> 0.3.0'
-  spec.add_dependency 'oj', '3.7.12'
-  spec.add_dependency 'rbnacl', '~> 6.0'
+  spec.add_dependency 'oj', '3.9.1'
+  spec.add_dependency 'rbnacl', '~> 7.0'
   spec.add_dependency 'ruby_home-srp', '~> 1.3'
   spec.add_dependency 'ruby_home-tlv', '~> 0.1.0'
-  spec.add_dependency 'sinatra', '2.0.5'
+  spec.add_dependency 'sinatra', '2.0.7'
   spec.add_dependency 'wisper', '~> 2.0'
 
   spec.add_development_dependency 'byebug', '~> 11.0'

data/sbin/characteristic_generator.rb

@@ -10,16 +10,38 @@ module RubyHome
       def run
         convert_binary_plist
         File.open(file_path, 'w') do |file|
-          file.write generate_characteristics.to_yaml
+          file.write characteristics.to_yaml
         end
       end
 
+      def characteristics
+        generate_characteristics + hardcoded_characteristics
+      end
+
       def generate_characteristics
         parsed_xml['Characteristics'].map do |characteristics_xml|
           new(characteristics_xml).generate_characteristic_hash
         end
       end
 
+      def hardcoded_characteristics
+        [
+          # HomeKit Accessory Simulator doesnt include color temperature as a characteristic
+          # HAP-Specification-Non-Commercial-Version lists it as a valid optional characteristic
+          {
+            name: :color_temperature,
+            description: 'Color Temperature',
+            uuid: '000000CE-0000-1000-8000-0026BB765291',
+            format: 'uint32',
+            unit: "nil",
+            permissions: %w(securedRead securedWrite),
+            properties: %w(read write cnotify),
+            constraints: { 'MaximumValue': 400, 'MinimumValue': 50, 'StepValue': 1 }
+          }
+        ]
+      end
+
+
       def convert_binary_plist
         system([
           'plutil -convert xml1 -o',

data/sbin/service_generator.rb

@@ -60,9 +60,19 @@ module RubyHome
         name.downcase.gsub(' ', '_')
       end
 
-      private
+      COLOR_TEMPERATURE_UUID = -'000000CE-0000-1000-8000-0026BB765291'
 
-      attr_reader :name, :optional_characteristics, :required_characteristics, :uuid
+      def optional_characteristics
+        if sanitized_name == 'lightbulb'
+          # HomeKit Accessory Simulator doesnt include color temperature as a characteristic
+          # HAP-Specification-Non-Commercial-Version lists it as a valid optional characteristic
+          @optional_characteristics + [COLOR_TEMPERATURE_UUID]
+        else
+          @optional_characteristics
+        end
+      end
+
+      attr_reader :name, :required_characteristics, :uuid
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_home
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Karl Entwistle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -78,28 +78,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.12
+        version: 3.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.12
+        version: 3.9.1
 - !ruby/object:Gem::Dependency
   name: rbnacl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: ruby_home-srp
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
   name: wisper
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +250,33 @@ files:
 - bin/console
 - bin/ruby_home
 - bin/setup
+- examples/air_purifier.rb
+- examples/air_quality_sensor.rb
+- examples/battery_service.rb
+- examples/carbon_dioxide_sensor.rb
+- examples/carbon_monoxide_sensor.rb
+- examples/contact_sensor.rb
+- examples/door.rb
+- examples/fan.rb
+- examples/fan_v2.rb
+- examples/garage_door_opener.rb
+- examples/heater_cooler.rb
+- examples/humidifier_dehumidifier.rb
+- examples/humidity_sensor.rb
+- examples/leak_sensor.rb
+- examples/light_sensor.rb
+- examples/lightbulb.rb
+- examples/lock_mechanism.rb
+- examples/motion_sensor.rb
+- examples/occupancy_sensor.rb
+- examples/outlet.rb
+- examples/security_system.rb
+- examples/smoke_sensor.rb
+- examples/switch.rb
+- examples/temperature_sensor.rb
+- examples/thermostat.rb
+- examples/window.rb
+- examples/window_covering.rb
 - lib/ruby_home.rb
 - lib/ruby_home/accessory.rb
 - lib/ruby_home/accessory_collection.rb
@@ -335,7 +362,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Ruby HomeKit support