saal 0.2.25 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 39379f2c03a4d1dfe41a1d481d2d90484b9d4e11b2c498f03c0f9ec064918850
+  data.tar.gz: ab741ee35c0c4528b89dbdbf32e17ca591d134f126db27e7a6974ce51e4a9723
+SHA512:
+  metadata.gz: b2532eff01ab6a191106abe8984b46aa0f9b9b0ca461b87b6b09b5174334c4d054ea8ac335e17551e5c733ca0a1dd31356bc25d68b0d38140b27f89b041f257b
+  data.tar.gz: 4bc1474527de78d0a7c80248376f0ae56a4fbc680cbfa991851f41931b5f2bd78c5073ae6ea4217d4edb3b55fec8e105963026b3ca229b90d0868e7f0cfc7179

data/lib/chart.rb

@@ -5,7 +5,7 @@ module SAAL
       @name = name
       @defs = defs
       @alignlabels = (defs['alignlabels'] || :center).to_sym
-      @sensors = defs['sensors'].map{|name| sensors.send(name)} 
+      @sensors = defs['sensors'].map{|sname| sensors.send(sname)}
       @num = defs['last']
       @periods = defs['periods']
       @alt = defs['alt']

data/lib/chart_data.rb

@@ -39,7 +39,7 @@ module SAAL
       (0..num-2).map do |i|
         f = t + 1
         t = (f+step)
-        v = sensor.send(method, f.to_i, t.to_i)
+        _v = sensor.send(method, f.to_i, t.to_i)
       end << sensor.send(method, (t+1).to_i, to.to_i)
     end
 

data/lib/dbstore.rb

@@ -46,54 +46,51 @@ module SAAL
                   WHERE sensor = '#{db_quote(sensor.to_s)}'
                   AND date > '#{Time.now.utc.to_i - MAX_LAST_VAL_AGE}'
                   ORDER BY date DESC LIMIT 1" do |r|
-        if r.num_rows == 0
-          return nil
+        row = r.first
+        if row
+          _date, value = [row["date"].to_i, row["value"].to_f]
+          value
         else
-          row = r.fetch_row
-          date, value = [row[0].to_i, row[1].to_f]
-          return value
+          nil
         end
       end
     end
 
     def each
       db_query "SELECT sensor,date,value FROM sensor_reads" do |r|
-        r.num_rows.times do
-          row = r.fetch_row
-          yield [row[0],row[1].to_i, row[2].to_f]
+        r.each do |row|
+          yield [row["sensor"],row["date"].to_i, row["value"].to_f]
         end
       end
     end
     
     private
     def db_range(function, sensor, from, to)
-      db_query "SELECT #{function}(value) AS average FROM sensor_reads
+      db_query "SELECT #{function}(value) AS func FROM sensor_reads
                        WHERE sensor = '#{db_quote(sensor.to_s)}' 
                          AND date >= #{from.to_s} 
                          AND date <= #{to.to_s}" do |r|
-        if r.num_rows == 0 
-          nil
+        row = r.first
+        if row && row["func"]
+          row["func"].to_f
         else
-          row = r.fetch_row
-          row[0] ? row[0].to_f : nil
+          nil
         end
       end
     end
 
     def db_quote(text)
-      Mysql.quote(text)
+      Mysql2::Client.escape(text)
     end
 
     def db_query(query, opts={})
       db = nil
       begin
         # connect to the MySQL server
-        db = Mysql.new(@dbopts['host'],@dbopts['user'],@dbopts['pass'],
-                       @dbopts['db'],@dbopts['port'],@dbopts['socket'],
-                       @dbopts['flags'])
+        db = Mysql2::Client.new(@dbopts)
         res = db.query(query)
         yield res if block_given?
-      rescue Mysql::Error => e
+      rescue Mysql2::Error => e
         $stderr.puts "MySQL Error #{e.errno}: #{e.error}" if !(e.errno == opts[:ignoreerr])
       ensure
         db.close if db

data/lib/dinrelay.rb

@@ -42,6 +42,7 @@ module SAAL
         @cache_timeout = opts[:cache_timeout] || opts['cache_timeout'] || DEFAULT_CACHE_TIMEOUT
         @cache = nil
         @cachehit = nil
+        @cachetime = nil
       end
 
       def state(num)

data/lib/outliercache.rb

@@ -41,7 +41,7 @@ module SAAL
     def valid_cache
       @compcache.sort!
       central = @compcache[1..(@compcache.size-2)]
-      sum = central.inject(0.0){|sum,el| sum+el}
+      sum = central.inject(0.0){|csum,el| csum+el}
       return false if sum == 0.0
       average = sum/central.size
       central.each do |el|

data/lib/saal.rb

@@ -1,5 +1,5 @@
 require 'yaml'
-require "mysql"
+require "mysql2"
 require 'ownet'
 require 'nokogiri'
 require 'erb'
@@ -10,7 +10,7 @@ module SAAL
     DBCONF = CONFDIR+"database.yml"
     CHARTSCONF = CONFDIR+"charts.yml"
 
-    VERSION = '0.2.25'
+    VERSION = '0.3.0'
 end
 
 require File.dirname(__FILE__)+'/dbstore.rb'

data/saal.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name              = 'saal'
-  s.version           = '0.2.25'
-  s.date              = '2014-01-03'
+  s.version           = '0.3.0'
+  s.date              = '2018-06-02'
 
   s.summary     = "Thin abstraction layer for interfacing and recording sensors (currently onewire) and actuators (currently dinrelay)"
   s.description = <<EOF
