Explorar el Código

fix kanso dependenciesto install a specific version

Markus Ochel hace 9 años
padre
commit
1fb6919f5c
Se han modificado 4 ficheros con 99 adiciones y 79 borrados
  1. 56 36
      README.md
  2. 17 17
      admin/kanso.json
  3. 13 13
      site/kanso.json
  4. 13 13
      site/static/css/theme.styl

+ 56 - 36
README.md

@@ -55,7 +55,9 @@ A fresh and ready copy of Kleks' design documents are pushed to a database named
 
 You can replicate using Futon from your CouchDB instance, or use the command line `curl` tool to do so:
 
-    $ curl http://localhost:5984/_replicate -H 'Content-Type: application/json' -d '{ "source": "https://markuso.cloudant.com/kleks_install", "target": "kleks" }'
+```
+$ curl http://localhost:5984/_replicate -H 'Content-Type: application/json' -d '{ "source": "https://markuso.cloudant.com/kleks_install", "target": "kleks" }'
+```
 
 ## VHOSTS are a MUST
 
@@ -71,9 +73,11 @@ Each site has a unique `_id` which should be set as its full domain name. Like `
 
 For example:
 
-    vhosts:
-      kleks.example.local = /kleks/_design/admin/_rewrite"
-      www.example.local   = /kleks/_design/site/_rewrite/render/www.example.com
+```
+vhosts:
+  kleks.example.local = /kleks/_design/admin/_rewrite
+  www.example.local   = /kleks/_design/site/_rewrite/render/www.example.com
+```
 
 If your local CouchDB install is still running on the default port `5984` then you can access the admin app above at `http://kleks.example.local:5984` and so on. I am running my CouchDB on port 80, so I don't need to use the port number.
 
@@ -93,15 +97,19 @@ You can use Cloudant's authentication to login to the admin app. Just make sure
 
 But if you want to create and use a `_users` database to manage access to the admin app, then you must first turn off Cloudant's own security for the Kleks database to manage via `_users`. To do this you need to PUT a JSON document like the following to the `_security` endpoint of the database (for example `https://USERNAME.cloudant.com/DATABASE/_security`):
 
-    {
-      "cloudant": { "nobody": ["_reader","_creator","_writer","_admin"] },
-      "readers": { "names": [], "roles": [] },
-      "admins": { "names": [], "roles": ["admin","manager"] }
-    }
+```
+{
+  "cloudant": { "nobody": ["_reader","_creator","_writer","_admin"] },
+  "readers": { "names": [], "roles": [] },
+  "admins": { "names": [], "roles": ["admin","manager"] }
+}
+```
 
 You can achieve that by using the following: _(be sure to change the USERNAME and DATABASE where needed below)_
 
