Merge remote-tracking branch 'jared/master'

Conflicts:
	worker.js

Author: Niall O'Higgins

.gitignore

@@ -12,4 +12,5 @@ logs
 results
 
 node_modules
-npm-debug.log
+npm-debug.log
+*.pyc

config/config.html

@@ -0,0 +1,12 @@
+<select ng-model="config.test">
+  <option value="py.test">py.test</option>
+  <option value="make test">make test</option>
+  <option value="./setup.py test">./setup.py test</option>
+  <option value="none">No test command</option>
+</select>
+<p class="help-text">
+  Select which command should be used to test your
+  project. Alternatively, select "none" if you are going to test using
+  some other plugin.
+</p>
+<button class="btn btn-primary" ng-click="save()">Save</button>

package.json

@@ -13,6 +13,15 @@
     "strider",
     "python"
   ],
+  "strider": {
+    "type": "job",
+    "id": "python",
+    "title": "Python",
+    "webapp": "webapp.js",
+    "worker":"worker.js",
+    "icon": "icon.png",
+    "config": true
+  },
   "author": "Niall O'Higgins",
   "license": "BSD",
   "dependencies": {

static/icon.png

@@ -0,0 +1,16 @@
+
+module.exports = {
+  config: {
+    /* we don't support this yet
+    runtime: {
+      type: String,
+      enum: ['2.6', '2.7', '3.3', 'whatever']
+    },
+    */
+    test: {
+      type: String,
+      enum: ['none', 'py.test', './setup.py test', 'make test'],
+      default: 'py.test'
+    }
+  }
+}

static/python-powered-w.svg

@@ -1,49 +1,29 @@
 var detect = require('strider-detection-rules')
+var fs = require('fs')
 var path = require('path')
 
-// We include a copy of the virtualenv script
-var VIRTUAL_ENV_PY = path.join(__dirname, "thirdparty", "virtualenv.py")
-// Virtual environment will be under this directory name in the project dir
-var VIRTUAL_ENV_DIR = "venv"
-// Command to create the virtual env
-var VIRTUAL_ENV_CMD = "python " + VIRTUAL_ENV_PY + " " + VIRTUAL_ENV_DIR
-var VIRTUAL_PYTHON = path.join(VIRTUAL_ENV_DIR, "bin", "python")
-var VIRTUAL_PIP = path.join(VIRTUAL_ENV_DIR, "bin", "pip")
-var CREATE_VIRTUAL_ENV = VIRTUAL_ENV_CMD + " && " + VIRTUAL_PIP + " install -r requirements.txt"
-
-var RULES = [{
-  filename:"manage.py",
-  grep:/django/i,
-  language:"python",
-  framework:"django",
-  prepare:CREATE_VIRTUAL_ENV,
-  test:VIRTUAL_PYTHON + " manage.py test",
-}, {
-  filename:"setup.py",
-  exists:true,
-  language:"python",
-  framework:null,
-  prepare:CREATE_VIRTUAL_ENV,
-  test:VIRTUAL_PYTHON + " setup.py test",
-}]
-
-
-module.exports = function(ctx, cb) {
-
-  function doTest(ctx , cb){
-    detect(RULES, "test", ctx, cb)
+module.exports = {
+  init: function (config, job, context, done) {
+    var venvDir = path.join(context.baseDir, '.venv')
+    done(null, {
+      path: [path.join(__dirname, 'thirdparty'),
+             path.join(venvDir, 'bin')],
+      environment: 'virtualenv.py ' + venvDir,
+      prepare: function (context, done) {
+        if (fs.existsSync(path.join(context.dataDir, 'requirements.txt'))) {
+          return context.cmd('pip install -r requirements.txt', function (err) {
+            done(err, true)
+          })
+        }
+        done(null, false)
+      },
+      test: (config && config.test !== 'none') ? config.test : undefined
+    })
+  },
+  autodetect: {
+    filename: 'requirements.txt',
+    exists: true,
+    language: 'python',
+    framework: null
   }
-
-  function doPrepare(ctx, cb) {
-    detect(RULES, "prepare", ctx, cb)
-  }
-
-  ctx.addBuildHook({
-    test: doTest,
-    prepare: doPrepare,
-  })
-
-  console.log("strider-python extension loaded")
-  cb(null, null)
-
 }