Update interfaces for services 0.33

package.json

@@ -7,7 +7,7 @@
   },
   "typings": "lib/index.d.ts",
   "dependencies": {
-    "@jupyterlab/services": "^0.32.0",
+    "@jupyterlab/services": "^0.33.0",
     "ansi_up": "^1.3.0",
     "backbone": "^1.2.0",
     "codemirror": "^5.20.2",

src/console/content.ts

@@ -498,7 +498,7 @@ class ConsoleContent extends Widget {
    */
   private _initialize(): void {
     let kernel = this._session.kernel;
-    kernel.ready().then(() => {
+    kernel.ready.then(() => {
       this._handleInfo(kernel.info);
     });
   }

src/console/plugin.ts

@@ -236,7 +236,7 @@ function activateConsole(app: JupyterLab, services: IServiceManager, rendermime:
 
       // If we get a session, use it.
       if (args.id) {
-        return manager.ready().then(() => {
+        return manager.ready.then(() => {
           return manager.connectTo(args.id);
         }).then(session => {
           name = session.path.split('/').pop();
@@ -255,7 +255,7 @@ function activateConsole(app: JupyterLab, services: IServiceManager, rendermime:
       path = `${path}/console-${count}-${utils.uuid()}`;
 
       // Get the kernel model.
-      return manager.ready().then(() => {
+      return manager.ready.then(() => {
         return getKernel(args, name);
       }).then(kernel => {
         if (!kernel) {
@@ -312,7 +312,7 @@ function activateConsole(app: JupyterLab, services: IServiceManager, rendermime:
     if (args.kernel) {
       return Promise.resolve(args.kernel);
     }
-    return manager.ready().then(() => {
+    return manager.ready.then(() => {
       let options = {
         name,
         specs: manager.specs,
@@ -393,7 +393,7 @@ function activateConsole(app: JupyterLab, services: IServiceManager, rendermime:
       let widget = current.content;
       let session = widget.session;
       let lang = '';
-      manager.ready().then(() => {
+      manager.ready.then(() => {
         let specs = manager.specs;
         if (session.kernel) {
           lang = specs.kernelspecs[session.kernel.name].language;

src/docmanager/manager.ts

@@ -294,7 +294,7 @@ class DocumentManager implements IDisposable {
       manager: this._serviceManager
     });
     Private.saveHandlerProperty.set(context, handler);
-    context.ready().then(() => {
+    context.ready.then(() => {
       handler.start();
     });
     context.disposed.connect(() => {

src/docmanager/widgetmanager.ts

@@ -113,7 +113,7 @@ class DocumentWidgetManager implements IDisposable {
     context.fileChanged.connect(() => {
       this.setCaption(widget);
     });
-    context.ready().then(() => {
+    context.ready.then(() => {
       this.setCaption(widget);
     });
     return widget;

src/docregistry/context.ts

@@ -58,7 +58,7 @@ class Context<T extends DocumentRegistry.IModel> implements DocumentRegistry.ICo
     this._model = this._factory.createNew(lang);
     manager.sessions.runningChanged.connect(this._onSessionsChanged, this);
     manager.contents.fileChanged.connect(this._onFileChanged, this);
-    this._readyPromise = manager.ready().then(() => {
+    this._readyPromise = manager.ready.then(() => {
       return this._populatedPromise.promise;
     });
   }
@@ -168,7 +168,7 @@ class Context<T extends DocumentRegistry.IModel> implements DocumentRegistry.ICo
  /**
   * A promise that is fulfilled when the context is ready.
   */
-  ready(): Promise<void> {
+  get ready(): Promise<void> {
     return this._readyPromise;
   }
 
@@ -178,7 +178,7 @@ class Context<T extends DocumentRegistry.IModel> implements DocumentRegistry.ICo
    * @returns A promise that resolves with the new kernel.
    */
   startDefaultKernel(): Promise<Kernel.IKernel> {
-    return this.ready().then(() => {
+    return this.ready.then(() => {
       let model = this.model;
       let name = findKernel(
         model.defaultKernelName,

src/docregistry/kernelselector.ts

@@ -129,7 +129,7 @@ function selectKernel(options: IKernelSelection): Promise<Kernel.IModel> {
  */
 export
 function selectKernelForContext(context: DocumentRegistry.IContext<DocumentRegistry.IModel>, manager: Session.IManager, host?: HTMLElement): Promise<void> {
-  return manager.ready().then(() => {
+  return manager.ready.then(() => {
     let options: IKernelSelection = {
       name: context.path.split('/').pop(),
       specs: manager.specs,

src/docregistry/registry.ts

@@ -632,7 +632,7 @@ namespace DocumentRegistry {
     /**
      * A promise that is fulfilled when the context is ready.
      */
-    ready(): Promise<void>;
+    readonly ready: Promise<void>;
 
     /**
      * Start the default kernel for the context.

src/filebrowser/dialogs.ts

@@ -47,7 +47,7 @@ const FILE_CONFLICT_CLASS = 'jp-mod-conflict';
 export
 function createFromDialog(model: FileBrowserModel, manager: DocumentManager, creatorName: string): Promise<Widget> {
   let handler = new CreateFromHandler(model, manager, creatorName);
-  return manager.services.ready().then(() => {
+  return manager.services.ready.then(() => {
     return handler.populate();
   }).then(() => {
     return handler.showDialog();
@@ -61,7 +61,7 @@ function createFromDialog(model: FileBrowserModel, manager: DocumentManager, cre
 export
 function openWithDialog(path: string, manager: DocumentManager, host?: HTMLElement): Promise<Widget> {
   let handler: OpenWithHandler;
-  return manager.services.ready().then(() => {
+  return manager.services.ready.then(() => {
     handler = new OpenWithHandler(path, manager);
     return showDialog({
       title: 'Open File',
@@ -82,7 +82,7 @@ function openWithDialog(path: string, manager: DocumentManager, host?: HTMLEleme
 export
 function createNewDialog(model: FileBrowserModel, manager: DocumentManager, host?: HTMLElement): Promise<Widget> {
   let handler: CreateNewHandler;
-  return manager.services.ready().then(() => {
+  return manager.services.ready.then(() => {
     handler = new CreateNewHandler(model, manager);
     return showDialog({
       title: 'Create New File',

src/notebook/notebook/panel.ts

@@ -283,7 +283,7 @@ class NotebookPanel extends Widget {
 
     // Clear the cells when the context is initially populated.
     if (!newValue.isReady) {
-      newValue.ready().then(() => {
+      newValue.ready.then(() => {
         let model = newValue.model;
         // Clear the undo state of the cells.
         if (model) {
@@ -307,7 +307,7 @@ class NotebookPanel extends Widget {
     if (!this.model || !kernel) {
       return;
     }
-    kernel.ready().then(() => {
+    kernel.ready.then(() => {
       if (this.model) {
         this._updateLanguage(kernel.info.language_info);
       }
@@ -327,7 +327,7 @@ class NotebookPanel extends Widget {
    * Update the kernel spec.
    */
   private _updateSpec(kernel: Kernel.IKernel): void {
-    kernel.spec().then(spec => {
+    kernel.getSpec().then(spec => {
       let specCursor = this.model.getMetadata('kernelspec');
       specCursor.setValue({
         name: kernel.name,

src/terminal/index.ts

@@ -85,7 +85,7 @@ class TerminalWidget extends Widget {
       return;
     }
 
-    value.ready().then(() => {
+    value.ready.then(() => {
       this._session = value;
       this._session.messageReceived.connect(this._onMessage, this);
       this.title.label = `Terminal ${this._session.name}`;

src/toolbar/kernel.ts

@@ -123,7 +123,7 @@ function updateKernelNameItem(widget: Widget, kernel: Kernel.IKernel): void {
   if (!kernel) {
     return;
   }
-  kernel.spec().then(spec => {
+  kernel.getSpec().then(spec => {
     if (!widget.isDisposed) {
       widget.node.textContent = spec.display_name;
     }