-    $ curl -X PUT -u USERNAME -p https://USERNAME.cloudant.com/DATABASE/_security -d '{"cloudant":{"nobody":["_reader","_creator","_writer","_admin"]}, "readers": {"names": [], "roles": []}, "admins": {"names": [], "roles": ["admin","manager"]}}'
+```
+$ curl -X PUT -u USERNAME -p https://USERNAME.cloudant.com/DATABASE/_security -d '{"cloudant":{"nobody":["_reader","_creator","_writer","_admin"]}, "readers": {"names": [], "roles": []}, "admins": {"names": [], "roles": ["admin","manager"]}}'
+```
 
 See their own [security documentation](https://cloudant.com/for-developers/faq/auth/) for more details.
 
@@ -114,13 +122,17 @@ The best way to ask a question about deployment, or to report an issue, is to us
 
 You will need to use [Kanso](http://kan.so/) for managing the CouchApp's packages, build, and deployment. It makes it super easy to manage. To [install Kanso](http://kan.so/install), just use NPM as follows given that you have NPM and Node.js already installed:
 
-    $ sudo npm install -g kanso
+```
+$ sudo npm install -g kanso
+```
 
 In Kanso, Node.js is used for the command-line tools only. The end result is a pure CouchApp you can host using CouchDB alone. Learn more at [Kanso](http://kan.so/).
 
 Now download or clone the Kleks git repo. You can always get a copy of the latest master branch by using:
 
-    $ git clone https://github.com/markuso/kleks.git
+```
+$ git clone https://github.com/markuso/kleks.git
+```
 
 That will download and create a folder in your current path named `kleks`. You may change the folder name as you wish.
 
@@ -130,40 +142,48 @@ Kleks has two CouchApps that need to be pushed to your CouchDB. One is `_design/
 
 When you first setup Kleks, begin with installing dependencies for each CouchApp and pushing to your destination as follows: _(assuming your folder is left named `kleks`)_
 
-    $ cd ~/path/to/kleks/admin
-    $ kanso install
-    $ kanso push
+```
+$ cd ~/path/to/kleks/admin
+$ kanso install
+$ kanso push
 
-    $ cd ~/path/to/kleks/site
-    $ kanso install
-    $ kanso push
+$ cd ~/path/to/kleks/site
+$ kanso install
+$ kanso push
+```
 
-Once a `.kansorc` file is created (see below) with a production config setting named `live` then we can deploy to prodcution using:
+Once a `.kansorc` file is created (see below) with a production config setting named `live` then we can deploy to production using:
 
-    $ cd ~/path/to/kleks/admin
-    $ kanso push live
+```
+$ cd ~/path/to/kleks/admin
+$ kanso push live
 
-    $ cd ~/path/to/kleks/site
-    $ kanso push live
+$ cd ~/path/to/kleks/site
+$ kanso push live
+```
 
-Or you can even push to any arbitrary distination if you like:
+Or you can even push to any arbitrary destination if you like:
 
-    $ kanso push http://your-couch-server.com/dbname
+```
+$ kanso push http://your-couch-server.com/dbname
+```
 
 ### Example `.kansorc` File
 
 You should create a `.kansorc` like the example below. The example assumes your database is name `kleks` but it could be anything you want, and for your live database it assumes you are hosting it on [Cloudant](http://cloudant.com). Be sure to modify by providing your information instead. This file should stay private and is ignored in `.gitignore` so to not commit it to Git.
 
-    exports.env = {
-      'default': {
-        db: 'http://user:password@localhost:5984/kleks'
-      },
-      'live': {
-        db: 'https://user:password@USERNAME.cloudant.com/kleks',
-        baseURL: '/.',
-        minify: true
-      }
-    };
+```
+exports.env = {
+  'default': {
+    db: 'http://user:password@localhost:5984/kleks'
+  },
+  'live': {
+    db: 'https://user:password@USERNAME.cloudant.com/kleks',
+    baseURL: '/.',
+    minify: true
+  }
+};
+```
 
 Please note that the `baseURL: '/.'` is needed when deploying a Kanso CouchApp to [Cloudant](http://cloudant.com) so file references, like js and css files, can work properly.
 
@@ -178,7 +198,7 @@ There is still more to document in the [wiki](https://github.com/markuso/kleks/w
 The [wiki](https://github.com/markuso/kleks/wiki) will be the next order of focus to create a User Manual essentially.
 
 ## TODO
- 
+
 - Deal with large data sets rendering
 - Write as many tests as possible
 - Documentation of all the features of Kleks

+ 17 - 17
admin/kanso.json

@@ -18,22 +18,22 @@
       "remove_from_attachments": true
   },
   "dependencies": {
-    "modules": null,
-    "settings": null,
-    "attachments": null,
-    "base64": null,
-    "properties": null,
-    "db": null,
-    "coffee-script-precompiler": null,
-    "stylus-precompiler": null,
-    "duality": null,
-    "handlebars": null,
-    "handlebars-helpers": null,
-    "duality-handlebars": null,
-    "showdown": null,
-    "jquery": null,
-    "spine": null,
-    "underscore": null
+    "modules": "0.0.13",
+    "settings": "0.0.12",
+    "attachments": "0.0.10",
+    "base64": "0.0.1",
+    "properties": "0.0.12",
+    "db": "0.1.0",
+    "coffee-script-precompiler": "1.3.1-kanso.1",
+    "stylus-precompiler": "0.26.0-kanso.3",
+    "duality": "0.0.18",
+    "handlebars": "1.0.2",
+    "handlebars-helpers": "0.0.5",
+    "duality-handlebars": "0.0.2",
+    "showdown": "0.0.2",
+    "jquery": "1.9.1-kanso.2",
+    "spine": "1.0.6-kanso.4",
+    "underscore": "1.3.3"
   },
 
   "app": {
@@ -42,4 +42,4 @@
     "themes": ["default","blue","green","brown","chocolate","teal","aqua","purple","red"],
     "content_types": ["essay","scene","video","profile"]
   }
-}
+}

+ 13 - 13
site/kanso.json

@@ -18,19 +18,19 @@
       "remove_from_attachments": true
   },
   "dependencies": {
-    "modules": null,
-    "settings": null,
-    "attachments": null,
-    "properties": null,
-    "db": null,
-    "coffee-script-precompiler": null,
-    "stylus-precompiler": null,
-    "duality": null,
-    "handlebars": null,
-    "handlebars-helpers": null,
-    "duality-handlebars": null,
-    "showdown": null,
-    "jquery": null
+    "modules": "0.0.13",
+    "settings": "0.0.12",
+    "attachments": "0.0.10",
+    "properties": "0.0.12",
+    "db": "0.1.0",
+    "coffee-script-precompiler": "1.3.1-kanso.1",
+    "stylus-precompiler": "0.26.0-kanso.3",
+    "duality": "0.0.18",
+    "handlebars": "1.0.2",
+    "handlebars-helpers": "0.0.5",
+    "duality-handlebars": "0.0.2",
+    "showdown": "0.0.2",
+    "jquery": "1.9.1-kanso.2"
   },
 
   "app": {

+ 13 - 13
site/static/css/theme.styl

@@ -151,7 +151,7 @@
 
       &.search-box
         padding: 10px
-        
+
         input
           border: 0
           padding: 5px 10px
@@ -162,7 +162,7 @@
 .toc-nav
 .collection-nav
   $iconRight = 80px
-  
+
   // Let's make it hidden by default
   display: none
   right: $iconRight
@@ -288,13 +288,13 @@ article
     margin: 0 0.8em
 
   p
-    
+
     &.center
       text-align: center
 
     &.right
       text-align: right
-  
+
   &.view
     a
       font-weight: $boldFont
@@ -327,7 +327,7 @@ article
     img
       display: block
       width: 100%
-    
+
     .shade
       position: absolute
       top: -10px
@@ -425,8 +425,8 @@ article
 
   .sponsor
     float: right
-    width: 300px
-    max-width: 300px
+    width: 336px
+    max-width: 336px
     margin: 0.4em 0 1em 1em
     text-align: center
     background: lighten($faintGrey, 3%)
@@ -446,7 +446,7 @@ article
     .name
       font-size: 1.125em
       padding: 1em
-    
+
     .content
       padding: 0 1em 1em 1em
       overflow: hidden
@@ -490,7 +490,7 @@ article
 
             &.fresh-true
               // color: $textColor
-      
+
       .date
         display: none
         float: right
@@ -521,7 +521,7 @@ article.home
       font-size: 1.5em
       text-align: center
       text-transform: uppercase
-    
+
     > ul
       list-style-type: none
       margin: 0
@@ -542,7 +542,7 @@ article.home
           a
             display: block
             padding: 1em
-            
+
             .icon
               float: right
               margin-left: 0.3em
@@ -633,7 +633,7 @@ footer
     .copyright
       font-size: 0.8em
       line-height: 1.5em
-      
+
       a
         font-weight: $boldFont
         color: #999
@@ -682,7 +682,7 @@ footer
             margin-left: -1.5em
             margin-right: 0.5em
             color: $lightGrey
-      
+
       .meta
         font-size: 0.875em
         > a