Installer: supports windows

installer/mod.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env deno --allow-all
-
+// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 const {
   args,
   env,
@@ -10,13 +10,14 @@ const {
   stdin,
   stat,
   readAll,
-  run,
+  chmod,
   remove
 } = Deno;
 import * as path from "../fs/path.ts";
 
 const encoder = new TextEncoder();
 const decoder = new TextDecoder("utf-8");
+const isWindows = Deno.platform.os === "win";
 
 enum Permission {
   Read,
@@ -89,19 +90,22 @@ function createDirIfNotExists(path: string): void {
 function checkIfExistsInPath(path: string): boolean {
   const { PATH } = env();
 
-  const paths = (PATH as string).split(":");
+  const paths = (PATH as string).split(isWindows ? ";" : ":");
 
   return paths.includes(path);
 }
 
 function getInstallerDir(): string {
-  const { HOME } = env();
+  // In windows's powershell. $HOME environmental variable maybe null. use $HOMEPATH instread.
+  let { HOME, HOMEPATH } = env();
+
+  const HOME_PATH = HOME || HOMEPATH
 
-  if (!HOME) {
+  if (!HOME_PATH) {
     throw new Error("$HOME is not defined.");
   }
 
-  return path.join(HOME, ".deno", "bin");
+  return path.join(HOME_PATH, ".deno", "bin");
 }
 
 // TODO: fetch doesn't handle redirects yet - once it does this function
@@ -140,17 +144,59 @@ async function fetchModule(url: string): Promise<any> {
 function showHelp(): void {
   console.log(`deno installer
   Install remote or local script as executables.
-  
+
 USAGE:
-  deno https://deno.land/std/installer/mod.ts EXE_NAME SCRIPT_URL [FLAGS...]  
+  deno https://deno.land/std/installer/mod.ts EXE_NAME SCRIPT_URL [FLAGS...]
 
 ARGS:
-  EXE_NAME  Name for executable     
+  EXE_NAME  Name for executable
   SCRIPT_URL  Local or remote URL of script to install
   [FLAGS...]  List of flags for script, both Deno permission and script specific flag can be used.
   `);
 }
 
+async function genereateExecutable(
+  filePath: string,
+  commands: string[]
+): Promise<void> {
+  // genereate Batch script
+  if (isWindows) {
+    const template = `% This executable is generated by Deno. Please don't modify it unless you know what it means. %
+@IF EXIST "%~dp0\deno.exe" (
+  "%~dp0\deno.exe" ${commands.slice(1).join(" ")} %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.TS;=;%
+  ${commands.join(" ")} %*
+)
+`;
+    const cmdFile = filePath + ".cmd";
+    await writeFile(cmdFile, encoder.encode(template));
+    await chmod(cmdFile, 0o755);
+  }
+
+  // generate Shell script
+  const template = `#/bin/sh
+# This executable is generated by Deno. Please don't modify it unless you know what it means.
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\\\,/,g')")
+
+case \`uname\` in
+  *CYGWIN*) basedir=\`cygpath -w "$basedir"\`;;
+esac
+
+if [ -x "$basedir/deno" ]; then
+  "$basedir/deno" ${commands.slice(1).join(" ")} "$@"
+  ret=$?
+else
+  ${commands.join(" ")} "$@"
+  ret=$?
+fi
+exit $ret
+`;
+  await writeFile(filePath, encoder.encode(template));
+  await chmod(filePath, 0o755);
+}
+
 export async function install(
   moduleName: string,
   moduleUrl: string,
@@ -201,28 +247,17 @@ export async function install(
 
   const commands = [
     "deno",
+    "run",
     ...grantedPermissions.map(getFlagFromPermission),
     moduleUrl,
-    ...scriptArgs,
-    "$@"
+    ...scriptArgs
   ];
 
-  // TODO: add windows Version
-  const template = `#/bin/sh\n${commands.join(" ")}`;
-  await writeFile(filePath, encoder.encode(template));
-
-  const makeExecutable = run({ args: ["chmod", "+x", filePath] });
-  const { code } = await makeExecutable.status();
-  makeExecutable.close();
-
-  if (code !== 0) {
-    throw new Error("Failed to make file executable");
-  }
+  await genereateExecutable(filePath, commands);
 
   console.log(`✅ Successfully installed ${moduleName}`);
   console.log(filePath);
 
-  // TODO: add Windows version
   if (!checkIfExistsInPath(installerDir)) {
     console.log("\nℹ️  Add ~/.deno/bin to PATH");
     console.log(
@@ -244,6 +279,9 @@ export async function uninstall(moduleName: string): Promise<void> {
   }
 
   await remove(filePath);
+  if (isWindows) {
+    await remove(filePath + ".cmd");
+  }
   console.log(`ℹ️  Uninstalled ${moduleName}`);
 }
 

installer/test.ts

@@ -1,14 +1,16 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-const { readFile, run, stat, makeTempDir, remove, env } = Deno;
+const { run, stat, makeTempDir, remove, env } = Deno;
 
 import { test, runIfMain, TestFunction } from "../testing/mod.ts";
 import { assert, assertEquals, assertThrowsAsync } from "../testing/asserts.ts";
 import { BufReader, EOF } from "../io/bufio.ts";
 import { TextProtoReader } from "../textproto/mod.ts";
 import { install, uninstall } from "./mod.ts";
 import * as path from "../fs/path.ts";
+import * as fs from "../fs/mod.ts";
 
 let fileServer: Deno.Process;
+const isWindows = Deno.platform.os === "win";
 
 // copied from `http/file_server_test.ts`
 async function startFileServer(): Promise<void> {
@@ -63,11 +65,40 @@ installerTest(async function installBasic(): Promise<void> {
   const fileInfo = await stat(filePath);
   assert(fileInfo.isFile());
 
-  const fileBytes = await readFile(filePath);
-  const fileContents = new TextDecoder().decode(fileBytes);
+  if (isWindows) {
+    assertEquals(
+      await fs.readFileStr(filePath + ".cmd"),
+      `% This executable is generated by Deno. Please don't modify it unless you know what it means. %
+@IF EXIST "%~dp0\deno.exe" (
+  "%~dp0\deno.exe" run http://localhost:4500/http/file_server.ts %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.TS;=;%
+  deno run http://localhost:4500/http/file_server.ts %*
+)
+`
+    );
+  }
+
   assertEquals(
-    fileContents,
-    "#/bin/sh\ndeno http://localhost:4500/http/file_server.ts $@"
+    await fs.readFileStr(filePath),
+    `#/bin/sh
+# This executable is generated by Deno. Please don't modify it unless you know what it means.
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\\\,/,g')")
+
+case \`uname\` in
+  *CYGWIN*) basedir=\`cygpath -w "$basedir"\`;;
+esac
+
+if [ -x "$basedir/deno" ]; then
+  "$basedir/deno" run http://localhost:4500/http/file_server.ts "$@"
+  ret=$?
+else
+  deno run http://localhost:4500/http/file_server.ts "$@"
+  ret=$?
+fi
+exit $ret
+`
   );
 });
 
@@ -81,11 +112,40 @@ installerTest(async function installWithFlags(): Promise<void> {
   const { HOME } = env();
   const filePath = path.resolve(HOME, ".deno/bin/file_server");
 
-  const fileBytes = await readFile(filePath);
-  const fileContents = new TextDecoder().decode(fileBytes);
+  if (isWindows) {
+    assertEquals(
+      await fs.readFileStr(filePath + ".cmd"),
+      `% This executable is generated by Deno. Please don't modify it unless you know what it means. %
+@IF EXIST "%~dp0\deno.exe" (
+  "%~dp0\deno.exe" run --allow-net --allow-read http://localhost:4500/http/file_server.ts --foobar %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.TS;=;%
+  deno run --allow-net --allow-read http://localhost:4500/http/file_server.ts --foobar %*
+)
+`
+    );
+  }
+
   assertEquals(
-    fileContents,
-    "#/bin/sh\ndeno --allow-net --allow-read http://localhost:4500/http/file_server.ts --foobar $@"
+    await fs.readFileStr(filePath),
+    `#/bin/sh
+# This executable is generated by Deno. Please don't modify it unless you know what it means.
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\\\,/,g')")
+
+case \`uname\` in
+  *CYGWIN*) basedir=\`cygpath -w "$basedir"\`;;
+esac
+
+if [ -x "$basedir/deno" ]; then
+  "$basedir/deno" run --allow-net --allow-read http://localhost:4500/http/file_server.ts --foobar "$@"
+  ret=$?
+else
+  deno run --allow-net --allow-read http://localhost:4500/http/file_server.ts --foobar "$@"
+  ret=$?
+fi
+exit $ret
+`
   );
 });
 
@@ -106,6 +166,16 @@ installerTest(async function uninstallBasic(): Promise<void> {
     assertEquals(e.kind, Deno.ErrorKind.NotFound);
   }
 
+  if (isWindows) {
+    try {
+      await stat(filePath + ".cmd");
+    } catch (e) {
+      thrown = true;
+      assert(e instanceof Deno.DenoError);
+      assertEquals(e.kind, Deno.ErrorKind.NotFound);
+    }
+  }
+
   assert(thrown);
 });