mywx_pusher 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5fe4c0a61fc28582065e62f5ccf563fe204626662f64d0bbd53c34c2723f5ca
-  data.tar.gz: 82b0733f8345e966c1fda7caed79174eff61778f27917f81a6097158a7b5a7ed
+  metadata.gz: 8eeb914b9d3c08b8400056b7faedaf21b1b26aecd27f2de46150e91a86bdcca4
+  data.tar.gz: 98e35107640ccc0016e51ccb984e5987101c7fb7d8f2681ce83aa7a236c8e261
 SHA512:
-  metadata.gz: c80e6f90b690893cce6c6735e532f1d60fc4487a5429246ca0fae7db7692139061bfe3d355ad32d1bed107a229f91ac40aff7a850c74f282056f54f16dceb1b9
-  data.tar.gz: 43c344d79a7b5645893609db286e91b81e9a08281095e8dfb7ff1acfda33dc8a8cedf89e1385ae3e844bf42a6ccf7d22c55e01631bdc907888f2f68d36bce6c1
+  metadata.gz: 65218968070e650cb6d21620246c0b25c451cc5a799c265e5269256fd7b64f7e71a7bafe62a59ea8469fecc99320ec3be455c980d92bdce0c0fe5ce8d6e2a848
+  data.tar.gz: aca04123e6a7a30429a8fb9ccf618e8684673d7d4f51f3d40476ce93ea1bc0d664bb2c20a177c47efbbd691ef3e09fb8d3a6dba5d26fde9bb79458b0b3cc42ec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mywx_pusher (0.1.3)
+    mywx_pusher (0.1.4)
       weatherlink (~> 0.1.2)
 
 GEM

data/exe/mywx_pusher

@@ -40,6 +40,7 @@ class MywxPusherCommand
       opts.on('-d', '--debug', 'Enable debug mode') { logger.level = Logger::DEBUG }
 
       opts.on('-w', '--weatherlink-host=HOST', '') { |o| options.weatherlink_host = o }
+      opts.on('-a', '--airlink-host=HOST', '') { |o| options.airlink_host = o }
 
       opts.on('-b', '--mywx-base-uri=URI', '') { |o| options.mywx_base_uri = o }
       opts.on('-s', '--mywx-station-slug=SLUG', '') { |o| options.mywx_station_slug = o }
@@ -69,18 +70,26 @@ class MywxPusherCommand
   end
 
   def collect_data
-    logger.debug("Collecting data from #{options.weatherlink_host}...")
 
     ts = Time.now.to_i
 
     begin
-      current_conditions = client.current_conditions
+      logger.debug("Collecting data from #{options.weatherlink_host}...")
+      weatherlink_current_conditions = weatherlink_client.current_conditions
     rescue StandardError => e
       raise CollectError, e
     end
 
-    iss_record = current_conditions.find { |sd| sd.record_type.id == 1 }
-    lss_pressure_record = current_conditions.find { |sd| sd.record_type.id == 3 }
+    begin
+      logger.debug("Collecting data from #{options.airlink_host}...")
+      airlink_current_conditions = airlink_client&.current_conditions
+    rescue StandardError => e
+      raise CollectError, e
+    end
+
+    iss_record = weatherlink_current_conditions.find { |sd| sd.record_type.id == 1 }
+    lss_pressure_record = weatherlink_current_conditions.find { |sd| sd.record_type.id == 3 }
+    airlink_record = airlink_current_conditions&.find { |sd| sd.record_type.id == 6 }
 
     data = {
       ts: ts,
@@ -94,6 +103,18 @@ class MywxPusherCommand
       solar_radiation: iss_record.solar_rad.scalar.to_f.round(2),
     }
 
+    if airlink_record
+      air_quality_data = {
+        air_quality: {
+          pm_1: airlink_record.pm_1,
+          pm_2p5: airlink_record.pm_2p5,
+          pm_10: airlink_record.pm_10,
+        }
+      }
+
+      data.merge!(air_quality_data)
+    end
+
     logger.debug("Collected data (#{data.size} variables): #{data}")
 
     data
@@ -111,18 +132,28 @@ class MywxPusherCommand
     true
   end
 
-  def client
-    @client ||= WeatherLink::LocalClient.new(
+  def weatherlink_client
+    @weatherlink_client ||= WeatherLink::LocalClient.new(
       host: options.weatherlink_host,
       desired_units: WeatherLink::METRIC_WEATHER_UNITS
     )
   end
 
+  def airlink_client
+    return unless options.airlink_host
+
+    @airlink_client ||= WeatherLink::LocalClient.new(
+      host: options.airlink_host,
+      desired_units: WeatherLink::METRIC_WEATHER_UNITS
+    )
+  end
+
   def run
     logger.info(
       format(
-        'Collecting from %s, pushing to %s every %i seconds...',
+        'Collecting weather data from %s%s, pushing to %s every %i seconds...',
         options.weatherlink_host,
+        options.airlink_host ? " and air quality data from #{options.airlink_host}" : '',
         mywx_push_data_uri,
         options.interval
       )

data/lib/mywx_pusher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MywxPusher
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mywx_pusher
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jeremy Cole
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-16 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake