Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Core Files/Testing Update and introduce adapter-core #5

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
os:
- linux
- osx
- windows
language: node_js
node_js:
- '4'
- '6'
- '8'
- '10'
- '12'
- '14'
- '16'
before_script:
- export NPMVERSION=$(echo "$($(which npm) -v)"|cut -c1)
- 'if [[ $NPMVERSION == 5 ]]; then npm install -g npm@5; fi'
- npm -v
- npm install [email protected]
- 'npm install https://github.com/ioBroker/ioBroker.js-controller/tarball/master --production'
env:
- CXX=g++-4.8
- CXX=g++-6
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
- g++-6
script:
- 'npm run test:package'
- 'npm run test:unit'
- 'npm run test:integration'
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![Logo](admin/poolcontroller.png)
# ioBroker.poolcontroller
=================
![Number of Installations](http://iobroker.live/badges/poolcontroller-installed.svg) ![Number of Installations](http://iobroker.live/badges/poolcontroller-stable.svg) =================

This adapter is for reading values ​​from the pool controller. This pool controller is from www.pooldigital.de.
A demo of the controller can be found at http://demo.poolcontroller.de/gui/phase2/
Expand Down
15 changes: 7 additions & 8 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
version: 'test-{build}'
environment:
matrix:
- nodejs_version: '4'
- nodejs_version: '6'
- nodejs_version: '8'
- nodejs_version: '10'
- nodejs_version: '12'
- nodejs_version: '14'
- nodejs_version: '16'
platform:
- x86
- x64
clone_folder: 'c:\projects\%APPVEYOR_PROJECT_NAME%'
install:
- ps: 'Install-Product node $env:nodejs_version $env:platform'
- ps: 'Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform'
- ps: '$NpmVersion = (npm -v).Substring(0,1)'
- ps: 'if($NpmVersion -eq 5) { npm install -g npm@5 }'
- ps: npm --version
- npm install
- npm install [email protected]
- 'npm install https://github.com/ioBroker/ioBroker.js-controller/tarball/master --production'
test_script:
- echo %cd%
- node --version
- npm --version
- npm test
- 'npm run test:package'
- 'npm run test:unit'
- 'npm run test:integration'
build: 'off'
7 changes: 4 additions & 3 deletions io-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
"de": "Initiale Version"
}
},
"title": "Poolcontroller Adapter",
"title": "Poolcontroller",
"titleLang": {
"en": "poolcontroller adapter",
"de": "Poolcontroller Adapter"
"en": "poolcontroller",
"de": "Poolcontroller"
},
"desc": {
"en": "ioBroker poolcontroller Adapter",
Expand All @@ -37,6 +37,7 @@
"en": "docs/en/template.md",
"de": "docs/de/template.md"
},
"license": "MIT",
"localLink": "http://%host%/gui/phase2/index.htm",
"platform": "Javascript/Node.js",
"mode": "schedule",
Expand Down
83 changes: 0 additions & 83 deletions lib/utils.js

This file was deleted.

2 changes: 1 addition & 1 deletion main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

'use strict';

var utils = require(__dirname + '/lib/utils'); // Get common adapter utils
var utils = require('@iobroker/adapter-core'); // Get common adapter utils
var request = require('request');
var adapter = new utils.Adapter('poolcontroller');

Expand Down
13 changes: 9 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,21 @@
"url": "https://github.com/sucht3371/ioBroker.poolcontroller"
},
"dependencies": {
"request": "^2.72.0"
},
"request": "^2.72.0",
"@iobroker/adapter-core": "^1.0.3"
},
"devDependencies": {
"gulp": "^3.9.1",
"mocha": "^4.1.0",
"chai": "^4.1.2"
"chai": "^4.1.2",
"@iobroker/testing": "^1.1.14"
},
"main": "main.js",
"scripts": {
"test": "node node_modules/mocha/bin/mocha --exit"
"test": "npm run test:package && npm run test:unit",
"test:package": "mocha test/package --exit",
"test:unit": "mocha test/unit --exit",
"test:integration": "mocha test/integration --exit"
},
"bugs": {
"url": "https://github.com/sucht3371/ioBroker.poolcontroller/issues"
Expand Down
5 changes: 5 additions & 0 deletions test/integration.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const path = require('path');
const { tests } = require('@iobroker/testing');

// Run integration tests - See https://github.com/ioBroker/testing for a detailed explanation and further options
tests.integration(path.join(__dirname, '..'));
Loading