Skip to content

Commit

Permalink
chore: update project automation scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
darlanalves committed Feb 16, 2015
1 parent b63c2f6 commit 0d9fa75
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 72 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
node_modules
test/coverage
dist/*.min.js
*.sublime*
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
all:
./node_modules/gulp/bin/gulp build
./node_modules/gulp/bin/gulp.js build

tdd:
./node_modules/gulp/bin/gulp tdd
./node_modules/gulp/bin/gulp.js tdd

test:
./node_modules/gulp/bin/gulp test
./node_modules/gulp/bin/gulp.js test

watch:
./node_modules/gulp/bin/gulp default
./node_modules/gulp/bin/gulp.js default

.PHONY: all tdd test watch
88 changes: 21 additions & 67 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,75 +15,32 @@ var gulp = require('gulp'),
livereload = require('gulp-livereload'),
karma = require('karma').server,

// NOTE: don't join the template strings, it will break Slush!
wrapper = '(function(undefined){\n\n<' + '%= contents %>\n}());';
wrapper = '(function(undefined){\n\n<%= contents %>\n}());';

diAnnotations.logger.enabled = false;
diAnnotations.constants.MODULE = 'angular.module(\'repository\')';

gulp.task('min', function() {
var pipe = pipeline(
gulp.src(['src/module.js', 'src/**/!(*spec).js']),
var PATH = {
sourceFiles: ['src/module.js', 'src/**/*.js'],
dist: 'dist',
distFile: 'repository.js',
karmaUnit: __dirname + '/karma.conf.js'
};

gulp.task('min', ['test'], function() {
return pipeline(
gulp.src(PATH.sourceFiles),
annotations(),
concat('app.js'),
concat(PATH.distFile),
wrap(wrapper),
gulp.dest('public'),
gulp.dest(PATH.dist),
uglify(),
rename({
suffix: '.min'
}),
gulp.dest('public')
);

pipe.on('error', createLogger('min'));
return pipe;
});

gulp.task('sass', function() {
var pipe = pipeline(
gulp.src('scss/**/*.scss'),
sass({
outputStyle: 'nested',
errLogToConsole: true
}),
concat('app.css'),
gulp.dest('public')
);

pipe.on('error', createLogger('sass'));
return pipe;
});

gulp.task('mocks', function() {
var pipe = pipeline(
gulp.src(['mocks/module.js', 'mocks/**/*.js']),
concat('mocks.js'),
wrap(wrapper),
gulp.dest('public')
);

pipe.on('error', createLogger('mocks'));
return pipe;
})


gulp.task('views', function() {
var pipe = pipeline(
gulp.src('views/**/*.html'),
templateCache({
output: 'views.js',
strip: 'views',
moduleName: 'app',
minify: {
collapseBooleanAttributes: true,
collapseWhitespace: true
}
}),
gulp.dest('public')
gulp.dest(PATH.dist),
createLogger('min')
);

pipe.on('error', createLogger('views'));
return pipe;
});

gulp.task('serve', function() {
Expand All @@ -93,15 +50,16 @@ gulp.task('serve', function() {
// @see https://github.com/karma-runner/gulp-karma#do-we-need-a-plugin
gulp.task('test', function(done) {
karma.start({
configFile: __dirname + '/karma.conf.js',
configFile: PATH.karmaUnit,
singleRun: true
}, done);
});

gulp.task('tdd', function(done) {
karma.start({
configFile: __dirname + '/karma.conf.js',
singleRun: false
configFile: PATH.karmaUnit,
singleRun: false,
autoWatch: true
}, done);
});

Expand All @@ -113,14 +71,10 @@ gulp.task('watch', function() {
}

handleChanges(gulp.watch('src/**/*.js', ['min']));
handleChanges(gulp.watch('scss/**/*.scss', ['sass']));
handleChanges(gulp.watch('views/**/*.html', ['views']));
handleChanges(gulp.watch('mocks/**/*.js', ['mocks']));
});

gulp.task('build', ['min', 'sass', 'mocks', 'views']);

gulp.task('default', ['min', 'sass', 'mocks', 'views', 'watch']);
gulp.task('build', ['min']);
gulp.task('default', ['test', 'min', 'watch']);

function createLogger(name) {
return function() {
Expand Down
1 change: 0 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ module.exports = function(config) {
files: [
'vendor/angular.js',
'vendor/angular-mocks.js',
'vendor/angular-ui-router.js',
'vendor/es5-shim.min.js',
'vendor/EventEmitter.js',
'vendor/JSONHttpRequest.js',
Expand Down

0 comments on commit 0d9fa75

Please sign in to comment.