saal 0.2.21 → 0.2.22

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'rake'
 require 'date'
 require 'rdoc'
-require 'rcov/rcovtask'
+#require 'rcov/rcovtask'
 require 'rake/testtask'
 require 'rdoc/task'
 
@@ -57,13 +57,13 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-Rcov::RcovTask.new(:coverage) do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/*_test.rb']
-  t.rcov_opts << ['--exclude "^/"', '--include "lib/.*\.rb"']
-  t.output_dir = 'coverage'
-  t.verbose = true
-end
+#Rcov::RcovTask.new(:coverage) do |t|
+#  t.libs << "test"
+#  t.test_files = FileList['test/*_test.rb']
+#  t.rcov_opts << ['--exclude "^/"', '--include "lib/.*\.rb"']
+#  t.output_dir = 'coverage'
+#  t.verbose = true
+#end
 
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/bin/saal_daemon

@@ -19,7 +19,8 @@ else
   d = SAAL::Daemon.new(:interval => SENSOR_INTERVAL,
                        :sensorconf => SENSORSCONF,
                        :dbconf => DBCONF,
-                       :foreground => foreground)
+                       :foreground => foreground,
+                       :keep_stdin => false)
   pid = d.run
   if !foreground
     File.open(pidfile, 'w') do |f|

data/bin/saal_daemon~

@@ -0,0 +1,31 @@
+#!/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

data/lib/daemon.rb

@@ -7,9 +7,9 @@ module SAAL
       else
         fork do
           if not opts[:keep_stdin]
-            $stderr.reopen "/dev/null", "a"
-            $stdin.reopen "/dev/null", "a"
+            $stdin.reopen "/dev/null"
             $stdout.reopen "/dev/null", "a"
+            $stderr.reopen "/dev/null", "a"
           end
           yield ForkedRunner.new
         end

data/lib/saal.rb

@@ -10,7 +10,7 @@ module SAAL
     DBCONF = CONFDIR+"database.yml"
     CHARTSCONF = CONFDIR+"charts.yml"
 
-    VERSION = '0.2.21'
+    VERSION = '0.2.22'
 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.21'
-  s.date              = '2013-04-14'
+  s.version           = '0.2.22'
+  s.date              = '2013-05-16'
 
   s.summary     = "Thin abstraction layer for interfacing and recording sensors (currently onewire) and actuators (currently dinrelay)"
   s.description = <<EOF
@@ -28,7 +28,7 @@ EOF
 
   s.executables = Dir.glob("bin/*").map{|f| f.gsub('bin/','')}
 
-  s.add_dependency('ownet', [">= 0.2.0"])
+  s.add_dependency('ownet', [">= 0.2.1"])
   s.add_dependency('nokogiri')
   s.add_dependency('mysql')
 

data/test/sensors_test.rb

@@ -70,7 +70,7 @@ class TestSensors < Test::Unit::TestCase
       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], 100
+      assert_in_delta Time.now.utc.to_i, row[1].to_i, 100
       assert_instance_of Float, row[2].to_f
     end
   end  

metadata

@@ -1,87 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: saal
-version: !ruby/object:Gem::Version 
-  hash: 61
+version: !ruby/object:Gem::Version
+  version: 0.2.22
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 21
-  version: 0.2.21
 platform: ruby
-authors: 
-- "Pedro C\xC3\xB4rte-Real"
+authors:
+- Pedro Côrte-Real
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ownet
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &72850210 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *72850210
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &72849690 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mysql
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *72849690
+- !ruby/object:Gem::Dependency
+  name: mysql
+  requirement: &72848430 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-description: |
-  A daemon and libraries to create an abstraction layer that interfaces with 
-  sensors and actuators, recording their state, responding to requests 
-  for current and historical values, and allowing changes of state.
-
+  prerelease: false
+  version_requirements: *72848430
+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: 
+executables:
 - saal_chart~
 - dinrelaystatus
 - saal_readall
 - saal_dump_database
 - saal_daemon
 - saal_chart
+- saal_daemon~
 - dinrelayset
 - saal_import_mysql
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - LICENSE
-files: 
+files:
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -124,43 +105,37 @@ files:
 - 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: 
-rdoc_options: 
+rdoc_options:
 - -S
 - -w 2
 - -N
 - -c utf8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 2
-summary: Thin abstraction layer for interfacing and recording sensors (currently onewire) and actuators (currently dinrelay)
-test_files: 
+summary: Thin abstraction layer for interfacing and recording sensors (currently onewire)
+  and actuators (currently dinrelay)
+test_files:
 - test/chart_data_test.rb
 - test/chart_test.rb
 - test/charts_test.rb