Merge pull request #69 from job13er/remove-http-sync

Remove http sync
ciena-blueplanet · Jul 1, 2015 · 1ff4d59 · 1ff4d59
2 parents 88ea2c9 + 3fc1755
commit 1ff4d59
Show file tree

Hide file tree

Showing 30 changed files with 1,127 additions and 793 deletions.
diff --git a/bin/beaker.js b/bin/beaker.js
@@ -8,11 +8,19 @@
 'use strict';
 
 // Since this is a CLI and only a CLI, we actually want process.exit
-/* eslint-disable no-process-exit */
 
+var exit = require('exit');
 var cli = require('../src/cli');
 var argv = require('minimist')(process.argv.slice(2), {'boolean': 'app'});
 
-var ret = cli.argv(argv);
+process.on('unhandledException', function (err) {
+    var exitCode = 1;
+    if (err.exitCode !== undefined) {
+        exitCode = err.exitCode;
+    }
 
-process.exit(ret);
+    console.error(err.message);
+    exit(exitCode);
+});
+
+cli.argv(argv);
diff --git a/files/project-templates/node/spec/.eslintrc b/files/project-templates/node/spec/.eslintrc
@@ -1,7 +1,6 @@
 {
     "globals": {
         "describe": false,
-        "fdescribe": false,
         "xdescribe": false,
         "beforeEach": false,
         "afterEach": false,

diff --git a/files/project-templates/webpack/spec/.eslintrc b/files/project-templates/webpack/spec/.eslintrc
@@ -1,7 +1,6 @@
 {
     "globals": {
         "describe": false,
-        "fdescribe": false,
         "xdescribe": false,
         "beforeEach": false,
         "afterEach": false,

diff --git a/make/node-targets.mk b/make/node-targets.mk
@@ -39,12 +39,12 @@ export NODE_SPECS
 jasmine-coverage: export JASMINE=1
 jasmine-coverage:
 	$(HIDE)echo "Running istanbul coverage on jasmine node specs"
-	$(HIDE)echo "Running jasmine node specs JASMINE=[$$JASMINE]"
+	$(HIDE)echo "Running jasmine node specs"
 	$(ENV)istanbul cover $(NODE_COVERAGE_OPTS) jasmine
 
 jasmine-test: export JASMINE=1
 jasmine-test:
-	$(HIDE)echo "Running jasmine node specs JASMINE=[$$JASMINE]"
+	$(HIDE)echo "Running jasmine node specs"
 	$(ENV)jasmine
 
 # =================================================================================================

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "beaker",
-    "version": "3.7.3",
+    "version": "3.8.0",
     "description": "Toolkit for building web interfaces",
     "keywords": [
         "tools",
@@ -39,13 +39,14 @@
     "dependencies": {
         "change-case": "^2.2.0",
         "execSync": "^1.0.2",
-        "http-sync": "0.1.0",
+        "exit": "^0.1.2",
         "lodash": "^3.2.0",
         "minimist": "^1.1.0",
         "nconf": "^0.7.1",
+        "q": "^1.4.1",
+        "q-io": "^1.13.1",
         "rimraf": "^2.2.8",
         "sleep": "^2.0.0",
-        "superagent": "^0.21.0",
         "versiony": "^1.3.0"
     },
     "devDependencies": {

diff --git a/spec/.eslintrc b/spec/.eslintrc
@@ -1,7 +1,6 @@
 {
     "globals": {
         "describe": false,
-        "fdescribe": false,
         "xdescribe": false,
         "beforeEach": false,
         "afterEach": false,

diff --git a/spec/node/cli/argv-spec.js b/spec/node/cli/argv-spec.js
@@ -9,6 +9,7 @@ var _ = require('lodash');
 
 var t = require('../../../src/transplant')(__dirname);
 var cli = t.require('./index');
+var utils = t.require('./utils');
 
 /**
  * Construct an argv object
@@ -30,6 +31,7 @@ describe('cli.argv', function () {
         versionStr = packageJSON.name + ' v' + packageJSON.version;
         spyOn(console, 'log');
         spyOn(console, 'error');
+        spyOn(utils, 'throwCliError');
     });
 
     it('help command calls cli.help()', function () {
@@ -57,28 +59,24 @@ describe('cli.argv', function () {
     });
 
     it('shows version with -v', function () {
-        var ret = cli.argv(constructArgv([], {v: true}));
+        cli.argv(constructArgv([], {v: true}));
         expect(console.log).toHaveBeenCalledWith(versionStr);
-        expect(ret).toBe(0);
     });
 
     it('shows version with --version', function () {
-        var ret = cli.argv(constructArgv([], {version: true}));
+        cli.argv(constructArgv([], {version: true}));
         expect(console.log).toHaveBeenCalledWith(versionStr);
-        expect(ret).toBe(0);
     });
 
     it('defaults to help when no args', function () {
-        spyOn(cli, 'help').and.returnValue(3);
-        var ret = cli.argv(constructArgv());
+        spyOn(cli, 'help');
+        cli.argv(constructArgv());
         expect(cli.help).toHaveBeenCalled();
-        expect(ret).toBe(3);
     });
 
     it('indicates invalid command', function () {
-        var ret = cli.argv(constructArgv(['foobar']));
+        cli.argv(constructArgv(['foobar']));
         var errorMsg = 'Invalid command "foobar"';
-        expect(console.error).toHaveBeenCalledWith(errorMsg);
-        expect(ret).toBe(1);
+        expect(utils.throwCliError).toHaveBeenCalledWith(errorMsg, 1);
     });
 });
diff --git a/spec/node/cli/github-spec.js b/spec/node/cli/github-spec.js
@@ -6,23 +6,22 @@
 'use strict';
 
 var t = require('../../../src/transplant')(__dirname);
-var github = t.require('../github');
+var githubProto = t.require('../github').proto;
 var cli = t.require('./index');
+var config = t.require('../config');
+var _config = require('../sample-config.json');
 
 describe('cli.github', function () {
-    var argv, ret;
+    var argv;
 
     beforeEach(function () {
         argv = {_: ['init']};
-        spyOn(github, 'command').and.returnValue(13);
-        ret = cli.github(argv);
+        spyOn(githubProto, 'command');
+        spyOn(config, 'load').and.returnValue(_config);
+        cli.github(argv);
     });
 
     it('calls github method', function () {
-        expect(github.command).toHaveBeenCalledWith(argv);
-    });
-
-    it('returns result of init', function () {
-        expect(ret).toBe(13);
+        expect(githubProto.command).toHaveBeenCalledWith(argv);
     });
 });
diff --git a/spec/node/cli/help-spec.js b/spec/node/cli/help-spec.js
@@ -11,17 +11,17 @@ var cli = t.require('./index');
 
 
 describe('cli.help', function () {
-    var argv, ret;
+    var argv;
 
     beforeEach(function () {
         argv = {
             _: ['help'],
         };
         spyOn(console, 'log');
+        cli.help(argv);
     });
 
-    it('returns 0', function () {
-        ret = cli.help(argv);
-        expect(ret).toBe(0);
+    it('does not blow up', function () {
+        expect(true).toBeTruthy();
     });
 });
diff --git a/spec/node/cli/init-spec.js b/spec/node/cli/init-spec.js
@@ -10,19 +10,15 @@ var init = t.require('../init');
 var cli = t.require('./index');
 
 describe('cli.init', function () {
-    var argv, ret;
+    var argv;
 
     beforeEach(function () {
         argv = {_: ['init']};
-        spyOn(init, 'command').and.returnValue(13);
-        ret = cli.init(argv);
+        spyOn(init, 'command');
+        cli.init(argv);
     });
 
     it('calls init method', function () {
         expect(init.command).toHaveBeenCalledWith(argv);
     });
-
-    it('returns result of init', function () {
-        expect(ret).toBe(13);
-    });
 });
diff --git a/spec/node/cli/new-config-spec.js b/spec/node/cli/new-config-spec.js
@@ -10,19 +10,15 @@ var newConfig = t.require('../new-config');
 var cli = t.require('./index');
 
 describe('cli.newConfig', function () {
-    var argv, ret;
+    var argv;
 
     beforeEach(function () {
         argv = {_: ['newConfig']};
-        spyOn(newConfig, 'command').and.returnValue(13);
-        ret = cli.newConfig(argv);
+        spyOn(newConfig, 'command');
+        cli.newConfig(argv);
     });
 
     it('calls newConfig method', function () {
         expect(newConfig.command).toHaveBeenCalledWith(argv);
     });
-
-    it('returns result of init', function () {
-        expect(ret).toBe(13);
-    });
 });
diff --git a/spec/node/cli/webdriverio-test-spec.js b/spec/node/cli/webdriverio-test-spec.js
@@ -10,19 +10,15 @@ var tester = t.require('../webdriverio-tester');
 var cli = t.require('./index');
 
 describe('cli.webdriverioTester', function () {
-    var argv, ret;
+    var argv;
 
     beforeEach(function () {
         argv = {_: ['init']};
-        spyOn(tester, 'command').and.returnValue(13);
-        ret = cli.webdriverioTester(argv);
+        spyOn(tester, 'command');
+        cli.webdriverioTester(argv);
     });
 
     it('calls tester method', function () {
         expect(tester.command).toHaveBeenCalledWith(argv);
     });
-
-    it('returns result of init', function () {
-        expect(ret).toBe(13);
-    });
 });