Skip to content

Commit

Permalink
--base is now --cwd
Browse files Browse the repository at this point in the history
  • Loading branch information
Contra committed Jan 16, 2014
1 parent 0c79d92 commit 636f016
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 18 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# gulp changelog

## 3.3.4

- `--base` is now `--cwd`

## 3.3.3

- support for `--base` CLI arg to change where the search for gulpfile/`--require`s starts
Expand Down
14 changes: 7 additions & 7 deletions bin/gulp.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ var prettyTime = require('pretty-hrtime');
var tasks = argv._;
var cliPkg = require('../package.json');

var localBaseDir;
var cwd;

if (argv.base) {
localBaseDir = path.resolve(argv.base);
if (argv.cwd) {
cwd = path.resolve(argv.cwd);
} else {
localBaseDir = process.cwd();
cwd = process.cwd();
}

loadRequires(argv.require, localBaseDir);
loadRequires(argv.require, cwd);

var gulpFile;

if (argv.gulpfile) {
gulpFile = path.resolve(argv.gulpfile);
gulpFile = path.join(cwd, argv.gulpfile);
} else {
gulpFile = getGulpFile(localBaseDir);
gulpFile = getGulpFile(cwd);
}

// find the local gulp
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gulp",
"description": "The streaming build system",
"version": "3.3.2",
"version": "3.3.4",
"homepage": "http://github.com/wearefractal/gulp",
"repository": "git://github.com/wearefractal/gulp.git",
"author": "Fractal <[email protected]> (http://wearefractal.com/)",
Expand All @@ -23,21 +23,21 @@
"resolve": "~0.6.1",
"findup-sync": "~0.1.2",
"pretty-hrtime": "~0.2.0",
"glob-watcher": "0.0.1",
"glob-watcher": "~0.0.1",
"graceful-fs": "~2.0.1",
"through": "~2.3.4",
"map-stream": "0.0.4",
"map-stream": "~0.1.0",
"semver": "~2.2.1"
},
"devDependencies": {
"mocha": "*",
"mocha-lcov-reporter": "*",
"coveralls": "*",
"istanbul": "*",
"should": "*",
"rimraf": "*",
"q": "*",
"jshint": "*"
"mocha": "~1.17.0",
"mocha-lcov-reporter": "0.0.1",
"coveralls": "~2.6.1",
"istanbul": "~0.2.3",
"should": "~2.1.1",
"rimraf": "~2.2.5",
"q": "~1.0.0",
"jshint": "~2.4.1"
},
"scripts": {
"test": "mocha --reporter spec && jshint",
Expand Down

0 comments on commit 636f016

Please sign in to comment.