Merge branch 'master' into data-bindings-293

donejs · Sep 21, 2017 · 425d0d0 · 425d0d0
2 parents 227b072 + 152f679
commit 425d0d0
Show file tree

Hide file tree

Showing 14 changed files with 69 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
-sudo: false
+sudo: required
 language: node_js
-dist: precise
+dist: trusty
 addons:
   firefox: "51.0"
 before_install:
@@ -22,6 +22,7 @@ notifications:
     on_success: change
     on_failure: change
 script:
+  - sudo sh -c 'dbus-uuidgen > /etc/machine-id'
   - npm run jshint
   - npm run document
   - npm run test-guides

diff --git a/docs/guides/bitballs.md b/docs/guides/bitballs.md
@@ -1,5 +1,5 @@
 @page bitballs Example: Bitballs
-@parent DoneJS
+@parent Guides
 @hide sidebar
 @outline 2 ol
 @description

diff --git a/docs/guides/contributing.md b/docs/guides/contributing.md
@@ -1,5 +1,5 @@
 @page contributing Contributing
-@parent DoneJS
+@parent Guides
 @hide sidebar
 @outline 2 ol
 

diff --git a/docs/guides/generator.md b/docs/guides/generator.md
@@ -1,5 +1,5 @@
 @page generator Creating a generator
-@parent DoneJS
+@parent Guides
 @hide sidebar
 @outline 2 ol
 @description Generators add additional functionality to DoneJS applications. In this guide, we’ll create a generator that adds JSHint and a `.editorconfig` file to a DoneJS application.
@@ -169,14 +169,14 @@ Our generator needs to ask if we want to use spaces or tabs and then copy the `.
         this.pkg = this.fs.readJSON(
           this.destinationPath('package.json'), {}
         );
-        
+
         // Maintain a list of all files we want to copy over
         this.files = [
           '.editorconfig',
           '.jshintrc'
         ];
       },
-      
+
       prompting: function () {
         var done = this.async();
 
@@ -202,30 +202,30 @@ Our generator needs to ask if we want to use spaces or tabs and then copy the `.
           done();
         }.bind(this));
       },
-      
+
       writing: function () {
         var pkg = this.pkg;
-        
+
         // Update `package.json` with the `jshint` command
         // and update the `test` script
         pkg.scripts = _.extend(pkg.scripts, {
-          test: 'npm run jshint && ' + 
+          test: 'npm run jshint && ' +
             _.get(pkg, 'scripts.test',
               'echo "No tests specified"'),
-          jshint: 'jshint ' + 
+          jshint: 'jshint ' +
             _.get(pkg, 'system.directories.lib',
-              'src') + 
+              'src') +
             '/. --config'
         });
-        
+
         // Write to `package.json` and format accordingly
         // This will prompt you to overwrite
         var indent = this.props.index === 'tab' ? '\t' : '  ';
         this.fs.writeJSON('package.json', pkg, null, indent);
 
         // Install jshint as a development dependency
         this.npmInstall([ 'jshint' ], { saveDev: true});
