New Case Study:See how Anthropic automated 95% of dependency reviews with Socket.Learn More →
phonegap-build
Advanced tools
phonegap-build - npm Package Compare versions
Comparing version 0.5.4 to 0.6.0
@@ -5,3 +5,4 @@ /* | ||
| var PhoneGapBuild = require('./phonegap-build'); | ||
| var phonegapbuild = require('./main'), | ||
| console = require('./cli/console'); | ||
@@ -14,3 +15,3 @@ | ||
| function CLI() { | ||
| this.phonegapbuild = new PhoneGapBuild(); | ||
| this.phonegapbuild = phonegapbuild; | ||
| } | ||
@@ -35,2 +36,22 @@ | ||
| /*! | ||
| * CLI messages. | ||
| */ | ||
| phonegapbuild.on('log', function() { | ||
| console.log.apply(this, arguments); | ||
| }); | ||
| phonegapbuild.on('warn', function() { | ||
| console.warn.apply(this, arguments); | ||
| }); | ||
| phonegapbuild.on('error', function(e) { | ||
| console.error.call(this, e); | ||
| }); | ||
| phonegapbuild.on('raw', function() { | ||
| console.raw.apply(this, arguments); | ||
| }); | ||
| /* | ||
@@ -37,0 +58,0 @@ * Expose the CLI object. |
@@ -64,7 +64,3 @@ /*! | ||
| }); | ||
| build.on('log', function() { | ||
| console.log.apply(this, arguments); | ||
| }); | ||
| }); | ||
| }; |
@@ -5,4 +5,4 @@ /* | ||
| var console = require('./console'), | ||
| config = require('../common/config'); | ||
| var phonegapbuild = require('../main'), | ||
| console = require('./console'); | ||
@@ -23,71 +23,56 @@ /** | ||
| module.exports = function(argv, callback) { | ||
| var self = this; | ||
| // login credentials | ||
| var data = { | ||
| username: argv.username || argv.u, | ||
| password: argv.password || argv.p | ||
| }; | ||
| // check if account exists | ||
| config.global.load(function(e, account) { | ||
| if (account && account.phonegap && account.phonegap.token) { | ||
| // login with saved account | ||
| self.phonegapbuild.login(null, function(e, api) { | ||
| if (e) { | ||
| console.error('failed to login:', e.message); | ||
| } | ||
| this.phonegapbuild.login(data, function(e, api) { | ||
| callback(e, api); | ||
| }); | ||
| }; | ||
| callback(e, api); | ||
| }); | ||
| } | ||
| else { | ||
| // do not prompt for provided --options | ||
| argv.username = argv.username || argv.u; | ||
| argv.password = argv.password || argv.p; | ||
| /** | ||
| * Bind login event handler. | ||
| * | ||
| * This event is fired when a username and password are required. | ||
| * | ||
| * Options: | ||
| * | ||
| * - `data` {Object} describes the known auth data. | ||
| - `username` {String} is the username or undefined. | ||
| - `password` {String} is the password or undefined. | ||
| * - `callback` {Function} is called with the login credentials. | ||
| * - `e` {Error} is null unless there was an error. | ||
| * - `options` {Object} | ||
| * - `options.username` {String} is the username to authenticate. | ||
| * - `options.password` {String} is the password to authenticate. | ||
| */ | ||
| // display login header before prompt | ||
| if (!argv.username || !argv.password) { | ||
| console.log('login for', 'build.phonegap.com'.underline); | ||
| console.warn('github login is unsupported'); | ||
| } | ||
| phonegapbuild.on('login', function(data, callback) { | ||
| // console.prompt setup | ||
| var promptOptions = { | ||
| // use provided values | ||
| override: data, | ||
| // console.prompt setup | ||
| var promptOptions = { | ||
| // use provided values | ||
| override: argv, | ||
| // prompt properties | ||
| data: { | ||
| properties: { | ||
| username: { | ||
| required: true, | ||
| description: 'enter username:' | ||
| }, | ||
| password: { | ||
| hidden: true, | ||
| required: true, | ||
| description: 'enter password:' | ||
| } | ||
| } | ||
| // prompt properties | ||
| data: { | ||
| properties: { | ||
| username: { | ||
| required: true, | ||
| description: 'enter username:' | ||
| }, | ||
| password: { | ||
| hidden: true, | ||
| required: true, | ||
| description: 'enter password:' | ||
| } | ||
| }; | ||
| } | ||
| } | ||
| }; | ||
| // begin prompting | ||
| console.prompt(promptOptions, function(e, result) { | ||
| if (e) { | ||
| console.log('failed during prompt:', e.message); | ||
| callback(e); | ||
| return; | ||
| } | ||
| // login with prompt result | ||
| console.log('logging in...'); | ||
| self.phonegapbuild.login(result, function(e, api) { | ||
| if (e) { | ||
| console.error('failed to login:', e.message); | ||
| } | ||
| else { | ||
| console.log('logged in as', result.username); | ||
| } | ||
| callback(e, api); | ||
| }); | ||
| }); | ||
| } | ||
| // begin prompting | ||
| console.prompt(promptOptions, function(e, result) { | ||
| callback(e, result); | ||
| }); | ||
| }; | ||
| }); |
@@ -0,8 +1,31 @@ | ||
| /*! | ||
| * Module dependencies. | ||
| */ | ||
| var events = require('events'), | ||
| util = require('util'); | ||
| /** | ||
| * PhoneGap Build object. | ||
| * | ||
| * Events: | ||
| * | ||
| * - `error` {Event} triggered with info compatible with console.error. | ||
| * - `e` {Error} describes the error. | ||
| * - `log` {Event} triggered with info compatible with console.log. | ||
| * - `warn` {Event} triggered with info compatible with console.warn. | ||
| * - `raw` {Event} trigger with info that should not be formatted. | ||
| * - `login` {Event} triggered when login credentials are needed. | ||
| * - `callback` {Function} is triggered with user credentials | ||
| * - `username` {String} | ||
| * - `password` {String} | ||
| */ | ||
| function PhoneGapBuild() { | ||
| // error events must always have a listener. | ||
| this.on('error', function(e) {}); | ||
| } | ||
| util.inherits(PhoneGapBuild, events.EventEmitter); | ||
| /* | ||
@@ -9,0 +32,0 @@ * PhoneGap Build prototype chain composed of isolated actions. |
@@ -30,4 +30,2 @@ /*! | ||
| * - `e` {Error} details the error. | ||
| * - `complete` is trigger when no error occurs. | ||
| * - `data` {Object} describes the built app. | ||
| */ | ||
@@ -44,15 +42,6 @@ | ||
| // event support | ||
| var emitter = new events.EventEmitter(); | ||
| emitter.on('error', callback); | ||
| emitter.on('complete', function(data) { | ||
| callback(null, data); | ||
| }); | ||
| // build | ||
| process.nextTick(function() { | ||
| execute(options, emitter); | ||
| }); | ||
| execute.call(this, options, callback); | ||
| return emitter; | ||
| return this; | ||
| }; | ||
@@ -71,12 +60,4 @@ | ||
| var execute = function(options, emitter) { | ||
| // generic callback | ||
| var callback = function(e, data) { | ||
| if (e) { | ||
| emitter.emit('error', e); | ||
| } | ||
| else { | ||
| emitter.emit('complete', data); | ||
| } | ||
| }; | ||
| var execute = function(options, callback) { | ||
| var self = this; | ||
@@ -86,3 +67,4 @@ // lookup app id | ||
| if (e) { | ||
| emitter.emit('error', e); | ||
| self.emit('error', e); | ||
| callback(e); | ||
| return; | ||
@@ -92,11 +74,19 @@ } | ||
| // expose event emitter | ||
| options.emitter = emitter; | ||
| options.emitter = self; | ||
| // common callback | ||
| var _callback = function(e, data) { | ||
| if (e) { | ||
| self.emit('error', e); | ||
| } | ||
| callback(e, data); | ||
| }; | ||
| if (data.phonegap && data.phonegap.id) { | ||
| module.exports.build(options, callback); | ||
| module.exports.build(options, _callback); | ||
| } | ||
| else { | ||
| module.exports.create(options, callback); | ||
| module.exports.create(options, _callback); | ||
| } | ||
| }); | ||
| }; |
@@ -23,5 +23,4 @@ /*! | ||
| * | ||
| * - `error` is trigger on an error. | ||
| * - `error` is triggered on an error. | ||
| * - `e` {Error} details the error. | ||
| * - `complete` is trigger when no error occurs. | ||
| */ | ||
@@ -40,15 +39,6 @@ | ||
| // event support | ||
| var emitter = new events.EventEmitter(); | ||
| emitter.on('error', callback); | ||
| emitter.on('complete', function() { | ||
| callback(null); | ||
| }); | ||
| // create app | ||
| process.nextTick(function() { | ||
| execute(options, emitter); | ||
| }); | ||
| execute.call(this, options, callback); | ||
| return emitter; | ||
| return this; | ||
| }; | ||
@@ -66,12 +56,15 @@ | ||
| var execute = function(options, emitter) { | ||
| var execute = function(options, callback) { | ||
| var self = this; | ||
| // create local project | ||
| module.exports.local({ path: options.path }, function(e) { | ||
| if (e) { | ||
| emitter.emit('error', e); | ||
| self.emit('error', e); | ||
| callback(e); | ||
| return; | ||
| } | ||
| emitter.emit('complete'); | ||
| callback(null); | ||
| }); | ||
| }; |
@@ -28,23 +28,15 @@ /*! | ||
| * - `e` {Error} details the error. | ||
| * - `complete` is trigger when there is no error. | ||
| * - `api` {API} is instance of phonegap-build-api object. | ||
| */ | ||
| module.exports = function(options, callback) { | ||
| // require options | ||
| if (!options) throw new Error('requires options parameter'); | ||
| // callback is optional | ||
| callback = callback || function() {}; | ||
| // event support | ||
| var emitter = new events.EventEmitter(); | ||
| emitter.on('error', callback); | ||
| emitter.on('complete', function(api) { | ||
| callback(null, api); | ||
| }); | ||
| // login | ||
| process.nextTick(function() { | ||
| execute(options, emitter); | ||
| }); | ||
| execute.call(this, options, callback); | ||
| return emitter; | ||
| return this; | ||
| }; | ||
@@ -56,29 +48,56 @@ | ||
| var execute = function(options, emitter) { | ||
| // lookup the token | ||
| var execute = function(options, callback) { | ||
| var self = this; | ||
| // check if account exists | ||
| config.global.load(function(e, data) { | ||
| // no config or token key | ||
| if (e || !data.phonegap || !data.phonegap.token) { | ||
| // require options | ||
| if (!options) { | ||
| emitter.emit('error', new Error('username and password are required')); | ||
| return; | ||
| } | ||
| // account exists with an auth token | ||
| if (!e && data && data.phonegap && data.phonegap.token) { | ||
| // login with saved account | ||
| var api = new client.API({ | ||
| 'protocol': 'https:', | ||
| 'host': 'build.phonegap.com', | ||
| 'port': '443', | ||
| 'path': '/api/v1', | ||
| 'token': data.phonegap.token | ||
| }); | ||
| // require options.username | ||
| if (!options.username) { | ||
| emitter.emit('error', new Error('username is required')); | ||
| return; | ||
| callback(null, api); | ||
| } | ||
| // account does not exist | ||
| else { | ||
| // authenticate with given username and password | ||
| if (options.username && options.password) { | ||
| authenticate(options, callback); | ||
| } | ||
| // authenticate after retrieving missing username and/or password | ||
| else { | ||
| var loginOptions = { | ||
| username: options.username, | ||
| password: options.password | ||
| }; | ||
| // require options.password | ||
| if (!options.password) { | ||
| emitter.emit('error', new Error('password is required')); | ||
| return; | ||
| // console output | ||
| self.emit('log', 'PhoneGap/Build Login'); | ||
| self.emit('log', 'Sign up at', 'build.phonegap.com'.underline); | ||
| self.emit('warn', 'GitHub accounts are unsupported'); | ||
| // retrieve username and/or password | ||
| self.emit('login', loginOptions, function(e, data) { | ||
| if (e) { | ||
| self.emit('error', e); | ||
| callback(e); | ||
| return; | ||
| } | ||
| authenticate(data, callback); | ||
| }); | ||
| } | ||
| } | ||
| // authenticate with phonegap build api | ||
| // authenticate with phonegap build api | ||
| function authenticate(options, callback) { | ||
| client.auth(options, function(e, api) { | ||
| if (e) { | ||
| emitter.emit('error', e); | ||
| self.emit('error', e); | ||
| callback(e); | ||
| return; | ||
@@ -96,23 +115,15 @@ } | ||
| if (e) { | ||
| emitter.emit('error', e); | ||
| self.emit('error', e); | ||
| callback(e); | ||
| return; | ||
| } | ||
| emitter.emit('complete', api); | ||
| // complete | ||
| self.emit('log', 'logged in as', options.username); | ||
| callback(null, api); | ||
| }); | ||
| }); | ||
| } | ||
| else { | ||
| // create phonegap build api | ||
| var api = new client.API({ | ||
| 'protocol': 'https:', | ||
| 'host': 'build.phonegap.com', | ||
| 'port': '443', | ||
| 'path': '/api/v1', | ||
| 'token': data.phonegap.token | ||
| }); | ||
| emitter.emit('complete', api); | ||
| } | ||
| }); | ||
| }; | ||
@@ -23,3 +23,2 @@ /*! | ||
| * - `e` {Error} details the error. | ||
| * - `complete` is trigger when there is no error. | ||
| */ | ||
@@ -36,13 +35,6 @@ | ||
| // event support | ||
| var emitter = new events.EventEmitter(); | ||
| emitter.on('error', callback); | ||
| emitter.on('complete', callback); | ||
| // logout | ||
| process.nextTick(function() { | ||
| execute(args, emitter); | ||
| }); | ||
| execute.call(this, args, callback); | ||
| return emitter; | ||
| return this; | ||
| }; | ||
@@ -54,7 +46,10 @@ | ||
| var execute = function(args, emitter) { | ||
| var execute = function(args, callback) { | ||
| var self = this; | ||
| // read global config file | ||
| config.global.load(function(e, data) { | ||
| if (e) { | ||
| emitter.emit('error', e); | ||
| self.emit('error', e); | ||
| callback(e); | ||
| return; | ||
@@ -67,9 +62,10 @@ } | ||
| if (e) { | ||
| emitter.emit('error', e); | ||
| self.emit('error', e); | ||
| callback(e); | ||
| return; | ||
| } | ||
| emitter.emit('complete', null); | ||
| callback(null); | ||
| }); | ||
| }); | ||
| }; |
| { | ||
| "name": "phonegap-build", | ||
| "description": "PhoneGap Build command-line interface and node.js library.", | ||
| "version": "0.5.4", | ||
| "version": "0.6.0", | ||
| "homepage": "http://github.com/mwbrooks/phonegap-build-cli", | ||
@@ -18,6 +18,5 @@ "repository": { | ||
| "preferGlobal": "true", | ||
| "main": "./lib/phonegap-build.js", | ||
| "main": "./lib/main.js", | ||
| "bin": { | ||
| "phonegap-build": "./bin/phonegap-build.js", | ||
| "pgb": "./bin/phonegap-build.js" | ||
| "phonegap-build": "./bin/phonegap-build.js" | ||
| }, | ||
@@ -24,0 +23,0 @@ "scripts": { |
@@ -5,4 +5,3 @@ /* | ||
| var prompt = require('prompt'), | ||
| config = require('../../lib/common/config'), | ||
| var console = require('../../lib/cli/console'), | ||
| CLI = require('../../lib/cli'), | ||
@@ -15,186 +14,66 @@ cli; | ||
| describe('$ phonegap-build login', function() { | ||
| describe('phonegap-build login', function() { | ||
| beforeEach(function() { | ||
| cli = new CLI(); | ||
| spyOn(process.stdout, 'write'); | ||
| spyOn(config.global, 'load'); | ||
| spyOn(cli.phonegapbuild, 'login'); | ||
| spyOn(console, 'prompt'); | ||
| }); | ||
| describe('$ phonegap-build help', function() { | ||
| it('outputs info on the login command', function() { | ||
| cli.argv({ _: ['help'] }); | ||
| expect(process.stdout.write.mostRecentCall.args[0]) | ||
| .toMatch(/Commands:[\w\W]*\s+login/i); | ||
| }); | ||
| }); | ||
| describe('$ phonegap-build login', function() { | ||
| it('should try to lookup account', function() { | ||
| it('should try to login', function() { | ||
| cli.argv({ _: ['login'] }); | ||
| expect(config.global.load).toHaveBeenCalled(); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| jasmine.any(Object), | ||
| jasmine.any(Function) | ||
| ); | ||
| }); | ||
| describe('successful account lookup', function() { | ||
| describe('successful login', function() { | ||
| beforeEach(function() { | ||
| spyOn(cli.phonegapbuild, 'login'); | ||
| config.global.load.andCallFake(function(callback) { | ||
| callback(null, { phonegap: { token: 'abc123' } }); | ||
| cli.phonegapbuild.login.andCallFake(function(argv, callback) { | ||
| cli.phonegapbuild.emit('login'); | ||
| callback(null, {}); | ||
| }); | ||
| }); | ||
| it('should try to login', function() { | ||
| it('should prompt for username and password', function() { | ||
| cli.argv({ _: ['login'] }); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| null, | ||
| jasmine.any(Function) | ||
| ); | ||
| expect(console.prompt).toHaveBeenCalled(); | ||
| }); | ||
| describe('successful login', function() { | ||
| beforeEach(function() { | ||
| cli.phonegapbuild.login.andCallFake(function(argv, callback) { | ||
| callback(null, {}); | ||
| }); | ||
| it('should trigger callback without an error', function(done) { | ||
| cli.argv({ _: ['login'] }, function(e, api) { | ||
| expect(e).toBeNull(); | ||
| done(); | ||
| }); | ||
| it('should trigger callback without an error', function(done) { | ||
| cli.argv({ _: ['login'] }, function(e, api) { | ||
| expect(e).toBeNull(); | ||
| done(); | ||
| }); | ||
| }); | ||
| it('should trigger callback with API object', function(done) { | ||
| cli.argv({ _: ['login'] }, function(e, api) { | ||
| expect(api).toBeDefined(); | ||
| done(); | ||
| }); | ||
| }); | ||
| }); | ||
| describe('failed login', function() { | ||
| beforeEach(function() { | ||
| cli.phonegapbuild.login.andCallFake(function(argv, callback) { | ||
| callback(new Error('Invalid password')); | ||
| }); | ||
| it('should trigger callback with API object', function(done) { | ||
| cli.argv({ _: ['login'] }, function(e, api) { | ||
| expect(api).toBeDefined(); | ||
| done(); | ||
| }); | ||
| it('should trigger callback with an error', function(done) { | ||
| cli.argv({ _: ['login'] }, function(e, api) { | ||
| expect(e).toBeDefined(); | ||
| done(); | ||
| }); | ||
| }); | ||
| it('should trigger callback without an API object', function(done) { | ||
| cli.argv({ _: ['login'] }, function(e, api) { | ||
| expect(api).not.toBeDefined(); | ||
| done(); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| describe('failed account lookup', function() { | ||
| describe('failed login', function() { | ||
| beforeEach(function() { | ||
| spyOn(prompt, 'get'); | ||
| spyOn(cli.phonegapbuild, 'login'); | ||
| config.global.load.andCallFake(function(callback) { | ||
| callback(null, { phonegap: { token: undefined } }); | ||
| cli.phonegapbuild.login.andCallFake(function(argv, callback) { | ||
| callback(new Error('Invalid password')); | ||
| }); | ||
| }); | ||
| it('should prompt for username', function() { | ||
| cli.argv({ _: ['login'] }); | ||
| expect(prompt.get).toHaveBeenCalled(); | ||
| expect(prompt.get.mostRecentCall.args[0].properties.username).toBeDefined(); | ||
| expect(prompt.get.mostRecentCall.args[0].properties.username.required).toBe(true); | ||
| }); | ||
| it('should prompt for password', function() { | ||
| cli.argv({ _: ['login'] }); | ||
| expect(prompt.get).toHaveBeenCalled(); | ||
| expect(prompt.get.mostRecentCall.args[0].properties.password).toBeDefined(); | ||
| expect(prompt.get.mostRecentCall.args[0].properties.password.required).toBe(true); | ||
| expect(prompt.get.mostRecentCall.args[0].properties.password.hidden).toBe(true); | ||
| }); | ||
| describe('successful prompt', function() { | ||
| beforeEach(function() { | ||
| prompt.get.andCallFake(function(obj, fn) { | ||
| fn(null, { username: 'zelda', password: 'tr1force' }); | ||
| }); | ||
| it('should trigger callback with an error', function(done) { | ||
| cli.argv({ _: ['login'] }, function(e, api) { | ||
| expect(e).toBeDefined(); | ||
| done(); | ||
| }); | ||
| it('should try to login', function() { | ||
| cli.argv({ _: ['login'] }); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| { username: 'zelda', password: 'tr1force' }, | ||
| jasmine.any(Function) | ||
| ); | ||
| }); | ||
| describe('successful login', function() { | ||
| beforeEach(function() { | ||
| cli.phonegapbuild.login.andCallFake(function(argv, callback) { | ||
| callback(null, {}); | ||
| }); | ||
| }); | ||
| it('should trigger callback without an error', function(done) { | ||
| cli.argv({ _: ['login'] }, function(e, api) { | ||
| expect(e).toBeNull(); | ||
| done(); | ||
| }); | ||
| }); | ||
| it('should trigger callback with API object', function(done) { | ||
| cli.argv({ _: ['login'] }, function(e, api) { | ||
| expect(api).toBeDefined(); | ||
| done(); | ||
| }); | ||
| }); | ||
| }); | ||
| describe('failed login', function() { | ||
| beforeEach(function() { | ||
| cli.phonegapbuild.login.andCallFake(function(argv, callback) { | ||
| callback(new Error('Invalid password')); | ||
| }); | ||
| }); | ||
| it('should trigger callback with an error', function(done) { | ||
| cli.argv({ _: ['login'] }, function(e, api) { | ||
| expect(e).toBeDefined(); | ||
| done(); | ||
| }); | ||
| }); | ||
| it('should trigger callback without an API object', function(done) { | ||
| cli.argv({ _: ['login'] }, function(e, api) { | ||
| expect(api).not.toBeDefined(); | ||
| done(); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| describe('failed prompt', function() { | ||
| beforeEach(function() { | ||
| prompt.get.andCallFake(function(obj, fn) { | ||
| fn(new Error('Invalid character')); | ||
| }); | ||
| it('should trigger callback without an API object', function(done) { | ||
| cli.argv({ _: ['login'] }, function(e, api) { | ||
| expect(api).not.toBeDefined(); | ||
| done(); | ||
| }); | ||
| it('should not try to login', function() { | ||
| cli.argv({ _: ['login'] }); | ||
| expect(cli.phonegapbuild.login).not.toHaveBeenCalled(); | ||
| }); | ||
| it('should trigger callback with an error', function(done) { | ||
| cli.argv({ _: ['login'] }, function(e) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
| done(); | ||
| }); | ||
| }); | ||
| }); | ||
@@ -205,258 +84,152 @@ }); | ||
| describe('$ phonegap-build login --username zelda', function() { | ||
| describe('successful account lookup', function() { | ||
| beforeEach(function() { | ||
| spyOn(cli.phonegapbuild, 'login'); | ||
| config.global.load.andCallFake(function(callback) { | ||
| callback(null, { phonegap: { token: 'abc123' } }); | ||
| }); | ||
| }); | ||
| it('should try to login', function() { | ||
| cli.argv({ _: ['login'], username: 'zelda' }); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| { username: 'zelda', password: undefined }, | ||
| jasmine.any(Function) | ||
| ); | ||
| }); | ||
| }); | ||
| it('should try to login', function() { | ||
| cli.argv({ _: ['login'], username: 'zelda' }); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| null, | ||
| jasmine.any(Function) | ||
| ); | ||
| }); | ||
| describe('$ phonegap-build login -u zelda', function() { | ||
| it('should try to login', function() { | ||
| cli.argv({ _: ['login'], u: 'zelda' }); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| { username: 'zelda', password: undefined }, | ||
| jasmine.any(Function) | ||
| ); | ||
| }); | ||
| }); | ||
| describe('failed account lookup', function() { | ||
| beforeEach(function() { | ||
| spyOn(prompt, 'get'); | ||
| spyOn(cli.phonegapbuild, 'login'); | ||
| config.global.load.andCallFake(function(callback) { | ||
| callback(null, { phonegap: { token: undefined } }); | ||
| }); | ||
| }); | ||
| describe('$ phonegap-build login --password tr1force', function() { | ||
| it('should try to login', function() { | ||
| cli.argv({ _: ['login'], password: 'tr1force' }); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| { username: undefined, password: 'tr1force' }, | ||
| jasmine.any(Function) | ||
| ); | ||
| }); | ||
| }); | ||
| it('should not prompt for username', function() { | ||
| cli.argv({ _: ['login'], username: 'zelda' }); | ||
| expect(prompt.override.username).toEqual('zelda'); | ||
| }); | ||
| describe('$ phonegap-build login -p tr1force', function() { | ||
| it('should try to login', function() { | ||
| cli.argv({ _: ['login'], p: 'tr1force' }); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| { username: undefined, password: 'tr1force' }, | ||
| jasmine.any(Function) | ||
| ); | ||
| }); | ||
| }); | ||
| it('should prompt for password', function() { | ||
| cli.argv({ _: ['login'], username: 'zelda' }); | ||
| expect(prompt.override.password).not.toBeDefined(); | ||
| describe('$ phonegap-build login --username zelda --password tr1force', function() { | ||
| it('should try to login', function() { | ||
| cli.argv({ | ||
| _: ['login'], | ||
| username: 'zelda', | ||
| password: 'tr1force' | ||
| }); | ||
| describe('successful prompt', function() { | ||
| beforeEach(function() { | ||
| prompt.get.andCallFake(function(obj, fn) { | ||
| var o = { | ||
| username: prompt.override.username || 'link', | ||
| password: prompt.override.password || 'tr1force' | ||
| }; | ||
| fn(null, o); | ||
| }); | ||
| }); | ||
| it('should try to login', function() { | ||
| cli.argv({ _: ['login'], username: 'zelda' }); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| { username: 'zelda', password: 'tr1force' }, | ||
| jasmine.any(Function) | ||
| ); | ||
| }); | ||
| }); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| { username: 'zelda', password: 'tr1force' }, | ||
| jasmine.any(Function) | ||
| ); | ||
| }); | ||
| }); | ||
| describe('$ phonegap-build login -u zelda', function() { | ||
| describe('successful account lookup', function() { | ||
| beforeEach(function() { | ||
| spyOn(cli.phonegapbuild, 'login'); | ||
| config.global.load.andCallFake(function(callback) { | ||
| callback(null, { phonegap: { token: 'abc123' } }); | ||
| }); | ||
| describe('login event', function() { | ||
| describe('no username and no password', function() { | ||
| it('should prompt for username', function() { | ||
| cli.phonegapbuild.emit('login', {}, function() {}); | ||
| expect(console.prompt).toHaveBeenCalled(); | ||
| expect(console.prompt.mostRecentCall.args[0].override.username).toBeUndefined(); | ||
| }); | ||
| it('should try to login', function() { | ||
| cli.argv({ _: ['login'], u: 'zelda' }); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| null, | ||
| jasmine.any(Function) | ||
| ); | ||
| it('should prompt for password', function() { | ||
| cli.phonegapbuild.emit('login', {}, function() {}); | ||
| expect(console.prompt).toHaveBeenCalled(); | ||
| expect(console.prompt.mostRecentCall.args[0].override.password).toBeUndefined(); | ||
| }); | ||
| }); | ||
| describe('failed account lookup', function() { | ||
| beforeEach(function() { | ||
| spyOn(prompt, 'get'); | ||
| spyOn(cli.phonegapbuild, 'login'); | ||
| config.global.load.andCallFake(function(callback) { | ||
| callback(null, { phonegap: { token: undefined } }); | ||
| }); | ||
| }); | ||
| describe('with username and no password', function() { | ||
| it('should not prompt for username', function() { | ||
| cli.argv({ _: ['login'], u: 'zelda' }); | ||
| expect(prompt.override.username).toEqual('zelda'); | ||
| cli.phonegapbuild.emit('login', { username: 'zelda' }, function() {}); | ||
| expect(console.prompt).toHaveBeenCalled(); | ||
| expect(console.prompt.mostRecentCall.args[0].override.username).toEqual('zelda'); | ||
| }); | ||
| it('should prompt for password', function() { | ||
| cli.argv({ _: ['login'], u: 'zelda' }); | ||
| expect(prompt.override.password).not.toBeDefined(); | ||
| cli.phonegapbuild.emit('login', { username: 'zelda' }, function() {}); | ||
| expect(console.prompt).toHaveBeenCalled(); | ||
| expect(console.prompt.mostRecentCall.args[0].override.password).toBeUndefined(); | ||
| }); | ||
| describe('successful prompt', function() { | ||
| beforeEach(function() { | ||
| prompt.get.andCallFake(function(obj, fn) { | ||
| var o = { | ||
| username: prompt.override.username || 'link', | ||
| password: prompt.override.password || 'tr1force' | ||
| }; | ||
| fn(null, o); | ||
| }); | ||
| }); | ||
| it('should try to login', function() { | ||
| cli.argv({ _: ['login'], u: 'zelda' }); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| { username: 'zelda', password: 'tr1force' }, | ||
| jasmine.any(Function) | ||
| ); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| describe('$ phonegap-build login --password tr1force', function() { | ||
| describe('successful account lookup', function() { | ||
| beforeEach(function() { | ||
| spyOn(cli.phonegapbuild, 'login'); | ||
| config.global.load.andCallFake(function(callback) { | ||
| callback(null, { phonegap: { token: 'abc123' } }); | ||
| }); | ||
| describe('no username and with password', function() { | ||
| it('should prompt for username', function() { | ||
| cli.phonegapbuild.emit('login', { password: 'tr1force' }, function() {}); | ||
| expect(console.prompt).toHaveBeenCalled(); | ||
| expect(console.prompt.mostRecentCall.args[0].override.username).toBeUndefined(); | ||
| }); | ||
| it('should try to login', function() { | ||
| cli.argv({ _: ['login'], password: 'tr1force' }); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| null, | ||
| jasmine.any(Function) | ||
| ); | ||
| it('should not prompt for password', function() { | ||
| cli.phonegapbuild.emit('login', { password: 'tr1force' }, function() {}); | ||
| expect(console.prompt).toHaveBeenCalled(); | ||
| expect(console.prompt.mostRecentCall.args[0].override.password).toEqual('tr1force'); | ||
| }); | ||
| }); | ||
| describe('failed account lookup', function() { | ||
| beforeEach(function() { | ||
| spyOn(prompt, 'get'); | ||
| spyOn(cli.phonegapbuild, 'login'); | ||
| config.global.load.andCallFake(function(callback) { | ||
| callback(null, { phonegap: { token: undefined } }); | ||
| }); | ||
| describe('with username and with password', function() { | ||
| it('should not prompt for username', function() { | ||
| cli.phonegapbuild.emit('login', | ||
| { username: 'zelda', password: 'tr1force' }, | ||
| function() {} | ||
| ); | ||
| expect(console.prompt).toHaveBeenCalled(); | ||
| expect(console.prompt.mostRecentCall.args[0].override.username).toEqual('zelda'); | ||
| }); | ||
| it('should prompt for username', function() { | ||
| cli.argv({ _: ['login'], password: 'tr1force' }); | ||
| expect(prompt.override.username).not.toBeDefined(); | ||
| }); | ||
| it('should not prompt for password', function() { | ||
| cli.argv({ _: ['login'], password: 'tr1force' }); | ||
| expect(prompt.override.password).toEqual('tr1force'); | ||
| cli.phonegapbuild.emit('login', | ||
| { username: 'zelda', password: 'tr1force' }, | ||
| function() {} | ||
| ); | ||
| expect(console.prompt).toHaveBeenCalled(); | ||
| expect(console.prompt.mostRecentCall.args[0].override.password).toEqual('tr1force'); | ||
| }); | ||
| describe('successful prompt', function() { | ||
| beforeEach(function() { | ||
| prompt.get.andCallFake(function(obj, fn) { | ||
| var o = { | ||
| username: prompt.override.username || 'zelda', | ||
| password: prompt.override.password || 'hyrule' | ||
| }; | ||
| fn(null, o); | ||
| }); | ||
| }); | ||
| it('should try to login', function() { | ||
| cli.argv({ _: ['login'], password: 'tr1force' }); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| { username: 'zelda', password: 'tr1force' }, | ||
| jasmine.any(Function) | ||
| ); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| describe('$ phonegap-build login -p tr1force', function() { | ||
| describe('failed account lookup', function() { | ||
| describe('successful prompt', function() { | ||
| beforeEach(function() { | ||
| spyOn(prompt, 'get'); | ||
| spyOn(cli.phonegapbuild, 'login'); | ||
| config.global.load.andCallFake(function(callback) { | ||
| callback(null, { phonegap: { token: undefined } }); | ||
| console.prompt.andCallFake(function(options, callback) { | ||
| callback(null, { username: 'zelda', password: 'tr1force' }); | ||
| }); | ||
| }); | ||
| it('should prompt for username', function() { | ||
| cli.argv({ _: ['login'], p: 'tr1force' }); | ||
| expect(prompt.override.username).not.toBeDefined(); | ||
| it('should trigger callback without an error', function(done) { | ||
| cli.phonegapbuild.emit('login', {}, function(e, data) { | ||
| expect(e).toBeNull(); | ||
| done(); | ||
| }); | ||
| }); | ||
| it('should not prompt for password', function() { | ||
| cli.argv({ _: ['login'], p: 'tr1force' }); | ||
| expect(prompt.override.password).toEqual('tr1force'); | ||
| }); | ||
| describe('successful prompt', function() { | ||
| beforeEach(function() { | ||
| prompt.get.andCallFake(function(obj, fn) { | ||
| var o = { | ||
| username: prompt.override.username || 'zelda', | ||
| password: prompt.override.password || 'hyrule' | ||
| }; | ||
| fn(null, o); | ||
| }); | ||
| it('should trigger callback with username and password', function(done) { | ||
| cli.phonegapbuild.emit('login', {}, function(e, data) { | ||
| expect(data).toEqual({ username: 'zelda', password: 'tr1force' }); | ||
| done(); | ||
| }); | ||
| it('should try to login', function() { | ||
| cli.argv({ _: ['login'], p: 'tr1force' }); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| { username: 'zelda', password: 'tr1force' }, | ||
| jasmine.any(Function) | ||
| ); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| describe('$ phonegap-build login --username zelda --password tr1force', function() { | ||
| describe('failed account lookup', function() { | ||
| describe('failed prompt', function() { | ||
| beforeEach(function() { | ||
| spyOn(prompt, 'get'); | ||
| spyOn(cli.phonegapbuild, 'login'); | ||
| config.global.load.andCallFake(function(callback) { | ||
| callback(null, { phonegap: { token: undefined } }); | ||
| console.prompt.andCallFake(function(options, callback) { | ||
| callback(new Error('prompt was cancelled')); | ||
| }); | ||
| }); | ||
| it('should not prompt for username', function() { | ||
| cli.argv({ _: ['login'], username: 'zelda', password: 'tr1force' }); | ||
| expect(prompt.override.username).toEqual('zelda'); | ||
| }); | ||
| it('should not prompt for password', function() { | ||
| cli.argv({ _: ['login'], username: 'zelda', password: 'tr1force' }); | ||
| expect(prompt.override.password).toEqual('tr1force'); | ||
| }); | ||
| describe('successful prompt', function() { | ||
| beforeEach(function() { | ||
| prompt.get.andCallFake(function(obj, fn) { | ||
| var o = { | ||
| username: prompt.override.username || 'link', | ||
| password: prompt.override.password || 'hyrule' | ||
| }; | ||
| fn(null, o); | ||
| }); | ||
| it('should trigger callback with an error', function(done) { | ||
| cli.phonegapbuild.emit('login', {}, function(e, data) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
| done(); | ||
| }); | ||
| it('should try to login', function() { | ||
| cli.argv({ _: ['login'], username: 'zelda', password: 'tr1force' }); | ||
| expect(cli.phonegapbuild.login).toHaveBeenCalledWith( | ||
| { username: 'zelda', password: 'tr1force' }, | ||
| jasmine.any(Function) | ||
| ); | ||
| }); | ||
| }); | ||
@@ -463,0 +236,0 @@ }); |
@@ -6,3 +6,3 @@ /*! | ||
| var PhoneGapBuild = require('../lib/phonegap-build'), | ||
| phonegapbuild = new PhoneGapBuild(); | ||
| phonegapbuild; | ||
@@ -14,2 +14,6 @@ /*! | ||
| describe('phonegapbuild', function() { | ||
| beforeEach(function() { | ||
| phonegapbuild = new PhoneGapBuild(); | ||
| }); | ||
| it('should have a login action', function() { | ||
@@ -30,2 +34,18 @@ expect(phonegapbuild.login).toEqual(jasmine.any(Function)); | ||
| }); | ||
| it('should support global events', function(done) { | ||
| phonegapbuild.on('log', function() { | ||
| done(); | ||
| }); | ||
| phonegapbuild.emit('log', 'hello world'); | ||
| }); | ||
| it('should not throw "error" events', function(done) { | ||
| phonegapbuild.on('error', function() { | ||
| done(); | ||
| }); | ||
| expect(function() { | ||
| phonegapbuild.emit('error', new Error('hello world')); | ||
| }).not.toThrow(); | ||
| }); | ||
| }); |
@@ -5,4 +5,5 @@ /* | ||
| var build = require('../../lib/phonegap-build/build'), | ||
| var PhoneGapBuild = require('../../lib/phonegap-build'), | ||
| config = require('../../lib/common/config'), | ||
| phonegapbuild, | ||
| appData, | ||
@@ -12,7 +13,8 @@ options; | ||
| /* | ||
| * Specification for build. | ||
| * Specification: phonegapbuild.build(options, [callback]) | ||
| */ | ||
| describe('build(options, callback)', function() { | ||
| describe('phonegapbuild.build(options, [callback])', function() { | ||
| beforeEach(function() { | ||
| phonegapbuild = new PhoneGapBuild(); | ||
| options = { | ||
@@ -30,4 +32,4 @@ api: { | ||
| }; | ||
| spyOn(build, 'create'); | ||
| spyOn(build, 'build'); | ||
| spyOn(phonegapbuild.build, 'create'); | ||
| spyOn(phonegapbuild.build, 'build'); | ||
| spyOn(config.local, 'load'); | ||
@@ -39,3 +41,3 @@ }); | ||
| options = undefined; | ||
| build(options, function(e, data) {}); | ||
| phonegapbuild.build(options, function(e, data) {}); | ||
| }).toThrow(); | ||
@@ -47,3 +49,3 @@ }); | ||
| options.api = undefined; | ||
| build(options, function(e, data) {}); | ||
| phonegapbuild.build(options, function(e, data) {}); | ||
| }).toThrow(); | ||
@@ -55,3 +57,3 @@ }); | ||
| options.platforms = undefined; | ||
| build(options, function(e, data) {}); | ||
| phonegapbuild.build(options, function(e, data) {}); | ||
| }).toThrow(); | ||
@@ -62,6 +64,10 @@ }); | ||
| expect(function() { | ||
| build(options); | ||
| phonegapbuild.build(options); | ||
| }).not.toThrow(); | ||
| }); | ||
| it('should return itself', function() { | ||
| expect(phonegapbuild.build(options)).toEqual(phonegapbuild); | ||
| }); | ||
| describe('when app exists', function() { | ||
@@ -75,5 +81,5 @@ beforeEach(function() { | ||
| it('should try to build the app', function(done) { | ||
| build(options, function(e, data) {}); | ||
| phonegapbuild.build(options, function(e, data) {}); | ||
| process.nextTick(function() { | ||
| expect(build.build).toHaveBeenCalled(); | ||
| expect(phonegapbuild.build.build).toHaveBeenCalled(); | ||
| done(); | ||
@@ -85,3 +91,3 @@ }); | ||
| beforeEach(function() { | ||
| build.build.andCallFake(function(options, callback) { | ||
| phonegapbuild.build.build.andCallFake(function(options, callback) { | ||
| callback(null, appData); | ||
@@ -92,3 +98,3 @@ }); | ||
| it('should trigger callback without an error', function(done) { | ||
| build(options, function(e, data) { | ||
| phonegapbuild.build(options, function(e, data) { | ||
| expect(e).toBeNull(); | ||
@@ -100,3 +106,3 @@ done(); | ||
| it('should trigger callback with data', function(done) { | ||
| build(options, function(e, data) { | ||
| phonegapbuild.build(options, function(e, data) { | ||
| expect(data).toEqual(appData); | ||
@@ -106,10 +112,2 @@ done(); | ||
| }); | ||
| it('should trigger "complete" event', function(done) { | ||
| var b = build(options); | ||
| b.on('complete', function(data) { | ||
| expect(data).toEqual(jasmine.any(Object)); | ||
| done(); | ||
| }); | ||
| }); | ||
| }); | ||
@@ -119,4 +117,4 @@ | ||
| beforeEach(function() { | ||
| build.build.andCallFake(function(options, callback) { | ||
| callback(new Error('Server did not respond')); | ||
| phonegapbuild.build.build.andCallFake(function(options, callback) { | ||
| callback(new Error('server did not respond')); | ||
| }); | ||
@@ -126,3 +124,3 @@ }); | ||
| it('should trigger callback with an error', function(done) { | ||
| build(options, function(e, data) { | ||
| phonegapbuild.build(options, function(e, data) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
@@ -134,7 +132,7 @@ done(); | ||
| it('should trigger "error" event', function(done) { | ||
| var b = build(options); | ||
| b.on('error', function(e, data) { | ||
| phonegapbuild.on('error', function(e, data) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
| done(); | ||
| }); | ||
| phonegapbuild.build(options); | ||
| }); | ||
@@ -152,5 +150,5 @@ }); | ||
| it('should try to create the app', function(done) { | ||
| build(options, function(e, data) {}); | ||
| phonegapbuild.build(options, function(e, data) {}); | ||
| process.nextTick(function() { | ||
| expect(build.create).toHaveBeenCalled(); | ||
| expect(phonegapbuild.build.create).toHaveBeenCalled(); | ||
| done(); | ||
@@ -162,3 +160,3 @@ }); | ||
| beforeEach(function() { | ||
| build.create.andCallFake(function(options, callback) { | ||
| phonegapbuild.build.create.andCallFake(function(options, callback) { | ||
| callback(null, appData); | ||
@@ -169,3 +167,3 @@ }); | ||
| it('should trigger callback without an error', function(done) { | ||
| build(options, function(e, data) { | ||
| phonegapbuild.build(options, function(e, data) { | ||
| expect(e).toBeNull(); | ||
@@ -177,3 +175,3 @@ done(); | ||
| it('should trigger callback with data', function(done) { | ||
| build(options, function(e, data) { | ||
| phonegapbuild.build(options, function(e, data) { | ||
| expect(data).toEqual(appData); | ||
@@ -183,10 +181,2 @@ done(); | ||
| }); | ||
| it('should trigger "complete" event', function(done) { | ||
| var b = build(options); | ||
| b.on('complete', function(data) { | ||
| expect(data).toEqual(jasmine.any(Object)); | ||
| done(); | ||
| }); | ||
| }); | ||
| }); | ||
@@ -196,4 +186,4 @@ | ||
| beforeEach(function() { | ||
| build.create.andCallFake(function(options, callback) { | ||
| callback(new Error('Server did not respond')); | ||
| phonegapbuild.build.create.andCallFake(function(options, callback) { | ||
| callback(new Error('server did not respond')); | ||
| }); | ||
@@ -203,3 +193,3 @@ }); | ||
| it('should trigger callback with an error', function(done) { | ||
| build(options, function(e, data) { | ||
| phonegapbuild.build(options, function(e, data) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
@@ -211,7 +201,7 @@ done(); | ||
| it('should trigger "error" event', function(done) { | ||
| var b = build(options); | ||
| b.on('error', function(e) { | ||
| phonegapbuild.on('error', function(e) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
| done(); | ||
| }); | ||
| phonegapbuild.build(options); | ||
| }); | ||
@@ -218,0 +208,0 @@ }); |
@@ -5,3 +5,3 @@ /* | ||
| var create = require('../../lib/phonegap-build/create'), | ||
| var PhoneGapBuild = require('../../lib/phonegap-build'), | ||
| config = require('../../lib/common/config'), | ||
@@ -12,2 +12,3 @@ zip = require('../../lib/phonegap-build/create/zip'), | ||
| fs = require('fs'), | ||
| phonegapbuild, | ||
| options; | ||
@@ -21,2 +22,3 @@ | ||
| beforeEach(function() { | ||
| phonegapbuild = new PhoneGapBuild(); | ||
| options = { | ||
@@ -26,3 +28,3 @@ api: {}, | ||
| }; | ||
| spyOn(create, 'local'); | ||
| spyOn(phonegapbuild.create, 'local'); | ||
| }); | ||
@@ -33,3 +35,3 @@ | ||
| options = undefined; | ||
| create(options, function(e) {}); | ||
| phonegapbuild.create(options, function(e) {}); | ||
| }).toThrow(); | ||
@@ -41,3 +43,3 @@ }); | ||
| options.path = undefined; | ||
| create(options, function(e) {}); | ||
| phonegapbuild.create(options, function(e) {}); | ||
| }).toThrow(); | ||
@@ -48,10 +50,14 @@ }); | ||
| expect(function() { | ||
| create(options); | ||
| phonegapbuild.create(options); | ||
| }).not.toThrow(); | ||
| }); | ||
| it('should return itself', function() { | ||
| expect(phonegapbuild.create(options)).toEqual(phonegapbuild); | ||
| }); | ||
| it('should try to create local project', function(done) { | ||
| create(options, function(e) {}); | ||
| phonegapbuild.create(options, function(e) {}); | ||
| process.nextTick(function() { | ||
| expect(create.local).toHaveBeenCalledWith( | ||
| expect(phonegapbuild.create.local).toHaveBeenCalledWith( | ||
| { path: options.path }, | ||
@@ -66,3 +72,3 @@ jasmine.any(Function) | ||
| beforeEach(function() { | ||
| create.local.andCallFake(function(options, callback) { | ||
| phonegapbuild.create.local.andCallFake(function(options, callback) { | ||
| callback(null); | ||
@@ -73,3 +79,3 @@ }); | ||
| it('should trigger called without an error', function(done) { | ||
| create(options, function(e) { | ||
| phonegapbuild.create(options, function(e) { | ||
| expect(e).toBeNull(); | ||
@@ -79,9 +85,2 @@ done(); | ||
| }); | ||
| it('should trigger "complete" event', function(done) { | ||
| var emitter = create(options); | ||
| emitter.on('complete', function() { | ||
| done(); | ||
| }); | ||
| }); | ||
| }); | ||
@@ -91,3 +90,3 @@ | ||
| beforeEach(function() { | ||
| create.local.andCallFake(function(options, callback) { | ||
| phonegapbuild.create.local.andCallFake(function(options, callback) { | ||
| callback(new Error('app path already exists')); | ||
@@ -98,3 +97,3 @@ }); | ||
| it('should trigger callback with an error', function(done) { | ||
| create(options, function(e) { | ||
| phonegapbuild.create(options, function(e) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
@@ -106,7 +105,7 @@ done(); | ||
| it('should trigger "error" event', function(done) { | ||
| var emitter = create(options); | ||
| emitter.on('error', function(e) { | ||
| phonegapbuild.on('error', function(e) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
| done(); | ||
| }); | ||
| phonegapbuild.create(options); | ||
| }); | ||
@@ -120,3 +119,3 @@ }); | ||
| describe('create.local(options, callback)', function() { | ||
| describe('phonegapbuild.create.local(options, [callback])', function() { | ||
| beforeEach(function() { | ||
@@ -133,3 +132,3 @@ options = { path: '/some/path/to/my/app' }; | ||
| options = undefined; | ||
| create.local(options, function(e) {}); | ||
| phonegapbuild.create.local(options, function(e) {}); | ||
| }).toThrow(); | ||
@@ -141,3 +140,3 @@ }); | ||
| options.path = undefined; | ||
| create.local(options, function(e) {}); | ||
| phonegapbuild.create.local(options, function(e) {}); | ||
| }).toThrow(); | ||
@@ -148,3 +147,3 @@ }); | ||
| expect(function() { | ||
| create.local(options); | ||
| phonegapbuild.create.local(options); | ||
| }).not.toThrow(); | ||
@@ -154,3 +153,3 @@ }); | ||
| it('should check if path exists', function() { | ||
| create.local(options, function(e) {}); | ||
| phonegapbuild.create.local(options, function(e) {}); | ||
| expect(fs.exists).toHaveBeenCalledWith(options.path, jasmine.any(Function)); | ||
@@ -167,3 +166,3 @@ }); | ||
| it('should create project from path', function() { | ||
| create.local(options, function(e) {}); | ||
| phonegapbuild.create.local(options, function(e) {}); | ||
| expect(shell.cp).toHaveBeenCalled(); | ||
@@ -179,3 +178,3 @@ expect(shell.cp.mostRecentCall.args[0]).toEqual('-R'); | ||
| it('should trigger callback without an error', function(done) { | ||
| create.local(options, function(e) { | ||
| phonegapbuild.create.local(options, function(e) { | ||
| expect(e).toBeNull(); | ||
@@ -194,3 +193,3 @@ done(); | ||
| expect(function() { | ||
| create.local(options, function(e) {}); | ||
| phonegapbuild.create.local(options, function(e) {}); | ||
| }).not.toThrow(); | ||
@@ -200,3 +199,3 @@ }); | ||
| it('should trigger callback with an error', function(done) { | ||
| create.local(options, function(e) { | ||
| phonegapbuild.create.local(options, function(e) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
@@ -217,3 +216,3 @@ done(); | ||
| it('should trigger callback with an error', function(done) { | ||
| create.local(options, function(e) { | ||
| phonegapbuild.create.local(options, function(e) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
@@ -220,0 +219,0 @@ done(); |
@@ -5,13 +5,15 @@ /* | ||
| var login = require('../../lib/phonegap-build/login'), | ||
| var PhoneGapBuild = require('../../lib/phonegap-build'), | ||
| config = require('../../lib/common/config'), | ||
| client = require('phonegap-build-api'), | ||
| phonegapbuild, | ||
| options; | ||
| /* | ||
| * Specification for login. | ||
| * Specification: phonegapbuild.login(options, [callback]) | ||
| */ | ||
| describe('login(options, callback)', function() { | ||
| describe('phonegapbuild.login(options, [callback])', function() { | ||
| beforeEach(function() { | ||
| phonegapbuild = new PhoneGapBuild(); | ||
| options = { username: 'zelda', password: 'tr1force' }; | ||
@@ -23,10 +25,21 @@ spyOn(client, 'auth'); | ||
| it('should require options', function() { | ||
| expect(function() { | ||
| options = null; | ||
| phonegapbuild.login(options); | ||
| }).toThrow(); | ||
| }); | ||
| it('should not require callback', function() { | ||
| expect(function() { | ||
| login(options); | ||
| phonegapbuild.login(options); | ||
| }).not.toThrow(); | ||
| }); | ||
| it('should try to lookup token', function() { | ||
| login(options, function(e, api) {}); | ||
| it('should return itself', function() { | ||
| expect(phonegapbuild.login(options)).toEqual(phonegapbuild); | ||
| }); | ||
| it('should try to find auth token', function() { | ||
| phonegapbuild.login(options, function(e, api) {}); | ||
| process.nextTick(function() { | ||
@@ -37,3 +50,3 @@ expect(config.global.load).toHaveBeenCalled(); | ||
| describe('successful token lookup', function() { | ||
| describe('successfully found auth token', function() { | ||
| beforeEach(function() { | ||
@@ -50,3 +63,3 @@ config.global.load.andCallFake(function(callback) { | ||
| it('should trigger callback without an error', function(done) { | ||
| login(options, function(e, api) { | ||
| phonegapbuild.login(options, function(e, api) { | ||
| expect(e).toBeNull(); | ||
@@ -58,3 +71,3 @@ done(); | ||
| it('should trigger callback with an api object', function(done) { | ||
| login(options, function(e, api) { | ||
| phonegapbuild.login(options, function(e, api) { | ||
| expect(api).toBeDefined(); | ||
@@ -64,13 +77,5 @@ done(); | ||
| }); | ||
| it('should trigger "complete" event', function(done) { | ||
| var emitter = login(options); | ||
| emitter.on('complete', function(api) { | ||
| expect(api).toBeDefined(); | ||
| done(); | ||
| }); | ||
| }); | ||
| }); | ||
| describe('failed token lookup', function() { | ||
| describe('failed to find auth token', function() { | ||
| beforeEach(function() { | ||
@@ -82,23 +87,12 @@ config.global.load.andCallFake(function(callback) { | ||
| it('should require option.username', function(done) { | ||
| options.username = undefined; | ||
| login(options, function(e, api) { | ||
| expect(e).toBeDefined(); | ||
| expect(api).not.toBeDefined(); | ||
| done(); | ||
| describe('when given username and password', function() { | ||
| beforeEach(function() { | ||
| options = { | ||
| username: 'zelda@nintendo.com', | ||
| password: 'tr1force' | ||
| }; | ||
| }); | ||
| }); | ||
| it('should require option.password', function(done) { | ||
| options.password = undefined; | ||
| login(options, function(e, api) { | ||
| expect(e).toBeDefined(); | ||
| expect(api).not.toBeDefined(); | ||
| done(); | ||
| }); | ||
| }); | ||
| it('should try to authenticate', function() { | ||
| login(options, function() {}); | ||
| process.nextTick(function() { | ||
| it('should try to authenticate', function() { | ||
| phonegapbuild.login(options, function() {}); | ||
| expect(client.auth).toHaveBeenCalledWith( | ||
@@ -109,31 +103,17 @@ options, | ||
| }); | ||
| }); | ||
| describe('successful authentication', function() { | ||
| beforeEach(function() { | ||
| client.auth.andCallFake(function(options, callback) { | ||
| callback(null, { token: 'abc123' }); | ||
| }); | ||
| }); | ||
| it('should try to save token', function() { | ||
| login(options, function(e, api) {}); | ||
| process.nextTick(function() { | ||
| expect(config.global.save).toHaveBeenCalled(); | ||
| expect( | ||
| config.global.save.mostRecentCall.args[0].phonegap.token | ||
| ).toEqual('abc123'); | ||
| }); | ||
| }); | ||
| describe('successfully saved token', function() { | ||
| describe('successful authentication', function() { | ||
| beforeEach(function() { | ||
| config.global.save.andCallFake(function(data, callback) { | ||
| callback(null); | ||
| client.auth.andCallFake(function(options, callback) { | ||
| callback(null, { token: 'abc123' }); | ||
| }); | ||
| }); | ||
| it('should trigger callback without an error', function(done) { | ||
| login(options, function(e, api) { | ||
| expect(e).toBeNull(); | ||
| it('should try to save token', function(done) { | ||
| phonegapbuild.login(options, function(e, api) {}); | ||
| process.nextTick(function() { | ||
| expect(config.global.save).toHaveBeenCalled(); | ||
| expect( | ||
| config.global.save.mostRecentCall.args[0].phonegap.token | ||
| ).toEqual('abc123'); | ||
| done(); | ||
@@ -143,27 +123,64 @@ }); | ||
| it('should trigger callback with an api object', function(done) { | ||
| login(options, function(e, api) { | ||
| expect(api).toBeDefined(); | ||
| done(); | ||
| describe('successfully saved token', function() { | ||
| beforeEach(function() { | ||
| config.global.save.andCallFake(function(data, callback) { | ||
| callback(null); | ||
| }); | ||
| }); | ||
| it('should trigger callback without an error', function(done) { | ||
| phonegapbuild.login(options, function(e, api) { | ||
| expect(e).toBeNull(); | ||
| done(); | ||
| }); | ||
| }); | ||
| it('should trigger callback with an api object', function(done) { | ||
| phonegapbuild.login(options, function(e, api) { | ||
| expect(api).toBeDefined(); | ||
| done(); | ||
| }); | ||
| }); | ||
| }); | ||
| it('should trigger "complete" event', function(done) { | ||
| var emitter = login(options); | ||
| emitter.on('complete', function(api) { | ||
| expect(api).toBeDefined(); | ||
| done(); | ||
| describe('failed to save token', function() { | ||
| beforeEach(function() { | ||
| config.global.save.andCallFake(function(data, callback) { | ||
| callback(new Error('No write permission')); | ||
| }); | ||
| }); | ||
| it('should trigger callback with an error', function(done) { | ||
| phonegapbuild.login(options, function(e, api) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
| done(); | ||
| }); | ||
| }); | ||
| it('should trigger callback without an api object', function(done) { | ||
| phonegapbuild.login(options, function(e, api) { | ||
| expect(api).not.toBeDefined(); | ||
| done(); | ||
| }); | ||
| }); | ||
| it('should trigger "error" event', function(done) { | ||
| phonegapbuild.on('error', function(e) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
| done(); | ||
| }); | ||
| phonegapbuild.login(options); | ||
| }); | ||
| }); | ||
| }); | ||
| describe('failed to save token', function() { | ||
| describe('failed authentication', function() { | ||
| beforeEach(function() { | ||
| config.global.save.andCallFake(function(data, callback) { | ||
| callback(new Error('No write permission')); | ||
| client.auth.andCallFake(function(options, callback) { | ||
| callback(new Error('account does not exist')); | ||
| }); | ||
| }); | ||
| it('should trigger callback with an error', function(done) { | ||
| login(options, function(e, api) { | ||
| it('should trigger callback an error', function(done) { | ||
| phonegapbuild.login(options, function(e, api) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
@@ -175,3 +192,3 @@ done(); | ||
| it('should trigger callback without an api object', function(done) { | ||
| login(options, function(e, api) { | ||
| phonegapbuild.login(options, function(e, api) { | ||
| expect(api).not.toBeDefined(); | ||
@@ -183,7 +200,7 @@ done(); | ||
| it('should trigger "error" event', function(done) { | ||
| var emitter = login(options); | ||
| emitter.on('error', function(e) { | ||
| phonegapbuild.on('error', function(e) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
| done(); | ||
| }); | ||
| phonegapbuild.login(options); | ||
| }); | ||
@@ -193,32 +210,69 @@ }); | ||
| describe('failed authentication', function() { | ||
| describe('when missing username and/or password', function() { | ||
| beforeEach(function() { | ||
| client.auth.andCallFake(function(options, callback) { | ||
| callback(new Error('account does not exist')); | ||
| }); | ||
| options = { | ||
| username: 'zelda@nintendo.com' | ||
| }; | ||
| }); | ||
| it('should trigger callback an error', function(done) { | ||
| login(options, function(e, api) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
| it('should fire a "login" event', function(done) { | ||
| phonegapbuild.on('login', function(options, callback) { | ||
| expect(options).toEqual(options); | ||
| expect(callback).toEqual(jasmine.any(Function)); | ||
| done(); | ||
| }); | ||
| phonegapbuild.login(options); | ||
| }); | ||
| it('should trigger callback without an api object', function(done) { | ||
| login(options, function(e, api) { | ||
| expect(api).not.toBeDefined(); | ||
| done(); | ||
| describe('successful "login" event callback', function() { | ||
| it('should try to authenticate', function(done) { | ||
| phonegapbuild.on('login', function(options, callback) { | ||
| callback(null, { username: 'zelda', password: 'tr1force' }); | ||
| expect(client.auth).toHaveBeenCalledWith( | ||
| { username: 'zelda', password: 'tr1force' }, | ||
| jasmine.any(Function) | ||
| ); | ||
| done(); | ||
| }); | ||
| phonegapbuild.login(options); | ||
| }); | ||
| }); | ||
| it('should trigger "error" event', function(done) { | ||
| var emitter = login(options); | ||
| emitter.on('error', function(e) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
| done(); | ||
| describe('failed "login" event callback', function() { | ||
| beforeEach(function() { | ||
| phonegapbuild.on('login', function(options, callback) { | ||
| callback(new Error('Ganon stole my username')); | ||
| }); | ||
| }); | ||
| it('should not try to authenticate', function(done) { | ||
| phonegapbuild.login(options); | ||
| process.nextTick(function() { | ||
| expect(client.auth).not.toHaveBeenCalled(); | ||
| done(); | ||
| }); | ||
| }); | ||
| it('should trigger callback with an error', function(done) { | ||
| phonegapbuild.login(options, function(e) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
| done(); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| describe('failed to read config', function() { | ||
| beforeEach(function() { | ||
| config.global.load.andCallFake(function(callback) { | ||
| callback(new Error('cannot read config file')); | ||
| }); | ||
| }); | ||
| it('should try to authenticate', function() { | ||
| phonegapbuild.login(options); | ||
| expect(client.auth).toHaveBeenCalled(); | ||
| }); | ||
| }); | ||
| }); |
@@ -5,4 +5,5 @@ /* | ||
| var logout = require('../../lib/phonegap-build/logout'), | ||
| config = require('../../lib/common/config'); | ||
| var PhoneGapBuild = require('../../lib/phonegap-build'), | ||
| config = require('../../lib/common/config'), | ||
| phonegapbuild; | ||
@@ -15,2 +16,3 @@ /* | ||
| beforeEach(function() { | ||
| phonegapbuild = new PhoneGapBuild(); | ||
| spyOn(config.global, 'load'); | ||
@@ -21,11 +23,19 @@ spyOn(config.global, 'save'); | ||
| it('should require options parameter', function() { | ||
| expect(function() { logout(undefined, function(e) {}); }).toThrow(); | ||
| expect(function() { | ||
| phonegapbuild.logout(undefined, function(e) {}); | ||
| }).toThrow(); | ||
| }); | ||
| it('should not require callback parameter', function() { | ||
| expect(function() { logout({}, undefined); }).not.toThrow(); | ||
| expect(function() { | ||
| phonegapbuild.logout({}, undefined); | ||
| }).not.toThrow(); | ||
| }); | ||
| it('should return itself', function() { | ||
| expect(phonegapbuild.logout({})).toEqual(phonegapbuild); | ||
| }); | ||
| it('should try to load the config', function(done) { | ||
| logout({}, function(e) {}); | ||
| phonegapbuild.logout({}, function(e) {}); | ||
| process.nextTick(function() { | ||
@@ -50,3 +60,3 @@ expect(config.global.load).toHaveBeenCalled(); | ||
| it('should try to save the config', function(done) { | ||
| logout({}, function(e) {}); | ||
| phonegapbuild.logout({}, function(e) {}); | ||
| process.nextTick(function() { | ||
@@ -66,3 +76,3 @@ expect(config.global.save).toHaveBeenCalled(); | ||
| it('should delete the token key', function(done) { | ||
| logout({}, function(e) {}); | ||
| phonegapbuild.logout({}, function(e) {}); | ||
| process.nextTick(function() { | ||
@@ -75,3 +85,3 @@ expect(config.global.save.mostRecentCall.args[0].phonegap.token).not.toBeDefined(); | ||
| it('should preserve the remaining keys', function(done) { | ||
| logout({}, function(e) {}); | ||
| phonegapbuild.logout({}, function(e) {}); | ||
| process.nextTick(function() { | ||
@@ -90,3 +100,3 @@ expect(config.global.save.mostRecentCall.args[0]).toEqual( | ||
| it('should trigger callback without an error', function(done) { | ||
| logout({}, function(e) { | ||
| phonegapbuild.logout({}, function(e) { | ||
| expect(e).toBeNull(); | ||
@@ -96,9 +106,2 @@ done(); | ||
| }); | ||
| it('should trigger "complete" event', function(done) { | ||
| var emitter = logout({}); | ||
| emitter.on('complete', function() { | ||
| done(); | ||
| }); | ||
| }); | ||
| }); | ||
@@ -114,3 +117,3 @@ | ||
| it('should trigger callback with an error', function(done) { | ||
| logout({}, function(e) { | ||
| phonegapbuild.logout({}, function(e) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
@@ -122,7 +125,7 @@ done(); | ||
| it('should trigger "error" event', function(done) { | ||
| var emitter = logout({}); | ||
| emitter.on('error', function(e) { | ||
| phonegapbuild.on('error', function(e) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
| done(); | ||
| }); | ||
| phonegapbuild.logout({}); | ||
| }); | ||
@@ -140,3 +143,3 @@ }); | ||
| it('should trigger callback with an error', function(done) { | ||
| logout({}, function(e) { | ||
| phonegapbuild.logout({}, function(e) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
@@ -148,9 +151,9 @@ done(); | ||
| it('should trigger "error" event', function(done) { | ||
| var emitter = logout({}); | ||
| emitter.on('error', function(e) { | ||
| phonegapbuild.on('error', function(e) { | ||
| expect(e).toEqual(jasmine.any(Error)); | ||
| done(); | ||
| }); | ||
| phonegapbuild.logout({}); | ||
| }); | ||
| }); | ||
| }); |
No alert changes
Improved metrics
- Number of package files
111
1.83%Worsened metrics
- Total package byte prevSize
1534305
-0.32%- Lines of code
6913
-1.58%No dependency changes