diff --git a/.travis.yml b/.travis.yml index 2456688..5a5145d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_script: - 'if [[ $NPMVERSION == 5 ]]; then npm install -g npm@5; fi' - npm -v - npm install winston@2.3.1 - - 'npm install https://github.com/ioBroker/ioBroker.js-controller/tarball/master --production' + - 'npm install https://git.spacen.net/yunkong2/yunkong2.js-controller/tarball/master --production' env: - CXX=g++-4.8 addons: diff --git a/README.md b/README.md index 5441ffc..a32f84b 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ ![Logo](admin/template.png) -# ioBroker.template +# yunkong2.template ================= -This adapter is a template for the creation of an ioBroker adapter. You do not need it at least that you plan developing your own adapter. +This adapter is a template for the creation of an yunkong2 adapter. You do not need it at least that you plan developing your own adapter. -It includes both code running within iobroker and as vis widget. If you only plan to create a vis widget then you should use the [iobroker.vis-template](https://github.com/ioBroker/ioBroker.vis-template) instead. +It includes both code running within yunkong2 and as vis widget. If you only plan to create a vis widget then you should use the [yunkong2.vis-template](https://git.spacen.net/yunkong2/yunkong2.vis-template) instead. ## Steps -1. download and unpack this packet from github ```https://github.com/ioBroker/ioBroker.template/archive/master.zip``` - or clone git repository ```git clone --depth=1 https://github.com/ioBroker/ioBroker.template.git``` +1. download and unpack this packet from github ```https://git.spacen.net/yunkong2/yunkong2.template/archive/master.zip``` + or clone git repository ```git clone --depth=1 https://git.spacen.net/yunkong2/yunkong2.template.git``` -2. download required npm packets. Write in ioBroker.template directory: +2. download required npm packets. Write in yunkong2.template directory: ```npm install``` @@ -24,38 +24,38 @@ It includes both code running within iobroker and as vis widget. If you only pla ```npm install -g gulp-cli``` -4. rename directory from *ioBroker.template* (can be *ioBroker.template-master*) to *iobroker.mynewname* +4. rename directory from *yunkong2.template* (can be *yunkong2.template-master*) to *yunkong2.mynewname* -5. to use this template you should copy it into *.../iobroker/node_modules* directory and then create an instance for it with iobroker.admin +5. to use this template you should copy it into *.../yunkong2/node_modules* directory and then create an instance for it with yunkong2.admin 6. create your adapter: - * you might want to start with main.js (code running within iobroker) and admin/index.html (the adapter settings page). + * you might want to start with main.js (code running within yunkong2) and admin/index.html (the adapter settings page). - * [Adapter-Development-Documentation](https://github.com/ioBroker/ioBroker/wiki/Adapter-Development-Documentation), + * [Adapter-Development-Documentation](https://git.spacen.net/yunkong2/yunkong2/wiki/Adapter-Development-Documentation), - * [Installation, setup and first steps with an ioBroker Development Environment](https://github.com/ioBroker/ioBroker/wiki/Installation,-setup-and-first-steps-with-an-ioBroker-Development-Environment) + * [Installation, setup and first steps with an yunkong2 Development Environment](https://git.spacen.net/yunkong2/yunkong2/wiki/Installation,-setup-and-first-steps-with-an-yunkong2-Development-Environment) - * [Write and debug vis widgets](https://github.com/ioBroker/ioBroker/wiki/How-to-debug-vis-and-to-write-own-widget-set) + * [Write and debug vis widgets](https://git.spacen.net/yunkong2/yunkong2/wiki/How-to-debug-vis-and-to-write-own-widget-set) - * files under the www folders are made available under http://<iobrokerIP>:8082/<adapter-name>/ - * for this to work the iobroker.vis adapter has to be installed + * files under the www folders are made available under http://<yunkong2IP>:8082/<adapter-name>/ + * for this to work the yunkong2.vis adapter has to be installed * delete this folder if you do not plan to export any files this way - * call ```iobroker upload ``` after you change files in the www folder to get the new files uploaded to vis + * call ```yunkong2 upload ``` after you change files in the www folder to get the new files uploaded to vis * the widget folder contains an example of a vis widget * you might want to start with *widget/.html* and *widget/js/.js* - * call ```iobroker visdebug ``` to enable debugging and upload widget to "vis". (This works only from V0.7.15 of js-controller) + * call ```yunkong2 visdebug ``` to enable debugging and upload widget to "vis". (This works only from V0.7.15 of js-controller) * If you do not plan to export any widget then delete the whole widget folder and remove the ```"restartAdapters": ["vis"]``` statement from *io-package.json* - * After admin/index.html is changed you must execute ```iobroker upload mynewname``` to see changes in admin console. The same is valid for any files in *admin* and *www* directory + * After admin/index.html is changed you must execute ```yunkong2 upload mynewname``` to see changes in admin console. The same is valid for any files in *admin* and *www* directory 7. change version: edit package.json and then call ```grunt p``` in your adapter directory. 8. share it with the community ## Requirements -* your github repository must have name "ioBroker.". **B** is capital in "ioBroker", but in the package.json the *name* must be low case, because npm does not allow upper case letters. +* your github repository must have name "yunkong2.". **B** is capital in "yunkong2", but in the package.json the *name* must be low case, because npm does not allow upper case letters. * *title* in io-package.json (common) is simple short name of adapter in english. *titleLang* is object that consist short names in many languages. *Lang* ist not german Länge, but english LANGuages. -* Do not use in the title the words "ioBroker" or "Adapter". It is clear anyway, that it is adapter for ioBroker. +* Do not use in the title the words "yunkong2" or "Adapter". It is clear anyway, that it is adapter for yunkong2. ## Changelog diff --git a/appveyor.yml b/appveyor.yml index 84ca0a9..d278435 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,7 +16,7 @@ install: - ps: npm --version - npm install - npm install winston@2.3.1 - - 'npm install https://github.com/ioBroker/ioBroker.js-controller/tarball/master --production' + - 'npm install https://git.spacen.net/yunkong2/yunkong2.js-controller/tarball/master --production' test_script: - echo %cd% - node --version diff --git a/gulpfile.js b/gulpfile.js index 570f802..1c27636 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -413,7 +413,7 @@ gulp.task('rename', function () { } var patterns = [ { - match: /ioBroker template Adapter/g, + match: /yunkong2 template Adapter/g, replacement: newname }, { diff --git a/io-package.json b/io-package.json index 86cf35d..9a6e7b8 100644 --- a/io-package.json +++ b/io-package.json @@ -42,14 +42,14 @@ "es": "Adaptador de plantilla basado en JavaScript / Node.js" }, "desc": { - "en": "ioBroker template", - "de": "ioBroker Template", - "ru": "ioBroker Template как образец", - "pt": "Modelo de adaptador para o ioBroker", - "fr": "ioBroker adaptateur modèle", - "nl": "ioBroker Template", - "it": "Adattatore modello ioBroker", - "es": "Adaptador de plantilla ioBroker" + "en": "yunkong2 template", + "de": "yunkong2 Template", + "ru": "yunkong2 Template как образец", + "pt": "Modelo de adaptador para o yunkong2", + "fr": "yunkong2 adaptateur modèle", + "nl": "yunkong2 Template", + "it": "Adattatore modello yunkong2", + "es": "Adaptador de plantilla yunkong2" }, "authors": [ "@@Author@@ <@@email@@>" @@ -69,9 +69,9 @@ "icon": "template.png", "materialize": true, "enabled": true, - "extIcon": "https://raw.githubusercontent.com/ioBroker/ioBroker.template/master/admin/template.png", + "extIcon": "https://git.spacen.net/yunkong2/yunkong2.template/raw/master/admin/template.png", "keywords": ["template", "vis", "GUI", "graphical", "scada"], - "readme": "https://github.com/ioBroker/ioBroker.template/blob/master/README.md", + "readme": "https://git.spacen.net/yunkong2/yunkong2.template/blob/master/README.md", "loglevel": "info", "type": "general", "license": "MIT", diff --git a/lib/utils.js b/lib/utils.js index c8a0eb7..6af37ff 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -27,8 +27,8 @@ let appName; function getControllerDir(isInstall) { // Find the js-controller location const possibilities = [ - 'iobroker.js-controller', - 'ioBroker.js-controller', + 'yunkong2.js-controller', + 'yunkong2.js-controller', ]; /** @type {string} */ let controllerPath; diff --git a/main.js b/main.js index a64234f..2bdd109 100644 --- a/main.js +++ b/main.js @@ -145,7 +145,7 @@ function main() { // examples for the checkPassword/checkGroup functions - adapter.checkPassword('admin', 'iobroker', function (res) { + adapter.checkPassword('admin', 'yunkong2', function (res) { console.log('check user admin pw ioboker: ' + res); }); diff --git a/package.json b/package.json index 79407ad..cb0419e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "iobroker.template", + "name": "yunkong2.template", "version": "0.6.0", - "description": "ioBroker template Adapter", + "description": "yunkong2 template Adapter", "author": { "name": "@@Author@@", "email": "@@email@@" @@ -12,17 +12,17 @@ "email": "@@email@@" } ], - "homepage": "https://github.com/ioBroker/ioBroker.template", + "homepage": "https://git.spacen.net/yunkong2/yunkong2.template", "license": "MIT", "keywords": [ - "ioBroker", + "yunkong2", "template", "Smart Home", "home automation" ], "repository": { "type": "git", - "url": "https://github.com/ioBroker/ioBroker.template" + "url": "https://git.spacen.net/yunkong2/yunkong2.template" }, "dependencies": {}, "devDependencies": { @@ -35,7 +35,7 @@ "test": "node node_modules/mocha/bin/mocha --exit" }, "bugs": { - "url": "https://github.com/ioBroker/ioBroker.template/issues" + "url": "https://git.spacen.net/yunkong2/yunkong2.template/issues" }, "readmeFilename": "README.md" } \ No newline at end of file diff --git a/test/lib/setup.js b/test/lib/setup.js index 16857ed..e2a1680 100644 --- a/test/lib/setup.js +++ b/test/lib/setup.js @@ -321,7 +321,7 @@ function installJsController(cb) { if (!fs.existsSync(rootDir + 'tmp/node_modules/' + appName + '.js-controller')) { console.log('installJsController: no js-controller => install from git'); - child_process.execSync('npm install https://github.com/' + appName + '/' + appName + '.js-controller/tarball/master --prefix ./ --production', { + child_process.execSync('npm install https://git.spacen.net/' + appName + '/' + appName + '.js-controller/tarball/master --prefix ./ --production', { cwd: rootDir + 'tmp/', stdio: [0, 1, 2] }); @@ -415,7 +415,7 @@ function clearControllerLog() { } function clearDB() { - var dirPath = rootDir + 'tmp/iobroker-data/sqlite'; + var dirPath = rootDir + 'tmp/yunkong2-data/sqlite'; var files; try { if (fs.existsSync(dirPath)) { diff --git a/test/testPackageFiles.js b/test/testPackageFiles.js index c600a60..d0759c0 100644 --- a/test/testPackageFiles.js +++ b/test/testPackageFiles.js @@ -52,12 +52,12 @@ describe('Test package.json and io-package.json', function() { console.log(); } if ( - ioPackage.common.title.indexOf('iobroker') !== -1 || - ioPackage.common.title.indexOf('ioBroker') !== -1 || + ioPackage.common.title.indexOf('yunkong2') !== -1 || + ioPackage.common.title.indexOf('yunkong2') !== -1 || ioPackage.common.title.indexOf('adapter') !== -1 || ioPackage.common.title.indexOf('Adapter') !== -1 ) { - console.log('WARNING: title contains Adapter or ioBroker. It is clear anyway, that it is adapter for ioBroker.'); + console.log('WARNING: title contains Adapter or yunkong2. It is clear anyway, that it is adapter for yunkong2.'); console.log(); } diff --git a/widgets/template.html b/widgets/template.html index ff9e4cf..1d93a16 100644 --- a/widgets/template.html +++ b/widgets/template.html @@ -1,5 +1,5 @@