Merge branch 'master' into docker

.gitignore

@@ -3,4 +3,5 @@ building_scripts/
 node_modules
 build
 npm-debug.log
-.env
+.env
+.idea/

schemas/Arg.js

@@ -8,7 +8,7 @@ const Arg = Joi.object({
     insertValue: Joi.string().allow(''),
     description: Joi.string().optional().allow(''),
     icon: Joi.string(),
-    suggestions: Joi.array().items(Suggestion),
+    suggestions: Joi.alternatives().try(Joi.array().items(Joi.string()), Joi.array().items(Suggestion)),
     template: Joi.alternatives().try(Joi.string().valid("filepaths", "folders"), Joi.array().items(Joi.string().valid("filepaths", "folders"))),
     generators: Joi.alternatives().try(Generator, Joi.array().items(Generator)),
     generator: Joi.alternatives().try(Generator),

specs/brew.js

@@ -24,6 +24,7 @@ var completionSpec = {
         { name: "update", description: "Fetch the newest version of Homebrew and all formulae" },
         { name: "upgrade", description: "Upgrade outdated casks and outdated" },
         { name: "search", description: "Perform a substring search of cask tokens and formula names" },
+        { name: "config", description: "Show Homebrew and system configuration info" },
         {
             name: "install",
             description: "Install <formula>",

specs/docker.js

@@ -14,26 +14,26 @@ var postProcessDockerPs = (out) => {
 }
 
 var generators = {
-    runningDockerContainers: {
-        script: `docker ps --format '{{ json . }}'`,
-        postProcess: postProcessDockerPs
-    },
-    allDockerContainers: {
-        script: `docker ps -a --format '{{ json . }}'`,
-        postProcess: postProcessDockerPs
-    },
+  runningDockerContainers: {
+    script: `docker ps --format '{{ json . }}'`,
+    postProcess: postProcessDockerPs
+  },
+  allDockerContainers: {
+    script: `docker ps -a --format '{{ json . }}'`,
+    postProcess: postProcessDockerPs
+  },
 	pausedDockerContainers: {
 		script: `docker ps --filter status=paused --format '{{ json . }}'`,
 		postProcess: postProcessDockerPs
 	},
 	allLocalImages: {
 		script: `docker image ls --format '{{ json . }}'`,
 		postProcess: function (out) {
-            let allLines = out.split('\n').map(JSON.parse);
-            return allLines.map(i => ({
-                name: `${i.Repository}`,
-            }));
-        }
+      let allLines = out.split('\n').map(JSON.parse);
+      return allLines.map(i => ({
+          name: `${i.Repository}`,
+      }));
+    }
 	}
 };
 
@@ -2473,5 +2473,4 @@ var completionSpec = {
 			subcommands: []
 		}
     ]
-
 }