From 6c1da09de46f390dc135d591297f07e4af0f6afe Mon Sep 17 00:00:00 2001 From: Loaye Date: Wed, 19 Jul 2017 12:25:50 -0700 Subject: [PATCH 1/7] Scaffold: Creates basic scaffold to be the foundation for the app --- .eslintignore | 5 ++ .eslintrc | 21 +++++++ .gitignore | 138 +++++++++++++++++++++++++++++++++++++++++++++ assests/data.txt | 1 + index.js | 0 lib/file-reader.js | 2 + package.json | 27 +++++++++ 7 files changed, 194 insertions(+) create mode 100644 .eslintignore create mode 100644 .eslintrc create mode 100644 .gitignore create mode 100644 assests/data.txt create mode 100644 index.js create mode 100644 lib/file-reader.js create mode 100644 package.json diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..82ff623 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,5 @@ +**/node_modules/* +**/vendor/* +**/*.min.js +**/coverage/* +**/build/* \ No newline at end of file diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..b663d77 --- /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" +} \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0173650 --- /dev/null +++ b/.gitignore @@ -0,0 +1,138 @@ + +# Created by https://www.gitignore.io/api/vim,node,macos,linux,microsoftoffice + +### 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* + +### macOS ### +*.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 + +### MicrosoftOffice ### +*.tmp + +# Word temporary +~$*.doc* + +# Excel temporary +~$*.xls* + +# Excel Backup File +*.xlk + +# PowerPoint temporary +~$*.ppt* + +# Visio autosave temporary files +*.~vsd* + +### 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 + + +### 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 + +# End of https://www.gitignore.io/api/vim,node,macos,linux,microsoftoffice \ No newline at end of file diff --git a/assests/data.txt b/assests/data.txt new file mode 100644 index 0000000..641a5e9 --- /dev/null +++ b/assests/data.txt @@ -0,0 +1 @@ +some words in here diff --git a/index.js b/index.js new file mode 100644 index 0000000..e69de29 diff --git a/lib/file-reader.js b/lib/file-reader.js new file mode 100644 index 0000000..eb109ab --- /dev/null +++ b/lib/file-reader.js @@ -0,0 +1,2 @@ +'use strict'; + diff --git a/package.json b/package.json new file mode 100644 index 0000000..3aa99df --- /dev/null +++ b/package.json @@ -0,0 +1,27 @@ +{ + "name": "03-parallel_file_system", + "version": "1.0.0", + "description": "![CF](https://camo.githubusercontent.com/70edab54bba80edb7493cad3135e9606781cbb6b/687474703a2f2f692e696d6775722e636f6d2f377635415363382e706e67) 04: Parallel File Processing ===", + "main": "index.js", + "directories": { + "test": "test" + }, + "scripts": { + "test": "mocha" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/Loaye/03-parallel_file_system.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/Loaye/03-parallel_file_system/issues" + }, + "homepage": "https://github.com/Loaye/03-parallel_file_system#readme", + "devDependencies": { + "chai": "^4.1.0", + "mocha": "^3.4.2" + } +} From 96e893e81aca22cf5f8be38010ed477c9903bf79 Mon Sep 17 00:00:00 2001 From: Loaye Date: Wed, 19 Jul 2017 14:13:11 -0700 Subject: [PATCH 2/7] TEST: adds a tester --- assests/data.txt | 1 - assests/one.txt | 1 + assests/three.txt | 1 + assests/two.txt | 1 + index.js | 10 ++++++++++ lib/file-reader.js | 23 +++++++++++++++++++++++ test/file-reader-test.js | 15 +++++++++++++++ 7 files changed, 51 insertions(+), 1 deletion(-) delete mode 100644 assests/data.txt create mode 100644 assests/one.txt create mode 100644 assests/three.txt create mode 100644 assests/two.txt create mode 100644 test/file-reader-test.js diff --git a/assests/data.txt b/assests/data.txt deleted file mode 100644 index 641a5e9..0000000 --- a/assests/data.txt +++ /dev/null @@ -1 +0,0 @@ -some words in here diff --git a/assests/one.txt b/assests/one.txt new file mode 100644 index 0000000..cf15f74 --- /dev/null +++ b/assests/one.txt @@ -0,0 +1 @@ +this text has one a really really really really really really really really really really really really long message \ No newline at end of file diff --git a/assests/three.txt b/assests/three.txt new file mode 100644 index 0000000..ed39191 --- /dev/null +++ b/assests/three.txt @@ -0,0 +1 @@ +this text has a short message diff --git a/assests/two.txt b/assests/two.txt new file mode 100644 index 0000000..ae58c42 --- /dev/null +++ b/assests/two.txt @@ -0,0 +1 @@ +this text has some text \ No newline at end of file diff --git a/index.js b/index.js index e69de29..99cc0db 100644 --- a/index.js +++ b/index.js @@ -0,0 +1,10 @@ +'use strict'; + +const readFiles = require('../lib/file-reader.js'); +const paths = [ + `${__dirname}/assests/one.txt`, + `${__dirname}/assests/two.txt`, + `${__dirname}/assests/three.txt` +] + +readFiles(paths); \ No newline at end of file diff --git a/lib/file-reader.js b/lib/file-reader.js index eb109ab..c069bdb 100644 --- a/lib/file-reader.js +++ b/lib/file-reader.js @@ -1,2 +1,25 @@ 'use strict'; +const fs = require('fs'); + +const fileReader = module.exports = function(paths, callback) { + if(paths.length > 3 || paths.length < 3) throw new Error('must have three paths'); + let buffers = []; + let [one, two, three] = paths; + + fs.readFile(one, function(err, data) { + if(err) throw err; + buffers.push(data.toString('hex', 0 , 7)) + + fs.readFile(two, function(err, data) { + if(err) throw err; + buffers.push(data.toString('hex', 0 , 7)) + + fs.readFile(three, function(err, data) { + if(err) throw err; + buffers.push(data.toString('hex', 0 , 7)) + console.log(buffers); + }); + }); + }); +}; \ No newline at end of file diff --git a/test/file-reader-test.js b/test/file-reader-test.js new file mode 100644 index 0000000..3331b69 --- /dev/null +++ b/test/file-reader-test.js @@ -0,0 +1,15 @@ +'use strict'; + +const expect = require('chai').expect; +const fileReader = require('../lib/file-reader.js'); + +describe('File Reader', function() { + describe('with proper file path', function() { + it('should return an error', function(done) { + fileReader(`${__dirname}/not-a-file.txt`, function(err) { + expect(err).to.be.an('error'); + done(); + }); + }); + }); +}); \ No newline at end of file From cdb2716f86ec021781b82fced2dd73e20c85a917 Mon Sep 17 00:00:00 2001 From: Loaye Date: Wed, 19 Jul 2017 14:15:32 -0700 Subject: [PATCH 3/7] TEST: adds a test, to test written code --- index.js | 2 +- lib/file-reader.js | 8 ++++---- test/file-reader-test.js | 30 ++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index 99cc0db..964bf10 100644 --- a/index.js +++ b/index.js @@ -5,6 +5,6 @@ const paths = [ `${__dirname}/assests/one.txt`, `${__dirname}/assests/two.txt`, `${__dirname}/assests/three.txt` -] +]; readFiles(paths); \ No newline at end of file diff --git a/lib/file-reader.js b/lib/file-reader.js index c069bdb..acc5a1b 100644 --- a/lib/file-reader.js +++ b/lib/file-reader.js @@ -9,16 +9,16 @@ const fileReader = module.exports = function(paths, callback) { fs.readFile(one, function(err, data) { if(err) throw err; - buffers.push(data.toString('hex', 0 , 7)) + buffers.push(data.toString('hex', 0 , 7)); fs.readFile(two, function(err, data) { if(err) throw err; - buffers.push(data.toString('hex', 0 , 7)) + buffers.push(data.toString('hex', 0 , 7)); fs.readFile(three, function(err, data) { if(err) throw err; - buffers.push(data.toString('hex', 0 , 7)) - console.log(buffers); + buffers.push(data.toString('hex', 0 , 7)); + return callback(null, buffers); }); }); }); diff --git a/test/file-reader-test.js b/test/file-reader-test.js index 3331b69..b0d3ba3 100644 --- a/test/file-reader-test.js +++ b/test/file-reader-test.js @@ -12,4 +12,34 @@ describe('File Reader', function() { }); }); }); + + describe('with first path', function() { + it('should return first path and content', function(done) { + fileReader(`${__dirname}/../assests/one.txt`, function(err, data) { + expect(err).to.equal('error'); + expect(data).to.be.a('string'); + done(); + }); + }); + }); + + describe('with first path', function() { + it('should return first path and content', function(done) { + fileReader(`${__dirname}/../assests/two.txt`, function(err, data) { + expect(err).to.equal('error'); + expect(data).to.be.a('string'); + done(); + }); + }); + }); + + describe('with first path', function() { + it('should return first path and content', function(done) { + fileReader(`${__dirname}/../assests/three.txt`, function(err, data) { + expect(err).to.equal('error'); + expect(data).to.be.a('string'); + done(); + }); + }); + }); }); \ No newline at end of file From 5063fc02fbdaabb1830fed6273324d1ec79c9f5a Mon Sep 17 00:00:00 2001 From: Loaye Date: Wed, 19 Jul 2017 14:56:29 -0700 Subject: [PATCH 4/7] fixed some errors --- assests/three.txt | 1 - assests/two.txt | 1 - {assests => assets}/one.txt | 0 assets/three.txt | 1 + assets/two.txt | 1 + index.js | 12 +++++++----- lib/file-reader.js | 20 +++++++++---------- package.json | 4 +++- test/file-reader-test.js | 38 ++++++++++++------------------------- 9 files changed, 33 insertions(+), 45 deletions(-) delete mode 100644 assests/three.txt delete mode 100644 assests/two.txt rename {assests => assets}/one.txt (100%) create mode 100644 assets/three.txt create mode 100644 assets/two.txt diff --git a/assests/three.txt b/assests/three.txt deleted file mode 100644 index ed39191..0000000 --- a/assests/three.txt +++ /dev/null @@ -1 +0,0 @@ -this text has a short message diff --git a/assests/two.txt b/assests/two.txt deleted file mode 100644 index ae58c42..0000000 --- a/assests/two.txt +++ /dev/null @@ -1 +0,0 @@ -this text has some text \ No newline at end of file diff --git a/assests/one.txt b/assets/one.txt similarity index 100% rename from assests/one.txt rename to assets/one.txt diff --git a/assets/three.txt b/assets/three.txt new file mode 100644 index 0000000..6e2f020 --- /dev/null +++ b/assets/three.txt @@ -0,0 +1 @@ +shortest diff --git a/assets/two.txt b/assets/two.txt new file mode 100644 index 0000000..386ab34 --- /dev/null +++ b/assets/two.txt @@ -0,0 +1 @@ +hello, from the other side \ No newline at end of file diff --git a/index.js b/index.js index 964bf10..6dfef84 100644 --- a/index.js +++ b/index.js @@ -1,10 +1,12 @@ 'use strict'; -const readFiles = require('../lib/file-reader.js'); +const readFiles = require('./lib/file-reader.js'); const paths = [ - `${__dirname}/assests/one.txt`, - `${__dirname}/assests/two.txt`, - `${__dirname}/assests/three.txt` + `${__dirname}/assets/one.txt`, + `${__dirname}/assets/two.txt`, + `${__dirname}/assets/three.txt` ]; -readFiles(paths); \ No newline at end of file +readFiles(paths, function(err, data) { + console.log('my data:', data); +}); \ No newline at end of file diff --git a/lib/file-reader.js b/lib/file-reader.js index acc5a1b..50d6ef1 100644 --- a/lib/file-reader.js +++ b/lib/file-reader.js @@ -3,21 +3,19 @@ const fs = require('fs'); const fileReader = module.exports = function(paths, callback) { - if(paths.length > 3 || paths.length < 3) throw new Error('must have three paths'); let buffers = []; - let [one, two, three] = paths; - fs.readFile(one, function(err, data) { - if(err) throw err; - buffers.push(data.toString('hex', 0 , 7)); + fs.readFile(paths[0], function(err, data) { + if(err) return callback(err); + buffers.push(data.toString('hex', 0 , 8)); - fs.readFile(two, function(err, data) { - if(err) throw err; - buffers.push(data.toString('hex', 0 , 7)); + fs.readFile(paths[1], function(err, data) { + if(err) return callback(err); + buffers.push(data.toString('hex', 0 , 8)); - fs.readFile(three, function(err, data) { - if(err) throw err; - buffers.push(data.toString('hex', 0 , 7)); + fs.readFile(paths[2], function(err, data) { + if(err) return callback(err); + buffers.push(data.toString('hex', 0 , 8)); return callback(null, buffers); }); }); diff --git a/package.json b/package.json index 3aa99df..7474d41 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,9 @@ "test": "test" }, "scripts": { - "test": "mocha" + "start": "index.js", + "test": "mocha", + "lint": "eslintrc ." }, "repository": { "type": "git", diff --git a/test/file-reader-test.js b/test/file-reader-test.js index b0d3ba3..9ede915 100644 --- a/test/file-reader-test.js +++ b/test/file-reader-test.js @@ -4,7 +4,7 @@ const expect = require('chai').expect; const fileReader = require('../lib/file-reader.js'); describe('File Reader', function() { - describe('with proper file path', function() { + describe('with improper file path', function() { it('should return an error', function(done) { fileReader(`${__dirname}/not-a-file.txt`, function(err) { expect(err).to.be.an('error'); @@ -13,31 +13,17 @@ describe('File Reader', function() { }); }); - describe('with first path', function() { - it('should return first path and content', function(done) { - fileReader(`${__dirname}/../assests/one.txt`, function(err, data) { - expect(err).to.equal('error'); - expect(data).to.be.a('string'); - done(); - }); - }); - }); - - describe('with first path', function() { - it('should return first path and content', function(done) { - fileReader(`${__dirname}/../assests/two.txt`, function(err, data) { - expect(err).to.equal('error'); - expect(data).to.be.a('string'); - done(); - }); - }); - }); - - describe('with first path', function() { - it('should return first path and content', function(done) { - fileReader(`${__dirname}/../assests/three.txt`, function(err, data) { - expect(err).to.equal('error'); - expect(data).to.be.a('string'); + describe('with proper file paths and data', function() { + it('should return: 7468697320746578, 68656c6c6f2c2066, 73686f7274657374', function(done) { + let paths = [ + `${__dirname}/../assets/one.txt`, + `${__dirname}/../assets/two.txt`, + `${__dirname}/../assets/three.txt` + ]; + fileReader(paths, function(err, data) { + expect(err).to.equal(null); + expect(data).to.be.an('array'); + expect(data).to.deep.equal([ '7468697320746578', '68656c6c6f2c2066', '73686f7274657374' ]); done(); }); }); From e289e9462e8afa86afccc5393ad57e044c9693af Mon Sep 17 00:00:00 2001 From: Loaye Date: Wed, 19 Jul 2017 15:02:17 -0700 Subject: [PATCH 5/7] Creates a readme file for this app --- README.md | 52 +++++++--------------------------------------------- 1 file changed, 7 insertions(+), 45 deletions(-) diff --git a/README.md b/README.md index 8cc8c11..7335e23 100644 --- a/README.md +++ b/README.md @@ -1,45 +1,7 @@ -![CF](https://camo.githubusercontent.com/70edab54bba80edb7493cad3135e9606781cbb6b/687474703a2f2f692e696d6775722e636f6d2f377635415363382e706e67) 04: Parallel File Processing -=== - -## Submission Instructions - * fork this repository & create a new branch for your work - * write all of your code in a directory named `lab-` + `` **e.g.** `lab-susan` - * push to your repository - * submit a pull request to this repository - * submit a link to your PR in canvas - * write a question and observation on canvas - -## Learning Objectives - * students will be able to create asynchronous programs using the node.js callback pattern - * students will be able to read, write, and encode binary data using the Buffer class - * students will be able to utilize the built-in `fs` module for basic file system I/O operations - * students will be able to use `done` (provided by mocha.js) for creating asynchronous tests - -## Resources - * [fs module docs](https://nodejs.org/api/fs.html) - -## Requirements - -#### Configuration - -* include the following: - * **README.md** - contains documentation about your lab - * **.gitignore** - contains a robust `.gitignore` file - * **.eslintrc** - contains the provided `.eslintrc` file - * **.eslintignore** - contains the provided `.eslintignore` file - * **lib/** - contains your modules - * **test/** - contains your unit tests - * **assets/** - contains the text files used by the program - * **index.js** - contains main program file - -#### Feature Tasks - * 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'` - -#### Testing - * create a test that guarantees that the files are logged in the proper order - * create a test that checks for improper file paths - -#### Documentation - * create a simple description of your project - * create a simple layer of documentation that describes how to use `done` in mocha callbacks +#### What this app does! +* Awesome Stuff!! +#### +* We made 3 files +* Sorts through the 3 files +* Organizes by length of file +* Shows Hex value based off of the first 8 letters of each message. \ No newline at end of file From e0554f9d1c5a3aefa3fa491d7cd5d64d5365bfc7 Mon Sep 17 00:00:00 2001 From: Loaye Date: Thu, 20 Jul 2017 10:12:19 -0700 Subject: [PATCH 6/7] Lint Script: Changes lint script from eslintrc to eslint --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7474d41..58c9d59 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "scripts": { "start": "index.js", "test": "mocha", - "lint": "eslintrc ." + "lint": "eslint ." }, "repository": { "type": "git", From 8c04a961ad629f6649450d27d8b769fed669beaa Mon Sep 17 00:00:00 2001 From: Loaye Date: Thu, 20 Jul 2017 12:27:44 -0700 Subject: [PATCH 7/7] ReadMe: Adds a readme to tell the what the app does. --- README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7335e23..b7b4b9c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ #### What this app does! -* Awesome Stuff!! -#### -* We made 3 files -* Sorts through the 3 files -* Organizes by length of file -* Shows Hex value based off of the first 8 letters of each message. \ No newline at end of file +* Converts a .txt file into hex and obtains the first 8 and logs it to the console. + +#### What is going on. +* This code is ran asynchronously. + +* This app uses Node Modules and a File System alongside a dev help tool of mocha and chai to read through text, run a test, and verify that our code is working. + +* Tests are used by callback functions and is used by done(). Mocha uses done() so that the test know it is completed. \ No newline at end of file