Skip to content

Lab3 corrections made #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -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"
}
132 changes: 132 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions data/one.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Ah, You think darkness is your ally
1 change: 1 addition & 0 deletions data/three.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I was born in it, molded by it. By the time I saw the light it only blinded me!
1 change: 1 addition & 0 deletions data/two.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
You've merely adapted to the dark..
23 changes: 23 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -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']);
8 changes: 8 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
'use strict';

const readFile = require('./lib/read-file.js');

readFile([`${__dirname}/data/one.txt`, `${__dirname}/data/two.txt`, `${__dirname}/data/three.txt`], function (err, result){
if (err) throw err;
console.log(result);
});
22 changes: 22 additions & 0 deletions lib/read-file.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
'use strict';

const fs = require('fs');

const readFileHelper = module.exports = function(pathArray, callback) {
var result = [];

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like that you are passing in the file paths as an array.

fs.readFile(pathArray[0], function(err, data) {
if (err) return callback(err);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good Job returning the error with the callback.

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);
});
});
});
};
27 changes: 27 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
37 changes: 37 additions & 0 deletions test/file-reader-test.js
Original file line number Diff line number Diff line change
@@ -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();
});
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a good test. It will make sure that your files are coming back in the correct order.

});
});
});