mywx_pusher 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eeb914b9d3c08b8400056b7faedaf21b1b26aecd27f2de46150e91a86bdcca4
-  data.tar.gz: 98e35107640ccc0016e51ccb984e5987101c7fb7d8f2681ce83aa7a236c8e261
+  metadata.gz: 12a04f6c8fbb2b86a66e68602ade29f5aa63e054d2d3fdea004d946811944840
+  data.tar.gz: f93f0c42a33af06f48b1fddc7b8ebaab719d9fd253088e868e3afdf31560f890
 SHA512:
-  metadata.gz: 65218968070e650cb6d21620246c0b25c451cc5a799c265e5269256fd7b64f7e71a7bafe62a59ea8469fecc99320ec3be455c980d92bdce0c0fe5ce8d6e2a848
-  data.tar.gz: aca04123e6a7a30429a8fb9ccf618e8684673d7d4f51f3d40476ce93ea1bc0d664bb2c20a177c47efbbd691ef3e09fb8d3a6dba5d26fde9bb79458b0b3cc42ec
+  metadata.gz: 2861380550dd188094ecbe2fa89834a95b64a65ebff946b4e6ab9e25aa426d90cdbdcd86978756cf869880bb4865975258025f3e9d84bd773d3cabc0bec4829c
+  data.tar.gz: 51d452df842fa984376ad60d473f21585d24131a0356a5e292c2c705c18414e9612b30ba9990cfd49c83a4c4c8ff07a1c53eed8a348fc0c9af270ae319e2d9fe

