Merge pull request #7 from Houfeng/dev

0.2.7

README.md

@@ -208,4 +208,8 @@ Example:
 
 # 更多内容
 
-请访问 wiki: [https://github.com/Houfeng/cize/wiki](https://github.com/Houfeng/cize/wiki)
+请访问 wiki: [https://github.com/Houfeng/cize/wiki](https://github.com/Houfeng/cize/wiki)
+
+# 路线图
+- 所有 Job 都在单儿独立在一个进程中执行（现在可能会有 n 个 job 共用一个主进程）
+- 集成 Docker 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cize",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "dbVersion": "1",
   "description": "Cize 是一个「持续集成」工具",
   "main": "index.js",
@@ -46,7 +46,7 @@
     "md5": "^2.1.0",
     "mkdir-p": "0.0.7",
     "nokit-pjax": "^0.2.0",
-    "nokitjs": "^1.24.5",
+    "nokitjs": "^1.25.1",
     "orm": "^3.1.0",
     "real-utils": "0.0.1",
     "request": "^2.74.0",

web/config.development.yaml

@@ -0,0 +1 @@
+showErrorDetail: true

web/config.yaml

@@ -0,0 +1,39 @@
+handlers:
+  ^/: $./handlers/mvc
+
+filters: 
+  ^/@pjax: ../node_modules/nokit-pjax
+  ^/@auth: ./filters/auth
+
+mvc: 
+  routes: 
+    /auth: 
+      target: ./auth
+      ignoreAuth: true
+    /: ./main
+    /projects/{project}/jobs/{job}/records/{sn:^[0-9]+$}: ./main
+    /projects/{project}/jobs/{job}: ./main
+    /projects/{project}: ./main
+    get /api: ./api
+    post /api/token: ./api token
+    post /api/projects/{project}/jobs/{job}/trigger: ./api trigger
+    get /api/projects: ./api projects
+    get /api/records: ./api serverRecords
+    get /api/projects/{project}: ./api project
+    get /api/projects/{project}/jobs: ./api jobs
+    get /api/projects/{project}/records: ./api projectRecords
+    get /api/projects/{project}/jobs/{job}: ./api job
+    get /api/projects/{project}/jobs/{job}/records: ./api records
+    get /api/projects/{project}/jobs/{job}/records/{sn:^[0-9]+$}: ./api record
+    get /api/projects/{project}/jobs/{job}/records/{sn:^[0-9]+$}/console: ./api console
+    post /api/projects/{project}/jobs/{job}/records/{sn:^[0-9]+$}/rerun: ./api rerun
+
+public: 
+  ^/bootstrap(.*): ../node_modules/bootstrap/dist
+  ^/jquery(.*): ../node_modules/jquery/dist
+  ^/font-awesome(.*): ../node_modules/font-awesome
+  ^/pjax/(.*)$: ../node_modules/nokit-pjax/client
+  ^/js-yaml/(.*)$: ../node_modules/js-yaml/dist
+
+session: 
+  timeout: 7200