Adds support for command packages

README.md

@@ -120,11 +120,14 @@ for more detailed instruction on app definitions.
 #### `command.json`
 
 This file is **optional**. Describes how to install the package's CLI.
-Currently the only supported format is a Python egg.
+Currently the only supported format is a Pip requirements file where each
+element in the array is a line in the requirements file.
 
 ```json
 {
-  "python": "https://pypi.python.org/packages/source/f/foo/foo-1.2.3.tar.gz"
+  "pip": [
+    "https://pypi.python.org/packages/source/f/foo/foo-1.2.3.tar.gz"
+  ]
 }
 ```
 _Sample `command.json`._

hooks/pre-commit

@@ -1,10 +1,10 @@
-#! /bin/bash
+#!/bin/bash
 set -o errexit -o nounset -o pipefail
 
 echo "RUNNING PRE-COMMIT";
 
 GIT_HOOKS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";
-UNIVERSE_DIR=$GIT_HOOKS_DIR/../..
+UNIVERSE_DIR=$GIT_HOOKS_DIR/..
 SCRIPTS_DIR=$UNIVERSE_DIR/scripts
 
 $SCRIPTS_DIR/build.sh

repo/meta/index.json

@@ -1,16 +1,27 @@
 {
   "packages":[
     {
-      "currentVersion":"0.1.0-SNAPSHOT",
-      "description":"Apache Cassandra running on Apache Mesos",
-      "framework":true,
-      "name":"cassandra",
+      "currentVersion":"1.564",
+      "description":"Jenkins is an award-winning application that monitors executions of repeated jobs, such as building a software project or jobs run by cron.",
+      "framework":false,
+      "name":"jenkins",
+      "tags":[],
+      "versions":{
+        "1.564":"0"
+      }
+    },
+    {
+      "currentVersion":"1.3.0-SNAPSHOT",
+      "description":"Spark is a fast and general cluster computing system for Big Data",
+      "framework":false,
+      "name":"spark",
       "tags":[
         "mesosphere",
-        "framework"
+        "framework",
+        "bigdata"
       ],
       "versions":{
-        "0.1.0-SNAPSHOT":"0"
+        "1.3.0-SNAPSHOT":"0"
       }
     },
     {
@@ -27,39 +38,43 @@
       }
     },
     {
-      "currentVersion":"0.1.0",
-      "description":"Hadoop Distributed File System (HDFS), Highly Available",
+      "currentVersion":"0.1.0-SNAPSHOT",
+      "description":"Apache Cassandra running on Apache Mesos",
       "framework":true,
-      "name":"hdfs",
+      "name":"cassandra",
       "tags":[
         "mesosphere",
         "framework"
       ],
       "versions":{
-        "0.1.0":"0"
+        "0.1.0-SNAPSHOT":"0"
       }
     },
     {
-      "currentVersion":"1.564",
-      "description":"Jenkins is an award-winning application that monitors executions of repeated jobs, such as building a software project or jobs run by cron.",
+      "currentVersion":"0.1.0",
+      "description":"Example DCOS application package",
       "framework":false,
-      "name":"jenkins",
-      "tags":[],
+      "name":"helloworld",
+      "tags":[
+        "mesosphere",
+        "example",
+        "subcommand"
+      ],
       "versions":{
-        "1.564":"0"
+        "0.1.0":"0"
       }
     },
     {
-      "currentVersion":"0.8.1",
-      "description":"A cluster-wide init and control system for services in cgroups or Docker containers.",
+      "currentVersion":"0.1.0",
+      "description":"Hadoop Distributed File System (HDFS), Highly Available",
       "framework":true,
-      "name":"marathon",
+      "name":"hdfs",
       "tags":[
         "mesosphere",
         "framework"
       ],
       "versions":{
-        "0.8.1":"0"
+        "0.1.0":"0"
       }
     },
     {
@@ -75,17 +90,16 @@
       }
     },
     {
-      "currentVersion":"1.3.0-SNAPSHOT",
-      "description":"Spark is a fast and general cluster computing system for Big Data",
-      "framework":false,
-      "name":"spark",
+      "currentVersion":"0.8.1",
+      "description":"A cluster-wide init and control system for services in cgroups or Docker containers.",
+      "framework":true,
+      "name":"marathon",
       "tags":[
         "mesosphere",
-        "framework",
-        "bigdata"
+        "framework"
       ],
       "versions":{
-        "1.3.0-SNAPSHOT":"0"
+        "0.8.1":"0"
       }
     }
   ],

repo/meta/schema/command-schema.json

@@ -1,15 +1,20 @@
 {
   "$schema": "http://json-schema.org/schema#",
-  "type": {
-    "oneOf": [
-      {
-        "type": "object",
-        "properties": {
-          "python": {
+  "oneOf": [
+    {
+      "type": "object",
+      "properties": {
+        "pip": {
+          "type": "array",
+          "items": {
             "type": "string"
-          }
+          },
+          "title": "Embedded Requirements File",
+          "description": "An array of strings representing of the requirements file to use for installing the subcommand for Pip. Each item is interpreted as a line in the requirements file."
         }
-      }
-    ]
-  }
+      },
+      "additionalProperties": false,
+      "required": ["pip"]
+    }
+  ]
 }

repo/packages/H/helloworld/0/command.json

@@ -0,0 +1,6 @@
+{
+  "pip": [
+    "http://downloads.mesosphere.io/dcos-cli/{{helloworld/secret}}/dcos-0.1.0-py2.py3-none-any.whl",
+    "git+https://github.com/mesosphere/dcos-helloworld.git#dcos-helloworld=0.1.0"
+  ]
+}

repo/packages/H/helloworld/0/config.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "type": "object",
+  "properties": {
+    "helloworld/secret": {
+      "type": "string",
+      "title": "Install Secret",
+      "description": "The temporary secret needed to download and install the DCOS CLI packages"
+    }
+  },
+  "additionalProperties": false,
+  "required": [ "helloworld/secret" ]
+}

repo/packages/H/helloworld/0/marathon.json

@@ -0,0 +1,14 @@
+{
+  "id": "helloworld",
+  "cpus": 1.0,
+  "mem": 512,
+  "instances": 1,
+  "cmd": "python3 -m http.server 8080",
+  "container": {
+    "type": "DOCKER",
+    "docker": {
+      "image": "python/3.4.3",
+      "network": "HOST"
+    }
+  }
+}

repo/packages/H/helloworld/0/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "helloworld",
+  "version": "0.1.0",
+  "website": "https://github.com/mesosphere/dcos-helloworld",
+  "maintainer": "[email protected]",
+  "description": "Example DCOS application package",
+  "tags": [ "mesosphere", "example", "subcommand" ]
+}