Skip to content

Commit cba8388

Browse files
committed
update dependencies (fix #63). version bump
1 parent e07edc7 commit cba8388

File tree

6 files changed

+31
-31
lines changed

6 files changed

+31
-31
lines changed

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ plan.local('default', function(transport) {});
186186
plan.remote(['default', 'deploy', 'build'], function(transport) {});
187187
```
188188

189-
### <a name="flightplan.target(name%2C%20hosts%5B%2C%20options%5D)"></a>flightplan.target(name, hosts[, options]) → this
189+
### <a name="flightplan.target(name%2C%20hosts%5B%2C%20options%5D)"></a>flightplan.target(name, hosts[, options]) → this
190190

191191
Configure the flightplan's targets with `target()`. Without a
192192
proper setup you can't do remote flights which require at
@@ -259,7 +259,7 @@ $ fly staging --sudoUser=foo
259259
# plan.runtime.options.sudoUser -> 'foo'
260260
```
261261

262-
### <a name="flightplan.local(%5Btasks%2C%20%5Dfn)"></a>flightplan.local([tasks, ]fn) → this
262+
### <a name="flightplan.local(%5Btasks%2C%20%5Dfn)"></a>flightplan.local([tasks, ]fn) → this
263263

264264
Calling this method registers a local flight. Local flights are
265265
executed on your localhost. When `fn` gets called a `Transport` object
@@ -274,7 +274,7 @@ plan.local(function(local) {
274274
An optional first parameter of type Array or String can be passed for
275275
defining the flight's task(s).
276276

277-
### <a name="flightplan.remote(%5Btasks%2C%20%5Dfn)"></a>flightplan.remote([tasks, ]fn) → this
277+
### <a name="flightplan.remote(%5Btasks%2C%20%5Dfn)"></a>flightplan.remote([tasks, ]fn) → this
278278

279279
Register a remote flight. Remote flights are executed on the current
280280
target's remote hosts defined with `briefing()`. When `fn` gets called
@@ -430,7 +430,7 @@ www:x:1002:1002::/home/www:/bin/bash # GOOD
430430
www:x:1002:1002::/home/www:/bin/false # BAD
431431
```
432432

433-
### <a name="transport.transfer(files%2C%20remoteDir%5B%2C%20options%5D)"></a>transport.transfer(files, remoteDir[, options]) → [results]
433+
### <a name="transport.transfer(files%2C%20remoteDir%5B%2C%20options%5D)"></a>transport.transfer(files, remoteDir[, options]) → [results]
434434

435435
Copy a list of files to the current target's remote host(s) using
436436
`rsync` with the SSH protocol. File transfers are executed in parallel.
@@ -471,7 +471,7 @@ In this case the latter will be used. If debugging is enabled
471471
(either with `briefing()` or with `fly --debug`), `rsync` is executed
472472
in verbose mode (`-vv`).
473473

474-
### <a name="transport.prompt(message%5B%2C%20options%5D)"></a>transport.prompt(message[, options]) → input
474+
### <a name="transport.prompt(message%5B%2C%20options%5D)"></a>transport.prompt(message[, options]) → input
475475

476476
Prompt for user input.
477477

@@ -493,7 +493,7 @@ if(plan.runtime.target === 'production') {
493493
}
494494
```
495495

496-
### <a name="transport.waitFor(fn(done))"></a>transport.waitFor(fn(done)) → mixed
496+
### <a name="transport.waitFor(fn(done))"></a>transport.waitFor(fn(done)) → mixed
497497

498498
Execute a function and return after the callback `done` is called.
499499
This is used for running asynchronous functions in a synchronous way.

bin/fly.js

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env node
22

33
var Liftoff = require('liftoff')
4+
, interpret = require('interpret')
45
, v8flags = require('v8flags')
56
, semver = require('semver')
67
, cliPackage = require('../package')
@@ -58,15 +59,13 @@ var cli = new Liftoff({
5859
name: 'flightplan',
5960
processTitle: 'Flightplan',
6061
configName: 'flightplan',
61-
extensions: {
62-
'.js': null,
63-
'.coffee': 'coffee-script/register'
64-
},
65-
nodeFlags: v8flags.fetch()
62+
extensions: interpret.jsVariants,
63+
v8flags: v8flags
6664
});
6765

68-
cli.on('requireFail', function (name, err) {
69-
console.error('Unable to load:', name, err);
66+
cli.on('requireFail', function(name) {
67+
console.error('Error: Unable to load module "' + name + '"');
68+
process.exit(1);
7069
});
7170

7271
var invoke = function(env) {

docs/template.md.ejs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<?= doc.javadoc[0].name.toLowerCase() ?>.<?= comment.name -?>
2525
<? if (comment.returnTags.length > 0) { -?> →
2626
<? comment.returnTags.forEach(function(returnTag) { -?>
27-
<?= ' ' + returnTag.joinedTypes ?><?= ' ' + returnTag.description ?>
27+
<?= /*' ' + returnTag.joinedTypes + */' ' + returnTag.description ?>
2828
<? }) ?>
2929
<? } ?>
3030
<? } else { ?>

lib/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ function _setupFlight(type, tasksOrFn, fn) {
101101
* ```
102102
*
103103
* @class Flightplan
104-
* @return flightplan
104+
* @return {Object} flightplan
105105
*/
106106
function Flightplan() {
107107
this._targets = [];
@@ -196,7 +196,7 @@ function Flightplan() {
196196
* ```
197197
*
198198
* @method target(name, hosts[, options])
199-
* @return this
199+
* @return {Object} this
200200
*/
201201
Flightplan.prototype.target = function(name, hosts, options) {
202202
if(!Array.isArray(hosts)) {
@@ -221,7 +221,7 @@ Flightplan.prototype.target = function(name, hosts, options) {
221221
* defining the flight's task(s).
222222
*
223223
* @method local([tasks, ]fn)
224-
* @return this
224+
* @return {Object} this
225225
*/
226226
Flightplan.prototype.local = function(tasksOrFn, fn) {
227227
this._flights.push(_setupFlight(flight.TYPE.LOCAL, tasksOrFn, fn));
@@ -243,7 +243,7 @@ Flightplan.prototype.local = function(tasksOrFn, fn) {
243243
* defining the flight's task(s).
244244
*
245245
* @method remote([tasks, ]fn)
246-
* @return this
246+
* @return {Object} this
247247
*/
248248
Flightplan.prototype.remote = function(tasksOrFn, fn) {
249249
this._flights.push(_setupFlight(flight.TYPE.REMOTE, tasksOrFn, fn));

lib/transport/index.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var format = require('util').format
4747
* ```
4848
*
4949
* @class Transport
50-
* @return transport
50+
* @return {Object} transport
5151
*/
5252
function Transport(context) {
5353
this._context = context;
@@ -131,7 +131,7 @@ Transport.prototype._exec = function() {
131131
* ```
132132
*
133133
* @method exec(command[, options])
134-
* @return code: int, stdout: String, stderr: String
134+
* @return {Object} code: int, stdout: String, stderr: String
135135
*/
136136
Transport.prototype.exec = function(command, options) {
137137
return this._exec(format('%s%s', this._execWith, command), options);
@@ -177,7 +177,7 @@ Transport.prototype.exec = function(command, options) {
177177
* ```
178178
*
179179
* @method sudo(command[, options])
180-
* @return code: int, stdout: String, stderr: String
180+
* @return {Object} code: int, stdout: String, stderr: String
181181
*/
182182
Transport.prototype.sudo = function(command, options) {
183183
options = options || {};
@@ -228,7 +228,7 @@ Transport.prototype.sudo = function(command, options) {
228228
* in verbose mode (`-vv`).
229229
*
230230
* @method transfer(files, remoteDir[, options])
231-
* @return [results]
231+
* @return {Array} [results]
232232
*/
233233
Transport.prototype.transfer = function() {
234234
throw new Error('This transport does not implement `transfer(files, remoteDir, options)`');
@@ -256,7 +256,7 @@ Transport.prototype.transfer = function() {
256256
* ```
257257
*
258258
* @method prompt(message[, options])
259-
* @return input
259+
* @return {String} input
260260
*/
261261
Transport.prototype.prompt = function(message, options) {
262262
options = options || {};
@@ -300,7 +300,7 @@ Transport.prototype.prompt = function(message, options) {
300300
* ```
301301
*
302302
* @method waitFor(fn(done))
303-
* @return mixed
303+
* @return {} mixed
304304
*/
305305
Transport.prototype.waitFor = function(fn) {
306306
var result;

package.json

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "flightplan",
33
"description": "Library for streamlining application deployment or systems administration tasks",
4-
"version": "0.5.5",
4+
"version": "0.5.6",
55
"author": "Patrick Stadler <[email protected]>",
66
"keywords": [
77
"deploy",
@@ -36,22 +36,23 @@
3636
"dependencies": {
3737
"byline": "^4.1.1",
3838
"chalk": "^0.5.1",
39-
"fibers": "^1.0.2",
40-
"liftoff": "^0.13.6",
39+
"fibers": "^1.0.5",
40+
"interpret": "^0.4.2",
41+
"liftoff": "^2.0.0",
4142
"nopt": "^3.0.1",
42-
"pretty-hrtime": "^0.2.2",
43+
"pretty-hrtime": "^1.0.0",
4344
"prompt": "^0.2.14",
44-
"semver": "^4.1.0",
45+
"semver": "^4.2.0",
4546
"ssh2": "^0.3.6",
4647
"temp-write": "^1.1.0",
4748
"util-extend": "^1.0.1",
48-
"v8flags": "^1.0.1"
49+
"v8flags": "^2.0.2"
4950
},
5051
"license": "MIT",
5152
"devDependencies": {
5253
"gulp": "^3.8.10",
5354
"gulp-jshint": "^1.9.0",
5455
"jshint-stylish": "^1.0.0",
55-
"markdox": "^0.1.7"
56+
"markdox": "^0.1.8"
5657
}
5758
}

0 commit comments

Comments
 (0)