From e75bde94fb39dc806deee8af47c1383542c8b7a9 Mon Sep 17 00:00:00 2001 From: Contra Date: Tue, 6 Aug 2013 17:51:25 -0700 Subject: [PATCH] .files -> .src, .folder -> .dest, removed .file, updated deps, 0.2.0 --- index.js | 5 ++- lib/createFileStream.js | 21 ----------- ...ateFilesStream.js => createInputStream.js} | 0 ...eFolderStream.js => createOutputStream.js} | 0 package.json | 6 ++-- test/{folder.js => dest.js} | 14 ++++---- test/file.js | 32 ----------------- test/{files.js => src.js} | 36 ++++++++++++++----- 8 files changed, 39 insertions(+), 75 deletions(-) delete mode 100644 lib/createFileStream.js rename lib/{createFilesStream.js => createInputStream.js} (100%) rename lib/{createFolderStream.js => createOutputStream.js} (100%) rename test/{folder.js => dest.js} (77%) delete mode 100644 test/file.js rename test/{files.js => src.js} (52%) diff --git a/index.js b/index.js index b891e2233..ce5a66541 100644 --- a/index.js +++ b/index.js @@ -19,9 +19,8 @@ module.exports = gulp = { }); return this; }, - files: require('./lib/createFilesStream'), - file: require('./lib/createFileStream'), - folder: require('./lib/createFolderStream'), + src: require('./lib/createInputStream'), + dest: require('./lib/createOutputStream'), watch: require('./lib/watchFile'), createGlobStream: require('glob-stream').create, diff --git a/lib/createFileStream.js b/lib/createFileStream.js deleted file mode 100644 index 754d3e014..000000000 --- a/lib/createFileStream.js +++ /dev/null @@ -1,21 +0,0 @@ -var es = require('event-stream'), - readFile = require('./readFile'), - dirname = require('path').dirname, - realBase = require('gulp-util').realBase; - -module.exports = function(path, opt) { - if (!opt) opt = {}; - - var file = { - base: dirname(path), - path: path - }; - file.shortened = realBase(file.base, file.path); - - var stream = es.map(readFile); - process.nextTick(function(){ - stream.write(file); - stream.end(); - }); - return stream; -}; diff --git a/lib/createFilesStream.js b/lib/createInputStream.js similarity index 100% rename from lib/createFilesStream.js rename to lib/createInputStream.js diff --git a/lib/createFolderStream.js b/lib/createOutputStream.js similarity index 100% rename from lib/createFolderStream.js rename to lib/createOutputStream.js diff --git a/package.json b/package.json index 40fdba1ac..5596f2562 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name":"gulp", "description":"Simple stream-y build helper", - "version":"0.1.0", + "version":"0.2.0", "homepage":"http://github.com/wearefractal/gulp", "repository":"git://github.com/wearefractal/gulp.git", "author":"Fractal (http://wearefractal.com/)", @@ -12,12 +12,12 @@ "gulp":"./bin/gulp" }, "dependencies":{ - "event-stream":"3.0.15", + "event-stream":"3.0.16", "glob-stream":"0.0.3", "mkdirp":"0.3.5", "optimist":"0.6.0", "gulp-util":"*", - "gaze":"0.4.0" + "gaze":"0.4.1" }, "devDependencies":{ "mocha":"1.12.0", diff --git a/test/folder.js b/test/dest.js similarity index 77% rename from test/folder.js rename to test/dest.js index 4a81cd2ba..8268565b2 100644 --- a/test/folder.js +++ b/test/dest.js @@ -6,20 +6,20 @@ var fs = require('fs'); require('mocha'); -describe('gulp file collection', function() { - describe('folder()', function() { +describe('gulp output stream', function() { + describe('dest()', function() { it('should return a stream', function(done) { - var stream = gulp.folder(join(__dirname, "./fixtures/")); + var stream = gulp.dest(join(__dirname, "./fixtures/")); should.exist(stream); should.exist(stream.on); done(); }); - it('should return a folder stream that writes files', function(done) { + it('should return a output stream that writes files', function(done) { var outpath = join(__dirname, "./out-fixtures"); rimraf(outpath, function(err){ should.not.exist(err); - var instream = gulp.files(join(__dirname, "./fixtures/**/*.txt")); - var outstream = gulp.folder(outpath); + var instream = gulp.src(join(__dirname, "./fixtures/**/*.txt")); + var outstream = gulp.dest(outpath); instream.pipe(outstream); outstream.on('error', done); @@ -42,4 +42,4 @@ describe('gulp file collection', function() { }); }); }); -}); +}); \ No newline at end of file diff --git a/test/file.js b/test/file.js deleted file mode 100644 index 2718927d1..000000000 --- a/test/file.js +++ /dev/null @@ -1,32 +0,0 @@ -var gulp = require('../'); -var should = require('should'); -var join = require('path').join; -require('mocha'); - -describe('gulp single file collection', function() { - describe('file()', function() { - it('should return a stream', function(done) { - var stream = gulp.file(join(__dirname, "./fixtures/test.coffee")); - should.exist(stream); - should.exist(stream.on); - done(); - }); - it('should return a file stream from a flat path', function(done) { - var a = 0; - var stream = gulp.file(join(__dirname, "./fixtures/test.coffee")); - stream.on('error', done); - stream.on('data', function(file) { - ++a; - should.exist(file); - should.exist(file.path); - should.exist(file.contents); - file.path.should.equal(join(__dirname, "./fixtures/test.coffee")); - String(file.contents).should.equal("this is a test"); - }); - stream.on('end', function() { - a.should.equal(1); - done(); - }); - }); - }); -}); diff --git a/test/files.js b/test/src.js similarity index 52% rename from test/files.js rename to test/src.js index 3f06cb9c5..7df99a974 100644 --- a/test/files.js +++ b/test/src.js @@ -3,16 +3,16 @@ var should = require('should'); var join = require('path').join; require('mocha'); -describe('gulp file collection', function() { - describe('files()', function() { +describe('gulp input stream', function() { + describe('src()', function() { it('should return a stream', function(done) { - var stream = gulp.files(join(__dirname, "./fixtures/*.coffee")); + var stream = gulp.src(join(__dirname, "./fixtures/*.coffee")); should.exist(stream); should.exist(stream.on); done(); }); - it('should return a files stream from a flat glob', function(done) { - var stream = gulp.files(join(__dirname, "./fixtures/*.coffee")); + it('should return a input stream from a flat glob', function(done) { + var stream = gulp.src(join(__dirname, "./fixtures/*.coffee")); stream.on('error', done); stream.on('data', function(file) { should.exist(file); @@ -25,8 +25,8 @@ describe('gulp file collection', function() { done(); }); }); - it('should return a files stream from a deep glob', function(done) { - var stream = gulp.files(join(__dirname, "./fixtures/**/*.jade")); + it('should return a input stream from a deep glob', function(done) { + var stream = gulp.src(join(__dirname, "./fixtures/**/*.jade")); stream.on('error', done); stream.on('data', function(file) { should.exist(file); @@ -39,8 +39,8 @@ describe('gulp file collection', function() { done(); }); }); - it('should return a files stream from a deeper glob', function(done) { - var stream = gulp.files(join(__dirname, "./fixtures/**/*.dmc")); + it('should return a input stream from a deeper glob', function(done) { + var stream = gulp.src(join(__dirname, "./fixtures/**/*.dmc")); var a = 0; stream.on('error', done); stream.on('data', function(file) { @@ -51,5 +51,23 @@ describe('gulp file collection', function() { done(); }); }); + + it('should return a file stream from a flat path', function(done) { + var a = 0; + var stream = gulp.src(join(__dirname, "./fixtures/test.coffee")); + stream.on('error', done); + stream.on('data', function(file) { + ++a; + should.exist(file); + should.exist(file.path); + should.exist(file.contents); + file.path.should.equal(join(__dirname, "./fixtures/test.coffee")); + String(file.contents).should.equal("this is a test"); + }); + stream.on('end', function() { + a.should.equal(1); + done(); + }); + }); }); });