saal 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '097e00e7d501d49e8b411d07a6a7eff6afe0adf220c3e1757304428c4cc059f1'
-  data.tar.gz: 398f11226d5a182aa92417448afd7b3adf0e6a3d1ab120b8f903eb952e6c131b
+  metadata.gz: a73d98e715e7b0460b414451f12d729f6c7ba0073a8c9f07fb1312cbf8e3088c
+  data.tar.gz: 5862c4608df8505117888d230f7318cf67b7d1674f9119354bb3cc0c6b9205f9
 SHA512:
-  metadata.gz: ce014accc32521fb1fad84ed552fe92d6ed3798aef83b30769b03244703d80c205d5463c5ebf9b5ad0fff418663d3293add9291d7344b51db4201a634ee0308e
-  data.tar.gz: 3aaeb5d0825733dd3e87d4eb9fb9900f6f7cb5a78c9be3a8168ba7b7afef7ce379d51d8e4a267c59f1fcce86e33075c6a55eb18cfcba65932d138d718f534dd0
+  metadata.gz: a9691af2407d177050886eb9754d164cea5b76044e14b42db23b176fc5efd1ce84bbc9986582a075c9ed9cd4e2648cc9d9c76c3c9c6543aaa5a5c1dd18a76d6a
+  data.tar.gz: 7f55fb52f23eb87744fe592a879295326d06b61ee046ae39fed2ae093d11c280f2988fb20fa4a0e6e67c48a7314eb93e5f1f2dca0ddc6133108a0f5a350cff32

data/bin/saal_envoy_generate_config

@@ -2,51 +2,35 @@
 
 require File.dirname(__FILE__)+'/../lib/saal.rb'
 
-if ARGV.size != 1 && ARGV.size != 3
-  $stderr.puts "USAGE: saal_envoy_generate_config <host> [<user> <password>]"
+if ARGV.size != 2
+  $stderr.puts "USAGE: saal_envoy_generate_config <host> <token>"
   exit(1)
 end
 
+envoy = SAAL::Envoy::Inverters::new(
+  :host => ARGV[0],
+  :token => ARGV[1],
+)
+envoy.set_all_inverters!
+if envoy.inverters.size <= 0
+  $stderr.puts "ERROR: Couldn't find any inverters!"
+  exit 0
+end
+
 puts "power:"
 puts "  envoy_power_energy:"
 puts "    host: \"#{ARGV[0]}\""
+puts "    token: \"#{ARGV[1]}\""
 puts
 puts "ac:"
 puts "  envoy_ac_quality:"
 puts "    host: \"#{ARGV[0]}\""
-
-user = "envoy"
-password = nil
-
-if ARGV[2]
-  user = ARGV[1]
-  password = ARGV[2]
-else
-  Net::HTTP.get(ARGV[0], '/home').split("\n").each do |line|
-    if line.include?("serial:")
-      password = line.split('"')[1][-6..-1]
-    end
-  end
-  if !password
-    $stderr.puts "Couldn't find serial number for envoy"
-    exit 2
-  end
-end
-
-envoy = SAAL::Envoy::Inverters::new(
-  :host => ARGV[0],
-  :user => user,
-  :password => password,
-)
-envoy.set_all_inverters!
-exit 0 if envoy.inverters.size <= 0
-
+puts "    token: \"#{ARGV[1]}\""
 puts
 puts "inverters:"
 puts "  envoy_inverters:"
 puts "    host: \"#{ARGV[0]}\""
-puts "    user: \"#{user}\""
-puts "    password: \"#{password}\""
+puts "    token: \"#{ARGV[1]}\""
 puts "    inverters:"
 envoy.inverters.each do |serial|
   puts "    - #{serial}"

data/bin/saal_envoy_read

@@ -2,11 +2,13 @@
 
 require File.dirname(__FILE__)+'/../lib/saal.rb'
 
-if ARGV.size != 3
-  $stderr.puts "USAGE: saal_envoy_read <host> <user> <password>"
+if ARGV.size != 2
+  $stderr.puts "USAGE: saal_envoy_read <host> <token>"
   exit(1)
 end
 
+config = {:host => ARGV[0], :token => ARGV[1]}
+
 def fdisp(val)
   if val
     '%10.0f' % val
@@ -58,7 +60,7 @@ def lratio(vals, name1, name2)
   end
 end
 
-ac_quality = SAAL::Envoy::ACQuality::new(:host => ARGV[0]).create_sensors
+ac_quality = SAAL::Envoy::ACQuality::new(config).create_sensors
 
 puts " ========= AC QUALITY ========"
 puts "        voltage (V)  freq (Hz)"
@@ -73,7 +75,7 @@ qual_line(ac_quality, "Phase1:", "phase1")
 qual_line(ac_quality, "Phase2:", "phase2")
 qual_line(ac_quality, "Phase3:", "phase3")
 
-production = SAAL::Envoy::PowerEnergy::new(:host => ARGV[0]).create_sensors
+production = SAAL::Envoy::PowerEnergy::new(config).create_sensors
 
 puts ""
 puts " ============ TRUE POWER (W) ============  ======= TRUE ENERGY (kWh) ======="
@@ -134,12 +136,7 @@ pf_line(production, "Phase2:", "phase2", "va")
 pf_line(production, "Phase3:", "phase3", "va")
 
 puts ""
-envoy = SAAL::Envoy::Inverters::new(
-  :host => ARGV[0],
-  :user => ARGV[1],
-  :password => ARGV[2],
-  :types => ["w_now", "last_report_date", "w_max"],
-)
+envoy = SAAL::Envoy::Inverters::new(config.merge({:types => ["w_now", "last_report_date", "w_max"]}))
 envoy.set_all_inverters!
 inverters = envoy.create_sensors
 puts " Found #{envoy.inverters.size} inverters"

data/lib/saal.rb

@@ -10,7 +10,7 @@ module SAAL
     DBCONF = CONFDIR+"database.yml"
     CHARTSCONF = CONFDIR+"charts.yml"
 
-    VERSION = '0.3.5'
+    VERSION = '0.3.6'
 end
 
 require File.dirname(__FILE__)+'/dbstore.rb'

data/saal.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name              = 'saal'
-  s.version           = '0.3.5'
+  s.version           = '0.3.6'
   s.date              = '2024-02-08'
 
   s.summary     = "Thin abstraction layer for interfacing and recording sensors (currently onewire) and actuators (currently dinrelay)"
@@ -32,7 +32,7 @@ EOF
   s.add_runtime_dependency 'ownet', "~>0.2"
   s.add_runtime_dependency 'mysql2', "~>0.5"
   s.add_runtime_dependency 'nokogiri', '~>1.8'
-  s.add_runtime_dependency 'net-http-digest_auth', '~>1.4'
+  s.add_runtime_dependency 'openssl', '~>2'
 
   # = MANIFEST =
   s.files = %w[

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saal
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Pedro Côrte-Real
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: net-http-digest_auth
+  name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2'
 description: "A daemon and libraries to create an abstraction layer that interfaces
   with \nsensors and actuators, recording their state, responding to requests \nfor
   current and historical values, and allowing changes of state.\n"