Merge branch 'master' of github.com:redhat-developer-tooling/developer-platform-install into JBDS-4026

Author: dgolovin

browser/model/helpers/downloader.js

@@ -103,7 +103,7 @@ class Downloader {
       .on('data', this.dataHandler.bind(this))
       .on('end', this.endHandler.bind(this, stream))
       .pipe(stream)
-      .on('finish', this.closeHandler.bind(this,stream.path,sha,options));
+      .on('close', this.closeHandler.bind(this,stream.path,sha,options));
   }
 
   downloadAuth(options, username, password, file, sha) {
@@ -116,7 +116,7 @@ class Downloader {
       .on('data', this.dataHandler.bind(this))
       .on('end', this.endHandler.bind(this, stream))
       .pipe(stream)
-      .on('finish', this.closeHandler.bind(this,stream.path,sha,options));
+      .on('close', this.closeHandler.bind(this,stream.path,sha,options));
   }
 
 

browser/model/helpers/hash.js

@@ -10,7 +10,7 @@ class Hash {
       while (null !== (chunk = readStream.read())) {
         hash.update(chunk);
       }
-    }).on('end', function () {
+    }).on('close', function () {
       var hashstring = hash.digest('hex');
       done(hashstring);
     });

browser/model/virtualbox.js

@@ -22,6 +22,7 @@ class VirtualBoxInstall extends InstallableItem {
 
     this.minimumVersion = '5.0.26';
     this.version = version || '5.0.26';
+    this.maximumVersion = '5.1.0';
     this.revision = revision;
     this.downloadedFileName = 'virtualbox.exe';
     this.bundledFile = path.join(this.downloadFolder, this.downloadedFileName);
@@ -98,7 +99,7 @@ class VirtualBoxInstall extends InstallableItem {
       var command = '"' + path.join(output, 'VBoxManage' + extension) +'"' + ' --version';
       return Util.executeCommand(command, 1);
     }).then((output) => {
-      let version =  versionRegex.exec(output)[1];
+      let version = versionRegex.exec(output)[1];
       this.addOption('detected',version,tempDetectedLocation,Version.GE(version,this.minimumVersion));
       this.selectedOption = 'detected';
       this.validateVersion();
@@ -119,10 +120,14 @@ class VirtualBoxInstall extends InstallableItem {
         installOption.valid = false;
         installOption.error = 'oldVersion';
         installOption.warning = '';
-      } else if(Version.GT(installOption.version,this.minimumVersion)) {
+      } else if(Version.GT(installOption.version,this.minimumVersion) && Version.LT(installOption.version,this.maximumVersion)) {
         installOption.valid = true;
         installOption.error = '';
         installOption.warning = 'newerVersion';
+      } else if(Version.GE(installOption.version,this.maximumVersion)) {
+        installOption.valid = false;
+        installOption.error = '';
+        installOption.warning = 'newerVersion';
       }
   }
 

browser/pages/confirm/confirm.html

@@ -120,7 +120,7 @@
 
     <div class="message-container error-message" ng-show="!checkboxModel.virtualbox.isConfigured() && checkboxModel.cdk.selectedOption == 'install'">
       <span class="pficon pficon-error-circle-o"></span>
-      <span>Red Hat Container Development Kit requires Oracle VirtualBox 5.0.8 or newer. Please uninstall detected Oracle VirtualBox and restart Installer to continue.</span>
+      <span>Red Hat Container Development Kit requires Oracle VirtualBox {{checkboxModel.virtualbox.minimumVersion}} or newer 5.0.x release. Please uninstall detected Oracle VirtualBox and restart Installer to continue.</span>
     </div>
 
     <!-- Cygwin -->
@@ -288,7 +288,7 @@
 
     <div class="message-container error-message" ng-show="!checkboxModel.vagrant.isConfigured() && checkboxModel.cdk.selectedOption == 'install'">
       <span class="pficon pficon-error-circle-o"></span>
-      <span>Red Hat Container Development Kit requires Vagrant 1.7.4 or newer. Please uninstall detected Vagrant and restart Installer to continue.</span>
+      <span>Red Hat Container Development Kit requires Vagrant {{checkboxModel.vagrant.minimumVersion}} or newer. Please uninstall detected Vagrant and restart Installer to continue.</span>
     </div>
 
     <!-- CDK -->

gulpfile.js

@@ -146,6 +146,8 @@ gulp.task('create-7zip-archive', function(cb) {
   // only include prefetch folder when zipping if the folder exists and we're doing a bundle build
   if (fs.existsSync(path.resolve(prefetchFolder)) && installerExe.indexOf("-bundle") > 0) {
     packCmd = packCmd + ' ' + path.resolve(prefetchFolder) + path.sep + '*';
+  } else {
+      packCmd = packCmd + ' ' + path.resolve(prefetchFolder) + path.sep + 'cygwin.exe';
   }
   //console.log('[DEBUG]' + packCmd);
   exec(packCmd, createExecCallback(cb, true));
@@ -255,7 +257,7 @@ function createSHA256File(filename, cb) {
 // Create stub installer that will then download all the requirements
 gulp.task('package-simple', function(cb) {
   runSequence(['check-requirements', 'clean'], 'create-dist-win-dir', 'update-requirements', ['generate',
-    'prepare-tools'], 'package', 'cleanup', cb);
+    'prepare-tools'], 'prefetch-cygwin', 'package', 'cleanup', cb);
 });
 
 gulp.task('package-bundle', function(cb) {
@@ -326,6 +328,11 @@ gulp.task('prefetch', ['create-prefetch-cache-dir'], function() {
   return prefetch('yes', prefetchFolder);
 });
 
+// prefetch cygwin to always include into installer
+gulp.task('prefetch-cygwin', ['create-prefetch-cache-dir'], function() {
+  return prefetch('always', prefetchFolder);
+});
+
 gulp.task('prefetch-tools', ['create-tools-dir'], function() {
   return prefetch('tools', toolsFolder);
 });

requirements.json

@@ -36,10 +36,10 @@
   "cygwin.exe": {
     "name": "Cygwin",
     "description": "A distribution of popular GNU and other Open Source tools running on Microsoft Windows",
-    "bundle": "yes",
-    "version": "2.5.2",
-    "url": "https://developers.redhat.com/redirect/to/cygwin-installer-2.5.2.download",
-    "filename": "cygwin_2.5.2.exe",
+    "bundle": "always",
+    "version": "2.6.0",
+    "url": "https://cygwin.com/setup-x86_64.exe",
+    "filename": "cygwin_2.6.0.exe",
     "sha256sum": "58f9f42f5dbd52c5e3ecd24e537603ee8897ea15176b7acdc34afcef83e5c19a",
     "virusTotalReport": "https://virustotal.com/en/file/58f9f42f5dbd52c5e3ecd24e537603ee8897ea15176b7acdc34afcef83e5c19a/analysis/",
     "vendor": "Community Project"

test/unit/model/helpers/hash-test.js

@@ -39,7 +39,7 @@ describe('Hash', function() {
         expect(createHashStub).to.have.been.calledWith('sha256');
         done();
       });
-      stream.emit('end');
+      stream.emit('close');
     });
 
     it('should read the specified file', function(done) {
@@ -48,7 +48,7 @@ describe('Hash', function() {
         expect(readStreamStub).to.have.been.calledWith('file');
         done();
       });
-      stream.emit('end');
+      stream.emit('close');
     });
 
     it('should create a hex string when the file is done reading', function(done) {
@@ -58,7 +58,7 @@ describe('Hash', function() {
         expect(spy).to.have.been.calledWith('hex');
         done();
       });
-      stream.emit('end');
+      stream.emit('close');
     });
   })
 });