From e1238f9082fa1949ba6d9e1283e801c588f33d5e Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Thu, 16 Feb 2017 10:11:10 -0800 Subject: [PATCH 1/3] lab3 --- .eslintrc | 21 +++++++ .gitignore | 132 +++++++++++++++++++++++++++++++++++++++ data/one.txt | 1 + data/three.txt | 1 + data/two.txt | 1 + gulpfile.js | 23 +++++++ index.js | 8 +++ lib/read-file.js | 22 +++++++ package.json | 27 ++++++++ test/file-reader-test.js | 37 +++++++++++ 10 files changed, 273 insertions(+) create mode 100644 .eslintrc 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 gulpfile.js create mode 100644 index.js create mode 100644 lib/read-file.js create mode 100644 package.json create mode 100644 test/file-reader-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..6159cdc --- /dev/null +++ b/.gitignore @@ -0,0 +1,132 @@ + +# Created by https://www.gitignore.io/api/node,vim,osx,macos,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* + +### 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 + +### 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 ### + +# Icon must end with two \r + + +# Thumbnails + +# Files that might appear in the root of a volume + +# Directories potentially created on remote AFP share + +### 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/node,vim,osx,macos,linux diff --git a/data/one.txt b/data/one.txt new file mode 100644 index 0000000..8569979 --- /dev/null +++ b/data/one.txt @@ -0,0 +1 @@ +Ah, You think darkness is your ally diff --git a/data/three.txt b/data/three.txt new file mode 100644 index 0000000..aecc37e --- /dev/null +++ b/data/three.txt @@ -0,0 +1 @@ +I was born in it, molded by it. By the time I saw the light it only blinded me! diff --git a/data/two.txt b/data/two.txt new file mode 100644 index 0000000..5a5c141 --- /dev/null +++ b/data/two.txt @@ -0,0 +1 @@ +You've merely adapted to the dark.. diff --git a/gulpfile.js b/gulpfile.js new file mode 100644 index 0000000..032c482 --- /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 new file mode 100644 index 0000000..88374ea --- /dev/null +++ b/index.js @@ -0,0 +1,8 @@ +'use strict'; + +const fs = require('fs'); + +fs.readFile(`${__dirname}/data/one.txt`, function(err, data) { + if (err) throw err; + console.log('content:', data.toString()); +}); diff --git a/lib/read-file.js b/lib/read-file.js new file mode 100644 index 0000000..15c17cd --- /dev/null +++ b/lib/read-file.js @@ -0,0 +1,22 @@ +'use strict'; + +const fs = require('fs'); + +const readFileHelper = module.exports = function(pathArray, callback) { + var result = []; + + fs.readFile(pathArray[0], function(err, data) { + if (err) return callback(err); + result.push(data.toString('hex', 0, 8)); + fs.readFile(pathArray[1], function(err, data){ + if (err) return callback(err); + result.push(data.toString('hex', 0, 8)); + fs.readFile(pathArray[2], function(err, data){ + if (err) return callback(err); + result.push(data.toString('hex', 0, 8)); + console.log('my resultz:', result); + callback(null, result); + }); + }); +}); +}; diff --git a/package.json b/package.json new file mode 100644 index 0000000..ee35405 --- /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", + "directories": { + "test": "test" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/jtwalters25/03-parallel_file_processing.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/jtwalters25/03-parallel_file_processing/issues" + }, + "homepage": "https://github.com/jtwalters25/03-parallel_file_processing#readme", + "devDependencies": { + "chai": "^3.5.0", + "mocha": "^3.2.0" + } +} diff --git a/test/file-reader-test.js b/test/file-reader-test.js new file mode 100644 index 0000000..c513cfe --- /dev/null +++ b/test/file-reader-test.js @@ -0,0 +1,37 @@ +'use strict' + +const expect = require('chai').expect; +const fileReader = require('../lib/read-file.js'); + +describe('File Reader Module', function() { + describe('with an improper file path', function() { + it('should return an error', function() { + fileReader([`${__dirname}/not-a-file.txt`], function(err) { + expect(err).to.equal(true); + }); + }); + }); + + describe('with a proper file path', function() { + before((done) => { + this.paths = [ + `${__dirname}/../data/one.txt`, + `${__dirname}/../data/two.txt`, + `${__dirname}/../data/three.txt` + ]; + done(); + }); + + it ('should have correct order of hex strings', (done) => { + var expectedResult = ['41682c20596f7520','596f75277665206d', '492077617320626f']; + fileReader(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(); + }); + }); + }); +}); From 7e661bb058573be3b7aa5f8fc85529664e4dd89d Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Sun, 19 Feb 2017 18:48:32 -0800 Subject: [PATCH 2/3] corrected index.js --- index.js | 6 +++--- lib/read-file.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index 88374ea..90d702c 100644 --- a/index.js +++ b/index.js @@ -1,8 +1,8 @@ 'use strict'; -const fs = require('fs'); +const fileReader = require('./lib/file-reader.js'); -fs.readFile(`${__dirname}/data/one.txt`, function(err, data) { +fileReader([`${__dirname}/data/one.txt`, `${__dirname}/data/two.txt`, `${__dirname}/data/three.txt`], function (err, result){ if (err) throw err; - console.log('content:', data.toString()); + console.log(result); }); diff --git a/lib/read-file.js b/lib/read-file.js index 15c17cd..44edf80 100644 --- a/lib/read-file.js +++ b/lib/read-file.js @@ -16,7 +16,7 @@ const readFileHelper = module.exports = function(pathArray, callback) { result.push(data.toString('hex', 0, 8)); console.log('my resultz:', result); callback(null, result); + }); }); }); -}); }; From 8740877b7765e5f68dfd2f4f74079afdeb0fd12e Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Mon, 20 Feb 2017 09:37:41 -0800 Subject: [PATCH 3/3] resubmit --- index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 90d702c..c8b63e1 100644 --- a/index.js +++ b/index.js @@ -1,8 +1,8 @@ 'use strict'; -const fileReader = require('./lib/file-reader.js'); +const readFile = require('./lib/read-file.js'); -fileReader([`${__dirname}/data/one.txt`, `${__dirname}/data/two.txt`, `${__dirname}/data/three.txt`], function (err, result){ +readFile([`${__dirname}/data/one.txt`, `${__dirname}/data/two.txt`, `${__dirname}/data/three.txt`], function (err, result){ if (err) throw err; console.log(result); });