Run full tests, cleanup things, add Bluebird.Promise type

Author: Ryan Munro

.gitignore

@@ -1,52 +1,10 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-node_modules
-
-# Optional npm cache directory
-.npm
-
-# Optional REPL history
+.*.swp
+.DS_Store
 .node_repl_history
-
+.npm
+node_modules
+npm-debug.log*
 npm-shrinkwrap.json
 package-lock.json
-
-.*.swp
-
-# TAP Coverage
-coverage
-.nyc_output
-
-DS_Store
-yarn.lock
-.yarn/
-.yarn-cache/
-.v8flags.*
-tags
-
 package-lock.json
 test_typescript.js

README.md

@@ -76,7 +76,7 @@ python`hello(${a}, ${b})`.then(x => assert.equal(x, a + b));
 
 ## python.lock(...).then(...)
 
-Locks access to the Python interpreter so code can be executed atomically.  If possible, it's recommend to define a function in Python to handle atomicity.  
+Locks access to the Python interpreter so code can be executed atomically.  If possible, it's recommend to define a function in Python to handle atomicity.
 
 ```javascript
 python.lock(python => {

README.ts.md

@@ -81,7 +81,7 @@ assert.equal(a + b, await python`hello(${a}, ${b})`);
 
 ## python.lock(...).then(...)
 
-Locks access to the Python interpreter so code can be executed atomically.  If possible, it's recommend to define a function in Python to handle atomicity.  
+Locks access to the Python interpreter so code can be executed atomically.  If possible, it's recommend to define a function in Python to handle atomicity.
 
 ```javascript
 const x: number = await python.lock(async python =>{

index.d.ts

@@ -1,53 +1,60 @@
-// declare module "python-bridge" {
-  interface pythonBridge extends Function {
-      (options?: PythonBridgeOptions): PythonBridge;
-  }
+interface pythonBridge extends Function {
+    (options?: PythonBridgeOptions): PythonBridge;
+}
 
-  export const pythonBridge: pythonBridge
 
-  export interface PythonBridgeOptions {
-    intepreter?: string;
-    stdio?: [PipeStdin, PipeStdout, PipeStderr];
-    cwd?: string;
-    env?: { [key:string]: string; };
-    uid?: number;
-    gid?: number;
-  }
+export const pythonBridge: pythonBridge
 
-  export interface PythonBridge {
-    (literals: TemplateStringsArray | string, ...placeholders: any[]): Promise<any>;
-    ex(literals: TemplateStringsArray | string, ...placeholders: any[]): Promise<void>;
-    lock<T>(withLock: (python: PythonBridge) => Promise<T>): Promise<T>
-    pid: number;
-    end(): Promise<void>;  
-    disconnect(): Promise<void>;
-    kill(signal: string | number): void;
-    stdin: NodeJS.WritableStream;
-    stdout: NodeJS.ReadableStream;
-    stderr: NodeJS.ReadableStream;
-    connected: boolean;
-  }
+export interface PythonBridgeOptions {
+  intepreter?: string;
+  stdio?: [PipeStdin, PipeStdout, PipeStderr];
+  cwd?: string;
+  env?: { [key:string]: string; };
+  uid?: number;
+  gid?: number;
+}
+
+export interface PythonBridge {
+  (literals: TemplateStringsArray | string, ...placeholders: any[]): Bluebird.Promise<any>;
+  ex(literals: TemplateStringsArray | string, ...placeholders: any[]): Bluebird.Promise<void>;
+  lock<T>(withLock: (python: PythonBridge) => Promise<T>): Bluebird.Promise<T>
+  pid: number;
+  end(): Promise<void>;
+  disconnect(): Promise<void>;
+  kill(signal: string | number): void;
+  stdin: NodeJS.WritableStream;
+  stdout: NodeJS.ReadableStream;
+  stderr: NodeJS.ReadableStream;
+  connected: boolean;
+}
 
-  export function isPythonException(name: string): (e: any) => boolean;
-  export function isPythonException(name: string, e: any): boolean;
-
-  export class PythonException extends Error {
-    exception: {
-      message: string;
-      args: any[];
-      type: { name: string; module: string; }
-      format: string[];
-    };
-    traceback: {
-      lineno: number;
-      strack: string[];
-      format: string[]
-    };
+export function isPythonException(name: string): (e: any) => boolean;
+export function isPythonException(name: string, e: any): boolean;
+
+export class PythonException extends Error {
+  exception: {
+    message: string;
+    args: any[];
+    type: { name: string; module: string; }
+    format: string[];
+  };
+  traceback: {
+    lineno: number;
+    strack: string[];
     format: string[]
+  };
+  format: string[]
+}
+
+export type Pipe = "pipe" | "ignore" | "inherit";
+export type PipeStdin = Pipe | NodeJS.ReadableStream;
+export type PipeStdout = Pipe | NodeJS.WritableStream;
+export type PipeStderr = Pipe | NodeJS.WritableStream;
+
+export namespace Bluebird {
+  interface Promise<T> extends _Promise<T>  {
+    timeout(number): Bluebird.Promise<T>;
   }
+}
 
-  export type Pipe = "pipe" | "ignore" | "inherit";
-  export type PipeStdin = Pipe | NodeJS.ReadableStream;
-  export type PipeStdout = Pipe | NodeJS.WritableStream;
-  export type PipeStderr = Pipe | NodeJS.WritableStream;
-// }
+type _Promise<T> = Promise<T>;

package.json

@@ -9,8 +9,7 @@
     "lint:ts": "tslint --project tsconfig.json --type-check",
     "test": "npm run lint && npm run test:js && npm run test:ts",
     "test:js": "tap test.js",
-    "test:ts": "ts-node test.ts",
-    "test_ts": "ts-node node_modules/blue-tape/bin/blue-tape test_typescript.ts"
+    "test:ts": "tsc --lib ES2015 test_typescript.ts && tap test_typescript.js"
   },
   "repository": {
     "type": "git",
@@ -28,14 +27,12 @@
   "author": "Ryan Munro <ryan@submersible.io>",
   "license": "MIT",
   "dependencies": {
-    "bluebird": "^3.4.6"
+    "bluebird": "^3.5.0"
   },
   "devDependencies": {
     "@types/node": "^8.0.14",
-    "blue-tape": "^1.0.0",
     "tap": "^10.7.0",
     "temp": "^0.8.3",
-    "ts-node": "^3.2.0",
     "tslint": "^5.5.0",
     "typescript": "^2.4.1"
   }

test.ts

@@ -1,7 +1,7 @@
-import { test } from 'blue-tape';
+import { test } from 'tap';
 import { join as path_join } from 'path';
-import { promisify, promisifyAll } from 'bluebird';
-import { pythonBridge, PythonException, isPythonException } from './';
+import { promisify } from 'bluebird';
+import { pythonBridge, PythonException, isPythonException } from './index';
 
 const mkdirTemp = promisify(require('temp').mkdir);
 
@@ -20,7 +20,7 @@ test('readme', t => {
             python.end();
         }
     });
-    
+
     t.test('expression', async assert => {
         let python = pythonBridge();
         try {
@@ -102,7 +102,7 @@ test('readme', t => {
                     sys.stdout.write(line)
                     sys.stdout.flush()
             `;
-            
+
             // write to Python process's stdin
             python.stdin.write('hello\n');
             await delay(10);
@@ -176,4 +176,6 @@ test('readme', t => {
 
         python.end();
     });
+
+    t.end();
 });