renstar 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3651f4b220453c1382ee4accc5503a1122364672acee6590366adcfe0bc911c9
-  data.tar.gz: 7355ee293bca9e280004a799198c107c060c555dfff9913215c757d678ef67cc
+  metadata.gz: 395939a21c7674830297c4b637980c6b0ef8dd5a368ac9c7f22046e8acd30f8d
+  data.tar.gz: 76fcd3f4913478ca1993f8b0b9acfd27ab420f23005f55803a98955d5b196a5a
 SHA512:
-  metadata.gz: d216511fa715d06164f923d0d923312d7c515f7c97f9395bb91fa90dec0cbc416fbcc935e338d4b08b20f518236a4a3bc55a8766d470c1b2a501fedb1ee67884
-  data.tar.gz: 56077d08ddc62d53d365999ac75fe552aeb8cf52222f97b3ba8fe4ce5de9a9ebc0f04546803fbb9df422ae51187bff0cc20ae30e682dbdfb3f2bce6cc647df14
+  metadata.gz: 85342777ce38973500afc97c66c059c3b8b0e6b023367902d2271b3ece751a2f40c9840fc44e27c792fdf08a86f41467494e07aecc86dfbaa481b6cf471fd2c5
+  data.tar.gz: a30e766bb836c2e682f3f4b4499d8e77aea7cb7cb90e1ac44c8a61398df9e0657223b7e136ccf27cc8512bace3cec41e80e7f238247f6576774b414503194bbb

data/Gemfile

@@ -6,3 +6,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake', '~> 13.0'
+gem 'ssdp', git: 'https://github.com/mikerodrigues/ssdp'

data/bin/renstar.rb

@@ -1,50 +1,43 @@
 require 'renstar'
 require 'optparse'
 require 'ostruct'
+require 'pry'
 
-class RenstarOptions
-  DEFAULT_OPTIONS = { all: false }.freeze
-  USAGE = " Usage: renstar.rb command [value]"
+options = {}
 
-  def self.parse(args)
+#DEFAULT_OPTIONS = { all: false }.freeze
 
-    @options = OpenStruct.new(DEFAULT_OPTIONS)
 
-    options = OptionParser.new do |opts|
-      opts.banner = USAGE
+USAGE = " Usage: renstar.rb command [value]"
 
-      opts.on '-d', '--discover', 'Discover all Renstar devices' do |d|
-        @options.discover = true
-      end
+OptionParser.new do |opts|
 
-      opts.on '-h', '--help', 'Display this screen' do |h|
-        @options.help = true
-      end
-    end
+  opts.banner = USAGE
 
-    options.parse!(args)
-
-    puts options if @options && ARGV == []
-
-    if @options.discover
-      Renstar.discover.each do |device|
-        puts "#{device.name} #{device.ip}"
-      end
-      exit 0
-    end
-
-    if @options.help
-      puts opts
-      exit 0
-    end
+  opts.on '-d', '--discover', 'Discover all Renstar devices' do |d|
+    options[:discover] = true
+  end
 
+  opts.on '-h', '--help', 'Display this screen' do |h|
+    puts opts
+    exit 0
+  end
+end.parse!
 
+if options[:discover]
+  thermos = Renstar::Thermostat.search
+  thermos.each do |thermo|
+    puts "Found: #{thermo.location} #{thermo.usn}"
   end
+  exit 0
 end
 
-@options = RenstarOptions.parse(ARGV)
 
-thermo = Renstar::Thermostat.search.first
-
-
-thermo.send(*ARGV)
+thermos = Renstar::Thermostat.search
+thermos.each do |thermo|
+  puts "Found: #{thermo.location} #{thermo.usn}"
+end
+puts "Using: " + thermos.first.location + " - " + thermos.first.usn
+unless (ARGV.nil? || ARGV.empty?)
+  puts thermos.first.send(*ARGV)
+end

data/lib/renstar/thermostat.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'ssdp'
+require 'socket'
 require_relative 'api_client'
 
 module Renstar
@@ -11,27 +12,42 @@ module Renstar
   #
   class Thermostat
     SERVICE = 'venstar:thermostat:ecp'
-    DEFAULT_TIMEOUT = 5
+    DEFAULT_TIMEOUT = 3
 
     attr_reader :location, :usn, :cached_info
 
     include APIClient
 
-    def initialize(location, usn)
-      @location = location
-      @usn = usn
+    def initialize(location, usn = nil)
+      if location && usn then
+        @location = location
+        @usn = usn
+      else
+        @location = "http://" + location + '/'
+        @usn = ""
+      end
+
       @cache_timestamp = Time.now
       @cached_info = info
     end
 
     def self.search(timeout = DEFAULT_TIMEOUT)
-      ssdp = SSDP::Consumer.new
-      thermos = ssdp.search(service: SERVICE, timeout: timeout)
-      thermos.map do |thermo|
-        location = thermo[:params]['Location']
-        usn = thermo[:params]['USN']
-        Renstar::Thermostat.new(location, usn)
+      all_thermos = []
+      ips = Socket.ip_address_list.select do |ip|
+        ip.ipv4? &&
+          !ip.ipv4_loopback?
+      end
+      ips.each do |ip|
+        puts "Searching subnet associated with #{ip.ip_address}"
+        ssdp = SSDP::Consumer.new({bind: ip.ip_address})
+        thermos = ssdp.search(service: SERVICE, timeout: timeout)
+        thermos.each do |thermo|
+          location = thermo[:params]['Location']
+          usn = thermo[:params]['USN']
+          all_thermos << Renstar::Thermostat.new(location, usn)
+        end
       end
+      all_thermos
     end
 
     def update

data/lib/renstar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renstar
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

data/renstar.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'json'
-  spec.add_runtime_dependency 'ssdp'
+#  spec.add_runtime_dependency 'ssdp'
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renstar
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Rodrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-21 00:00:00.000000000 Z
+date: 2022-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ssdp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Control Venstar thermostats with Ruby via their local API.
 email:
 - mikebrodrigues@gmail.com
@@ -50,7 +36,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,23 +0,0 @@
-PATH
-  remote: .
-  specs:
-    renstar (0.1.1)
-      json
-      ssdp
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    json (2.6.1)
-    rake (13.0.6)
-    ssdp (1.1.7)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  rake (~> 13.0)
-  renstar!
-
-BUNDLED WITH
-   2.2.22