Skip to content
This repository has been archived by the owner on Oct 13, 2018. It is now read-only.

Commit

Permalink
Add absolute-path checking for CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Shane Osbourne committed Jan 9, 2015
1 parent bec8625 commit 4b6930b
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 43 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
language: node_js
sudo: false
node_js:
- '0.10'
before_script:
- npm install -g karma
- npm install -g bower
- bower install
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
4 changes: 2 additions & 2 deletions example.server.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ var logger = require("eazy-logger").Logger({

var cp = require("./index");
//var bs = require('browser-sync');
var bs = require('/Users/shakyshane/sites/os-browser-sync');
var bs = require('/Users/shaneobsourne/sites/browser-sync');

var htmlInjector = require('/Users/shakyshane/code/bs-plugins/html-injector');
//var htmlInjector = require('/Users/shakyshane/code/bs-plugins/html-injector');

//bs.use(htmlInjector, {
// logLevel: "debug",
Expand Down
74 changes: 41 additions & 33 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,40 @@
var gulp = require("gulp");
var jshint = require('gulp-jshint');
var contribs = require('gulp-contribs');
var jshint = require("gulp-jshint");
var contribs = require("gulp-contribs");
var sass = require("gulp-sass");
var fs = require("fs");
var autoprefix = require("gulp-autoprefixer");
var browserify = require('gulp-browserify');
var rename = require('gulp-rename');
var filter = require('gulp-filter');
var sprites = require('gulp-svg-sprites');
var browserSync = require('browser-sync');
var browserify = require("gulp-browserify");
var rename = require("gulp-rename");
var filter = require("gulp-filter");
var sprites = require("gulp-svg-sprites");
var browserSync = require("browser-sync");
var crossbow = require("crossbow/plugins/stream");
var reload = browserSync.reload;

/**
* Lint all JS files
*/
gulp.task('lint', function () {
return gulp.src(['test/client/specs/**/*.js', 'lib/js/scripts/*.js', 'index.js'])
.pipe(jshint('test/.jshintrc'))
.pipe(jshint.reporter("default"))
.pipe(jshint.reporter("fail"));
gulp.task("lint", function () {
return gulp.src([
"test/client/specs/**/*.js",
"test/server/**/*.js",
"lib/js/scripts/*.js",
"index.js",
"server/*.js",
"gulpfile.js",
])
.pipe(require("no-abs")());
//.pipe(jshint("test/.jshintrc"))
//.pipe(jshint.reporter("default"))
//.pipe(jshint.reporter("fail"));
});

/**
* Update Contributors list
*/
gulp.task('contribs', function () {
gulp.src('README.md')
gulp.task("contribs", function () {
gulp.src("README.md")
.pipe(contribs())
.pipe(gulp.dest("./"));
});
Expand All @@ -35,8 +43,8 @@ gulp.task('contribs', function () {
/**
* Build the app.
*/
gulp.task('browserify', function () {
return gulp.src('lib/js/scripts/index.js')
gulp.task("browserify", function () {
return gulp.src("lib/js/scripts/index.js")
.pipe(browserify())
.pipe(rename("app.js"))
.pipe(gulp.dest("./lib/js/dist"));
Expand All @@ -45,7 +53,7 @@ gulp.task('browserify', function () {
/**
* Start BrowserSync
*/
gulp.task('browser-sync', function () {
gulp.task("browser-sync", function () {
browserSync({
proxy: "http://localhost:3001/",
files: ["lib/*.html"]
Expand All @@ -54,7 +62,7 @@ gulp.task('browser-sync', function () {
/**
* Start BrowserSync
*/
gulp.task('browser-sync-dev', function () {
gulp.task("browser-sync-dev", function () {
browserSync({
notify: false,
server: {
Expand All @@ -67,39 +75,39 @@ gulp.task('browser-sync-dev', function () {
/**
* Compile CSS
*/
gulp.task('sass', function () {
return gulp.src('lib/scss/**/*.scss')
gulp.task("sass", function () {
return gulp.src("lib/scss/**/*.scss")
.pipe(sass())
.on('error', function(err){
.on("error", function(err){
browserSync.notify(err.message, 3000);
this.emit('end');
this.emit("end");
})
.pipe(autoprefix())
.pipe(gulp.dest('lib/css'))
.pipe(gulp.dest("lib/css"))
.pipe(filter("**/*.css"));
});

/**
* Compile CSS
*/
gulp.task('bs-inject', function () {
gulp.task("bs-inject", function () {
browserSync.reload("core.css");
});

/**
* Compile HTML
*/
gulp.task('build-src', function () {
gulp.task("build-src", function () {
crossbow.clearCache();
return gulp.src("lib/src/*.hbs")
.pipe(crossbow({cwd: "lib/src"}))
.pipe(gulp.dest("./lib"))
.pipe(gulp.dest("./lib"));
});

/**
* Compile SVG Symbols
*/
gulp.task('svg', function () {
gulp.task("svg", function () {
return gulp.src("lib/img/svg/*.svg")
.pipe(sprites({
mode: "symbols",
Expand All @@ -118,27 +126,27 @@ gulp.task('svg', function () {
return data;
}
}))
.pipe(gulp.dest("lib/img/icons"))
.pipe(gulp.dest("lib/img/icons"));
});

/**
* Build Front-end stuff
*/
gulp.task('dev-frontend', ["sass", "build-src", "browser-sync-dev"], function () {
gulp.task("dev-frontend", ["sass", "build-src", "browser-sync-dev"], function () {
gulp.watch("lib/scss/**/*.scss", ["sass", browserSync.reload]);
gulp.watch("lib/src/**/*", ["build-src", browserSync.reload]);
//gulp.watch("lib/*.html", browserSync.reload);
});

gulp.task('watch-css', ["sass"], function () {
gulp.task("watch-css", ["sass"], function () {
gulp.watch("lib/scss/**/*.scss", ["sass"]);
});

gulp.task('default', ["lint"]);
gulp.task("default", ["lint"]);

gulp.task('build', ["browserify", "lint"]);
gulp.task("build", ["browserify", "lint"]);

gulp.task('dev', ["browserify"], function () {
gulp.task("dev", ["browserify"], function () {
gulp.watch("lib/scss/**/*.scss", ["sass"]);
gulp.watch("lib/js/scripts/**/*.js", ["browserify"]);
});
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"angular-mocks": "^1.3.8",
"angular-route": "^1.3.8",
"angular-touch": "^1.3.8",
"browser-sync": "^1.8.1",
"browser-sync": "git://github.com/shakyshane/browser-sync#v2-rc1",
"bs-html-injector": "^1.1.0",
"chai": "^1.9.1",
"crossbow": "^0.2.0",
Expand All @@ -71,6 +71,7 @@
"karma-sinon": "^1.0.3",
"mocha": "^1.21.4",
"ng-html2js": "^1.2.0",
"no-abs": "0.0.0",
"pretty-js": "^0.1.5",
"serve-static": "^1.6.3",
"sinon": "^1.10.3",
Expand Down
2 changes: 1 addition & 1 deletion server/async.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module.exports = {
cp.pages = pages;
})
}
})
});
},
/**
* Simple static file server with some middlewares for custom
Expand Down
2 changes: 1 addition & 1 deletion server/hooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ module.exports = {
var inlineTemplates = createInlineTemplates(hooks);
return inlineTemplates;
}
}
};

/**
*
Expand Down
2 changes: 1 addition & 1 deletion server/transform.options.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ module.exports = function (bs) {
server.baseDirs = [path.join(cwd, server.baseDir)];
}
}
}
};
2 changes: 1 addition & 1 deletion server/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function verifyUrl(url, cb) {
} else {
cb("not 200");
}
}).on('error', function(e) {
}).on("error", function(e) {
console.log("Got error: " + e.message);
});
}
Expand Down
2 changes: 1 addition & 1 deletion test/server/init.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var browserSync = require("/Users/shakyshane/sites/os-browser-sync");
var browserSync = require("browser-sync");
var cp = require("../../index");
var assert = require("chai").assert;
var sinon = require("sinon");
Expand Down

0 comments on commit 4b6930b

Please sign in to comment.