data/.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: rubocop
+    versions:
+    - 1.10.0
+    - 1.12.0
+    - 1.12.1
+    - 1.9.0
+    - 1.9.1

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    mywx_pusher (0.1.4)
+    mywx_pusher (0.1.5)
       weatherlink (~> 0.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
+    ast (2.4.2)
     diff-lcs (1.4.4)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (13.0.3)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -29,17 +29,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
-    rubocop (1.8.1)
+    rubocop (1.16.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     ruby-units (2.3.2)
     unicode-display_width (2.0.0)

data/exe/mywx_pusher

@@ -19,6 +19,7 @@ class MywxPusherCommand
 
   def initialize_options
     @options = OpenStruct.new(
+      debug: false,
       mywx_base_uri: 'https://www.mywx.live/',
       mywx_station_slug: nil,
       mywx_secret_key: nil,
@@ -37,10 +38,11 @@ class MywxPusherCommand
         exit 0
       end
 
-      opts.on('-d', '--debug', 'Enable debug mode') { logger.level = Logger::DEBUG }
+      opts.on('-d', '--debug', 'Enable debug mode') { options.debug = true; 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('-a', '--outdoor-airlink-host=HOST', '') { |o| options.outdoor_airlink_host = o }
+      opts.on('-A', '--indoor-airlink-host=HOST', '') { |o| options.indoor_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 }
@@ -80,16 +82,41 @@ class MywxPusherCommand
       raise CollectError, e
     end
 
-    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 }
+
+    outdoor_airlink_current_conditions = nil
+    if options.outdoor_airlink_host
+      begin
+        logger.debug("Collecting data from #{options.outdoor_airlink_host}...")
+        outdoor_airlink_current_conditions = airlink_client(options.outdoor_airlink_host)&.current_conditions
+      rescue StandardError => e
+        raise CollectError, e
+      end
+    end
+
+    outdoor_airlink_record = outdoor_airlink_current_conditions&.find { |sd| sd.record_type.id == 6 }
+
+    indoor_airlink_current_conditions = nil
+    if options.outdoor_airlink_host
+      begin
+        logger.debug("Collecting data from #{options.indoor_airlink_host}...")
+        indoor_airlink_current_conditions = airlink_client(options.indoor_airlink_host)&.current_conditions
+      rescue StandardError => e
+        raise CollectError, e
+      end
+    end
+
+    indoor_airlink_record = indoor_airlink_current_conditions&.find { |sd| sd.record_type.id == 6 }
+
+    if options.debug
+      pp({
+        iss_record: iss_record,
+        lss_pressure_record: lss_pressure_record,
+        outdoor_airlink_record: outdoor_airlink_record,
+        indoor_airlink_record: indoor_airlink_record,
+      })
+    end
 
     data = {
       ts: ts,
@@ -97,22 +124,49 @@ class MywxPusherCommand
       dew_point: iss_record.dew_point.scalar.to_f.round(2),
       humidity: iss_record.hum.scalar.to_f.round(2),
       pressure: lss_pressure_record.bar_sea_level.scalar.to_f.round(2),
+      pressure_absolute: lss_pressure_record.bar_absolute.scalar.to_f.round(2),
+      pressure_trend: lss_pressure_record.bar_trend.scalar.to_f.round(2),
       wind_speed: iss_record.wind_speed_avg_last_1_min.scalar.to_f.round(2),
       wind_direction: iss_record.wind_dir_scalar_avg_last_1_min.scalar.to_i,
+      wind_speed_10_minutes_max: iss_record.wind_speed_hi_last_10_min.scalar.to_f.round(2),
+      wind_direction_10_minutes_max: iss_record.wind_dir_at_hi_speed_last_10_min.scalar.to_i,
       rain_rate: iss_record.rain_rate_last.scalar.to_f.round(2),
       solar_radiation: iss_record.solar_rad.scalar.to_f.round(2),
+      uv_index: iss_record.uv_index.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,
+    if outdoor_airlink_record
+      data.merge!(
+        {
+          air_quality: {
+            pm_1: outdoor_airlink_record.pm_1,
+            pm_2p5: outdoor_airlink_record.pm_2p5,
+            pm_2p5_last_1_hour: outdoor_airlink_record.pm_2p5_last_1_hour,
+            pm_2p5_last_24_hours: outdoor_airlink_record.pm_2p5_last_24_hours,
+            pm_10: outdoor_airlink_record.pm_10,
+            pm_10_last_1_hour: outdoor_airlink_record.pm_10_last_1_hour,
+            pm_10_last_24_hours: outdoor_airlink_record.pm_10_last_24_hours,
+          }
         }
-      }
+      )
+    end
 
-      data.merge!(air_quality_data)
+    if indoor_airlink_record
+      data.merge!(
+        {
+          indoor_temperature: indoor_airlink_record.temp.scalar.to_f.round(2),
+          indoor_humidity: indoor_airlink_record.hum.scalar.to_f.round(2),
+          indoor_air_quality: {
+            pm_1: indoor_airlink_record.pm_1,
+            pm_2p5: indoor_airlink_record.pm_2p5,
+            pm_2p5_last_1_hour: indoor_airlink_record.pm_2p5_last_1_hour,
+            pm_2p5_last_24_hours: indoor_airlink_record.pm_2p5_last_24_hours,
+            pm_10: indoor_airlink_record.pm_10,
+            pm_10_last_1_hour: indoor_airlink_record.pm_10_last_1_hour,
+            pm_10_last_24_hours: indoor_airlink_record.pm_10_last_24_hours,
+          }
+        }
+      )
     end
 
     logger.debug("Collected data (#{data.size} variables): #{data}")
@@ -139,11 +193,12 @@ class MywxPusherCommand
     )
   end
 
-  def airlink_client
-    return unless options.airlink_host
+  def airlink_client(airlink_host)
+    return unless airlink_host
 
-    @airlink_client ||= WeatherLink::LocalClient.new(
-      host: options.airlink_host,
+    @airlink_client ||= {}
+    @airlink_client[airlink_host] ||= WeatherLink::LocalClient.new(
+      host: airlink_host,
       desired_units: WeatherLink::METRIC_WEATHER_UNITS
     )
   end
@@ -151,9 +206,10 @@ class MywxPusherCommand
   def run
     logger.info(
       format(
-        'Collecting weather data from %s%s, pushing to %s every %i seconds...',
+        'Collecting weather data from %s%s%s, pushing to %s every %i seconds...',
         options.weatherlink_host,
-        options.airlink_host ? " and air quality data from #{options.airlink_host}" : '',
+        options.outdoor_airlink_host ? ", outdoor air quality data from #{options.outdoor_airlink_host}" : '',
+        options.outdoor_airlink_host ? ", indoor air quality data from #{options.indoor_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.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mywx_pusher
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jeremy Cole
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,6 +75,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"