saal 0.2.25 → 0.3.4

data/test/sensors_test.rb

@@ -67,11 +67,11 @@ class TestSensors < Test::Unit::TestCase
     end
 
     db_test_query("SELECT * FROM sensor_reads") do |res|
-      assert_equal 1, res.num_rows
-      row = res.fetch_row
-      assert_equal "fake_temp", row[0]
-      assert_in_delta Time.now.utc.to_i, row[1].to_i, 100
-      assert_instance_of Float, row[2].to_f
+      assert_equal 1, res.count
+      row = res.first
+      assert_equal "fake_temp", row["sensor"]
+      assert_in_delta Time.now.utc.to_i, row["date"].to_i, 100
+      assert_instance_of Float, row["value"].to_f
     end
   end  
 end

data/test/test_db.yml

@@ -1,4 +1,4 @@
 host: localhost
-user: sensor_reads
-pass: password
-db: sensor_reads_test
+username: sensor_reads
+password: password
+database: sensor_reads_test

data/test/test_denkovi_sensors.yml

@@ -0,0 +1,39 @@
+group1:
+  denkovi:
+    host: localhost
+    port: 33333
+    pass: somepass
+    outlets:
+      1: name01
+      2: name02
+      3: name03
+      4: name04
+      5: name05
+      6: name06
+      7: name07
+      8: name08
+      9: name09
+      10: name10
+      11: name11
+      12: name12
+      13: name13
+      14: name14
+      15: name15
+      16: name16
+    descriptions:
+      1: description01
+      2: description02
+      3: description03
+      4: description04
+      5: description05
+      6: description06
+      7: description07
+      8: description08
+      9: description09
+      10: description10
+      11: description11
+      12: description12
+      13: description13
+      14: description14
+      15: description15
+      16: description16

data/test/test_helper.rb

@@ -6,6 +6,7 @@ require File.dirname(__FILE__)+'/../lib/saal.rb'
 class Test::Unit::TestCase
   TEST_SENSORS_FILE = File.dirname(__FILE__)+'/test_sensors.yml'
   TEST_SENSORS_DINRELAY_FILE = File.dirname(__FILE__)+'/test_dinrelay_sensors.yml'
+  TEST_SENSORS_DENKOVI_FILE = File.dirname(__FILE__)+'/test_denkovi_sensors.yml'
   TEST_SENSOR_CLEANUPS_FILE = File.dirname(__FILE__)+'/test_sensor_cleanups.yml'
   TEST_NONEXIST_SENSOR_FILE = File.dirname(__FILE__)+'/nonexistant_sensor.yml'
   TEST_CHARTS_FILE = File.dirname(__FILE__)+'/test_charts.yml'
@@ -29,8 +30,7 @@ class Test::Unit::TestCase
   end
 
   def db_test_query(query)  
-    db = Mysql.new(TEST_DBOPTS['host'],TEST_DBOPTS['user'],
-                   TEST_DBOPTS['pass'],TEST_DBOPTS['db'])
+    db = Mysql2::Client.new(TEST_DBOPTS)
     res = db.query(query)
     yield res
     db.close

data/test/test_sensors.yml

@@ -1,7 +1,7 @@
 fake_temp:
   name: "A fake temperature sensor"
   onewire: 
-    serial: /10.4AEC29CDBAAB/temperature
+    serial: /10.67C6697351FF/temperature
 
 non_existant:
   name: "A non-existant sensor"

metadata

@@ -1,63 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: saal
 version: !ruby/object:Gem::Version
-  version: 0.2.25
-  prerelease: 
+  version: 0.3.4
 platform: ruby
 authors:
 - Pedro Côrte-Real
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2021-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ownet
-  requirement: &85784820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *85784820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &85784520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
-  version_requirements: *85784520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: mysql
-  requirement: &85782840 !ruby/object:Gem::Requirement
-    none: false
+  name: net-http-digest_auth
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *85782840
-description: ! "A daemon and libraries to create an abstraction layer that interfaces
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+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"
 email: pedro@pedrocr.net
 executables:
-- saal_chart~
 - dinrelaystatus
-- saal_readall
-- saal_dump_database
-- saal_daemon
-- saal_chart
-- saal_daemon~
 - dinrelayset
 - saal_import_mysql
+- saal_dump_database
+- saal_readall
+- saal_denkovi_relays
+- saal_chart
+- saal_daemon
+- saal_envoy_generate_config
+- saal_envoy_read
 extensions: []
 extra_rdoc_files:
 - README.rdoc
@@ -72,7 +95,10 @@ files:
 - bin/dinrelaystatus
 - bin/saal_chart
 - bin/saal_daemon
+- bin/saal_denkovi_relays
 - bin/saal_dump_database
+- bin/saal_envoy_generate_config
+- bin/saal_envoy_read
 - bin/saal_import_mysql
 - bin/saal_readall
 - lib/chart.rb
@@ -80,7 +106,10 @@ files:
 - lib/charts.rb
 - lib/daemon.rb
 - lib/dbstore.rb
+- lib/denkovi.rb
 - lib/dinrelay.rb
+- lib/envoy.rb
+- lib/http.rb
 - lib/outliercache.rb
 - lib/owsensor.rb
 - lib/saal.rb
@@ -92,6 +121,8 @@ files:
 - test/charts_test.rb
 - test/daemon_test.rb
 - test/dbstore_test.rb
+- test/denkovi.json.erb
+- test/denkovi_test.rb
 - test/dinrelay.html.erb
 - test/dinrelay_test.rb
 - test/nonexistant_sensor.yml
@@ -100,38 +131,36 @@ files:
 - test/sensors_test.rb
 - test/test_charts.yml
 - test/test_db.yml
