garden_messenger 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7b25c790bf561282f4fb0e150d2a6d5e75cbae1f7e2a7176af43a25caef39d9
-  data.tar.gz: 9e7109e232c79bea95bba4a1a7b885809bcddbd909af94f9ed5bb7ba26f72700
+  metadata.gz: 9c62f2e95f39628a4b0b1d82302e02cdd2ee8fa8c6e1d526499ac57ded6b078d
+  data.tar.gz: 3ceb8b89feafa04ffb436d0431b1b945b39861e719c2c05351875b91010e3f50
 SHA512:
-  metadata.gz: 2d90a0176635a0c122c70f169c9233bcfe7cad1851b8abf2ba3f855ea8e5f27093a10ea1a28614b00608cc7a8b3832f725a1e5740b41fac4ab671f9de293122c
-  data.tar.gz: 99a55d17590b04f90e76a2c4ec6680f46e7c40179629681bac3b7c5da15a1fdbd2b3e0b66ad771982479bda83f81db9fb728b7bcf9389b0c6b847d97d2a85754
+  metadata.gz: d2cdf5b607b90830c0d273792a2c44fd5b93bf3bdfe8ac18a3c7f677e374eedaac10b980f315d2a1881e451eeb43de8d7fa46f1ea734da7b9f1a224547b01c61
+  data.tar.gz: e0ce5bb9f48bf987897c26e2915ca833187f47ccfb94ae304e87be58a61771c4edb3864bfabd2e67b810c19a0d6543c6ffffd1bb1c4e25fe3ed916b1d66d6b29

data/.rubocop.yml

@@ -1,2 +1,4 @@
+Style/WordArray:
+  Enabled: false
 inherit_from:
   - https://raw.githubusercontent.com/siegy22/dotfiles/c4b42f0bba4e4eb0a573d538ecc99266be90a8f8/rubocop.yml

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    garden_messenger (0.2.0)
+    garden_messenger (0.3.0)
       action_cable_client (~> 3.0)
       http (~> 4.1)
       thor (~> 0.20)

data/README.md

@@ -6,6 +6,7 @@ Collects data of [AtlasScientific](https://www.atlas-scientific.com/) and [myStr
 
 Currently supported:
 
+- [x] [DHT22 temperature and humidity sensor](https://www.adafruit.com/product/385)
 - [x] [pH Kit](https://www.atlas-scientific.com/product_pages/kits/ph-kit.html)
 - [x] [Conductivity Kit](https://www.atlas-scientific.com/product_pages/kits/ec_k1_0_kit.html)
 - [x] [Temperature Kit](https://www.atlas-scientific.com/product_pages/kits/temp_kit.html)

data/lib/garden_messenger/cli.rb

@@ -2,6 +2,13 @@ require 'thor'
 
 module GardenMessenger
   class CLI < Thor
+    map %w[--version -v] => :__print_version
+
+    desc '--version, -v', 'print the version'
+    def __print_version
+      puts GardenMessenger::VERSION
+    end
+
     desc 'report MONITOR_URL TOKEN [options]', 'Report to a monitor which is located on MONITOR_URL'
     option 'wattage-switch-host'
     option 'update-rate'
@@ -19,15 +26,26 @@ module GardenMessenger
       ec = GardenMessenger::AtlasScientific::EC.new
       wattage = GardenMessenger::Wattage.new(options['wattage-switch-host'])
 
+      begin
+        require 'dht-sensor-ffi'
+      rescue LoadError
+        warn 'Failed to load dht-sensor-ffi, air temperature and humidity are disabled. ' \
+             'To enable it, install dht-sensor-ffi: https://github.com/chetan/dht-sensor-ffi'
+      end
+
       reporter.report! do
-        data = { air_temp: 0.0, humidity: 0.0 }
+        data = {}
 
-        data[:wattage] = wattage.get if options.key?('wattage-switch-host')
         data[:water_temp] = water_temperature.take_reading
+        wattage_thread = Thread.new { wattage.get }
         ph_thread = Thread.new { ph.take_reading_with_temperature_compensation(data[:water_temp]) }
         ec_thread = Thread.new { ec.take_reading_with_temperature_compensation(data[:water_temp]) }
+        dht_thread = Thread.new { DhtSensor.read(4, 22) } if defined?(DhtSensor)
+        data[:wattage] = wattage_thread.value
         data[:ph] = ph_thread.value
         data[:ec] = ec_thread.value
+        data[:air_temp] = dht_thread.value.temperature if defined?(DhtSensor)
+        data[:humidity] = dht_thread.value.humidity if defined?(DhtSensor)
 
         data
       end

data/lib/garden_messenger/reporter.rb

@@ -35,7 +35,7 @@ module GardenMessenger
             puts 'Connection established with monitor ' \
                  "on #{@monitor_url}"
           end
-          Thread.new do
+          thread = Thread.new do
             loop do
               data = yield
               puts "Sending data: #{data.to_json}" if @verbose
@@ -44,6 +44,7 @@ module GardenMessenger
               sleep @update_rate
             end
           end
+          thread.abort_on_exception = true
         end
 
         client.disconnected do

data/lib/garden_messenger/version.rb

@@ -1,3 +1,3 @@
 module GardenMessenger
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: garden_messenger
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Yves Siegrist
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-05 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: action_cable_client