From 403ae45b4d6e2a015e25c11e1a5375a8b1489f47 Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Mon, 12 Sep 2016 16:50:35 -0700 Subject: [PATCH 01/17] added .eslintrc --- lab-elizabeth/.eslintrc | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 lab-elizabeth/.eslintrc diff --git a/lab-elizabeth/.eslintrc b/lab-elizabeth/.eslintrc new file mode 100644 index 0000000..86e3575 --- /dev/null +++ b/lab-elizabeth/.eslintrc @@ -0,0 +1,24 @@ +{ + "rules": { + "comma-dangle": ["error", "always-multiline"], + "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 + }, + "globals": { + }, + "ecmaFeatures": { + "modules": true, + "experimentalObjectRestSpread": true, + "impliedStrict": true + }, + "extends": "eslint:recommended" +} From 2c6b319d025161cc2e7fe2469b7e5ebd5736fb58 Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Mon, 12 Sep 2016 16:58:15 -0700 Subject: [PATCH 02/17] added my package.json file --- lab-elizabeth/package.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 lab-elizabeth/package.json diff --git a/lab-elizabeth/package.json b/lab-elizabeth/package.json new file mode 100644 index 0000000..d904522 --- /dev/null +++ b/lab-elizabeth/package.json @@ -0,0 +1,11 @@ +{ + "name": "lab-elizabeth", + "version": "1.0.0", + "description": "day 01 lab assignment", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "tenlia@hotmail.com", + "license": "ISC" +} From 071f136ccc893175296b1845e835072865e7c792 Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Tue, 13 Sep 2016 13:28:25 -0700 Subject: [PATCH 03/17] added my package.json and started more coding --- lab-elizabeth/index.js | 1 + lab-elizabeth/package.json | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 lab-elizabeth/index.js diff --git a/lab-elizabeth/index.js b/lab-elizabeth/index.js new file mode 100644 index 0000000..ad9a93a --- /dev/null +++ b/lab-elizabeth/index.js @@ -0,0 +1 @@ +'use strict'; diff --git a/lab-elizabeth/package.json b/lab-elizabeth/package.json index d904522..f945d21 100644 --- a/lab-elizabeth/package.json +++ b/lab-elizabeth/package.json @@ -7,5 +7,8 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "author": "tenlia@hotmail.com", - "license": "ISC" + "license": "ISC", + "devDependencies": { + "mocha": "^3.0.2" + } } From c05fb76b60cac87c732c4e1bee3c9b1648fc0f89 Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Tue, 13 Sep 2016 13:42:53 -0700 Subject: [PATCH 04/17] made greet and test-greet --- LAB-02.md | 6 +++--- lab-elizabeth/greet.js | 5 +++++ lab-elizabeth/test/test-greet.js | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 lab-elizabeth/greet.js create mode 100644 lab-elizabeth/test/test-greet.js diff --git a/LAB-02.md b/LAB-02.md index 60881c7..6520275 100644 --- a/LAB-02.md +++ b/LAB-02.md @@ -13,13 +13,13 @@ * add your own gitignore * include a package.json * include the class eslint -* add a glup file +* add a gulp file ### Gulp Tasks * make a lint task for running eslint * make a test task for running mocha -* make a dev task that waches your files and runs the lint and test taks -* make a defalut task that runs your favorite task +* make a dev task that watches your files and runs the lint and test task +* make a default task that runs your favorite task ## Rubric: * Correct Submission: 2pts diff --git a/lab-elizabeth/greet.js b/lab-elizabeth/greet.js new file mode 100644 index 0000000..ea33466 --- /dev/null +++ b/lab-elizabeth/greet.js @@ -0,0 +1,5 @@ +'use strict'; + +module.export = function greet(name) { + console.log('hello' + name); +}; diff --git a/lab-elizabeth/test/test-greet.js b/lab-elizabeth/test/test-greet.js new file mode 100644 index 0000000..ad9a93a --- /dev/null +++ b/lab-elizabeth/test/test-greet.js @@ -0,0 +1 @@ +'use strict'; From d11c8533c661684408208e405e949c451051ffbc Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Tue, 13 Sep 2016 13:58:14 -0700 Subject: [PATCH 05/17] added lib folder and reorganized --- lab-elizabeth/index.js | 4 ++++ lab-elizabeth/{ => lib}/greet.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) rename lab-elizabeth/{ => lib}/greet.js (64%) diff --git a/lab-elizabeth/index.js b/lab-elizabeth/index.js index ad9a93a..f47765e 100644 --- a/lab-elizabeth/index.js +++ b/lab-elizabeth/index.js @@ -1 +1,5 @@ 'use strict'; + +const greet = require('./lib/greet'); + +greet(); diff --git a/lab-elizabeth/greet.js b/lab-elizabeth/lib/greet.js similarity index 64% rename from lab-elizabeth/greet.js rename to lab-elizabeth/lib/greet.js index ea33466..cd8c211 100644 --- a/lab-elizabeth/greet.js +++ b/lab-elizabeth/lib/greet.js @@ -1,5 +1,5 @@ 'use strict'; module.export = function greet(name) { - console.log('hello' + name); + return 'hello' + name; }; From 8980fdb615868c55d963b7f47059c08410f8beb3 Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Tue, 13 Sep 2016 14:24:40 -0700 Subject: [PATCH 06/17] figuring-out the testing code bit-by-bit --- lab-elizabeth/test/test-greet.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lab-elizabeth/test/test-greet.js b/lab-elizabeth/test/test-greet.js index ad9a93a..712da0e 100644 --- a/lab-elizabeth/test/test-greet.js +++ b/lab-elizabeth/test/test-greet.js @@ -1 +1,11 @@ 'use strict'; + +const greet = require('../lib/greet'); +const assert = require('assert'); + +describe('testing greet.js module', function(){ + it('should return hello liz', function(){ + var result = greet('liz'); + assert.equal(result, 'hello liz', 'expected "hello liz"'); + }); +}); From 700e700b5e4cbd9832bf2128e67721e41f39e629 Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Tue, 13 Sep 2016 14:29:35 -0700 Subject: [PATCH 07/17] forgot a space oh-no --- lab-elizabeth/lib/greet.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lab-elizabeth/lib/greet.js b/lab-elizabeth/lib/greet.js index cd8c211..f26066f 100644 --- a/lab-elizabeth/lib/greet.js +++ b/lab-elizabeth/lib/greet.js @@ -1,5 +1,5 @@ 'use strict'; -module.export = function greet(name) { - return 'hello' + name; +module.exports = function greet(name) { + return 'hello ' + name; }; From 376606e8fd0319fdbc7c5424948020193e404987 Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Tue, 13 Sep 2016 14:49:24 -0700 Subject: [PATCH 08/17] added a name to the greet function invocation --- lab-elizabeth/index.js | 2 +- lab-elizabeth/lib/greet.js | 3 ++- lab-elizabeth/test/test-greet.js | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lab-elizabeth/index.js b/lab-elizabeth/index.js index f47765e..c3af9a3 100644 --- a/lab-elizabeth/index.js +++ b/lab-elizabeth/index.js @@ -2,4 +2,4 @@ const greet = require('./lib/greet'); -greet(); +greet('liz'); diff --git a/lab-elizabeth/lib/greet.js b/lab-elizabeth/lib/greet.js index f26066f..4bac1df 100644 --- a/lab-elizabeth/lib/greet.js +++ b/lab-elizabeth/lib/greet.js @@ -1,5 +1,6 @@ 'use strict'; module.exports = function greet(name) { - return 'hello ' + name; + console.log(`hello ${name}`); + return `hello ${name}`; }; diff --git a/lab-elizabeth/test/test-greet.js b/lab-elizabeth/test/test-greet.js index 712da0e..e5cffbd 100644 --- a/lab-elizabeth/test/test-greet.js +++ b/lab-elizabeth/test/test-greet.js @@ -4,8 +4,8 @@ const greet = require('../lib/greet'); const assert = require('assert'); describe('testing greet.js module', function(){ - it('should return hello liz', function(){ - var result = greet('liz'); - assert.equal(result, 'hello liz', 'expected "hello liz"'); + it('should return hello lizzie', function(){ + var result = greet('lizzie'); + assert.equal(result, 'hello lizzie', 'expected "hello lizzie"'); }); }); From 9651205281b61905f92cd9fe9df992abbd1f23df Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Tue, 13 Sep 2016 14:55:22 -0700 Subject: [PATCH 09/17] added my gitignore file --- lab-elizabeth/.gitignore | 87 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 lab-elizabeth/.gitignore diff --git a/lab-elizabeth/.gitignore b/lab-elizabeth/.gitignore new file mode 100644 index 0000000..ca0ed80 --- /dev/null +++ b/lab-elizabeth/.gitignore @@ -0,0 +1,87 @@ +# Created by https://www.gitignore.io/api/linux,node,sublimetext + +### 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-* + + +### 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 + + +### SublimeText ### +# cache files for sublime text +*.tmlanguage.cache +*.tmPreferences.cache +*.stTheme.cache + +# workspace files are user-specific +*.sublime-workspace + +# project files should be checked into the repository, unless a significant +# proportion of contributors will probably not be using SublimeText +# *.sublime-project + +# sftp configuration file +sftp-config.json + +# Package control specific files +Package Control.last-run +Package Control.ca-list +Package Control.ca-bundle +Package Control.system-ca-bundle +Package Control.cache/ +Package Control.ca-certs/ +bh_unicode_properties.cache + +# Sublime-github package stores a github token in this file +# https://packagecontrol.io/packages/sublime-github +GitHub.sublime-settings From 7968e0bb38e587196eede7ff989243e94ceddb96 Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Tue, 13 Sep 2016 15:15:08 -0700 Subject: [PATCH 10/17] added gulp, eslint, etc. to package.json --- lab-elizabeth/package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lab-elizabeth/package.json b/lab-elizabeth/package.json index f945d21..d61e84d 100644 --- a/lab-elizabeth/package.json +++ b/lab-elizabeth/package.json @@ -9,6 +9,10 @@ "author": "tenlia@hotmail.com", "license": "ISC", "devDependencies": { + "eslint": "^3.5.0", + "gulp": "^3.9.1", + "gulp-eslint": "^3.0.1", + "gulp-mocha": "^3.0.1", "mocha": "^3.0.2" } } From a1305c5ff65ae0845fcd0388c509ad4e11189c9c Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Tue, 13 Sep 2016 15:28:49 -0700 Subject: [PATCH 11/17] updated gitignore and added a gulp.js file --- lab-elizabeth/.gitignore | 45 +++++++++++++++++++++++++++++++++++++- lab-elizabeth/gulp.js | 1 + lab-elizabeth/lib/greet.js | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 lab-elizabeth/gulp.js diff --git a/lab-elizabeth/.gitignore b/lab-elizabeth/.gitignore index ca0ed80..1a89a33 100644 --- a/lab-elizabeth/.gitignore +++ b/lab-elizabeth/.gitignore @@ -1,4 +1,34 @@ -# Created by https://www.gitignore.io/api/linux,node,sublimetext + +# Created by https://www.gitignore.io/api/osx,linux,node,vim,sublimetext + +### 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 + ### Linux ### *~ @@ -57,6 +87,19 @@ jspm_packages .node_repl_history +### Vim ### +# swap +[._]*.s[a-w][a-z] +[._]s[a-w][a-z] +# session +Session.vim +# temporary +.netrwhist +*~ +# auto-generated tag files +tags + + ### SublimeText ### # cache files for sublime text *.tmlanguage.cache diff --git a/lab-elizabeth/gulp.js b/lab-elizabeth/gulp.js new file mode 100644 index 0000000..ad9a93a --- /dev/null +++ b/lab-elizabeth/gulp.js @@ -0,0 +1 @@ +'use strict'; diff --git a/lab-elizabeth/lib/greet.js b/lab-elizabeth/lib/greet.js index 4bac1df..7315cee 100644 --- a/lab-elizabeth/lib/greet.js +++ b/lab-elizabeth/lib/greet.js @@ -1,6 +1,6 @@ 'use strict'; module.exports = function greet(name) { - console.log(`hello ${name}`); + if(!name) throw new Error('expected name'); return `hello ${name}`; }; From fdef9d3519545d5c835dcdabbbb24fac059b4221 Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Tue, 13 Sep 2016 15:38:54 -0700 Subject: [PATCH 12/17] filled-in gulp.js file --- lab-elizabeth/gulp.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/lab-elizabeth/gulp.js b/lab-elizabeth/gulp.js index ad9a93a..89b8281 100644 --- a/lab-elizabeth/gulp.js +++ b/lab-elizabeth/gulp.js @@ -1 +1,23 @@ 'use strict'; + +const gulp = require('gulp'); +const eslint = require('gulp-eslint'); +const mocha = require('gulp-mocha'); + +gulp.task('lint', function(){ + return gulp.src(['**/*.js', '!node_modules/**']) + .pipe(eslint()) + .pipe(eslint.format()) + .pipe(eslint.failAfterError()); +}); + +gulp.task('test', function(){ + gulp.src('./test/*-test.js', {read: false}) + .pipe(mocha({reporter: 'landing'})); +}); + +gulp.task('dev', function(){ + gulp.watch(['**/*.js', '!node_modules/**'], ['lint', 'test']); +}); + +gulp.task('default', ['lint']); From 5c31ed9b434111febb4da72fe626e21d0835857d Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Tue, 13 Sep 2016 15:41:58 -0700 Subject: [PATCH 13/17] realized why my gulp file wasnt working --- lab-elizabeth/{gulp.js => gulpfile.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lab-elizabeth/{gulp.js => gulpfile.js} (100%) diff --git a/lab-elizabeth/gulp.js b/lab-elizabeth/gulpfile.js similarity index 100% rename from lab-elizabeth/gulp.js rename to lab-elizabeth/gulpfile.js From 424d9c0fbec9af567f5d3cbf882ad7cdad3eb575 Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Tue, 13 Sep 2016 16:05:45 -0700 Subject: [PATCH 14/17] added missing name error --- lab-elizabeth/package.json | 2 +- lab-elizabeth/test/{test-greet.js => greet-test.js} | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) rename lab-elizabeth/test/{test-greet.js => greet-test.js} (66%) diff --git a/lab-elizabeth/package.json b/lab-elizabeth/package.json index d61e84d..ce0c59c 100644 --- a/lab-elizabeth/package.json +++ b/lab-elizabeth/package.json @@ -7,7 +7,7 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "author": "tenlia@hotmail.com", - "license": "ISC", + "license": "MIT", "devDependencies": { "eslint": "^3.5.0", "gulp": "^3.9.1", diff --git a/lab-elizabeth/test/test-greet.js b/lab-elizabeth/test/greet-test.js similarity index 66% rename from lab-elizabeth/test/test-greet.js rename to lab-elizabeth/test/greet-test.js index e5cffbd..812026f 100644 --- a/lab-elizabeth/test/test-greet.js +++ b/lab-elizabeth/test/greet-test.js @@ -8,4 +8,9 @@ describe('testing greet.js module', function(){ var result = greet('lizzie'); assert.equal(result, 'hello lizzie', 'expected "hello lizzie"'); }); + it('should throw error for missing input', function(){ + assert.throws(function(){ + greet(); + }, 'expected missing name error'); + }); }); From ac88b99e8ce4f0f1e31132aabe4dc6113ec850d4 Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Tue, 13 Sep 2016 16:10:26 -0700 Subject: [PATCH 15/17] testing something on my greet-test --- lab-elizabeth/test/greet-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lab-elizabeth/test/greet-test.js b/lab-elizabeth/test/greet-test.js index 812026f..2172ed5 100644 --- a/lab-elizabeth/test/greet-test.js +++ b/lab-elizabeth/test/greet-test.js @@ -5,8 +5,8 @@ const assert = require('assert'); describe('testing greet.js module', function(){ it('should return hello lizzie', function(){ - var result = greet('lizzie'); - assert.equal(result, 'hello lizzie', 'expected "hello lizzie"'); + // var result = greet('lizzie'); + assert.equal(greet('lizzie'), 'hello lizzie', 'expected "hello lizzie"'); }); it('should throw error for missing input', function(){ assert.throws(function(){ From ae76f39a2489628cde0f046eac2de47e3b01410d Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Tue, 13 Sep 2016 16:11:07 -0700 Subject: [PATCH 16/17] it worked, cool --- lab-elizabeth/test/greet-test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lab-elizabeth/test/greet-test.js b/lab-elizabeth/test/greet-test.js index 2172ed5..57ca193 100644 --- a/lab-elizabeth/test/greet-test.js +++ b/lab-elizabeth/test/greet-test.js @@ -5,7 +5,6 @@ const assert = require('assert'); describe('testing greet.js module', function(){ it('should return hello lizzie', function(){ - // var result = greet('lizzie'); assert.equal(greet('lizzie'), 'hello lizzie', 'expected "hello lizzie"'); }); it('should throw error for missing input', function(){ From a7f5ce518ddbf8f334e0d364b296311160ae3814 Mon Sep 17 00:00:00 2001 From: Elizabeth Kleinschmidt Date: Tue, 13 Sep 2016 16:47:31 -0700 Subject: [PATCH 17/17] worked on making my tests a little better and changed my default on gulpfile to test --- lab-elizabeth/gulpfile.js | 2 +- lab-elizabeth/test/greet-test.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lab-elizabeth/gulpfile.js b/lab-elizabeth/gulpfile.js index 89b8281..83e5853 100644 --- a/lab-elizabeth/gulpfile.js +++ b/lab-elizabeth/gulpfile.js @@ -20,4 +20,4 @@ gulp.task('dev', function(){ gulp.watch(['**/*.js', '!node_modules/**'], ['lint', 'test']); }); -gulp.task('default', ['lint']); +gulp.task('default', ['test']); diff --git a/lab-elizabeth/test/greet-test.js b/lab-elizabeth/test/greet-test.js index 57ca193..a26ea5b 100644 --- a/lab-elizabeth/test/greet-test.js +++ b/lab-elizabeth/test/greet-test.js @@ -8,8 +8,6 @@ describe('testing greet.js module', function(){ assert.equal(greet('lizzie'), 'hello lizzie', 'expected "hello lizzie"'); }); it('should throw error for missing input', function(){ - assert.throws(function(){ - greet(); - }, 'expected missing name error'); + assert.throws(greet, 'expected missing name error'); }); });