Merge pull request #9 from AlCalzone/npm

prepare npm release

.npmignore

@@ -9,12 +9,12 @@ src/
 travis/
 .travis.yml
 appveyor.yml
-tsconfig.json
-tslint.json
+obj/
+bin/
 .vs*/
-*.njsproj
+tslint.json
+tsconfig.json
 *.sln
-build/**/.map
-
-# npm package files
-iobroker.*.tgz
+*.njsproj*
+iobroker.*.tgz
+build/**/*.map

README.md

@@ -13,20 +13,16 @@ Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/AlCalzo
 * NodeJS >= 6.x
 * Trådfri gateway
 
-Might need additional build tools. If anything is unclear, please ask and provide error details.
-
 ## Installation
-1. Install prerequisites
-	1. Linux/Raspberry Pi: Make sure you have git installed. If not: `sudo apt-get install git-core`
-	1. Windows: Make sure you have git installed. If not, download the correct version at https://git-scm.com/download/win
-	1. OSX: ??? Probably like Linux.
-1. Install this adapter over the iobroker admin GUI or via  
-`iobroker url https://github.com/AlCalzone/ioBroker.tradfri ` 
+1. Install this adapter over the iobroker admin GUI or via `npm install iobroker.tradfri --production` 
 1. In the ioBroker GUI, add an adapter instance. 
 1. Configure the instance by entering the IP/hostname of your gateway and the security code that can be found on the label at the bottom.
 
 ## Changelog
 
+#### 0.2.0 (2017-08-14)
+* (AlCalzone) Remove git dependency, publish on npm
+
 #### 0.1.5 (2017-08-14)
 * (AlCalzone) Ensure only whole numbers are sent (fixes #6)
 * (AlCalzone) Fix connection to the gateway using the hostname

io-package.json

@@ -1,7 +1,7 @@
 {
     "common": {
         "name": "tradfri",
-        "version": "0.1.5",
+        "version": "0.2.0",
         "news": {
             "0.1.0": {
                 "en": "initial release. Functionality limited to controlling lightbulbs.",
@@ -22,6 +22,10 @@
             "0.1.5": {
                 "en": "Ensure only whole numbers are sent. Fix connection by hostname.",
                 "de": "Sichergehen, dass nur Ganzzahlen gesendet werden. Verbindung mit Hostname gefixt."
+            },
+            "0.2.0": {
+                "en": "Removed git dependency, published to npm.",
+                "de": "Git-Abhängigkeit entfernt, auf npm veröffentlicht."
             }
         },
         "title": "IKEA Trådfri",

ioBroker.tradfri.njsproj

@@ -5,7 +5,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{53e51c2f-73aa-4803-9a77-5431efc98998}</ProjectGuid>
     <ProjectHome />
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
     <StartupFile />
     <WorkingDirectory>.</WorkingDirectory>
     <OutputPath>.</OutputPath>
@@ -19,6 +19,7 @@
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'" />
   <PropertyGroup Condition="'$(Configuration)' == 'Release'" />
   <ItemGroup>
+    <Content Include=".npmignore" />
     <Content Include=".travis.yml" />
     <Content Include="appveyor.yml" />
     <Content Include="io-package.json" />
@@ -74,6 +75,7 @@
     <Content Include="src\flow\startup.txt" />
     <Content Include="src\flow\timetable.txt" />
     <Compile Include="test\lib\setup.js" />
+    <Content Include="travis\setup.sh" />
     <Content Include="tsconfig.json" />
     <Content Include="tslint.json" />
   </ItemGroup>
@@ -92,6 +94,7 @@
     <Folder Include="src\lib\" />
     <Folder Include="test" />
     <Folder Include="test\lib" />
+    <Folder Include="travis\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <!--Do not delete the following Import Project.  While this appears to do nothing it is a marker for setting TypeScript properties before our import that depends on them.-->

package.json

@@ -1,47 +1,47 @@
 {
-    "name": "iobroker.tradfri",
-    "version": "0.1.5",
-    "description": "ioBroker tradfri Adapter",
-    "author": {
-        "name": "AlCalzone",
-        "email": "[email protected]"
-    },
-    "bugs": {
-        "url": "https://github.com/AlCalzone/ioBroker.tradfri/issues"
-    },
-    "contributors": [
-        {
-            "name": "AlCalzone",
-            "email": "[email protected]"
-        }
-    ],
-    "dependencies": {
-        "node-coap-client": "git+https://github.com/AlCalzone/node-coap-client"
-    },
-    "devDependencies": {
-        "@types/chai": "^4.0.0",
-        "@types/mocha": "^2.2.41",
-        "@types/node": "^6.0.78",
-        "chai": "^4.0.2",
-        "mocha": "^3.4.2",
-        "tslint": "^5.6.0",
-        "typescript": "^2.4.2"
-    },
-    "homepage": "https://github.com/AlCalzone/ioBroker.tradfri",
-    "keywords": [
-        "ioBroker",
-        "tradfri",
-        "Smart Home",
-        "home automation"
-    ],
-    "license": "MIT",
-    "main": "build/main.js",
-    "readmeFilename": "README.md",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/AlCalzone/ioBroker.tradfri"
-    },
-    "scripts": {
-        "test": "node node_modules/mocha/bin/mocha"
+  "name": "iobroker.tradfri",
+  "version": "0.2.0",
+  "description": "ioBroker tradfri Adapter",
+  "author": {
+    "name": "AlCalzone",
+    "email": "[email protected]"
+  },
+  "bugs": {
+    "url": "https://github.com/AlCalzone/ioBroker.tradfri/issues"
+  },
+  "contributors": [
+    {
+      "name": "AlCalzone",
+      "email": "[email protected]"
     }
+  ],
+  "dependencies": {
+    "node-coap-client": "^0.1.0"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.0.0",
+    "@types/mocha": "^2.2.41",
+    "@types/node": "^6.0.78",
+    "chai": "^4.0.2",
+    "mocha": "^3.4.2",
+    "tslint": "^5.6.0",
+    "typescript": "^2.4.2"
+  },
+  "homepage": "https://github.com/AlCalzone/ioBroker.tradfri",
+  "keywords": [
+    "ioBroker",
+    "tradfri",
+    "Smart Home",
+    "home automation"
+  ],
+  "license": "MIT",
+  "main": "build/main.js",
+  "readmeFilename": "README.md",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/AlCalzone/ioBroker.tradfri"
+  },
+  "scripts": {
+    "test": "node node_modules/mocha/bin/mocha"
+  }
 }