Added Docker push postpublish script

.dockerignore

@@ -0,0 +1,42 @@
+# PLATFORM
+# ========
+# All exclusions that are specific to the NPM, GIT, IDE and Operating Systems.
+
+# - Do not allow installed node modules to be committed. Doing `npm install -d` will bring them in root or other places.
+node_modules
+
+# - Do not commit any log file from anywhere
+*.log
+*.log.*
+
+# - Prevent addition of OS specific file explorer files
+Thumbs.db
+.DS_Store
+
+# Prevent IDE stuff
+.idea
+.vscode
+
+# PROJECT
+# =======
+# Configuration pertaining to project specific repository structure.
+
+# - Prevent Sublime text IDE files from being commited to repository
+*.sublime-*
+
+# - Allow sublime text project file to be commited in the development directory.
+!/develop/*.sublime-project
+
+# - Prevent CI output files from being Added
+/out/
+/newman/
+
+# - Prevent diff backups from SourceTree from showing as commit.
+*.BACKUP.*
+*.BASE.*
+*.LOCAL.*
+*.REMOTE.*
+*.orig
+
+# Prevent unit test coverage reports from being added
+.coverage

docker/images/alpine33/Dockerfile

@@ -0,0 +1,40 @@
+FROM alpine:3.3
+MAINTAINER Postman Labs <help@getpostman.com>
+
+ARG newman_version
+# Bail out early if NODE_VERSION is not provided
+RUN if [ ! $(echo $newman_version | grep -oE "^[0-9]+\.[0-9]+\.[0-9]+$") ]; then \
+        echo "\033[0;31mA valid semver Newman version is required in the newman_version build-arg\033[0m"; \
+        exit 1; \
+    fi
+
+# Can't upgrade to node v8 because it isn't supported in alpine 3.3
+ENV NODE_VERSION 4.3.2
+
+# Install node
+RUN echo -e "http://nl.alpinelinux.org/alpine/v3.3/main\nhttp://nl.alpinelinux.org/alpine/v3.3/community" > /etc/apk/repositories && \
+    apk add --update nodejs=${NODE_VERSION}-r1;
+
+# Set environment variables
+ENV LC_ALL="en_US.UTF-8" LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8" NEWMAN_VERSION=$newman_version
+
+# Install newman
+RUN npm install -g newman@${NEWMAN_VERSION};
+
+# Set workdir to /etc/newman
+# When running the image, mount the directory containing your collection to this location
+#
+# docker run -v <path to collections directory>:/etc/newman ...
+#
+# In case you mount your collections directory to a different location, you will need to give absolute paths to any
+# collection, environment files you want to pass to newman, and if you want newman reports to be saved to your disk.
+# Or you can change the workdir by using the -w or --workdir flag
+WORKDIR /etc/newman
+
+# Set newman as the default container command
+# Now you can run the container via
+#
+# docker run -v /home/collections:/etc/newman -t postman/newman_alpine33 -c YourCollection.json.postman_collection \
+#                                                                        -e YourEnvironment.postman_environment \
+#                                                                        -H newman_report.html
+ENTRYPOINT ["newman"]

docker/images/alpine33/README.md

@@ -0,0 +1,38 @@
+# newman_alpine33
+
+This image runs newman on node 4.3.2 on Alpine 3.3
+
+Build the image:
+
+```terminal
+docker build -t postman/newman_alpine33 .
+```
+
+Or get it from [Docker Hub](https://registry.hub.docker.com/u/postman/newman_alpine33/):
+
+```terminal
+docker pull postman/newman_alpine33
+```
+
+Then run it:
+
+```terminal
+docker --volume="/home/postman/collections:/etc/newman" -t postman/newman_alpine33 --collection="JSONBlobCoreAPI.json.postman_collection" --html="newman-report.html"
+```
+For newman-docker to be able to use collections and environment files saved on the host machine, and to save reports generated by newman, a directory containing the collection and environment needs to be mounted on to the docker instance on run time, preferably at `/etc/newman`, which is the default working directory. If you mount to a different location, then:
+  - You can pass the full path to your collection and environment files to newman. For instance, if you mount to `/var/newman`,
+
+```terminal
+docker --volume="/home/postman/collection:/var/newman" -t postman/newman_alpine33 --collection="/var/newman/JSONBlobCoreAPI.json.postman_collection" --html="/var/newman/newman-report.html"
+```
+  - You can change the working directory while running the image to the location you mounted to, using the `-w` or `--workdir` flag.
+
+```terminal
+docker run --volume="/home/postman/collections:/var/newman" --workdir="/var/newman" -t postman/newman_alpine33 --collection="JSONBlobCoreAPI.json.postman_collection" --html="newman-report.html"
+```
+
+In case you don't need to save newman's report to the host, and your collection is available online and does not require any environment, then you can forgo mounting your collections directory and directly pass the collection URL to newman:
+
+```terminal
+docker run -t postman/newman_alpine33 --url="https://www.getpostman.com/collections/8a0c9bc08f062d12dcda"
+```

docker/images/ubuntu1404/Dockerfile

@@ -0,0 +1,40 @@
+FROM ubuntu:14.04.2
+MAINTAINER Postman Labs <help@getpostman.com>
+
+ARG newman_version
+# Bail out early if NODE_VERSION is not provided
+RUN if [ ! $(echo $newman_version | grep -oE "^[0-9]+\.[0-9]+\.[0-9]+$") ]; then \
+        echo "\033[0;31mA valid semver Newman version is required in the newman_version build-arg\033[0m"; \
+        exit 1; \
+    fi
+
+# Set node version
+ENV NODE_VERSION 8
+
+# Install node
+ADD https://deb.nodesource.com/setup_$NODE_VERSION.x /opt/install_node.sh
+RUN bash /opt/install_node.sh && apt-get install -y nodejs
+
+# Set environment variables
+ENV LC_ALL="en_US.UTF-8" LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8" NEWMAN_VERSION=$newman_version
+
+# Install newman
+RUN npm install -g newman@${NEWMAN_VERSION};
+
+# Set workdir to /etc/newman
+# When running the image, mount the directory containing your collection to this location
+#
+# docker run -v <path to collections directory>:/etc/newman ...
+#
+# In case you mount your collections directory to a different location, you will need to give absolute paths to any
+# collection, environment files you want to pass to newman, and if you want newman reports to be saved to your disk.
+# Or you can change the workdir by using the -w or --workdir flag
+WORKDIR /etc/newman
+
+# Set newman as the default container command
+# Now you can run the container via
+#
+# docker run -v /home/collections:/etc/newman -t postman/newman_ubuntu1404 -c YourCollection.json.postman_collection \
+#                                                                          -e YourEnvironment.postman_environment \
+#                                                                          -H newman_report.html
+ENTRYPOINT ["newman"]

docker/images/ubuntu1404/README.md

@@ -0,0 +1,38 @@
+# newman_ubuntu1404
+
+This image runs newman on node v8 on Ubuntu 14.04.2
+
+Build the image,
+
+```terminal
+docker build -t postman/newman_ubuntu1404 .
+```
+
+Or get it from [docker hub](https://registry.hub.docker.com/u/postman/newman_ubuntu1404/)
+
+```terminal
+docker pull postman/newman_ubuntu1404
+```
+
+then run it
+
+```terminal
+docker --volume="/home/postman/collections:/etc/newman" -t postman/newman_ubuntu1404 --collection="JSONBlobCoreAPI.json.postman_collection" --html="newman-report.html"
+```
+For newman-docker to be able to use collections and environment files saved on the host machine, and to save reports generated by newman, a directory containing the collection and environment needs to be mounted on to the docker instance on run time, preferably at `/etc/newman`, which is the default working directory. If you mount to a different location, then
+  - You can either pass the full path to your collection and environment files to newman. For instance, if you mount to `/var/newman`,
+
+```terminal
+docker --volume="/home/postman/collection:/var/newman" -t postman/newman_ubuntu1404 --collection="/var/newman/JSONBlobCoreAPI.json.postman_collection" --html="/var/newman/newman-report.html"
+```
+  - You can change the working directory while running the image to the location you mounted to, using the `-w` or `--workdir` flag.
+
+```terminal
+docker run --volume="/home/postman/collections:/var/newman" --workdir="/var/newman" -t postman/newman_ubuntu1404 --collection="JSONBlobCoreAPI.json.postman_collection" --html="newman-report.html"
+```
+
+In case you don't need to save newmans report to the host, and your collection is available online and it does not require any environment, then you can forgo mounting your collections directory, and directly pass the collection url to newman
+
+```terminal
+docker run -t postman/newman_ubuntu1404 --url="https://www.getpostman.com/collections/8a0c9bc08f062d12dcda"
+```

npm/postpublish.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# Bail out on the first error
+set -e;
+
+BLUE='\033[0;34m';
+NO_COLOUR='\033[0m';
+DOCKER_USER="postman";
+TAG=$npm_package_version;
+IMAGES_BASE_PATH="./docker/images";
+
+# It's good to be paranoid
+[[ -z "$TAG" ]] && TAG=$(jq -r ".version" < package.json);
+
+function build_docker_image {
+    local TAG="$2";
+    local BASENAME=$(basename $1);
+    local IMAGE_NAME="newman_$BASENAME";
+
+    echo "";
+    echo -e "$BLUE Building docker image for $DOCKER_USER/$IMAGE_NAME:$TAG, latest $NO_COLOUR";
+    docker build \
+        -t "$DOCKER_USER/$IMAGE_NAME:$TAG" -t "$DOCKER_USER/$IMAGE_NAME:latest" \
+        --no-cache --force-rm --file="docker/images/$BASENAME/Dockerfile" --build-arg newman_version="$TAG" .;
+
+    echo -e "$BLUE Running docker image test for $DOCKER_USER/$IMAGE_NAME:$TAG, latest $NO_COLOUR";
+    docker run -v "$PWD/examples:/etc/newman" -t "$DOCKER_USER/$IMAGE_NAME:$TAG" run "sample-collection.json";
+
+    # prepare current images for pushing
+    docker tag $DOCKER_USER/$IMAGE_NAME:$TAG $DOCKER_USER/$IMAGE_NAME:$TAG;
+    docker tag $DOCKER_USER/$IMAGE_NAME:latest $DOCKER_USER/$IMAGE_NAME:latest;
+
+    echo -e "$BLUE Pushing docker image for $DOCKER_USER/$IMAGE_NAME:$TAG, latest $NO_COLOUR";
+    docker push $DOCKER_USER/$IMAGE_NAME:$TAG;
+    docker push $DOCKER_USER/$IMAGE_NAME:latest;
+}
+
+for image in $IMAGES_BASE_PATH/*; do
+    build_docker_image ${image} ${TAG};
+done

package.json

@@ -33,6 +33,7 @@
     "build-docs": "node npm/build-docs.js",
     "build-wiki": "node npm/build-wiki.js",
     "publish-docs": "node npm/publish-docs.js",
+    "postpublish": "./npm/postpublish.sh",
     "publish-wiki": "node npm/publish-wiki.js"
   },
   "author": "Postman Labs <help@getpostman.com> (=)",

test/system/repository.test.js

@@ -2,7 +2,9 @@
  * @fileOverview This test specs runs tests on the package.json file of repository. It has a set of strict tests on the
  * content of the file as well. Any change to package.json must be accompanied by valid test case in this spec-sheet.
  */
