Update packages, fix testing for versions

When checking that a package isn't installed you don't need a to check for a version, only that the package doesn't exist. Also helps making upading packages and their tests a lot easier.
sondr3 · May 27, 2016 · 5acea64 · 5acea64
1 parent 0415f99
commit 5acea64
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 30 deletions.
diff --git a/generators/gulp/index.js b/generators/gulp/index.js
@@ -44,9 +44,9 @@ module.exports = generators.Base.extend({
         'gulp-cssnano': '^2.1.0',
         'gulp-eslint': '^2.0.0',
         'gulp-gzip': '^1.1.0',
-        'gulp-htmlmin': '^1.3.0',
+        'gulp-htmlmin': '^2.0.0',
         'gulp-if': '^2.0.0',
-        'gulp-imagemin': '^2.1.0',
+        'gulp-imagemin': '^3.0.0',
         'gulp-inject': '^4.0.0',
         'gulp-load-plugins': '^1.2.0',
         'gulp-newer': '^1.1.0',
@@ -58,17 +58,17 @@ module.exports = generators.Base.extend({
         'gulp-sourcemaps': '^1.3.0',
         'gulp-uglify': '^1.5.1',
         'gulp-uncss': '^1.0.0',
-        'shelljs': '^0.6.0',
-        'yargs': '^4.3.2'
+        'shelljs': '^0.7.0',
+        'yargs': '^4.7.0'
       });
 
       if (this.options.uploading === 'Amazon S3') {
-        pkg.devDependencies['gulp-awspublish'] = '^3.0.1';
+        pkg.devDependencies['gulp-awspublish'] = '^3.2.0';
         pkg.devDependencies['concurrent-transform'] = '^1.0.0';
       }
 
       if (this.options.uploading === 'Rsync') {
-        pkg.devDependencies['gulp-rsync'] = '^0.0.5';
+        pkg.devDependencies['gulp-rsync'] = '^0.0.6';
       }
 
       if (this.options.uploading === 'Github Pages') {

diff --git a/generators/gulp/templates/gulpfile.js b/generators/gulp/templates/gulpfile.js
@@ -164,8 +164,8 @@ gulp.task('inject:footer', () =>
 gulp.task('images', () =>
   gulp.src('src/assets/images/**/*')
     .pipe($.cache($.imagemin({
-      progressive: true,
-      interlaced: true
+      imagemin.gifsicle({interlaced: true}),
+      imagemin.mozjpeg({progressive: true})
     })))
     .pipe(gulp.dest('.tmp/assets/images'))
     .pipe($.size({title: 'images'}))

diff --git a/test/gulp.js b/test/gulp.js
@@ -30,9 +30,9 @@ test('package.json contains correct packages', () => {
       'gulp-cssnano': '^2.1.0',
       'gulp-eslint': '^2.0.0',
       'gulp-gzip': '^1.1.0',
-      'gulp-htmlmin': '^1.3.0',
+      'gulp-htmlmin': '^2.0.0',
       'gulp-if': '^2.0.0',
-      'gulp-imagemin': '^2.1.0',
+      'gulp-imagemin': '^3.0.0',
       'gulp-inject': '^4.0.0',
       'gulp-load-plugins': '^1.2.0',
       'gulp-newer': '^1.1.0',
@@ -44,8 +44,8 @@ test('package.json contains correct packages', () => {
       'gulp-sourcemaps': '^1.3.0',
       'gulp-uglify': '^1.5.1',
       'gulp-uncss': '^1.0.0',
-      'shelljs': '^0.6.0',
-      'yargs': '^4.3.2'
+      'shelljs': '^0.7.0',
+      'yargs': '^4.7.0'
     }
   });
 });
@@ -60,10 +60,10 @@ test('does not create credentials files', () => {
 test('does not contain uploading packages', () => {
   assert.noJSONFileContent('package.json', {
     devDependencies: {
-      'gulp-awspublish': '^3.0.1',
-      'concurrent-transform': '^1.0.0',
-      'gulp-rsync': '^0.0.5',
-      'gulp-gh-pages': '^0.5.2'
+      'gulp-awspublish': '',
+      'concurrent-transform': '',
+      'gulp-rsync': '',
+      'gulp-gh-pages': ''
     }
   });
 });

diff --git a/test/uploading/aws.js b/test/uploading/aws.js
@@ -21,7 +21,7 @@ test('creates package.json file', () => {
 test('contain correct uploading packages', () => {
   assert.JSONFileContent('package.json', {
     devDependencies: {
-      'gulp-awspublish': '^3.0.1',
+      'gulp-awspublish': '^3.2.0',
       'concurrent-transform': '^1.0.0'
     }
   });
@@ -30,8 +30,8 @@ test('contain correct uploading packages', () => {
 test('does not contain wrong uploading packages', () => {
   assert.noJSONFileContent('package.json', {
     devDependencies: {
-      'gulp-rsync': '^0.0.5',
-      'gulp-gh-pages': '^0.5.2'
+      'gulp-rsync': '',
+      'gulp-gh-pages': ''
     }
   });
 });

diff --git a/test/uploading/ghpages.js b/test/uploading/ghpages.js
@@ -29,9 +29,9 @@ test('contain correct uploading packages', () => {
 test('does not contain wrong uploading packages', () => {
   assert.noJSONFileContent('package.json', {
     devDependencies: {
-      'gulp-awspublish': '^3.0.1',
-      'concurrent-transform': '^1.0.0',
-      'gulp-rsync': '^0.0.5'
+      'gulp-awspublish': '',
+      'concurrent-transform': '',
+      'gulp-rsync': ''
     }
   });
 });

diff --git a/test/uploading/no-uploading.js b/test/uploading/no-uploading.js
@@ -28,10 +28,10 @@ test('does not create credentials files', () => {
 test('does not contain uploading packages', () => {
   assert.noJSONFileContent('package.json', {
     devDependencies: {
-      'gulp-awspublish': '^3.0.1',
-      'concurrent-transform': '^1.0.0',
-      'gulp-rsync': '^0.0.5',
-      'gulp-gh-pages': '^0.5.2'
+      'gulp-awspublish': '',
+      'concurrent-transform': '',
+      'gulp-rsync': '',
+      'gulp-gh-pages': ''
     }
   });
 });

diff --git a/test/uploading/rsync.js b/test/uploading/rsync.js
@@ -21,17 +21,17 @@ test('creates package.json file', () => {
 test('contain correct uploading packages', () => {
   assert.JSONFileContent('package.json', {
     devDependencies: {
-      'gulp-rsync': '^0.0.5'
+      'gulp-rsync': '^0.0.6'
     }
   });
 });
 
 test('does not contain wrong uploading packages', () => {
   assert.noJSONFileContent('package.json', {
     devDependencies: {
-      'gulp-awspublish': '^3.0.1',
-      'concurrent-transform': '^1.0.0',
-      'gulp-gh-pages': '^0.5.2'
+      'gulp-awspublish': '',
+      'concurrent-transform': '',
+      'gulp-gh-pages': ''
     }
   });
 });