Skip to content

Commit

Permalink
Updated packages, fixed errors on tests
Browse files Browse the repository at this point in the history
Not too sure honestly what caused them but playing around some more with
the gulpfile seems to have fixed them.
  • Loading branch information
sondr3 committed May 19, 2015
1 parent 24ad2df commit bf65d66
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
9 changes: 5 additions & 4 deletions generators/gulp/templates/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ function optimize() {
.pipe(gulp.dest(config.assets.dest))
.pipe($.size({title: 'optimizations'}));
}
<% if (amazonS3) { -%>

<% if (amazonS3) { -%>
// Task to deploy your site to Amazon S3 and Cloudfront
function deploy() {
// Generate the needed credentials (bucket, secret key etc) from a 'hidden' JSON file
Expand Down Expand Up @@ -198,8 +198,8 @@ function deploy() {
// And update the default root object
.pipe($.cloudfront(credentials));
}
<% } -%><% if (rsync) { -%>

<% } -%><% if (rsync) { -%>
// Task to upload your site via Rsync to your server
function deploy() {
// Load in the variables needed for our Rsync synchronization
Expand All @@ -219,8 +219,8 @@ function deploy() {
progress: true
}));
}
<% } -%><% if (ghPages) { -%>

<% } -%><% if (ghPages) { -%>
// Task to upload your site to your personal GH Pages repo
function deploy() {
// Deploys your optimized site, you can change the settings in the html task if you want to
Expand All @@ -231,8 +231,9 @@ function deploy() {
branch: 'master'
}));
}
<% } -%>

<% } -%>
<% if (noUpload) { -%><% } -%>
// Run JS Lint against your JS
function jslint() {
gulp.src(config.javascript.dest)
Expand Down
1 change: 1 addition & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,5 @@ gulp.task('coveralls', function() {
.pipe(coveralls());
});

gulp.task('test', gulp.series('clean', 'istanbul'));
gulp.task('default', gulp.series('check', 'coveralls'));
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"chalk": "^1.0.0",
"globule": "~0.2.0",
"lodash": "^3.8.0",
"shelljs": "^0.4.0",
"shelljs": "^0.5.0",
"yeoman-generator": "^0.20.1",
"yosay": "^1.0.2"
},
Expand All @@ -30,7 +30,7 @@
"generator-mocha": "^0.1.7",
"gulp": "git://github.com/gulpjs/gulp#4.0",
"gulp-coveralls": "^0.1.4",
"gulp-istanbul": "^0.8.1",
"gulp-istanbul": "^0.9.0",
"gulp-jscs": "^1.6.0",
"gulp-jshint": "^1.10.0",
"gulp-load-plugins": "^0.10.0",
Expand Down

0 comments on commit bf65d66

Please sign in to comment.