feature(cursor-blink) add

Author: coderaiser

.gitignore

@@ -1,5 +1,6 @@
 node_modules
 npm-debug.log
+.nyc_output
 
 dist
 dist-dev

.npmignore

@@ -2,6 +2,7 @@
 
 webpack.config.js
 client
+test
 
 img
 

.travis.yml

@@ -5,6 +5,7 @@ node_js:
 
 script:
   - npm run lint
+  - npm run coverage && npm run report
 
 notifications:
     email:

client/cursor-blink.js

@@ -0,0 +1,8 @@
+'use strict';
+
+const currify = require('currify/legacy');
+
+module.exports = currify((terminal, blink) => {
+    terminal.setOption('cursorBlink', blink);
+});
+

client/gritty.js

@@ -5,6 +5,8 @@ require('../css/gritty.css');
 
 require('xterm/dist/addons/fit');
 
+const cursorBlink = require('./cursor-blink');
+
 const io = require('socket.io-client/dist/socket.io.min');
 const timeout = (fn) => () => setTimeout(fn);
 
@@ -42,6 +44,8 @@ function createTerminal(terminalContainer, {env, socket}) {
         theme: 'gritty',
     });
 
+    const blink = cursorBlink(terminal);
+    
     terminal.open(terminalContainer);
     terminal.fit();
 
@@ -63,15 +67,15 @@ function createTerminal(terminalContainer, {env, socket}) {
 
     // auth check delay
     socket.on('connect', timeout(() => {
-        terminal.setOption('cursorBlink', true);
+        blink(true);
 
         socket.emit('terminal', {env, cols, rows});
         socket.emit('resize', {cols, rows});
     }));
 
     socket.on('disconnect', () => {
         terminal.writeln('terminal disconnected...');
-        terminal.setOption('cursorBlink', false);
+        blink(false);
     });
 
     socket.on('data', (data) => {

client/sinon.js

@@ -18,6 +18,12 @@
     "lint:eslint:server": "eslint --rule 'no-console:0' bin server",
     "lint:eslint:client": "eslint --env browser --config .eslintrc client",
     "lint": "redrun lint:*",
+    "coverage": "nyc npm test",
+    "test": "tape 'test/**/*.js'",
+    "report": "nyc report --reporter=text-lcov | coveralls",
+    "watch:coverage": "npm run watcher -- npm run coverage",
+    "watch:test": "npm run watcher -- npm test",
+    "watcher": "nodemon -w test -w lib --exec",
     "6to5:lib": "babel server -d server_",
     "6to5:bin": "babel bin -d legacy/bin",
     "6to5:client": "webpack --progress",
@@ -54,9 +60,12 @@
     "eslint": "^3.10.2",
     "json-loader": "^0.5.4",
     "nodemon": "^1.11.0",
+    "nyc": "^10.2.0",
     "promise-polyfill": "^6.0.2",
     "redrun": "^5.9.3",
+    "sinon": "^2.1.0",
     "style-loader": "^0.16.0",
+    "tape": "^4.6.3",
     "webpack": "^2.2.1",
     "whatwg-fetch": "^2.0.2",
     "xterm": "^2.4.0"

package.json

@@ -0,0 +1,25 @@
+'use strict';
+
+const test = require('tape');
+const sinon = require('../sinon');
+
+const cursorBlink = require('../../client/cursor-blink');
+
+test('gritty: cursor-blink: setOption: true', (t) => {
+    const setOption = sinon.stub();
+    
+    cursorBlink({setOption}, true);
+    
+    t.ok(setOption.calledWith('cursorBlink', true), 'should call setOption with true');
+    t.end();
+});
+
+test('gritty: cursor-blink: setOption: true', (t) => {
+    const setOption = sinon.stub();
+    
+    cursorBlink({setOption}, false);
+    
+    t.ok(setOption.calledWith('cursorBlink', false), 'should call setOption with false');
+    t.end();
+});
+

test/client/cursor-blink.js

@@ -0,0 +1,57 @@
+'use strict';
+
+/* eslint-disable no-console */
+
+const chalk = require('chalk');
+
+module.exports = (sinon) => {
+    const {stub} = sinon;
+    
+    sinon.stub = () => {
+        const fn = stub();
+        const {calledWith:original} = fn;
+        
+        fn.calledWith = (...args) => {
+            if (original.apply(fn, args))
+                return true;
+            
+            return calledWith.apply(fn, args);
+        };
+        
+        return fn;
+    };
+    
+    Object.assign(sinon.stub, stub);
+    
+    return sinon;
+};
+
+function calledWith(...args) {
+    if (!this.called) {
+        write(`expected to call with ${JSON.stringify(this.args)}, but not called at all\n`);
+        return false;
+    }
+    
+    const actual = this.args.pop();
+    
+    write(`wrong arguments in ${this.func.name}`);
+    writeObjectActual('actual:', actual);
+    writeObjectExpected('expected:', args);
+    
+    return false;
+}
+
+function write(str) {
+    process.stdout.write(chalk.red(str) + '\n');
+}
+
+function writeObjectActual(str, object) {
+    const json = JSON.stringify(object, null, 2);
+    console.log(str, chalk.yellow(json) + '\n');
+}
+
+function writeObjectExpected(str, object) {
+    const json = JSON.stringify(object, null, 2);
+    console.log(str, chalk.green(json) + '\n');
+}
+

test/sinon-called-with-diff.js

@@ -0,0 +1,6 @@
+'use strict';
+
+const sinon = require('sinon');
+const diff = require('./sinon-called-with-diff');
+
+module.exports = diff(sinon);