From 4a6393cf13d60004c9b9b2a9f86f7e1e5253c19a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 20 Jan 2016 22:02:44 +0100
Subject: execute gulp

---
 .travis.yml  | 6 +++---
 gulpfile.js  | 7 ++-----
 package.json | 3 +--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 80546f89..3bedd02f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ matrix:
 
 install:
   # install ocdev
-  - sudo apt-get -y install python3-jinja2 python3-setuptools
+  - sudo apt-get -y install python3-jinja2 python3-setuptools npm
   - sudo easy_install3 requests
   - sudo easy_install3 ocdev
   # set up postgresql
@@ -40,10 +40,10 @@ install:
   - cd owncloud
   - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --database-pass --admin-user admin --admin-pass admin --database $DB
   - ./occ app:enable contactsrework
-
-before_script:
   - cd apps/contactsrework
+  - npm install
 
 script:
   - phpunit -c phpunit.xml
   - phpunit -c phpunit.integration.xml
+  - node_modules/gulp/bin/gulp.js
diff --git a/gulpfile.js b/gulpfile.js
index 8988571b..47b5191c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,6 +1,5 @@
 var gulp = require('gulp'),
 	concat = require('gulp-concat'),
-	notify = require('gulp-notify'),
 	jshint = require('gulp-jshint');
 
 gulp.task('js', function() {
@@ -14,8 +13,7 @@ gulp.task('js', function() {
 		.pipe(jshint('.jshintrc'))
 		.pipe(jshint.reporter('default'))
 		.pipe(concat('script.js'))
-		.pipe(gulp.dest('js/public'))
-		.pipe(notify({message: 'Scripts task complete'}));
+		.pipe(gulp.dest('js/public'));
 });
 
 gulp.task('css', function() {
@@ -24,8 +22,7 @@ gulp.task('css', function() {
 			'!css/public/**.css'
 			])
 		.pipe(concat('style.css'))
-		.pipe(gulp.dest('css/public'))
-		.pipe(notify({message: 'Styles task complete'}));
+		.pipe(gulp.dest('css/public'));
 });
 
 gulp.task('watch', function() {
diff --git a/package.json b/package.json
index 3c698eea..68270aac 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,6 @@
   "devDependencies": {
     "gulp": "^3.9.0",
     "gulp-concat": "^2.6.0",
-    "gulp-jshint": "^1.11.2",
-    "gulp-notify": "^2.2.0"
+    "gulp-jshint": "^1.11.2"
   }
 }
-- 
cgit v1.2.3