-var _ = require('lodash'),
+var path = require('path'),
+
+    _ = require('lodash'),
     expect = require('expect.js'),
     parseIgnore = require('parse-gitignore');
 
@@ -73,19 +75,36 @@ describe('project repository', function () {
 
         describe('script definitions', function () {
             it('files must exist', function () {
-                var scriptRegex = /^node\snpm\/.+\.js$/;
-
                 expect(json.scripts).to.be.ok();
                 json.scripts && Object.keys(json.scripts).forEach(function (scriptName) {
-                    expect(scriptRegex.test(json.scripts[scriptName])).to.be.ok();
-                    expect(fs.statSync('npm/' + scriptName + '.js')).to.be.ok();
+                    var name = json.scripts[scriptName];
+                    name = name.replace(/^(node\s|\.\/)/, '');
+                    fs.stat(name, function (err) {
+                        var fileDetails = path.parse(name);
+                        expect(err).to.equal(null);
+                        expect(fileDetails.ext).to.match(/^\.(sh|js)$/);
+                    });
                 });
             });
 
             it('must have the hashbang defined', function () {
+                expect(json.scripts).to.be.ok();
                 json.scripts && Object.keys(json.scripts).forEach(function (scriptName) {
-                    var fileContent = fs.readFileSync('npm/' + scriptName + '.js').toString();
-                    expect(/^#!\/(bin\/bash|usr\/bin\/env\snode)[\r\n][\W\w]*$/g.test(fileContent)).to.be.ok();
+                    var fileDetails,
+                        name = json.scripts[scriptName].replace(/^(node\s|\.\/)/, '');
+
+                    fileDetails = path.parse(name);
+                    expect(fileDetails.ext).to.match(/^\.(sh|js)$/);
+
+                    fs.readFile(name, function (error, content) {
+                        expect(error).to.equal(null);
+                        if (fileDetails.ext === '.sh') {
+                            expect(/^#!\/bin\/bash[\r\n][\W\w]*$/g.test(content)).to.be.ok();
+                        }
+                        else {
+                            expect(/^#!\/usr\/bin\/env\snode[\r\n][\W\w]*$/g.test(content)).to.be.ok();
+                        }
+                    });
                 });
             });
         });