Merge pull request #112 from adaptlearning/issue/adapt-register

Fixes for issues #110 and #111

Author: chris-steele

README.md

@@ -258,5 +258,5 @@ See [Developing plug-ins](https://github.com/adaptlearning/adapt_framework/wiki/
 <div float align=right><a href="#top">Back to Top</a></div>  
 
 ----------------------------
-**Version number:**  2.1.4   <a href="https://community.adaptlearning.org/" target="_blank"><img src="https://github.com/adaptlearning/documentation/blob/master/04_wiki_assets/plug-ins/images/adapt-logo-mrgn-lft.jpg" alt="adapt learning logo" align="right"></a>   
+**Version number:**  2.1.7   <a href="https://community.adaptlearning.org/" target="_blank"><img src="https://github.com/adaptlearning/documentation/blob/master/04_wiki_assets/plug-ins/images/adapt-logo-mrgn-lft.jpg" alt="adapt learning logo" align="right"></a>   
 **Author / maintainer:** Adapt Core Team with [contributors](https://github.com/adaptlearning/adapt-contrib-hotgraphic/graphs/contributors)  

lib/commands/register.js

@@ -8,7 +8,8 @@ var bower = require('bower'),
     JsonLoader = require('../JsonLoader'),
     JsonWriter = require('../JsonWriter'),
     Project = require('../Project'),
-    Plugin = require('../Plugin');
+    Plugin = require('../Plugin'),
+    semver = require('semver');
 
 module.exports = {
     register: function (renderer) {
@@ -110,16 +111,20 @@ function confirm(properties) {
                     default: plugin.toString() || 'not specified',
                     required: true
                 },
-                repository: {
-                    description: chalk.cyan('repository'),
-                    pattern: /([A-Za-z0-9]+@|http(|s)|git\:\/\/)([A-Za-z0-9.]+)(:|\/)([A-Za-z0-9\-\.\/]+)(\.git)?/,
+                repositoryUrl: {
+                    description: chalk.cyan('repository URL'),
+                    message: 'Please provide a repository URL of the form git://<domain><path>.git',
+                    pattern: /git:\/\/([\w\.@\:/\-~]+)(\.git)(\/)?/,
                     type: 'string',
-                    default: properties.repository || 'not specified',
+                    default: properties.repository ? properties.repository.url : undefined,
                     required: true
                 },
                 framework: {
                     description: chalk.cyan('framework'),
-                    pattern: /\bv?(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)(?:-[\da-z\-]+(?:\.[\da-z\-]+)*)?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?\b/ig,
+                    message: 'Please provide a valid semver (see https://semver.org/)',
+                    conform:function(v) {
+                        return semver.valid(semver.coerce(v));
+                    },
                     type: 'string',
                     default: properties.framework || '~2.0.0',
                     required: false
@@ -143,8 +148,9 @@ function confirm(properties) {
         if(!confirmation.ready) deferred.reject(new Error('Aborted. Nothing has been registered.'));
 
         properties.name = confirmation.name;
-        properties.repository = confirmation.repository;
+        properties.repository = {type:'git', url:confirmation.repositoryUrl};
         properties.framework = confirmation.framework;
+
         deferred.resolve(properties);
     });
     return deferred.promise;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-cli",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "Command line tools for Adapt",
   "main": "./lib/cli.js",
   "directories": {