Skip to content

Commit

Permalink
update dependencies (fix #63). version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
pstadler committed Jan 19, 2015
1 parent e07edc7 commit cba8388
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 31 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ plan.local('default', function(transport) {});
plan.remote(['default', 'deploy', 'build'], function(transport) {});
```

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

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

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

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

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

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

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

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

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

Prompt for user input.

Expand All @@ -493,7 +493,7 @@ if(plan.runtime.target === 'production') {
}
```

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

Execute a function and return after the callback `done` is called.
This is used for running asynchronous functions in a synchronous way.
Expand Down
13 changes: 6 additions & 7 deletions bin/fly.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env node

var Liftoff = require('liftoff')
, interpret = require('interpret')
, v8flags = require('v8flags')
, semver = require('semver')
, cliPackage = require('../package')
Expand Down Expand Up @@ -58,15 +59,13 @@ var cli = new Liftoff({
name: 'flightplan',
processTitle: 'Flightplan',
configName: 'flightplan',
extensions: {
'.js': null,
'.coffee': 'coffee-script/register'
},
nodeFlags: v8flags.fetch()
extensions: interpret.jsVariants,
v8flags: v8flags
});

cli.on('requireFail', function (name, err) {
console.error('Unable to load:', name, err);
cli.on('requireFail', function(name) {
console.error('Error: Unable to load module "' + name + '"');
process.exit(1);
});

var invoke = function(env) {
Expand Down
2 changes: 1 addition & 1 deletion docs/template.md.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<?= doc.javadoc[0].name.toLowerCase() ?>.<?= comment.name -?>
<? if (comment.returnTags.length > 0) { -?> →
<? comment.returnTags.forEach(function(returnTag) { -?>
<?= ' ' + returnTag.joinedTypes ?><?= ' ' + returnTag.description ?>
<?= /*' ' + returnTag.joinedTypes + */' ' + returnTag.description ?>
<? }) ?>
<? } ?>
<? } else { ?>
Expand Down
8 changes: 4 additions & 4 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ function _setupFlight(type, tasksOrFn, fn) {
* ```
*
* @class Flightplan
* @return flightplan
* @return {Object} flightplan
*/
function Flightplan() {
this._targets = [];
Expand Down Expand Up @@ -196,7 +196,7 @@ function Flightplan() {
* ```
*
* @method target(name, hosts[, options])
* @return this
* @return {Object} this
*/
Flightplan.prototype.target = function(name, hosts, options) {
if(!Array.isArray(hosts)) {
Expand All @@ -221,7 +221,7 @@ Flightplan.prototype.target = function(name, hosts, options) {
* defining the flight's task(s).
*
* @method local([tasks, ]fn)
* @return this
* @return {Object} this
*/
Flightplan.prototype.local = function(tasksOrFn, fn) {
this._flights.push(_setupFlight(flight.TYPE.LOCAL, tasksOrFn, fn));
Expand All @@ -243,7 +243,7 @@ Flightplan.prototype.local = function(tasksOrFn, fn) {
* defining the flight's task(s).
*
* @method remote([tasks, ]fn)
* @return this
* @return {Object} this
*/
Flightplan.prototype.remote = function(tasksOrFn, fn) {
this._flights.push(_setupFlight(flight.TYPE.REMOTE, tasksOrFn, fn));
Expand Down
12 changes: 6 additions & 6 deletions lib/transport/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ var format = require('util').format
* ```
*
* @class Transport
* @return transport
* @return {Object} transport
*/
function Transport(context) {
this._context = context;
Expand Down Expand Up @@ -131,7 +131,7 @@ Transport.prototype._exec = function() {
* ```
*
* @method exec(command[, options])
* @return code: int, stdout: String, stderr: String
* @return {Object} code: int, stdout: String, stderr: String
*/
Transport.prototype.exec = function(command, options) {
return this._exec(format('%s%s', this._execWith, command), options);
Expand Down Expand Up @@ -177,7 +177,7 @@ Transport.prototype.exec = function(command, options) {
* ```
*
* @method sudo(command[, options])
* @return code: int, stdout: String, stderr: String
* @return {Object} code: int, stdout: String, stderr: String
*/
Transport.prototype.sudo = function(command, options) {
options = options || {};
Expand Down Expand Up @@ -228,7 +228,7 @@ Transport.prototype.sudo = function(command, options) {
* in verbose mode (`-vv`).
*
* @method transfer(files, remoteDir[, options])
* @return [results]
* @return {Array} [results]
*/
Transport.prototype.transfer = function() {
throw new Error('This transport does not implement `transfer(files, remoteDir, options)`');
Expand Down Expand Up @@ -256,7 +256,7 @@ Transport.prototype.transfer = function() {
* ```
*
* @method prompt(message[, options])
* @return input
* @return {String} input
*/
Transport.prototype.prompt = function(message, options) {
options = options || {};
Expand Down Expand Up @@ -300,7 +300,7 @@ Transport.prototype.prompt = function(message, options) {
* ```
*
* @method waitFor(fn(done))
* @return mixed
* @return {} mixed
*/
Transport.prototype.waitFor = function(fn) {
var result;
Expand Down
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "flightplan",
"description": "Library for streamlining application deployment or systems administration tasks",
"version": "0.5.5",
"version": "0.5.6",
"author": "Patrick Stadler <[email protected]>",
"keywords": [
"deploy",
Expand Down Expand Up @@ -36,22 +36,23 @@
"dependencies": {
"byline": "^4.1.1",
"chalk": "^0.5.1",
"fibers": "^1.0.2",
"liftoff": "^0.13.6",
"fibers": "^1.0.5",
"interpret": "^0.4.2",
"liftoff": "^2.0.0",
"nopt": "^3.0.1",
"pretty-hrtime": "^0.2.2",
"pretty-hrtime": "^1.0.0",
"prompt": "^0.2.14",
"semver": "^4.1.0",
"semver": "^4.2.0",
"ssh2": "^0.3.6",
"temp-write": "^1.1.0",
"util-extend": "^1.0.1",
"v8flags": "^1.0.1"
"v8flags": "^2.0.2"
},
"license": "MIT",
"devDependencies": {
"gulp": "^3.8.10",
"gulp-jshint": "^1.9.0",
"jshint-stylish": "^1.0.0",
"markdox": "^0.1.7"
"markdox": "^0.1.8"
}
}

0 comments on commit cba8388

Please sign in to comment.