Merge pull request #109 from adaptlearning/issue/92

allow a tagged version of the framework to be used to create a course

Author: chris-steele

lib/RepositoryDownloader.js

@@ -20,13 +20,15 @@ RepositoryDownloader.prototype.fetch = function(destination) {
         download = require('download'),
         totalSize,
         receivedSize,
-        previousPercent = 0;
+        previousPercent = 0,
+        fileName = '';
 
     download(this.url, destination, {
         extract: true
     })
     .on('response', function (response) {
         totalSize = Number(response.headers['content-length']);
+        fileName = getFileName(response.headers['content-disposition']);
         receivedSize = 0;
     })
     .on('data', function(data) {
@@ -46,11 +48,23 @@ RepositoryDownloader.prototype.fetch = function(destination) {
         deferred.reject(err);
     })
     .then(function() {
-        deferred.resolve(destination);
+        deferred.resolve(fileName);
     });
 
     return deferred.promise;
 };
 
+function getFileName(disposition) {
+    var fileName = "";
+    if (disposition && disposition.indexOf('attachment') !== -1) {
+        var regex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
+        var matches = regex.exec(disposition);
+        if (matches != null && matches[1]) {
+            fileName = matches[1].replace(/['"]/g, '');
+        }
+    }
+    return fileName;
+}
+
 module.exports = RepositoryDownloader;
 

lib/commands/create.js

@@ -66,7 +66,7 @@ function confirm(properties) {
                     required: true
                 },
                 branch: {
-                    description: 'branch',
+                    description: 'branch/tag',
                     pattern: /\w/,
                     type: 'string',
                     default: properties.branch || 'not specified',

lib/promise/getRepository.js

@@ -9,14 +9,18 @@ module.exports = function (properties) {
             repository: properties.repository || Constants.FrameworkRepository,
             branch : properties.branch
         }),
-        tmp = properties.tmp = path.join(Constants.HomeDirectory, '.adapt', 'tmp', uuid.v1()),
-        downloadedSource = path.join(tmp, (properties.repositoryName || Constants.FrameworkRepositoryName) + '-' + properties.branch);
+        tmp = properties.tmp = path.join(Constants.HomeDirectory, '.adapt', 'tmp', uuid.v1());
 
     return downloader.fetch(tmp)
-                     .then(function () {
-                         return fs.copyTree(downloadedSource, properties.localDir)
+                     .then(function (fileName) {
+                         return fs.copyTree(getDownloadedSourcePath(properties, fileName), properties.localDir)
                                   .then(function () {
                                      return properties;
                                   });
                      });
-};
+};
+
+function getDownloadedSourcePath(properties, fileName) {
+    var fName = fileName ? fs.base(fileName, fs.extension(fileName)) : ((properties.repositoryName || Constants.FrameworkRepositoryName) + '-' + properties.branch);
+    return path.join(properties.tmp, fName);
+}