consume terminal services

Author: UziTech

lib/runtime.js

@@ -10,10 +10,11 @@ export default class Runtime {
   // Public: Initializes a new {Runtime} instance
   //
   // This class is responsible for properly configuring {Runner}
-  constructor(runner, codeContextBuilder, observers = []) {
+  constructor(runner, codeContextBuilder, observers = [], terminals = []) {
     this.runner = runner;
     this.codeContextBuilder = codeContextBuilder;
     this.observers = observers;
+    this.terminals = terminals;
     this.emitter = new Emitter();
     this.scriptOptions = this.runner.scriptOptions;
     _.each(this.observers, observer => observer.observe(this));
@@ -59,21 +60,16 @@ export default class Runtime {
     const executionOptions = !options ? this.scriptOptions : options;
     const commandContext = CommandContext.build(this, executionOptions, codeContext);
 
-
-    // Will cooperate with Terminus to allow for inputs, if user has installed.
-    try {
-      var terminus = require('../../terminus/lib/terminus.js').provideTerminus();
-    } catch (e) {
-      var terminus = null;
-      console.log('Could not find Terminus');
-    }
-    if (terminus != null) {
+    const terminal = this.terminals[0];
+    if (terminal) {
       let command = commandContext.command;
       for (let i = 0; i < commandContext.args.length; i++) {
         command += ` "${commandContext.args[i]}"`;
       }
-      terminus.run([`printf "\\33c\\e[3J" && ${command}`]);
+      terminal.run([`printf "\\33c\\e[3J" && ${command}`]);
       return;
+    } else {
+      console.log("No terminal found");
     }
 
     if (atom.config.get('script.stopOnRerun')) this.stop();

lib/script.js

@@ -1,6 +1,6 @@
 'use babel';
 
-import { CompositeDisposable } from 'atom';
+import { CompositeDisposable, Disposable } from 'atom';
 
 import CodeContextBuilder from './code-context-builder';
 import GrammarUtils from './grammar-utils';
@@ -63,6 +63,7 @@ export default {
   scriptProfileRunView: null,
   scriptOptions: null,
   scriptProfiles: [],
+  terminals: [],
 
   activate(state) {
     this.scriptView = new ScriptView(state.scriptViewState);
@@ -85,7 +86,7 @@ export default {
 
     const observer = new ViewRuntimeObserver(this.scriptView);
 
-    this.runtime = new Runtime(runner, codeContextBuilder, [observer]);
+    this.runtime = new Runtime(runner, codeContextBuilder, [observer], this.terminals);
 
     this.subscriptions = new CompositeDisposable();
     this.subscriptions.add(atom.commands.add('atom-workspace', {
@@ -153,6 +154,7 @@ export default {
     this.scriptOptionsView.close();
     this.scriptProfileRunView.close();
     this.subscriptions.dispose();
+    this.terminals.length = 0;
     GrammarUtils.deleteTempFiles();
   },
 
@@ -161,6 +163,13 @@ export default {
     this.scriptView.removePanel();
   },
 
+  consumeTerminal(terminal) {
+    this.terminals.push(terminal);
+    return new Disposable(() => {
+      this.terminals = this.terminals.filter((t) => t !== terminal);
+    });
+  },
+
   // Public
   //
   // Service method that provides the default runtime that's configurable through Atom editor
@@ -199,7 +208,7 @@ export default {
     const runner = new Runner(new ScriptOptions());
     const codeContextBuilder = new CodeContextBuilder();
 
-    return new Runtime(runner, codeContextBuilder, []);
+    return new Runtime(runner, codeContextBuilder, [], this.terminals);
   },
 
   serialize() {

package.json

@@ -52,6 +52,38 @@
       }
     }
   },
+  "consumedServices": {
+    "runInTerminal": {
+      "description": "Allow to run commands in platformio-ide-terminal.",
+      "versions": {
+        "0.14.5": "consumeTerminal"
+      }
+    },
+    "platformioIDETerminal": {
+      "description": "Allow to run commands in platformio-ide-terminal.",
+      "versions": {
+        "^1.1.0": "consumeTerminal"
+      }
+    },
+    "terminusTerminal": {
+      "description": "Allow to run commands in terminus.",
+      "versions": {
+        "^1.1.1": "consumeTerminal"
+      }
+    },
+    "terminationTerminal": {
+      "description": "Allow to run commands in termination.",
+      "versions": {
+        "^1.1.0": "consumeTerminal"
+      }
+    },
+    "terminal": {
+      "description": "Allow to run commands in terminal.",
+      "versions": {
+        "^1.0.0": "consumeTerminal"
+      }
+    }
+  },
   "scripts": {
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",