Merge pull request #29 from ember-learn/windows-kill

Use "tree kill" on windows to stop servers

Author: chancancode

README.md

@@ -417,8 +417,6 @@ Options:
 
 Indicates a checkpoint where the following steps are performed:
 
-* `yarn lint:hbs`
-* `yarn lint:js`
 * `yarn test`
 * Optionally, commit the current changes
 * Verify the git tree is clean (i.e. no dirty or untracked files)

src/lib/plugins/run-code-blocks/directives/checkpoint.ts

@@ -28,14 +28,6 @@ export default async function checkpoint(node: Code, options: Options): Promise<
     cwd = join(cwd, args.cwd);
   }
 
-  console.log(`$ yarn lint:hbs`);
-
-  await exec('yarn lint:hbs', { cwd });
-
-  console.log(`$ yarn lint:js`);
-
-  await exec('yarn lint:js', { cwd });
-
   console.log(`$ yarn test`);
 
   await exec('yarn test', { cwd });

src/lib/plugins/run-code-blocks/server.ts

@@ -1,6 +1,8 @@
 import { ChildProcess, spawn } from 'child_process';
 import { Option, assert } from 'ts-std';
 
+const WINDOWS = process.platform === 'win32';
+
 export enum Status {
   Starting = 'STARTING',
   Started = 'STARTED',
@@ -58,7 +60,12 @@ export default class Server {
 
     let { id, cmd, cwd } = this;
 
-    let process = this.process = spawn(cmd, { cwd, shell: true, detached: true });
+    let process = this.process = spawn(cmd, {
+      cwd,
+      shell: true,
+      // On Windows, if we set this to true, the stdio pipes do not work
+      detached: !WINDOWS
+    });
 
     return new Promise<Option<string>>((resolveStart, rejectStart) => {
       let settled = false;
@@ -133,7 +140,8 @@ export default class Server {
 
         let { status } = this;
 
-        if (status === Status.Stopping && (code === 0 || signal === 'SIGTERM')) {
+        // On Windows, we can only forcefully terminate at the moment
+        if (status === Status.Stopping && (WINDOWS || code === 0 || signal === 'SIGTERM')) {
           assert(didComplete !== null, 'didComplete must not be null');
           didComplete!();
         } else {
@@ -204,7 +212,7 @@ ${this.stderr || '(No output)'}
     assert(this.pid !== null, `Unknown pid for server \`${this.id}\``);
 
     this.status = Status.Stopping;
-    process.kill(-this.pid!);
+    this.sendKill();
 
     await this.promise;
   }
@@ -214,7 +222,7 @@ ${this.stderr || '(No output)'}
 
     if (pid) {
       this.status = Status.Stopping;
-      process.kill(-pid, 'SIGKILL');
+      this.sendKill(true);
 
       if (promise) {
         try {
@@ -225,4 +233,17 @@ ${this.stderr || '(No output)'}
       }
     }
   }
+
+  private sendKill(force = false) {
+    assert(this.pid !== null, 'pid cannot be null');
+
+    let pid = this.pid!;
+
+    if (WINDOWS) {
+      // On Windows, we can only forcefully terminate at the moment
+      spawn('taskkill', ['/pid', `${pid}`, '/t', '/f']);
+    } else {
+      process.kill(-pid, force ? 'SIGKILL' : 'SIGTERM');
+    }
+  }
 }

src/markdown/tutorial/part-1/01-orientation.md

@@ -32,9 +32,12 @@ If a version number is shown, you're ready to go.
 
 We can create a new project using Ember CLI's `new` command. It follows the pattern `ember new <project-name>`. In our case, the project name would be `super-rentals`:
 
-```run:command hidden=true
-# Hack: convince ember-cli we are really not in a project. Otherwise, we will get the "You cannot use the new command inside an ember-cli project." error when running `ember new`.
-echo "{}" > package.json
+```run:ignore
+Hack: make an empty package.json to convince ember-cli we are really not in an Ember project. Otherwise, we will get the "You cannot use the new command inside an ember-cli project." error when running `ember new`.
+```
+
+```run:file:create hidden=true filename=package.json
+{}
 ```
 
 ```run:command
@@ -221,7 +224,7 @@ tree super-rentals -a -I "node_modules|.git|yarn.lock|_redirects" --dirsfirst \
     !/package\.json/ { print }'
 
 #[cfg(windows)]
-tree super-rentals /F
+npx --quiet tree-cli --base super-rentals --ignore node_modules --ignore .git --ignore yarn.lock --ignore _redirects --directoryFirst -a -l 99
 ```
 
 We'll learn about the purposes of these files and folders as we go. For now, just know that we'll spend most of our time working within the `app` folder.

src/markdown/tutorial/part-1/07-reusable-components.md

@@ -39,7 +39,7 @@ As its name implies, `config/environment.js` is used to *configure* our app and
 > If you prefer, you can [create different Mapbox access tokens](https://account.mapbox.com/access-tokens/) for use in different environments. At a minimum, the tokens will each need to have the "styles:tiles" scope in order to use Mapbox's static images API.
 
 ```run:command hidden=true cwd=super-rentals
-yarn test
+yarn ember test
 git add config/environment.js
 ```
 
@@ -52,7 +52,7 @@ git add config/environment.js
 ```
 
 ```run:command hidden=true cwd=super-rentals
-yarn test
+yarn ember test
 git add config/environment.js
 ```