1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-05 19:42:01 +02:00

Allow adb connect URL to be customized.

This commit is contained in:
Simo Kinnunen 2015-07-24 13:43:12 +09:00
parent 7eb6f8f871
commit caf8d35eb7
4 changed files with 47 additions and 2 deletions

View file

@ -15,13 +15,14 @@ module.exports = syrup.serial()
.dependency(require('../support/push'))
.dependency(require('./group'))
.dependency(require('./solo'))
.define(function(options, adb, router, push, group, solo) {
.dependency(require('./util/urlformat'))
.define(function(options, adb, router, push, group, solo, urlformat) {
var log = logger.createLogger('device:plugins:connect')
, plugin = Object.create(null)
, activeServer = null
plugin.port = options.connectPort
plugin.url = util.format('%s:%s', options.publicIp, plugin.port)
plugin.url = urlformat(options.connectUrlPattern, plugin.port)
plugin.start = function() {
return new Promise(function(resolve, reject) {

View file

@ -0,0 +1,33 @@
var syrup = require('stf-syrup')
var _ = require('lodash')
var tr = require('transliteration')
module.exports = syrup.serial()
.dependency(require('../identity'))
.dependency(require('../data'))
.define(function(options, identity, data) {
function createSlug() {
var model = identity.model
, name = data ? data.name.id : ''
return (name === '' || model.toLowerCase() === name.toLowerCase())
? tr.slugify(model)
: tr.slugify(name + ' ' + model)
}
var defaults = {
publicIp: options.publicIp
, serial: options.serial
, model: identity.model
, name: data ? data.name.id : ''
, slug: createSlug()
}
return function(template, port) {
return _.template(template, {
imports: {
slugify: tr.slugify
}
})(_.defaults({publicPort: port}, defaults))
}
})