ruby_home 0.2.0 → 0.2.5

data/lib/ruby_home/http/services/verify_srp_service.rb

@@ -1,57 +1,48 @@
 module RubyHome
   class VerifySRPService
-    def initialize(public_key: , device_proof: , srp_session: )
-      @device_proof = device_proof
+    def initialize(device_proof: , public_key: , srp_session: )
+      @device_proof_bytes = device_proof.to_s.unpack1('H*')
+      @public_key_bytes = public_key.to_s.unpack1('H*')
       @srp_session = srp_session
-      @public_key = public_key
     end
 
-    def valid?
-      return false unless public_key
-      return false unless device_proof
-      return false unless srp_session
-      return false unless valid_session?
-
-      true
-    end
-
-    def session_key
-      srp_verifier.K
-    end
-
-    def server_proof
-      verify_session_bytes
+    def run
+      if valid_session?
+        OpenStruct.new(
+          success?: true,
+          session_key: session_key,
+          server_proof: verify_session_bytes
+        )
+      else
+        OpenStruct.new(success?: false)
+      end
     end
 
     private
 
-    def valid_session?
-      !!verify_session
-    end
-
-    def verify_session_bytes
-      [verify_session].pack('H*')
-    end
+      def valid_session?
+        !!verify_session
+      end
 
-    def verify_session
-      @_verify_session ||= srp_verifier.verify_session(
-        srp_session.merge({A: public_key_bytes}),
-        device_proof_bytes
-      )
-    end
+      def session_key
+        srp_verifier.K
+      end
 
-    def public_key_bytes
-      public_key.unpack1('H*')
-    end
+      def verify_session_bytes
+        [verify_session].pack('H*')
+      end
 
-    def device_proof_bytes
-      device_proof.unpack1('H*')
-    end
+      def verify_session
+        srp_verifier.verify_session(
+          srp_session.merge({A: public_key_bytes}),
+          device_proof_bytes
+        )
+      end
 
-    def srp_verifier
-      @_verifier ||= RubyHome::SRP::Verifier.new
-    end
+      def srp_verifier
+        @_verifier ||= RubyHome::SRP::Verifier.new
+      end
 
-    attr_reader :public_key, :device_proof, :srp_session
+      attr_reader :public_key_bytes, :device_proof_bytes, :srp_session
   end
 end

data/lib/ruby_home/persistable.rb

@@ -10,7 +10,7 @@ module RubyHome
     module ClassMethods
       def persisted
         if yaml = read
-          new(yaml)
+          new(**yaml)
         end
       end
 
@@ -23,19 +23,11 @@ module RubyHome
       end
 
       def read
-        return false unless file_exists?
+        return false unless File.exist?(source)
 
         YAML.load_file(source)
-      end
-
-      def truncate
-        return false unless file_exists?
-
-        File.truncate(source, 0)
-      end
-
-      def file_exists?
-        File.exists?(source)
+      rescue Errno::EBADF
+        return false
       end
     end
 

data/lib/ruby_home/service.rb

@@ -12,6 +12,7 @@ module RubyHome
       @description = description
       @uuid = uuid
       @characteristics = CharacteristicCollection.new
+      @linked = []
     end
 
     attr_reader(
@@ -24,6 +25,8 @@ module RubyHome
       :uuid,
       :instance_id
     )
+    
+    attr_accessor :linked
 
     def instance_id=(new_id)
       raise DuplicateServiceError if accessory.contains_instance_id?(new_id)

data/lib/ruby_home/version.rb

@@ -1,3 +1,3 @@
 module RubyHome
-  VERSION = '0.2.0'
+  VERSION = '0.2.5'
 end

data/rubyhome.gemspec

@@ -24,22 +24,22 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'bin'
   spec.executables   = ['ruby_home']
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.4.1'
+  spec.required_ruby_version = '>= 2.5.0'
 
-  spec.add_dependency 'bindata', '~> 2.4', '>= 2.4.3'
   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.9'
-  spec.add_dependency 'rbnacl', '~> 6.0'
+  spec.add_dependency 'oj', '~> 3.10'
+  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 'ruby_home-tlv', '~> 0.1'
+  spec.add_dependency 'sinatra', '~> 2.0'
+  spec.add_dependency 'webrick', '~> 1.7'
   spec.add_dependency 'wisper', '~> 2.0'
 
   spec.add_development_dependency 'byebug', '~> 11.0'
   spec.add_development_dependency 'plist', '~> 3.4'
   spec.add_development_dependency 'rack-test', '~> 1.1.0'
-  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

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,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ruby_home
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Karl Entwistle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bindata
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.4.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: dnssd
   requirement: !ruby/object:Gem::Requirement
@@ -76,30 +56,30 @@ dependencies:
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.9
+        version: '3.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.9
+        version: '3.10'
 - !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
@@ -120,28 +100,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: wisper
   requirement: !ruby/object:Gem::Requirement
@@ -204,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -238,11 +232,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -250,18 +245,48 @@ 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/television.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
 - lib/ruby_home/accessory_info.rb
 - lib/ruby_home/characteristic.rb
 - lib/ruby_home/characteristic_collection.rb
+- lib/ruby_home/config/categories.yml
 - lib/ruby_home/config/characteristics.yml
 - lib/ruby_home/config/services.yml
 - lib/ruby_home/configuration.rb
 - lib/ruby_home/device_id.rb
 - lib/ruby_home/dns/service.rb
 - lib/ruby_home/dns/text_record.rb
+- lib/ruby_home/errors.rb
 - lib/ruby_home/factories/characteristic_factory.rb
 - lib/ruby_home/factories/service_factory.rb
 - lib/ruby_home/factories/templates/characteristic_template.rb
@@ -304,6 +329,7 @@ files:
 - lib/ruby_home/http/serializers/uuid_helper.rb
 - lib/ruby_home/http/services/session_notifier.rb
 - lib/ruby_home/http/services/start_srp_service.rb
+- lib/ruby_home/http/services/verify_finish_service.rb
 - lib/ruby_home/http/services/verify_srp_service.rb
 - lib/ruby_home/identifier_cache.rb
 - lib/ruby_home/password.rb
@@ -326,14 +352,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.1
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby HomeKit support

data/.travis.yml

@@ -1,31 +0,0 @@
-dist: xenial
-cache: bundler
-language: ruby
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y software-properties-common; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libsodium-dev; fi
-install:
-  - 'gem update --system'
-  - 'gem --version'
-  - 'gem install bundler -v 2.0.1'
-  - 'bundle --version'
-  - bundle
-rvm:
-  - 2.4.1
-  - 2.5
-  - 2.6
-  - ruby-head
-os:
-  - linux
-  - osx
-addons:
-  apt:
-    packages:
-      - libavahi-compat-libdnssd-dev
-  homebrew:
-    packages:
-      - libsodium
-notifications:
-  email: false