-        
+
         // Got through every file and copy it
         this.files.forEach(function(file) {
           this.fs.copyTpl(
@@ -295,15 +295,15 @@ Yeoman also comes with some tools for [testing generators](http://yeoman.io/auth
         assert.fileContent('.jshintrc',
           /"latedef": "nofunc"/);
       });
-      
+
       // Verify that `.editorconfig` got written
       // with `indent_style` set to our selection
       it('.editorconfig with indent_style', function() {
         assert.file(['.editorconfig']);
         assert.fileContent('.editorconfig',
           /indent_style = tab/);
       });
-      
+
       // Make sure that `package.json` got updated
       // with the `jshint` npm script
       it('update package.json', function() {

diff --git a/docs/guides/guide.md b/docs/guides/guide.md
@@ -1,5 +1,5 @@
 @page Guide Quick start guide
-@parent DoneJS
+@parent Guides
 @hide sidebar
 @outline 2 ol
 @description In this guide, we will create [chat.donejs.com](https://chat.donejs.com), a small real-time chat application with a homepage showing a tabs widget and a messages page that lets us send and receive messages in real-time:

diff --git a/docs/guides/migrate-1.md b/docs/guides/migrate-1.md
@@ -1,5 +1,5 @@
 @page migrate-1 Migrating to DoneJS 1
-@parent DoneJS
+@parent Guides
 @hide sidebar
 @outline 2 ol
 @description This guide walks you through the step-by-step process of upgrading a DoneJS 0.9 app to DoneJS 1.

diff --git a/docs/guides/place-my-order.md b/docs/guides/place-my-order.md
@@ -1,5 +1,5 @@
 @page place-my-order In-depth guide
-@parent DoneJS
+@parent Guides
 @hide sidebar
 @outline 2 ol
 @description In this guide you will learn about all of [DoneJS' features](./Features.html) by creating, testing, documenting, building and deploying [place-my-order.com](http://place-my-order.com), a restaurant menu and ordering application. The final result will look like this:

diff --git a/docs/guides/plugin.md b/docs/guides/plugin.md
@@ -1,5 +1,5 @@
 @page plugin Creating a plugin
-@parent DoneJS
+@parent Guides
 @hide sidebar
 @outline 2 ol
 @description DoneJS doesn't just make it easy to build high performance, real-time web and mobile applications. It can also be used to create reusable plugins that can be shared across different applications. In this guide we will create a reusable number input widget using [Bootstrap](http://getbootstrap.com) styles.

diff --git a/docs/guides/presentations.md b/docs/guides/presentations.md
@@ -1,5 +1,5 @@
 @page presentations Presentations
-@parent DoneJS
+@parent contributing
 @hide sidebar
 @outline 1 ol
 

diff --git a/docs/guides/setting-up.md b/docs/guides/setting-up.md
@@ -1,5 +1,5 @@
 @page SettingUp Setting Up DoneJS
-@parent DoneJS
+@parent Guides
 @hide sidebar
 @outline 2 ol
 @description This page contains information on setting up DoneJS. It will walk you through getting prerequisites needed before you ever

diff --git a/docs/ru/setting-up-ru.md b/docs/ru/setting-up-ru.md
@@ -1,8 +1,8 @@
 @page SettingUp-ru Setting Up DoneJS
-@parent DoneJS
+@parent Guides
 @hide sidebar
 @outline 2 ol
-@description На этой странице содержится информация о настройке DoneJS. Вы настроите все необходимые зависимости перед установкой DoneJS, эта информация не содержится в быстром старте или более подробном гайде. 
+@description На этой странице содержится информация о настройке DoneJS. Вы настроите все необходимые зависимости перед установкой DoneJS, эта информация не содержится в быстром старте или более подробном гайде.
 
 DoneJS официально поддерживает:
 

diff --git a/docs/survey.md b/docs/survey.md
@@ -0,0 +1,41 @@
+@page survey Community Survey
+@parent DoneJS
+@hide sidebar
+
+@description Help us improve CanJS, StealJS, and the rest of the DoneJS family
+by taking a short email survey every six weeks.
+
+@body
+
+__We want to hear from you.__ What do you love and hate about CanJS, DoneJS, and
+StealJS? What can the core team work on to make you grow fonder of these
+projects?
+
+<script charset="utf-8" type="text/javascript" src="//js.hsforms.net/forms/v2.js"></script>
+<script>
+  hbspt.forms.create({
+    css: '',
+    portalId: '2171535',
+    formId: '45da8caa-c096-4099-a444-450f5c303ba0'
+  });
+</script>
+
+Provide your email address (and optionally your GitHub username) above and
+you’ll be signed up for our survey:
+
+- You’ll receive an email about
+[every six weeks](https://calendar.google.com/calendar/embed?src=jupiterjs.com_g27vck36nifbnqrgkctkoanqb4%40group.calendar.google.com)
+with a link to the survey.
+- Each survey will be about seven questions and take just a few minutes to complete.
+- An opt-out/unsubscribe link will be included in each email.
+
+We will look at every single response and use it to prioritize what the team
+works on in the coming months. Short of [hiring us](https://www.bitovi.com/contact)
+to work on something in particular, __this is the best way to have a direct impact
+on our priorities.__
+
+[Read more about the survey in our announcement blog post.](https://www.bitovi.com/blog/help-us-improve-canjs-stealjs-and-the-rest-of-the-donejs-family)
+If you have any questions, please don’t hesitate to ask on
+[our forums](https://forums.donejs.com/),
+[Gitter](https://gitter.im/donejs/donejs), or
+[Twitter](https://twitter.com/donejs)
diff --git a/guides/place-my-order/test.js b/guides/place-my-order/test.js
@@ -263,7 +263,7 @@ guide.step("Create a test", function(){
 													 join(__dirname, "steps", "create-test", "restaurants.js"));
 		})
 		.then(function(){
-			return guide.replaceFile(join("src", "models", "restaurants.js"),
+			return guide.replaceFile(join("src", "models", "restaurant.js"),
 													 join(__dirname, "steps", "create-test", "restaurants_model.js"));
 		})
 		.then(function(){

diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "coveralls-send": "0.0.2",
     "dotdotdot": "^1.7.0",
     "es6-promise": "^4.1.0",
-    "guide-automation": "^0.3.4",
+    "guide-automation": "^0.3.11",
     "is-appveyor": "^1.0.0",
     "istanbul": "^0.4.2",
     "jshint": "^2.8.0",
@@ -77,7 +77,7 @@
       "bit-docs-html-highlight-line": "^0.2.2",
       "bit-docs-tag-demo": "^0.3.0",
       "bit-docs-html-toc": "^0.6.2",
-      "bit-docs-donejs-theme": "^1.1.0"
+      "bit-docs-donejs-theme": "^1.2.1"
     },
     "glob": {
       "pattern": "docs/**/*.{md,mustache}"