@@ -19,6 +19,7 @@ EOF
   s.authors  = ["Pedro Côrte-Real"]
   s.email    = 'pedro@pedrocr.net'
   s.homepage = 'https://github.com/pedrocr/saal'
+  s.licenses = 'LGPL-2.1'
 
   s.require_paths = %w[lib]
 
@@ -28,9 +29,9 @@ EOF
 
   s.executables = Dir.glob("bin/*").map{|f| f.gsub('bin/','')}
 
-  s.add_dependency('ownet', [">= 0.2.1"])
-  s.add_dependency('nokogiri')
-  s.add_dependency('mysql')
+  s.add_runtime_dependency 'ownet', "~>0.2"
+  s.add_runtime_dependency 'mysql2', "~>0.5"
+  s.add_runtime_dependency 'nokogiri', '~>1.8'
 
   # = MANIFEST =
   s.files = %w[

data/test/chart_data_test.rb

@@ -78,7 +78,7 @@ class TestChartData < Test::Unit::TestCase
                                         Time.utc(2012, 3, 25, 23, 59, 59),
                             ["0"]+(2..23).map{|s| s.to_s}+["0"], 
                             Time.utc(2012, 3, 25, 23, 59, 59),
-                            "_changing_timezone_test","Europe/Lisbon")
+                            "_changing_timezone_test2","Europe/Lisbon")
 
   assert_alignment_interval(24, :hours, Time.utc(2010, 12, 29, 16, 0, 0),
                                         Time.utc(2010, 12, 30, 15, 59, 59),

data/test/chart_test.rb

@@ -16,7 +16,6 @@ class TestChart < Test::Unit::TestCase
 
   def test_average
     name = 'week'
-    defs = @defs[name]
     chart = @charts.find(name)    
     assert_equal ['Fri','Sat','Sun','Mon','Tue','Wed','Thu'], chart.periodnames
     chart.sensors.each {|s| s.mock_set(:average => 1)}
@@ -31,7 +30,6 @@ class TestChart < Test::Unit::TestCase
 
   def test_min_max_avg_1arity
     name = 'week'
-    defs = @defs[name]
     chart = @charts.find(name)    
     assert_equal ['Fri','Sat','Sun','Mon','Tue','Wed','Thu'], chart.periodnames
     v = {:minimum => 1.0, :maximum => 2.0, :average => 1.5}
@@ -43,7 +41,6 @@ class TestChart < Test::Unit::TestCase
   
   def test_min_max_0arity
     name = 'week'
-    defs = @defs[name]
     chart = @charts.find(name)    
     assert_equal ['Fri','Sat','Sun','Mon','Tue','Wed','Thu'], chart.periodnames
     v = {:minimum => 1.0, :maximum => 2.0, :average => 1.5}

data/test/daemon_test.rb

@@ -18,7 +18,7 @@ class TestDaemon < Test::Unit::TestCase
     end
 
     db_test_query("SELECT * FROM sensor_reads") do |res|
-      assert res.num_rows > 0, "No sensor reads in DB"
+      assert res.count > 0, "No sensor reads in DB"
     end
   end
 
@@ -38,7 +38,7 @@ class TestDaemon < Test::Unit::TestCase
     end
 
     db_test_query("SELECT * FROM sensor_reads") do |res|
-      assert res.num_rows == 0
+      assert res.count == 0
     end
   end
 end

data/test/dbstore_test.rb

@@ -9,8 +9,11 @@ class TestFileStore < Test::Unit::TestCase
     @dbstore.write(:test_sensor, test_time, test_value)
     
     db_test_query("SELECT * FROM sensor_reads") do |res|
-      assert_equal 1, res.num_rows
-      assert_equal ["test_sensor", test_time.to_s, test_value.to_s], res.fetch_row
+      assert_equal 1, res.count
+      row = res.first
+      assert_equal "test_sensor", row["sensor"]
+      assert_equal test_time, row["date"].to_i
+      assert_equal test_value, row["value"].to_f
     end
   end
 

data/test/dinrelay_test.rb

@@ -151,7 +151,7 @@ class TestDINRelay < Test::Unit::TestCase
 
   # Test that the cache times out
   def test_cache_invalidation
-    sensors = SAAL::Sensors.new(@test_sensors_dinrelay_file, TEST_DBCONF)
+    _sensors = SAAL::Sensors.new(@test_sensors_dinrelay_file, TEST_DBCONF)
     @og.cache_timeout = 0.1
     with_webrick(:html=>create_index_html(@vals)) do |feedback|
       @og.state(1)

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_helper.rb

@@ -29,8 +29,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,71 @@
 --- !ruby/object:Gem::Specification
 name: saal
 version: !ruby/object:Gem::Version
-  version: 0.2.25
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Pedro Côrte-Real
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2018-06-02 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: nokogiri
-  requirement: &85784520 !ruby/object:Gem::Requirement
-    none: false
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *85784520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: mysql
-  requirement: &85782840 !ruby/object:Gem::Requirement
-    none: false
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   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.8'
+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_chart~
+- saal_daemon~
+- saal_dump_database
+- saal_readall
+- saal_chart
+- saal_daemon
 extensions: []
 extra_rdoc_files:
 - README.rdoc
@@ -71,7 +79,9 @@ files:
 - bin/dinrelayset
 - bin/dinrelaystatus
 - bin/saal_chart
+- bin/saal_chart~
 - bin/saal_daemon
+- bin/saal_daemon~
 - bin/saal_dump_database
 - bin/saal_import_mysql
 - bin/saal_readall
@@ -104,33 +114,31 @@ files:
 - 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: []
+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
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 2
 summary: Thin abstraction layer for interfacing and recording sensors (currently onewire)