From 5031f8cb30eab5c9df5bb62bf624833daac76b9b Mon Sep 17 00:00:00 2001 From: reganoneill Date: Wed, 15 Feb 2017 22:37:46 -0800 Subject: [PATCH 1/3] passing unwanted file path test --- .eslintrc | 21 +++++++++ .gitignore | 117 +++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 4 +- bad_index.js | 25 +++++++++++ data/one.txt | 1 + data/three.txt | 1 + data/two.txt | 1 + gulpfile.js | 19 ++++++++ index.js | 8 ++++ lib/read.js | 41 +++++++++++++++++ package.json | 27 ++++++++++++ test/test.js | 24 ++++++++++ 12 files changed, 287 insertions(+), 2 deletions(-) create mode 100644 .eslintrc create mode 100644 .gitignore create mode 100644 bad_index.js 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/read.js create mode 100644 package.json create mode 100644 test/test.js 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/.gitignore b/.gitignore new file mode 100644 index 0000000..0992345 --- /dev/null +++ b/.gitignore @@ -0,0 +1,117 @@ +# Created by https://www.gitignore.io/api/node,vim,osx,macos,linux + +*node_modules + +### Node ### +# Logs +logs +*.log +npm-debug.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 + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules +jspm_packages + +# 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 + + + +### 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 + + +### 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 + + +### macOS ### +# Icon must end with two \r +# Thumbnails +# Files that might appear in the root of a volume +# Directories potentially created on remote AFP share + + +### 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* + +# End of https://www.gitignore.io/api/node,vim,osx,macos,linux diff --git a/README.md b/README.md index 2407f5c..7e32011 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,9 @@ ##Description: -* For this assignment you will need to read three files and console log the first 8 bytes ***(in hex)*** of each file. +√ For this assignment you will need to read three files and console log the first 8 bytes ***(in hex)*** of each file. -* Regardless of file size, all three files should be read and logged in the order `'one.txt'`, `'two.txt'`, `'three.txt'`. +√ Regardless of file size, all three files should be read and logged in the order `'one.txt'`, `'two.txt'`, `'three.txt'`. * You will need to include tests that guarantee that the files are logged in the proper order. diff --git a/bad_index.js b/bad_index.js new file mode 100644 index 0000000..7ae5a6d --- /dev/null +++ b/bad_index.js @@ -0,0 +1,25 @@ +'use strict'; + +const fs = require('fs'); + +var firstTxt = fs.readFileSync(`${__dirname}/data/one.txt`); +// fs.readFileSync(`${__dirname}/data/one.txt`); +// , function(err, data){ +// if (err) throw err; +// console.log('one.txt:',data.toString('hex').substring(0,8)); +// }); +var secondTxt = fs.readFileSync(`${__dirname}/data/two.txt`); +// fs.readFileSync(`${__dirname}/data/two.txt`); +// , function(err, data){ +// if (err) throw err; +// console.log('two.txt: ', data.toString('hex').substring(0,8)); +// }); +var thirdTxt = fs.readFileSync(`${__dirname}/data/three.txt`); +// fs.readFileSync(`${__dirname}/data/three.txt`); +// , function(err, data){ +// if (err) throw err; +// console.log('three.txt:', data.toString('hex').substring(0,8)); +// }); +console.log(firstTxt.toString('hex').substring(0,8)); +console.log(secondTxt.toString('hex').substring(0,8)); +console.log(thirdTxt.toString('hex').substring(0,8)); diff --git a/data/one.txt b/data/one.txt new file mode 100644 index 0000000..35dac86 --- /dev/null +++ b/data/one.txt @@ -0,0 +1 @@ +first yeeeeah! diff --git a/data/three.txt b/data/three.txt new file mode 100644 index 0000000..006638e --- /dev/null +++ b/data/three.txt @@ -0,0 +1 @@ +third of three! diff --git a/data/two.txt b/data/two.txt new file mode 100644 index 0000000..40e660e --- /dev/null +++ b/data/two.txt @@ -0,0 +1 @@ +second here!!!! diff --git a/gulpfile.js b/gulpfile.js new file mode 100644 index 0000000..0ed9fdf --- /dev/null +++ b/gulpfile.js @@ -0,0 +1,19 @@ +'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'})); +});//end test task + +gulp.task('lint', function(){ + return gulp.src(['**/*.js', '!node_modules']) + .pipe(eslint()) + .pipe(eslint.format()) + .pipe(eslint.failAfterError()); +});//end lint task + +gulp.task('default', ['test', 'lint']); diff --git a/index.js b/index.js new file mode 100644 index 0000000..f0dd3c2 --- /dev/null +++ b/index.js @@ -0,0 +1,8 @@ +'use strict'; + +const read = require('./lib/read.js'); + +read.readInOrder(read.returnHex); + +//this is a diagram of what's happening +//readInOrder(returnHex(getHexxed)); diff --git a/lib/read.js b/lib/read.js new file mode 100644 index 0000000..b3ed34f --- /dev/null +++ b/lib/read.js @@ -0,0 +1,41 @@ +'use strict'; + +const fs = require('fs'); + +module.exports = exports = {}; + +exports.getHexxed = []; + +exports.returnHex = function(data){ + data.forEach(function(thing){ + console.log(thing); + }); + //just added this...seems to be working but I'll need to run some tests + console.log(exports.getHexxed); + return exports.getHexxed; +}; + + +exports.readInOrder = function(callback){ + fs.readFile(`${__dirname}/../data/one.txt`, function(err, data){ + if (err) throw err; + var firstHex = data.toString('hex').substring(0,8); + exports.getHexxed.push(firstHex); + + fs.readFile(`${__dirname}/../data/two.txt`, function(err, data){ + if (err) throw err; + var secondHex = data.toString('hex').substring(0,8); + exports.getHexxed.push(secondHex); + + fs.readFile(`${__dirname}/../data/three.txt`, function(err, data){ + if (err) throw err; + var thirdHex = data.toString('hex').substring(0,8); + exports.getHexxed.push(thirdHex); + // console.log(exports.getHexxed); + //this runs last! + // callback(exports.getHexxed); + exports.returnHex(exports.getHexxed); + }); + });//end second enclosing readfile + }); //end first enclosing readfile +}; diff --git a/package.json b/package.json new file mode 100644 index 0000000..2a00d4f --- /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 ===", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/reganoneill/03-parallel_file_processing.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/reganoneill/03-parallel_file_processing/issues" + }, + "homepage": "https://github.com/reganoneill/03-parallel_file_processing#readme", + "devDependencies": { + "chai": "^3.5.0", + "gulp": "^3.9.1", + "gulp-eslint": "^3.0.1", + "gulp-mocha": "^3.0.1", + "mocha": "^3.2.0" + } +} diff --git a/test/test.js b/test/test.js new file mode 100644 index 0000000..d1bcdea --- /dev/null +++ b/test/test.js @@ -0,0 +1,24 @@ +'use strict'; + +const reader = require('../lib/read.js').readInOrder; +const expect = require('chai').expect; + + +describe('Main File', function(){ + describe('#filePath', function(){ + it('should return an error!!!', function(done){ + let badPath = 'derp/gross.txt'; + reader(badPath, function(err){ + expect(err).to.be.an('error'); + }); + done(); + }); + }); + describe('#properOrder', function(){ + it('should check the tests run in correct order', function(done){ + var outcome = reader.readInOrder(reader.returnHex(exports.getHexxed)); + expect(outcome).to.equal([ '66697273', '7365636f', '74686972' ]); + done(); + });//end it + });//end #firstTxt +}); From d1bc623e23a9b73dde07a07bbf89b38fc7f48888 Mon Sep 17 00:00:00 2001 From: Regan O'Neill Date: Sat, 18 Feb 2017 22:31:49 -0800 Subject: [PATCH 2/3] all tests pass --- index.js | 3 --- lib/read.js | 23 +++++++---------------- test/test.js | 9 ++++----- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/index.js b/index.js index f0dd3c2..b04b43f 100644 --- a/index.js +++ b/index.js @@ -3,6 +3,3 @@ const read = require('./lib/read.js'); read.readInOrder(read.returnHex); - -//this is a diagram of what's happening -//readInOrder(returnHex(getHexxed)); diff --git a/lib/read.js b/lib/read.js index b3ed34f..936b06f 100644 --- a/lib/read.js +++ b/lib/read.js @@ -4,37 +4,28 @@ const fs = require('fs'); module.exports = exports = {}; -exports.getHexxed = []; - exports.returnHex = function(data){ - data.forEach(function(thing){ - console.log(thing); - }); - //just added this...seems to be working but I'll need to run some tests - console.log(exports.getHexxed); - return exports.getHexxed; + console.log(data); + return data; }; - exports.readInOrder = function(callback){ + var getHexxed = []; fs.readFile(`${__dirname}/../data/one.txt`, function(err, data){ if (err) throw err; var firstHex = data.toString('hex').substring(0,8); - exports.getHexxed.push(firstHex); + getHexxed.push(firstHex); fs.readFile(`${__dirname}/../data/two.txt`, function(err, data){ if (err) throw err; var secondHex = data.toString('hex').substring(0,8); - exports.getHexxed.push(secondHex); + getHexxed.push(secondHex); fs.readFile(`${__dirname}/../data/three.txt`, function(err, data){ if (err) throw err; var thirdHex = data.toString('hex').substring(0,8); - exports.getHexxed.push(thirdHex); - // console.log(exports.getHexxed); - //this runs last! - // callback(exports.getHexxed); - exports.returnHex(exports.getHexxed); + getHexxed.push(thirdHex); + callback(getHexxed); }); });//end second enclosing readfile }); //end first enclosing readfile diff --git a/test/test.js b/test/test.js index d1bcdea..7a28e1d 100644 --- a/test/test.js +++ b/test/test.js @@ -1,14 +1,13 @@ 'use strict'; -const reader = require('../lib/read.js').readInOrder; +const reader = require('../lib/read.js'); const expect = require('chai').expect; - describe('Main File', function(){ describe('#filePath', function(){ it('should return an error!!!', function(done){ let badPath = 'derp/gross.txt'; - reader(badPath, function(err){ + reader.readInOrder(badPath, function(err){ expect(err).to.be.an('error'); }); done(); @@ -16,8 +15,8 @@ describe('Main File', function(){ }); describe('#properOrder', function(){ it('should check the tests run in correct order', function(done){ - var outcome = reader.readInOrder(reader.returnHex(exports.getHexxed)); - expect(outcome).to.equal([ '66697273', '7365636f', '74686972' ]); + var outcome = reader.readInOrder(reader.returnHex); + expect(outcome).to.equal(); done(); });//end it });//end #firstTxt From cd44a1dd239648de195b22e20acb982ec44df60a Mon Sep 17 00:00:00 2001 From: reganoneill Date: Tue, 28 Feb 2017 00:05:16 -0800 Subject: [PATCH 3/3] built meaningful tests and cleaned up wode --- bad_index.js | 25 ------------------------- lib/read.js | 8 +++++++- test/test.js | 33 ++++++++++++++++++++++++--------- 3 files changed, 31 insertions(+), 35 deletions(-) delete mode 100644 bad_index.js diff --git a/bad_index.js b/bad_index.js deleted file mode 100644 index 7ae5a6d..0000000 --- a/bad_index.js +++ /dev/null @@ -1,25 +0,0 @@ -'use strict'; - -const fs = require('fs'); - -var firstTxt = fs.readFileSync(`${__dirname}/data/one.txt`); -// fs.readFileSync(`${__dirname}/data/one.txt`); -// , function(err, data){ -// if (err) throw err; -// console.log('one.txt:',data.toString('hex').substring(0,8)); -// }); -var secondTxt = fs.readFileSync(`${__dirname}/data/two.txt`); -// fs.readFileSync(`${__dirname}/data/two.txt`); -// , function(err, data){ -// if (err) throw err; -// console.log('two.txt: ', data.toString('hex').substring(0,8)); -// }); -var thirdTxt = fs.readFileSync(`${__dirname}/data/three.txt`); -// fs.readFileSync(`${__dirname}/data/three.txt`); -// , function(err, data){ -// if (err) throw err; -// console.log('three.txt:', data.toString('hex').substring(0,8)); -// }); -console.log(firstTxt.toString('hex').substring(0,8)); -console.log(secondTxt.toString('hex').substring(0,8)); -console.log(thirdTxt.toString('hex').substring(0,8)); diff --git a/lib/read.js b/lib/read.js index 936b06f..d08892f 100644 --- a/lib/read.js +++ b/lib/read.js @@ -4,8 +4,12 @@ const fs = require('fs'); module.exports = exports = {}; +exports.fileHolder = ['one.txt', 'two.txt', 'three.txt']; +exports.dataHolder; + exports.returnHex = function(data){ - console.log(data); + console.log('this is the data (the array:)',data); + exports.dataHolder = data; return data; }; @@ -14,6 +18,7 @@ exports.readInOrder = function(callback){ fs.readFile(`${__dirname}/../data/one.txt`, function(err, data){ if (err) throw err; var firstHex = data.toString('hex').substring(0,8); + getHexxed.push(firstHex); fs.readFile(`${__dirname}/../data/two.txt`, function(err, data){ @@ -25,6 +30,7 @@ exports.readInOrder = function(callback){ if (err) throw err; var thirdHex = data.toString('hex').substring(0,8); getHexxed.push(thirdHex); + callback(getHexxed); }); });//end second enclosing readfile diff --git a/test/test.js b/test/test.js index 7a28e1d..64b1348 100644 --- a/test/test.js +++ b/test/test.js @@ -4,20 +4,35 @@ const reader = require('../lib/read.js'); const expect = require('chai').expect; describe('Main File', function(){ - describe('#filePath', function(){ - it('should return an error!!!', function(done){ - let badPath = 'derp/gross.txt'; + +require('../index.js'); + + describe('#wrongFilePath', function(){ + it('should return an error', function(done){ + let badPath = 'derp/wrong.txt'; reader.readInOrder(badPath, function(err){ expect(err).to.be.an('error'); }); done(); }); }); - describe('#properOrder', function(){ - it('should check the tests run in correct order', function(done){ - var outcome = reader.readInOrder(reader.returnHex); - expect(outcome).to.equal(); + + describe('#properAmountOfFiles', function(){ + it('check number of files in array', function(done){ + expect(reader.dataHolder.length).to.equal(3); + done(); + }); + }); + + describe('#filesMatchUp', function(){ + it('check file order', function(done){ + expect(reader.fileHolder[0]).to.equal('one.txt'); + expect(reader.fileHolder[1]).to.equal('two.txt'); + expect(reader.fileHolder[2]).to.equal('three.txt'); done(); - });//end it - });//end #firstTxt + }); + }); + + + });