From 931cb3ef261c991fa53d1b69637eaf59f3c02e85 Mon Sep 17 00:00:00 2001 From: Dan Wilson Date: Fri, 25 May 2018 13:34:51 -0600 Subject: [PATCH 1/3] enhancements to the build --- .gitignore | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9125b72..562d45a 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ bower_components # Compiled binary addons (https://nodejs.org/api/addons.html) build/Release +build # Dependency directories node_modules/ diff --git a/package.json b/package.json index b0d80b0..26c6aec 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "test": "echo \"Error: no test specified\" && exit 1", "start": "node index.js", "start dev": "nodemon index.js", - "build": "zip -x 'node_modules/*' -x 'config/development.json' -r /tmp/ambient2pwsweather-$(npm run version).zip *", + "build": "mkdir -p build && zip -x 'node_modules/*' -x 'build/*' -x '.git/*' -x '.idea/*' -x 'config/development.json' -r build/ambient2pwsweather-$(npm run version --silent).zip *", "version": "echo $npm_package_version" }, "repository": { From ec1b4096dc021528f723dbffd32d067e826b378a Mon Sep 17 00:00:00 2001 From: Dan Wilson Date: Sun, 3 Jun 2018 09:42:49 -0600 Subject: [PATCH 2/3] Fix hourly and total rain totals --- index.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index fea0638..82ceb63 100644 --- a/index.js +++ b/index.js @@ -25,8 +25,8 @@ const got = require('got'), logger.info('------- ambient2weather v' + pkg.version, '--------'); logger.debug('Ambient Application Key:', appKey); logger.debug('Ambient API Key:', apiKey); -logger.debug('PWD Station ID:', pwsStation); -logger.debug('PWD Password:', pwsPassword); +logger.debug('PWS Station ID:', pwsStation); +logger.debug('PWS Password:', pwsPassword); if (!appKey || !apiKey || !pwsStation || !pwsPassword) { logger.error('Insufficient configuration data. Missing API Key, App Key, Station ID or PWS Password.'); @@ -68,7 +68,7 @@ api.on('data', data => { baromin : data.baromrelin, dewptf : data.dewPoint, humidity : data.humidityin, - rainin : data.totalrainin, + rainin : data.hourlyrainin, UV : data.uv, softwaretype: 'ambient2pwsweather-' + pkg.version, action : 'updateraw' @@ -81,6 +81,8 @@ api.on('data', data => { delete params.baromabsin; delete params.feelslike; delete params.maxdailygust; + delete params.totalrainin; + delete params.hourlyrainin; // logger.debug('params', params); From adf9819f5c7857bb7d4d3cb7e0ddb598dffbdb13 Mon Sep 17 00:00:00 2001 From: Dan Wilson Date: Sun, 3 Jun 2018 10:31:26 -0600 Subject: [PATCH 3/3] release v bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 26c6aec..30f9e62 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ambient2pwsweather", - "version": "0.0.5", + "version": "0.0.6", "description": "Pull weather data from AmbientWeather.net and push to PWSWeather", "main": "index.js", "scripts": {