From 9b1b1cdfb02bb9000a9e77af06a94ed6d215188d Mon Sep 17 00:00:00 2001 From: Gary Lundgren Date: Wed, 15 Feb 2017 16:05:15 -0800 Subject: [PATCH 1/5] getting going --- .gitignore | 122 +++++++++++++++++++++++++++++++++++++++++++++ data/one.txt | 1 + data/three.txt | 1 + data/two.txt | 1 + index.js | 4 ++ lib/file-reader.js | 20 ++++++++ package.json | 27 ++++++++++ test/file-test.js | 15 ++++++ 8 files changed, 191 insertions(+) create mode 100644 .gitignore create mode 100644 data/one.txt create mode 100644 data/three.txt create mode 100644 data/two.txt create mode 100644 index.js create mode 100644 lib/file-reader.js create mode 100644 package.json create mode 100644 test/file-test.js diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..13a6a1b --- /dev/null +++ b/.gitignore @@ -0,0 +1,122 @@ + +# Created by https://www.gitignore.io/api/monodevelop,vim,node,windows,archlinuxpackages + +### ArchLinuxPackages ### +*.tar +*.tar.* +*.jar +*.exe +*.msi +*.zip +*.tgz +*.log +*.log.* +*.sig + +pkg/ +src/ + +### MonoDevelop ### +#User Specific +*.userprefs +*.usertasks + +#Mono Project Files +*.pidb +*.resources +test-results/ + +### Node ### +# Logs +logs +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' + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + + +### Vim ### +# swap +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-v][a-z] +[._]sw[a-p] +# session +Session.vim +# temporary +.netrwhist +*~ +# auto-generated tag files +tags + +### 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 +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.gitignore.io/api/monodevelop,vim,node,windows,archlinuxpackages diff --git a/data/one.txt b/data/one.txt new file mode 100644 index 0000000..b511748 --- /dev/null +++ b/data/one.txt @@ -0,0 +1 @@ +Cayla and Jeremiah are sitting on the other side of the desk. diff --git a/data/three.txt b/data/three.txt new file mode 100644 index 0000000..336ace1 --- /dev/null +++ b/data/three.txt @@ -0,0 +1 @@ +We are loving 401 so far! diff --git a/data/two.txt b/data/two.txt new file mode 100644 index 0000000..36345cc --- /dev/null +++ b/data/two.txt @@ -0,0 +1 @@ +The lighting here can be a bit annoying. diff --git a/index.js b/index.js new file mode 100644 index 0000000..c081022 --- /dev/null +++ b/index.js @@ -0,0 +1,4 @@ +'use strict'; + +const fs = require('fs'); +const fileReader = require('./lib/fileReader.js'); diff --git a/lib/file-reader.js b/lib/file-reader.js new file mode 100644 index 0000000..0850443 --- /dev/null +++ b/lib/file-reader.js @@ -0,0 +1,20 @@ +'use strict'; + +const fs = require('fs'); + +const fileReader = module.exports = function(file, callback) { + fs.readFile(`${__dirname}/data/one.txt`, function(err, data) { + if(err) throw err; + console.log('content of file one.txt written in hex', data.toString('hex', 0, 8)); + }); + + fs.readFile(`${__dirname}/data/two.txt`, function(err, data) { + if(err) throw err; + console.log('content of file two.txt written in hex', data.toString('hex', 0, 8)); + }); + + fs.readFile(`${__dirname}/data/three.txt`, function(err, data) { + if(err) throw err; + console.log('content of file three.txt written in hex', data.toString('hex', 0, 8)); + }); +}; diff --git a/package.json b/package.json new file mode 100644 index 0000000..7250112 --- /dev/null +++ b/package.json @@ -0,0 +1,27 @@ +{ + "name": "03-parallel_file_processing", + "version": "1.0.0", + "description": "![CF](https://camo.githubusercontent.com/70edab54bba80edb7493cad3135e9606781cbb6b/687474703a2f2f692e696d6775722e636f6d2f377635415363382e706e67) Lab 03: Parallel File Processing\r ===", + "main": "index.js", + "directories": { + "test": "test" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/GLSea1979/03-parallel_file_processing.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/GLSea1979/03-parallel_file_processing/issues" + }, + "homepage": "https://github.com/GLSea1979/03-parallel_file_processing#readme", + "devDependencies": { + "chai": "^3.5.0", + "mocha": "^3.2.0" + } +} diff --git a/test/file-test.js b/test/file-test.js new file mode 100644 index 0000000..97088af --- /dev/null +++ b/test/file-test.js @@ -0,0 +1,15 @@ +'use strict'; + +const expect = require('chai').expect; +const fileReader = require('../lib/file-reader.js'); + +describe('File reading module', function() { + describe('with an improper path', function() { + it('should return with an error', function(done) { + fileReader(`${__dirname}/not-a-file.text`, function(err) { + expect(err).to.be.an(Error); + done(); + }); + }); + }); +}); From 7f48fb684ce3aaf0773c2443c509996222f88b71 Mon Sep 17 00:00:00 2001 From: Gary Lundgren Date: Wed, 15 Feb 2017 21:32:27 -0800 Subject: [PATCH 2/5] lots of stuff, not much working --- .eslintrc | 22 ++++++++++++++++++++++ gulpfile.js | 23 +++++++++++++++++++++++ index.js | 5 ++++- lib/file-reader.js | 25 +++++++++++++------------ test/file-test.js | 4 ++-- 5 files changed, 64 insertions(+), 15 deletions(-) create mode 100644 .eslintrc create mode 100644 gulpfile.js diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..92af0d0 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,22 @@ +{ + "rules": { + "no-console": "off", + "indent": [ "error", 2 ], + "quotes": [ "error", "single" ], + "semi": ["error", "always"], + # "linebreak-style": [ "error", "unix" ], + "linebreak-style": [ "error", "windows"] + }, + "env": { + "es6": true, + "node": true, + "mocha": true, + "jasmine": true + }, + "ecmaFeatures": { + "modules": true, + "experimentalObjectRestSpread": true, + "impliedStrict": true + }, + "extends": "eslint:recommended" +} diff --git a/gulpfile.js b/gulpfile.js new file mode 100644 index 0000000..3b51b12 --- /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/*-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']); diff --git a/index.js b/index.js index c081022..d39def7 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,7 @@ 'use strict'; const fs = require('fs'); -const fileReader = require('./lib/fileReader.js'); +const fileReader = require('./lib/file-reader.js'); + + +fileReader('./data/one.txt', ) diff --git a/lib/file-reader.js b/lib/file-reader.js index 0850443..7e4efb0 100644 --- a/lib/file-reader.js +++ b/lib/file-reader.js @@ -1,20 +1,21 @@ 'use strict'; const fs = require('fs'); +var fileArray = []; -const fileReader = module.exports = function(file, callback) { - fs.readFile(`${__dirname}/data/one.txt`, function(err, data) { - if(err) throw err; - console.log('content of file one.txt written in hex', data.toString('hex', 0, 8)); - }); - fs.readFile(`${__dirname}/data/two.txt`, function(err, data) { - if(err) throw err; - console.log('content of file two.txt written in hex', data.toString('hex', 0, 8)); - }); - - fs.readFile(`${__dirname}/data/three.txt`, function(err, data) { +const fileReader = module.exports = function(file, callback) { + fs.readFile(file, function(err, data) { if(err) throw err; - console.log('content of file three.txt written in hex', data.toString('hex', 0, 8)); + fileArray.push(data.toString('hex', 0, 8)); + fs.readFile(`${__dirname}/../data/two.txt`, function(err, data) { + if(err) throw err; + fileArray.push(data.toString('hex', 0, 8)); + fs.readFile(`${__dirname}/../data/three.txt`, function(err, data) { + if(err) throw err; + fileArray.push(data.toString('hex', 0, 8)); + callback(fileArray); + }); + }); }); }; diff --git a/test/file-test.js b/test/file-test.js index 97088af..33ed134 100644 --- a/test/file-test.js +++ b/test/file-test.js @@ -6,8 +6,8 @@ const fileReader = require('../lib/file-reader.js'); describe('File reading module', function() { describe('with an improper path', function() { it('should return with an error', function(done) { - fileReader(`${__dirname}/not-a-file.text`, function(err) { - expect(err).to.be.an(Error); + fileReader(`${__dirname}/../not-a-file.text`, function(err) { + expect(err).to.be.an('error'); done(); }); }); From 156ddac1ac639a6b35714a6106896d040ed3a668 Mon Sep 17 00:00:00 2001 From: Gary Lundgren Date: Wed, 15 Feb 2017 21:48:24 -0800 Subject: [PATCH 3/5] not done --- index.js | 2 +- lib/file-reader.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index d39def7..0ab4c97 100644 --- a/index.js +++ b/index.js @@ -4,4 +4,4 @@ const fs = require('fs'); const fileReader = require('./lib/file-reader.js'); -fileReader('./data/one.txt', ) +fileReader('./data/one.txt', callback); diff --git a/lib/file-reader.js b/lib/file-reader.js index 7e4efb0..2ae107c 100644 --- a/lib/file-reader.js +++ b/lib/file-reader.js @@ -14,7 +14,7 @@ const fileReader = module.exports = function(file, callback) { fs.readFile(`${__dirname}/../data/three.txt`, function(err, data) { if(err) throw err; fileArray.push(data.toString('hex', 0, 8)); - callback(fileArray); + return (null, fileArray); }); }); }); From 00a49682f40c8804ea2d89a100d92824280a3785 Mon Sep 17 00:00:00 2001 From: Gary Lundgren Date: Thu, 16 Feb 2017 06:19:13 -0800 Subject: [PATCH 4/5] added some TODOs for later --- index.js | 2 ++ lib/file-reader.js | 2 +- test/file-test.js | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index 0ab4c97..6cdaa33 100644 --- a/index.js +++ b/index.js @@ -5,3 +5,5 @@ const fileReader = require('./lib/file-reader.js'); fileReader('./data/one.txt', callback); + + // TODO: I want this to send my file reader the first path and start it reading my text files, then get a array of results and log them here. diff --git a/lib/file-reader.js b/lib/file-reader.js index 2ae107c..54611fd 100644 --- a/lib/file-reader.js +++ b/lib/file-reader.js @@ -14,7 +14,7 @@ const fileReader = module.exports = function(file, callback) { fs.readFile(`${__dirname}/../data/three.txt`, function(err, data) { if(err) throw err; fileArray.push(data.toString('hex', 0, 8)); - return (null, fileArray); + return callback(null, fileArray); }); }); }); diff --git a/test/file-test.js b/test/file-test.js index 33ed134..668a663 100644 --- a/test/file-test.js +++ b/test/file-test.js @@ -12,4 +12,9 @@ describe('File reading module', function() { }); }); }); + describe('with a proper path for file one', function() { + it('should return the file for file one.txt', function() { + // TODO: make a test + }) + }); }); From c704f5b98f5a131e6affbce77f406cb2ab7a1b3a Mon Sep 17 00:00:00 2001 From: Gary Lundgren Date: Thu, 16 Feb 2017 20:47:34 -0800 Subject: [PATCH 5/5] added some tests and fixed filereader --- lib/file-reader.js | 17 +++++++++-------- test/file-test.js | 32 +++++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/lib/file-reader.js b/lib/file-reader.js index 54611fd..c26ca64 100644 --- a/lib/file-reader.js +++ b/lib/file-reader.js @@ -1,19 +1,20 @@ 'use strict'; const fs = require('fs'); -var fileArray = []; +const fileReader = module.exports = function(pathArray, callback) { + var fileArray = []; -const fileReader = module.exports = function(file, callback) { - fs.readFile(file, function(err, data) { - if(err) throw err; + fs.readFile(pathArray[0], function(err, data) { + if(err) return callback(err); fileArray.push(data.toString('hex', 0, 8)); - fs.readFile(`${__dirname}/../data/two.txt`, function(err, data) { - if(err) throw err; + fs.readFile(pathArray[1], function(err, data) { + if(err) return callback(err); fileArray.push(data.toString('hex', 0, 8)); - fs.readFile(`${__dirname}/../data/three.txt`, function(err, data) { - if(err) throw err; + fs.readFile(pathArray[2], function(err, data) { + if(err) return callback(err); fileArray.push(data.toString('hex', 0, 8)); + console.log('my read file result:', fileArray); return callback(null, fileArray); }); }); diff --git a/test/file-test.js b/test/file-test.js index 668a663..ee4845a 100644 --- a/test/file-test.js +++ b/test/file-test.js @@ -4,17 +4,31 @@ const expect = require('chai').expect; const fileReader = require('../lib/file-reader.js'); describe('File reading module', function() { - describe('with an improper path', function() { - it('should return with an error', function(done) { - fileReader(`${__dirname}/../not-a-file.text`, function(err) { - expect(err).to.be.an('error'); - done(); + describe('with improper paths', function() { + it('should return with an error', function() { + fileReader(`${__dirname}/dont-exit.text`, function() { + expect(err).to.equal(true); }); }); }); - describe('with a proper path for file one', function() { - it('should return the file for file one.txt', function() { - // TODO: make a test - }) + describe('with a proper paths', function() { + before((done) => { + this.paths = [ + `${__dirname}/../data/one.txt`, + `${__dirname}/../data/two.txt`, + `${__dirname}/../data/three.txt`, + ]; + }); + it('should have the correct order of hex strings read in', (done) => { + var expectedResult = []; + readFile(this.paths, function(err, data) { + expect(err).to.equal(null); + expect(data[0]).to.equal(expectedResult[0]); + expect(data[1]).to.equal(expectedResult[1]); + expect(data[2]).to.equal(expectedResult[2]); + console.log('data', data); + done(); + }); + }); }); });