+- test/test_denkovi_sensors.yml
 - test/test_dinrelay_sensors.yml
 - test/test_helper.rb
 - test/test_sensor_cleanups.yml
 - test/test_sensors.yml
-- bin/saal_chart~
-- bin/saal_daemon~
 homepage: https://github.com/pedrocr/saal
-licenses: []
-post_install_message: 
+licenses:
+- LGPL-2.1
+metadata: {}
+post_install_message:
 rdoc_options:
-- -S
-- -w 2
-- -N
-- -c utf8
+- "-S"
+- "-w 2"
+- "-N"
+- "-c utf8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.11
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 2
 summary: Thin abstraction layer for interfacing and recording sensors (currently onewire)
   and actuators (currently dinrelay)
@@ -141,6 +170,7 @@ test_files:
 - test/charts_test.rb
 - test/daemon_test.rb
 - test/dbstore_test.rb
+- test/denkovi_test.rb
 - test/dinrelay_test.rb
 - test/outliercache_test.rb
 - test/sensor_test.rb

data/bin/saal_chart~

@@ -1,90 +0,0 @@
-#!/usr/bin/env ruby
-
-NUM_VALUES_SMALL = 500 # Datapoints in "small" charts
-NUM_VALUES_LARGE = 150 # Datapoints in "large" charts
-LARGE_CHART_THRESHOLD = 30*24*60*60 # Threshold for a large chart (in seconds)
-
-require File.dirname(__FILE__)+'/../lib/saal.rb'
-
-def usage
-  $stderr.puts("Usage: saal_chart <chart dir>")
-end
-
-if ARGV.size != 1
-  usage
-  exit (2)
-end
-
-SENSOR_RANGES = {:temperature=>[-15, 45], :humidity=>[0,100], :pressure=>[950,1050]}
-
-
-SAAL::Charts.new.each do |chart|
-  $stderr.puts "Generating chart #{chart.name}"
-
-  pngfile = ARGV[0]+'/chart-'+chart.name.to_s+'.png'
-  ymlfile = ARGV[0]+'/chart-'+chart.name.to_s+'.yml'
-
-  @mins = chart.minimum
-  @maxs = chart.maximum
-  @avgs = chart.average
-  @minmax = {}
-  chart.sensors.each do |s|
-    s = s.name.to_sym
-    @minmax[s] = {:maximum => @maxs[s], :minimum => @mins[s], :average => @avgs[s]}
-  end
-
-  File.open(ymlfile, 'w').write(YAML::dump(@minmax))
-
-  def normalize_data(data, min, max)
-    data.map do |i|
-      if i.nil?
-        -1.0
-      elsif i < min
-        0.0
-      elsif i > max
-        100.0
-      else
-        (((i-min)/(max-min).to_f)*1000).round/10.0
-      end
-    end
-  end
-
-  @periodnames = chart.periodnames
-  @numperiods = @periodnames.size
-  num_values = ((chart.to-chart.from)>LARGE_CHART_THRESHOLD) ?
-               NUM_VALUES_LARGE : 
-               NUM_VALUES_SMALL
-
-  @averages = chart.average(num_values)
-
-  @data = chart.sensors.map do |sensor|
-    normalize_data(@averages[sensor.name.to_sym], *(SENSOR_RANGES[sensor.sensor_type]))
-  end
-
-  @dataurl = @data.map {|values| values.join(",")}.join('|')
-
-  r = {}
-  case chart.alignlabels
-  when :center
-    @periodnamesurl = "||"+@periodnames.join('||')+"||"
-  when :left
-    @periodnamesurl = "|"+@periodnames.join('|')+"||"
-    r[:chxs] = "0,555555,11,-1,lt"
-  end
-  @xincr = 100.0/@numperiods.to_f*10000.truncate.to_f/10000
-
-  r[:chof] = "png"
-  r[:chs] = "700x300"
-  r[:cht] = "lc"
-  r[:chco] = "00ff00,ff0000,0000ff,ff9933,800080"
-  r[:chxt] = "x,y,y,r"
-  r[:chxl] = "0:#{@periodnamesurl}1:|-15ºC||0||15||30||45ºC|2:|0%|25|50|75|100%|3:|950||975||1000||1025||1050 hPa"
-  r[:chg] = "#{@xincr},12.5,1,5"
-  r[:chd] = "t:#{@dataurl}"
-
-  @url = "http://chart.apis.google.com/chart?&"
-  @postdata = r.map{|k,v| k.to_s+"="+v}.join("&")
-
-
-  system "wget --quiet \"#{@url}\" --post-data=\"#{@postdata}\" -O #{pngfile}"
-end

data/bin/saal_daemon~

@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-
-SENSOR_INTERVAL = 60 # seconds between consecutive measurements of the sensors
-DBCONF = "/etc/saal/database.yml"
-SENSORSCONF = "/etc/saal/sensors.yml"
-
-require File.dirname(__FILE__)+'/../lib/saal.rb'
-
-def usage
-  $stderr.puts "Usage: saal_daemon <pidfile|--foreground>"
-end
-
-if ARGV.size != 1
-  usage
-  exit 2
-else
-  pidfile = ARGV[0]
-  foreground = (ARGV[0] == '--foreground')
-  d = SAAL::Daemon.new(:interval => SENSOR_INTERVAL,
-                       :sensorconf => SENSORSCONF,
-                       :dbconf => DBCONF,
-                       :foreground => foreground,
-                       :keep_stdin => true)
-  pid = d.run
-  if !foreground
-    File.open(pidfile, 'w') do |f|
-      f.write(pid)
-      f.close
-    end
-  end
-end