Add option to specify username with --instance CLI switch

Closes #70

README.md

@@ -56,6 +56,10 @@ To upgrade to the latest version
 
 Username `admin` is used.  A prompt is shown for entering password.
 
+If a different username is required, add the `--user` switch:
+
+	--user user-name --instance instance-name.dev
+
 ### To an arbitrary URL
 
 	medic-conf --url https://username:password@example.com:12345

bin/medic-conf.js

@@ -30,13 +30,19 @@ switch(args[0]) {
   default:          log.level = log.LEVEL_INFO;
 }
 
+let instanceUsername = 'admin';
 switch(args[0]) {
 
 //> instance URL handling:
+  case '--user':
+    instanceUsername = args[1];
+    shift(2);
+    if(args[0] !== '--instance') throw new Error('The --user switch can only be used if followed by --instance');
+    /* falls through */
   case '--instance':
     const password = readline.question(`${emoji.key}  Password: `, { hideEchoBack:true });
     const encodedPassword = encodeURIComponent(password);
-    instanceUrl = `https://admin:${encodedPassword}@${args[1]}.medicmobile.org`;
+    instanceUrl = `https://${instanceUsername}:${encodedPassword}@${args[1]}.medicmobile.org`;
     shift(2);
     break;
   case '--local':

package.json

@@ -1,6 +1,6 @@
 {
   "name": "medic-conf",
-  "version": "1.16.6",
+  "version": "1.16.7",
   "description": "Configure Medic Mobile deployments",
   "main": "index.js",
   "scripts": {

src/cli/usage.js

@@ -26,7 +26,10 @@ ${bold('SPECIFYING URL')}
 		Upload to http://admin:pass@localhost:5988
 
 	--instance <instance-name>
-		Upload to https://admin:<password>@instance-name.medicmobile.org
+		Upload to https://admin:<password>@<instance-name>.medicmobile.org
+
+	--user <user-name> --instance <instance-name>
+		Upload to https://<user-name>:<password>@<instance-name>.medicmobile.org
 
 	--url <url>
 		Upload to URL specified.