From 8e5f37c1ce02227562f531a03d7eadfdaa5c16d0 Mon Sep 17 00:00:00 2001 From: Zachary Crumbo Date: Wed, 15 Feb 2017 18:50:09 -0800 Subject: [PATCH 1/4] Submitting all files --- data/one.txt | 1 + data/three.txt | 1 + data/two.txt | 1 + gulpfile.js | 23 +++++++++++++++++++++++ index.js | 16 ++++++++++++++++ lib/data-loaded.js | 6 ++++++ lib/read-file.js | 27 +++++++++++++++++++++++++++ test/fs-test.js | 29 +++++++++++++++++++++++++++++ 8 files changed, 104 insertions(+) create mode 100644 data/one.txt create mode 100644 data/three.txt create mode 100644 data/two.txt create mode 100644 gulpfile.js create mode 100644 index.js create mode 100644 lib/data-loaded.js create mode 100644 lib/read-file.js create mode 100644 test/fs-test.js diff --git a/data/one.txt b/data/one.txt new file mode 100644 index 0000000..9a9cdd2 --- /dev/null +++ b/data/one.txt @@ -0,0 +1 @@ +1 this is the contents of text \ No newline at end of file diff --git a/data/three.txt b/data/three.txt new file mode 100644 index 0000000..bfd2df9 --- /dev/null +++ b/data/three.txt @@ -0,0 +1 @@ +this is the contents of text 3 \ No newline at end of file diff --git a/data/two.txt b/data/two.txt new file mode 100644 index 0000000..4186e0c --- /dev/null +++ b/data/two.txt @@ -0,0 +1 @@ +2 contents are right here \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js new file mode 100644 index 0000000..a29c45d --- /dev/null +++ b/gulpfile.js @@ -0,0 +1,23 @@ +'use strict'; + +const gulp=require('gulp'); +const eslint = require('gulp-eslint'); +const mocha = require('gulp-mocha'); + +gulp.task('test', function(){ + gulp.src('*/*-test.js', {read:false}) + .pipe(mocha({reporter: 'spec'})); +}); + +gulp.task('lint', function(){ + return gulp.src(['**/*.js', '!node_modules']) + .pipe(eslint()) + .pipe(eslint.format()) + .pipe(eslint.failAfterError()); +}); + +gulp.task('dev', function(){ + gulp.watch(['**/*.js', '!node_modules/**'], ['lint', 'test']); +}); + +gulp.task('default', ['dev']); \ No newline at end of file diff --git a/index.js b/index.js new file mode 100644 index 0000000..d5c4199 --- /dev/null +++ b/index.js @@ -0,0 +1,16 @@ +'use strict'; + +const fileReader = require('./lib/read-file.js'); + +fileReader('one.txt', 'two.txt', 'three.txt', waitForIt); + +function waitForIt(err, data){ + if(err) throw err; + data.forEach(logArrayElements); + function logArrayElements(element, i) { + console.log(`file ${i} ${element}`); + } +} + + + diff --git a/lib/data-loaded.js b/lib/data-loaded.js new file mode 100644 index 0000000..5092487 --- /dev/null +++ b/lib/data-loaded.js @@ -0,0 +1,6 @@ +'use-strict'; + +// const displayData = module.exports = function(err,data){ +// if(err) throw err; +// console.log(data); +// }; \ No newline at end of file diff --git a/lib/read-file.js b/lib/read-file.js new file mode 100644 index 0000000..30311aa --- /dev/null +++ b/lib/read-file.js @@ -0,0 +1,27 @@ +'use strict'; + +const fs = require('fs'); +const resultsArray = []; + + + +module.exports = function(file1, file2, file3, callback){ + + fs.readFile(`${__dirname}/../data/${file1}`, function(err,data){ + if (err) return callback(err); + + var first = data.toString('hex').substring(0,8); + resultsArray.push(first); + fs.readFile(`${__dirname}/../data/${file2}`, function(err,data){ + if (err) return callback(err); + var second = data.toString('hex').substring(0,8); + resultsArray.push(second); + fs.readFile(`${__dirname}/../data/${file3}`, function(err,data){ + if (err) return callback(err); + var third = data.toString('hex').substring(0,8); + resultsArray.push(third); + return callback(null, resultsArray); + }); + }); + }); +}; diff --git a/test/fs-test.js b/test/fs-test.js new file mode 100644 index 0000000..cc2ec83 --- /dev/null +++ b/test/fs-test.js @@ -0,0 +1,29 @@ +'use strict'; + +const expect = require('chai').expect; +const fileReader = require('../lib/read-file.js'); + +describe('FS Module', function(){ + describe('with an improper file path', function(){ + it('should return file path error', function(done){ + fileReader('fake.txt', 'file.txt', 'paths.txt', function(err){ + expect(err).to.be.an('error'); + done(); + }); + }); + }); + describe('with an out of order data return', function(){ + it('should flag it as out of order', function(done){ + fileReader('one.txt', 'two.txt', 'three.txt', dataReturn); + function dataReturn(err ,data){ + var testData = new Array('31207468', '3220636f', '74686973'); + expect(data[0]).to.equal(testData[0]); + expect(data[1]).to.equal(testData[1]); + expect(data[2]).to.equal(testData[2]); + done(); + } + }); + }); +}); + + From 6018c92912a722ed5875af4994dd6399e5905095 Mon Sep 17 00:00:00 2001 From: Zachary Crumbo Date: Wed, 15 Feb 2017 18:51:50 -0800 Subject: [PATCH 2/4] adding gitignore file --- .gitignore | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..89ab13a --- /dev/null +++ b/.gitignore @@ -0,0 +1,129 @@ + +# Created by https://www.gitignore.io/api/node,osx,windows,linux + +### Linux ### +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### Node ### +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Typescript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + + +### OSX ### +*.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.gitignore.io/api/node,osx,windows,linux \ No newline at end of file From 150b2d7cd44eb27d88b94204bf558bb2e5abe094 Mon Sep 17 00:00:00 2001 From: Zachary Crumbo Date: Wed, 15 Feb 2017 18:58:56 -0800 Subject: [PATCH 3/4] removed data-loaded.js b/c it didn't do anything --- lib/data-loaded.js | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 lib/data-loaded.js diff --git a/lib/data-loaded.js b/lib/data-loaded.js deleted file mode 100644 index 5092487..0000000 --- a/lib/data-loaded.js +++ /dev/null @@ -1,6 +0,0 @@ -'use-strict'; - -// const displayData = module.exports = function(err,data){ -// if(err) throw err; -// console.log(data); -// }; \ No newline at end of file From 3c885022c8c09dd164ba7e7377f9713961e029a6 Mon Sep 17 00:00:00 2001 From: Zachary Crumbo Date: Sun, 19 Feb 2017 11:24:41 -0800 Subject: [PATCH 4/4] re-added package.json and eslint, which mysteriously disappeared --- .eslintrc | 21 +++++++++++++++++++++ package.json | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 .eslintrc create mode 100644 package.json diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..8dc6807 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,21 @@ +{ + "rules": { + "no-console": "off", + "indent": [ "error", 2 ], + "quotes": [ "error", "single" ], + "semi": ["error", "always"], + "linebreak-style": [ "error", "unix" ] + }, + "env": { + "es6": true, + "node": true, + "mocha": true, + "jasmine": true + }, + "ecmaFeatures": { + "modules": true, + "experimentalObjectRestSpread": true, + "impliedStrict": true + }, + "extends": "eslint:recommended" +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..336b006 --- /dev/null +++ b/package.json @@ -0,0 +1,33 @@ +{ + "name": "03-parallel_file_processing", + "version": "1.0.0", + "description": "![CF](https://camo.githubusercontent.com/70edab54bba80edb7493cad3135e9606781cbb6b/687474703a2f2f692e696d6775722e636f6d2f377635415363382e706e67) Lab 03: Parallel File Processing ===", + "main": "index.js", + "directories": { + "test": "test" + }, + "dependencies": { + "chai": "^3.5.0", + "gulp-cli": "^1.2.2", + "gulp": "^3.9.1", + "gulp-eslint": "^3.0.1", + "gulp-mocha": "^3.0.1" + }, + "devDependencies": { + "mocha": "^3.2.0" + }, + "scripts": { + "test": "mocha" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/zcrumbo/03-parallel_file_processing.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/zcrumbo/03-parallel_file_processing/issues" + }, + "homepage": "https://github.com/zcrumbo/03-parallel_file_processing#readme" +}