From 223ff44948187719bb7bf4cfa961310376cb892b Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Tue, 27 Oct 2015 06:16:15 -0700 Subject: [PATCH 01/12] add function greet that takes name as param, returns hello name, one test --- isabella_organ/index.js | 6 ++++++ isabella_organ/lib/greet.js | 5 +++++ isabella_organ/test/greet_test.js | 12 ++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 isabella_organ/index.js create mode 100644 isabella_organ/lib/greet.js create mode 100644 isabella_organ/test/greet_test.js diff --git a/isabella_organ/index.js b/isabella_organ/index.js new file mode 100644 index 0000000..4f720f5 --- /dev/null +++ b/isabella_organ/index.js @@ -0,0 +1,6 @@ +'use strict'; + +var greet = require(__dirname + '/lib/greet'); +console.log(greet()); + + diff --git a/isabella_organ/lib/greet.js b/isabella_organ/lib/greet.js new file mode 100644 index 0000000..fc30d2e --- /dev/null +++ b/isabella_organ/lib/greet.js @@ -0,0 +1,5 @@ +'use strict'; + +var greet = exports = module.exports = function(name) { + return 'hello ' + name; +}; \ No newline at end of file diff --git a/isabella_organ/test/greet_test.js b/isabella_organ/test/greet_test.js new file mode 100644 index 0000000..dae7957 --- /dev/null +++ b/isabella_organ/test/greet_test.js @@ -0,0 +1,12 @@ +'use strict'; + +var expect = require('chai').expect; +var greet = require(__dirname + '/../lib/greet'); + +describe('the greet function', function() { + it('should return hello (name)', function() { + expect(greet('some person')).to.eql('hello some person'); + }); +}); + + From 9347f565650dd6a7a19920d7885b4b579c8949d6 Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Tue, 27 Oct 2015 10:11:25 -0700 Subject: [PATCH 02/12] add command line utility --- isabella_organ/index.js | 2 +- isabella_organ/test/greet_test.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/isabella_organ/index.js b/isabella_organ/index.js index 4f720f5..645c56a 100644 --- a/isabella_organ/index.js +++ b/isabella_organ/index.js @@ -1,6 +1,6 @@ 'use strict'; var greet = require(__dirname + '/lib/greet'); -console.log(greet()); +console.log(greet(process.argv[2])); diff --git a/isabella_organ/test/greet_test.js b/isabella_organ/test/greet_test.js index dae7957..772a5fd 100644 --- a/isabella_organ/test/greet_test.js +++ b/isabella_organ/test/greet_test.js @@ -5,8 +5,10 @@ var greet = require(__dirname + '/../lib/greet'); describe('the greet function', function() { it('should return hello (name)', function() { - expect(greet('some person')).to.eql('hello some person'); + expect(greet('Tyler')).to.eql('hello Tyler'); }); }); + + From d7a67ad17fef3d8d0798e083aefc60b345c9b6c0 Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Tue, 27 Oct 2015 10:12:35 -0700 Subject: [PATCH 03/12] gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index ab646e2..3ca15f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ **/*.sw? + +node_modules + From 8646b602ba6ad6e88ec96e65c908ffa65f7ea84d Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Wed, 28 Oct 2015 08:57:31 -0700 Subject: [PATCH 04/12] add pkg json --- isabella_organ/package.json | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 isabella_organ/package.json diff --git a/isabella_organ/package.json b/isabella_organ/package.json new file mode 100644 index 0000000..c73c9c7 --- /dev/null +++ b/isabella_organ/package.json @@ -0,0 +1,36 @@ +{ + "name": "isabella_organ", + "version": "1.0.0", + "description": "Simple Test and Modular Patterns", + "main": "index.js", + "directories": { + "test": "test" + }, + "dependencies": { + "chai": "^3.4.0", + "cltags": "^0.0.2" + }, + "devDependencies": {}, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/isabellaorgan/simple-test-and-modular-patterns.git" + }, + "keywords": [ + "test", + "mocha", + "chai", + "modules", + "node", + "json", + "gulp" + ], + "author": "isabellaorgan@gmail.com", + "license": "ISC", + "bugs": { + "url": "https://github.com/isabellaorgan/simple-test-and-modular-patterns/issues" + }, + "homepage": "https://github.com/isabellaorgan/simple-test-and-modular-patterns#readme" +} From fb2dbdfc665029bbc355b17700668e44bca448d6 Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Wed, 28 Oct 2015 13:41:45 -0700 Subject: [PATCH 05/12] add files for creating cl code --- isabella_organ/bin/greet.js | 8 ++++++++ isabella_organ/bin/greet_test1.js | 9 +++++++++ isabella_organ/index-old.js | 8 ++++++++ isabella_organ/index.js | 7 +------ isabella_organ/index1.js | 1 + isabella_organ/lib/greet1.js | 8 ++++++++ isabella_organ/test/greet_test-old.js | 14 +++++++++++++ isabella_organ/test/greet_test.js | 20 +++++++++---------- isabella_organ/test/old-greet_test.js | 14 +++++++++++++ ... = rgreet_test.jsequire('chai').expect;.js | 9 +++++++++ 10 files changed, 82 insertions(+), 16 deletions(-) create mode 100755 isabella_organ/bin/greet.js create mode 100644 isabella_organ/bin/greet_test1.js create mode 100644 isabella_organ/index-old.js create mode 100644 isabella_organ/index1.js create mode 100644 isabella_organ/lib/greet1.js create mode 100644 isabella_organ/test/greet_test-old.js create mode 100644 isabella_organ/test/old-greet_test.js create mode 100644 isabella_organ/test/var expect = rgreet_test.jsequire('chai').expect;.js diff --git a/isabella_organ/bin/greet.js b/isabella_organ/bin/greet.js new file mode 100755 index 0000000..93af7fb --- /dev/null +++ b/isabella_organ/bin/greet.js @@ -0,0 +1,8 @@ +#!/usr/bin/env/node + +var greet = require(__dirname + '/lib/greet'); +var bin = exports = module.exports = funtion() { + console.log(greet(process.argv[2] || 'anonymous')); + return greet(process.argv[2] || 'anonymous'); +}; +bin(); \ No newline at end of file diff --git a/isabella_organ/bin/greet_test1.js b/isabella_organ/bin/greet_test1.js new file mode 100644 index 0000000..0e5d291 --- /dev/null +++ b/isabella_organ/bin/greet_test1.js @@ -0,0 +1,9 @@ +var expect = require('chai').expect; +var greet = require(__dirname + '/../bin/greet'); + +describe('greet bin', function() { + before(function() { + this.backup = process.argv; + process.argv ['node', 'myfile', 'test name']; + }); +}); \ No newline at end of file diff --git a/isabella_organ/index-old.js b/isabella_organ/index-old.js new file mode 100644 index 0000000..89249f8 --- /dev/null +++ b/isabella_organ/index-old.js @@ -0,0 +1,8 @@ +'use strict'; + +var greet = require(__dirname + '/lib/greet'); +console.log(greet(process.argv[2])); + + +//should this be greet.js? +// diff --git a/isabella_organ/index.js b/isabella_organ/index.js index 645c56a..8a71081 100644 --- a/isabella_organ/index.js +++ b/isabella_organ/index.js @@ -1,6 +1 @@ -'use strict'; - -var greet = require(__dirname + '/lib/greet'); -console.log(greet(process.argv[2])); - - +mobile.exports = require(__dirname + '/lib/greet'); \ No newline at end of file diff --git a/isabella_organ/index1.js b/isabella_organ/index1.js new file mode 100644 index 0000000..8a71081 --- /dev/null +++ b/isabella_organ/index1.js @@ -0,0 +1 @@ +mobile.exports = require(__dirname + '/lib/greet'); \ No newline at end of file diff --git a/isabella_organ/lib/greet1.js b/isabella_organ/lib/greet1.js new file mode 100644 index 0000000..93af7fb --- /dev/null +++ b/isabella_organ/lib/greet1.js @@ -0,0 +1,8 @@ +#!/usr/bin/env/node + +var greet = require(__dirname + '/lib/greet'); +var bin = exports = module.exports = funtion() { + console.log(greet(process.argv[2] || 'anonymous')); + return greet(process.argv[2] || 'anonymous'); +}; +bin(); \ No newline at end of file diff --git a/isabella_organ/test/greet_test-old.js b/isabella_organ/test/greet_test-old.js new file mode 100644 index 0000000..772a5fd --- /dev/null +++ b/isabella_organ/test/greet_test-old.js @@ -0,0 +1,14 @@ +'use strict'; + +var expect = require('chai').expect; +var greet = require(__dirname + '/../lib/greet'); + +describe('the greet function', function() { + it('should return hello (name)', function() { + expect(greet('Tyler')).to.eql('hello Tyler'); + }); +}); + + + + diff --git a/isabella_organ/test/greet_test.js b/isabella_organ/test/greet_test.js index 772a5fd..adf87d7 100644 --- a/isabella_organ/test/greet_test.js +++ b/isabella_organ/test/greet_test.js @@ -1,14 +1,14 @@ -'use strict'; - var expect = require('chai').expect; -var greet = require(__dirname + '/../lib/greet'); +var greet = require(__dirname + '/../bin/greet'); -describe('the greet function', function() { - it('should return hello (name)', function() { - expect(greet('Tyler')).to.eql('hello Tyler'); +describe('greet bin', function() { + before(function() { + this.backup = process.argv; + process.argv ['node', 'myfile', 'test name']; + }); + after(function() { + process.argv = this.backup; }); -}); - - - +it ('should ') +}); \ No newline at end of file diff --git a/isabella_organ/test/old-greet_test.js b/isabella_organ/test/old-greet_test.js new file mode 100644 index 0000000..772a5fd --- /dev/null +++ b/isabella_organ/test/old-greet_test.js @@ -0,0 +1,14 @@ +'use strict'; + +var expect = require('chai').expect; +var greet = require(__dirname + '/../lib/greet'); + +describe('the greet function', function() { + it('should return hello (name)', function() { + expect(greet('Tyler')).to.eql('hello Tyler'); + }); +}); + + + + diff --git a/isabella_organ/test/var expect = rgreet_test.jsequire('chai').expect;.js b/isabella_organ/test/var expect = rgreet_test.jsequire('chai').expect;.js new file mode 100644 index 0000000..0e5d291 --- /dev/null +++ b/isabella_organ/test/var expect = rgreet_test.jsequire('chai').expect;.js @@ -0,0 +1,9 @@ +var expect = require('chai').expect; +var greet = require(__dirname + '/../bin/greet'); + +describe('greet bin', function() { + before(function() { + this.backup = process.argv; + process.argv ['node', 'myfile', 'test name']; + }); +}); \ No newline at end of file From 0a4788557164f5f5074ccf25b8f4010e8e5af542 Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Wed, 28 Oct 2015 17:41:45 -0700 Subject: [PATCH 06/12] update package json --- isabella_organ/bin/greet.js | 4 ++-- isabella_organ/gulpfile.js | 28 ++++++++++++++++++++++++++++ isabella_organ/lib/greet_3.js | 10 ++++++++++ isabella_organ/package.json | 17 +++++++++++------ isabella_organ/test/greet_test.js | 4 +++- 5 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 isabella_organ/gulpfile.js create mode 100644 isabella_organ/lib/greet_3.js diff --git a/isabella_organ/bin/greet.js b/isabella_organ/bin/greet.js index 93af7fb..99a0fa0 100755 --- a/isabella_organ/bin/greet.js +++ b/isabella_organ/bin/greet.js @@ -1,7 +1,7 @@ -#!/usr/bin/env/node +#!/usr/bin/env node var greet = require(__dirname + '/lib/greet'); -var bin = exports = module.exports = funtion() { +var bin = exports = module.exports = function() { console.log(greet(process.argv[2] || 'anonymous')); return greet(process.argv[2] || 'anonymous'); }; diff --git a/isabella_organ/gulpfile.js b/isabella_organ/gulpfile.js new file mode 100644 index 0000000..26f3735 --- /dev/null +++ b/isabella_organ/gulpfile.js @@ -0,0 +1,28 @@ +var gulp = require('gulp'); +var jshint = require('gulp-jshint'); +var appFiles = ['index.js', './lib/**/*.js', 'bin/**/*.js']; +var testFiles = ['./test/**/*.js']; + +gulp.task('jshint:test', function() { + return gulp.src(testFiles) + .pipe(jshint({ + node: true, + globals: { + describe: true, + it: true, + before: true, + after: true + } + })) + pipe.(jshint.reporter('default')); +}); + +gulp.task('jshint:app', function( { + return gulp.src(appFiles) + .pipe(jshint({ + node: true + })) + .pipe(jshint.reporter('default')); +}); +gulp.task('jshint', ['jshint:test', 'jshint:app']); +gulp.task('default', ['jshint']); \ No newline at end of file diff --git a/isabella_organ/lib/greet_3.js b/isabella_organ/lib/greet_3.js new file mode 100644 index 0000000..5244517 --- /dev/null +++ b/isabella_organ/lib/greet_3.js @@ -0,0 +1,10 @@ +'use strict'; + +//use constructor +var Greet = exports = module.exports = function() { + this.greeting = 'hello world'; +}; + +Greet.prototype.greet = function() { + return this.greeting; +}; \ No newline at end of file diff --git a/isabella_organ/package.json b/isabella_organ/package.json index c73c9c7..ce64df6 100644 --- a/isabella_organ/package.json +++ b/isabella_organ/package.json @@ -6,13 +6,18 @@ "directories": { "test": "test" }, - "dependencies": { - "chai": "^3.4.0", - "cltags": "^0.0.2" + + "devDependencies": { + "chai": "^3.4.0", + "gulp": "^3.9.0", + "gulp-jshint": "^1.11.2", + "gulp-mocha": "^2.1.3", + "mocha": "^2.3.3" }, - "devDependencies": {}, "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "test": "./node_modules/mocha/bin/mocha test", + "start": "echo 'hello world'", + "custom": "echo 'custom'" }, "repository": { "type": "git", @@ -28,7 +33,7 @@ "gulp" ], "author": "isabellaorgan@gmail.com", - "license": "ISC", + "license": "MIT", "bugs": { "url": "https://github.com/isabellaorgan/simple-test-and-modular-patterns/issues" }, diff --git a/isabella_organ/test/greet_test.js b/isabella_organ/test/greet_test.js index adf87d7..3eb6c6d 100644 --- a/isabella_organ/test/greet_test.js +++ b/isabella_organ/test/greet_test.js @@ -10,5 +10,7 @@ describe('greet bin', function() { process.argv = this.backup; }); -it ('should ') +it ('should pull from process.argv', function) { + +} }); \ No newline at end of file From 55d4235dca5f1483f80a71a1540d023ef3245822 Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Wed, 28 Oct 2015 19:40:16 -0700 Subject: [PATCH 07/12] code and file cleanup --- isabella_organ/bin/greet.js | 6 ++++-- isabella_organ/bin/greet_test1.js | 9 --------- isabella_organ/gulpfile.js | 4 ++-- isabella_organ/index-old.js | 8 -------- isabella_organ/index.js | 3 ++- isabella_organ/index1.js | 1 - isabella_organ/lib/greet_2.js | 5 +++++ isabella_organ/test/greet_test-old.js | 14 -------------- isabella_organ/test/greet_test.js | 3 ++- isabella_organ/test/old-greet_test.js | 19 +++++++++++++++++++ ... = rgreet_test.jsequire('chai').expect;.js | 9 --------- 11 files changed, 34 insertions(+), 47 deletions(-) delete mode 100644 isabella_organ/bin/greet_test1.js delete mode 100644 isabella_organ/index-old.js delete mode 100644 isabella_organ/index1.js create mode 100644 isabella_organ/lib/greet_2.js delete mode 100644 isabella_organ/test/greet_test-old.js delete mode 100644 isabella_organ/test/var expect = rgreet_test.jsequire('chai').expect;.js diff --git a/isabella_organ/bin/greet.js b/isabella_organ/bin/greet.js index 99a0fa0..6dbf7b1 100755 --- a/isabella_organ/bin/greet.js +++ b/isabella_organ/bin/greet.js @@ -1,8 +1,10 @@ #!/usr/bin/env node -var greet = require(__dirname + '/lib/greet'); +var greet = require(__dirname + '/..lib/greet'); var bin = exports = module.exports = function() { console.log(greet(process.argv[2] || 'anonymous')); return greet(process.argv[2] || 'anonymous'); }; -bin(); \ No newline at end of file +debugger; +bin(); + diff --git a/isabella_organ/bin/greet_test1.js b/isabella_organ/bin/greet_test1.js deleted file mode 100644 index 0e5d291..0000000 --- a/isabella_organ/bin/greet_test1.js +++ /dev/null @@ -1,9 +0,0 @@ -var expect = require('chai').expect; -var greet = require(__dirname + '/../bin/greet'); - -describe('greet bin', function() { - before(function() { - this.backup = process.argv; - process.argv ['node', 'myfile', 'test name']; - }); -}); \ No newline at end of file diff --git a/isabella_organ/gulpfile.js b/isabella_organ/gulpfile.js index 26f3735..bc2d0ab 100644 --- a/isabella_organ/gulpfile.js +++ b/isabella_organ/gulpfile.js @@ -14,10 +14,10 @@ gulp.task('jshint:test', function() { after: true } })) - pipe.(jshint.reporter('default')); + pipe.(jshint.reporter('default')); }); -gulp.task('jshint:app', function( { +gulp.task('jshint:app', function() { return gulp.src(appFiles) .pipe(jshint({ node: true diff --git a/isabella_organ/index-old.js b/isabella_organ/index-old.js deleted file mode 100644 index 89249f8..0000000 --- a/isabella_organ/index-old.js +++ /dev/null @@ -1,8 +0,0 @@ -'use strict'; - -var greet = require(__dirname + '/lib/greet'); -console.log(greet(process.argv[2])); - - -//should this be greet.js? -// diff --git a/isabella_organ/index.js b/isabella_organ/index.js index 8a71081..fdfd90d 100644 --- a/isabella_organ/index.js +++ b/isabella_organ/index.js @@ -1 +1,2 @@ -mobile.exports = require(__dirname + '/lib/greet'); \ No newline at end of file +mobile.exports = require(__dirname + '/lib/greet'); + diff --git a/isabella_organ/index1.js b/isabella_organ/index1.js deleted file mode 100644 index 8a71081..0000000 --- a/isabella_organ/index1.js +++ /dev/null @@ -1 +0,0 @@ -mobile.exports = require(__dirname + '/lib/greet'); \ No newline at end of file diff --git a/isabella_organ/lib/greet_2.js b/isabella_organ/lib/greet_2.js new file mode 100644 index 0000000..afc2718 --- /dev/null +++ b/isabella_organ/lib/greet_2.js @@ -0,0 +1,5 @@ +'use strict'; + +exports.greet = function(name) { + return 'hello ' + name; +}; \ No newline at end of file diff --git a/isabella_organ/test/greet_test-old.js b/isabella_organ/test/greet_test-old.js deleted file mode 100644 index 772a5fd..0000000 --- a/isabella_organ/test/greet_test-old.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict'; - -var expect = require('chai').expect; -var greet = require(__dirname + '/../lib/greet'); - -describe('the greet function', function() { - it('should return hello (name)', function() { - expect(greet('Tyler')).to.eql('hello Tyler'); - }); -}); - - - - diff --git a/isabella_organ/test/greet_test.js b/isabella_organ/test/greet_test.js index 3eb6c6d..252f982 100644 --- a/isabella_organ/test/greet_test.js +++ b/isabella_organ/test/greet_test.js @@ -13,4 +13,5 @@ describe('greet bin', function() { it ('should pull from process.argv', function) { } -}); \ No newline at end of file +}); + diff --git a/isabella_organ/test/old-greet_test.js b/isabella_organ/test/old-greet_test.js index 772a5fd..3406a3b 100644 --- a/isabella_organ/test/old-greet_test.js +++ b/isabella_organ/test/old-greet_test.js @@ -2,6 +2,7 @@ var expect = require('chai').expect; var greet = require(__dirname + '/../lib/greet'); +//var greet2 = require(__dirname + '/../lib/greet_2'); describe('the greet function', function() { it('should return hello (name)', function() { @@ -9,6 +10,24 @@ describe('the greet function', function() { }); }); +// describe('the greet function', function() { +// it('should return hello world', function() { +// expect(greet()).to.eql('hello world'); +// }); + +// it('should solve all the world\'s problems'); +// }); + +// describe('the greet 2 object', function() { +// it('should greet someone by name', function() { +// expect(greet2.greet('test')).to.eql('hello test'); +// }); + +// it('should do some stuff', function() { +// throw new Error('what will happen?'); +// }); +// }); + diff --git a/isabella_organ/test/var expect = rgreet_test.jsequire('chai').expect;.js b/isabella_organ/test/var expect = rgreet_test.jsequire('chai').expect;.js deleted file mode 100644 index 0e5d291..0000000 --- a/isabella_organ/test/var expect = rgreet_test.jsequire('chai').expect;.js +++ /dev/null @@ -1,9 +0,0 @@ -var expect = require('chai').expect; -var greet = require(__dirname + '/../bin/greet'); - -describe('greet bin', function() { - before(function() { - this.backup = process.argv; - process.argv ['node', 'myfile', 'test name']; - }); -}); \ No newline at end of file From f08d95f89902df6d5d1d99226dc1bae78de2a56d Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Thu, 29 Oct 2015 12:10:23 -0700 Subject: [PATCH 08/12] got gulp jshint working, run mocha test, failed first, clean up code, 2 passing mocha now --- isabella_organ/bin/greet.js | 2 +- isabella_organ/gulpfile.js | 5 ++-- isabella_organ/lib/greet.js | 2 +- isabella_organ/lib/greet1.js | 8 ------- isabella_organ/package.json | 3 +-- isabella_organ/test/greet_test.js | 30 ++++++++++++++++++++---- isabella_organ/test/old-greet_test.js | 33 --------------------------- 7 files changed, 31 insertions(+), 52 deletions(-) delete mode 100644 isabella_organ/lib/greet1.js delete mode 100644 isabella_organ/test/old-greet_test.js diff --git a/isabella_organ/bin/greet.js b/isabella_organ/bin/greet.js index 6dbf7b1..ae073b1 100755 --- a/isabella_organ/bin/greet.js +++ b/isabella_organ/bin/greet.js @@ -1,6 +1,6 @@ #!/usr/bin/env node -var greet = require(__dirname + '/..lib/greet'); +var greet = require(__dirname + '/../lib/greet.js'); var bin = exports = module.exports = function() { console.log(greet(process.argv[2] || 'anonymous')); return greet(process.argv[2] || 'anonymous'); diff --git a/isabella_organ/gulpfile.js b/isabella_organ/gulpfile.js index bc2d0ab..201bcbe 100644 --- a/isabella_organ/gulpfile.js +++ b/isabella_organ/gulpfile.js @@ -14,7 +14,7 @@ gulp.task('jshint:test', function() { after: true } })) - pipe.(jshint.reporter('default')); + .pipe(jshint.reporter('default')); }); gulp.task('jshint:app', function() { @@ -25,4 +25,5 @@ gulp.task('jshint:app', function() { .pipe(jshint.reporter('default')); }); gulp.task('jshint', ['jshint:test', 'jshint:app']); -gulp.task('default', ['jshint']); \ No newline at end of file +gulp.task('default', ['jshint']); + diff --git a/isabella_organ/lib/greet.js b/isabella_organ/lib/greet.js index fc30d2e..33821e3 100644 --- a/isabella_organ/lib/greet.js +++ b/isabella_organ/lib/greet.js @@ -1,5 +1,5 @@ 'use strict'; -var greet = exports = module.exports = function(name) { +module.exports = function(name) { return 'hello ' + name; }; \ No newline at end of file diff --git a/isabella_organ/lib/greet1.js b/isabella_organ/lib/greet1.js deleted file mode 100644 index 93af7fb..0000000 --- a/isabella_organ/lib/greet1.js +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env/node - -var greet = require(__dirname + '/lib/greet'); -var bin = exports = module.exports = funtion() { - console.log(greet(process.argv[2] || 'anonymous')); - return greet(process.argv[2] || 'anonymous'); -}; -bin(); \ No newline at end of file diff --git a/isabella_organ/package.json b/isabella_organ/package.json index ce64df6..e3ac92b 100644 --- a/isabella_organ/package.json +++ b/isabella_organ/package.json @@ -6,9 +6,8 @@ "directories": { "test": "test" }, - "devDependencies": { - "chai": "^3.4.0", + "chai": "^3.4.0", "gulp": "^3.9.0", "gulp-jshint": "^1.11.2", "gulp-mocha": "^2.1.3", diff --git a/isabella_organ/test/greet_test.js b/isabella_organ/test/greet_test.js index 252f982..b745237 100644 --- a/isabella_organ/test/greet_test.js +++ b/isabella_organ/test/greet_test.js @@ -1,17 +1,37 @@ var expect = require('chai').expect; -var greet = require(__dirname + '/../bin/greet'); +var greet = require(__dirname + '/../bin/greet.js'); describe('greet bin', function() { before(function() { this.backup = process.argv; - process.argv ['node', 'myfile', 'test name']; + process.argv = {}; }); + after(function() { process.argv = this.backup; + debugger; + }); + + it ('should greet anonymous', function() { + debugger; + expect(greet()).to.eql('hello anonymous'); }); -it ('should pull from process.argv', function) { - -} + describe('with arguments', function() { + before(function() { + this.backup = process.argv; + process.argv = ['node', 'myfile', 'test name']; + }); + + after(function() { + process.argv = this.backup; + debugger; + }); + + it('should pull from process.argv', function() { + expect(greet()).to.eql('hello test name'); + }); + }); }); +debugger; diff --git a/isabella_organ/test/old-greet_test.js b/isabella_organ/test/old-greet_test.js deleted file mode 100644 index 3406a3b..0000000 --- a/isabella_organ/test/old-greet_test.js +++ /dev/null @@ -1,33 +0,0 @@ -'use strict'; - -var expect = require('chai').expect; -var greet = require(__dirname + '/../lib/greet'); -//var greet2 = require(__dirname + '/../lib/greet_2'); - -describe('the greet function', function() { - it('should return hello (name)', function() { - expect(greet('Tyler')).to.eql('hello Tyler'); - }); -}); - -// describe('the greet function', function() { -// it('should return hello world', function() { -// expect(greet()).to.eql('hello world'); -// }); - -// it('should solve all the world\'s problems'); -// }); - -// describe('the greet 2 object', function() { -// it('should greet someone by name', function() { -// expect(greet2.greet('test')).to.eql('hello test'); -// }); - -// it('should do some stuff', function() { -// throw new Error('what will happen?'); -// }); -// }); - - - - From f747f241df22483610d46a5712e563014a6b3b73 Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Tue, 5 Apr 2016 06:04:48 -0700 Subject: [PATCH 09/12] update code style --- isabella_organ/gulpfile.js | 21 ++++++------- isabella_organ/index.js | 3 +- isabella_organ/lib/greet.js | 4 +-- isabella_organ/lib/greet_3.js | 6 ++-- isabella_organ/test/greet_test.js | 51 +++++++++++++++---------------- 5 files changed, 41 insertions(+), 44 deletions(-) diff --git a/isabella_organ/gulpfile.js b/isabella_organ/gulpfile.js index 201bcbe..50d8c3c 100644 --- a/isabella_organ/gulpfile.js +++ b/isabella_organ/gulpfile.js @@ -4,26 +4,25 @@ var appFiles = ['index.js', './lib/**/*.js', 'bin/**/*.js']; var testFiles = ['./test/**/*.js']; gulp.task('jshint:test', function() { - return gulp.src(testFiles) + return gulp.src(testFiles) .pipe(jshint({ - node: true, - globals: { - describe: true, - it: true, - before: true, - after: true - } + node: true, + globals: { + describe: true, + it: true, + before: true, + after: true + } })) .pipe(jshint.reporter('default')); }); gulp.task('jshint:app', function() { - return gulp.src(appFiles) + return gulp.src(appFiles) .pipe(jshint({ - node: true + node: true })) .pipe(jshint.reporter('default')); }); gulp.task('jshint', ['jshint:test', 'jshint:app']); gulp.task('default', ['jshint']); - diff --git a/isabella_organ/index.js b/isabella_organ/index.js index fdfd90d..955bf70 100644 --- a/isabella_organ/index.js +++ b/isabella_organ/index.js @@ -1,2 +1 @@ -mobile.exports = require(__dirname + '/lib/greet'); - +module.exports = require(__dirname + '/lib/greet'); diff --git a/isabella_organ/lib/greet.js b/isabella_organ/lib/greet.js index 33821e3..6310660 100644 --- a/isabella_organ/lib/greet.js +++ b/isabella_organ/lib/greet.js @@ -1,5 +1,5 @@ 'use strict'; module.exports = function(name) { - return 'hello ' + name; -}; \ No newline at end of file + return 'hello ' + name; +}; diff --git a/isabella_organ/lib/greet_3.js b/isabella_organ/lib/greet_3.js index 5244517..0d86bde 100644 --- a/isabella_organ/lib/greet_3.js +++ b/isabella_organ/lib/greet_3.js @@ -2,9 +2,9 @@ //use constructor var Greet = exports = module.exports = function() { - this.greeting = 'hello world'; + this.greeting = 'hello world'; }; Greet.prototype.greet = function() { - return this.greeting; -}; \ No newline at end of file + return this.greeting; +}; diff --git a/isabella_organ/test/greet_test.js b/isabella_organ/test/greet_test.js index b745237..45247d7 100644 --- a/isabella_organ/test/greet_test.js +++ b/isabella_organ/test/greet_test.js @@ -2,36 +2,35 @@ var expect = require('chai').expect; var greet = require(__dirname + '/../bin/greet.js'); describe('greet bin', function() { - before(function() { - this.backup = process.argv; - process.argv = {}; - }); + before(function() { + this.backup = process.argv; + process.argv = {}; + }); - after(function() { - process.argv = this.backup; - debugger; - }); + after(function() { + process.argv = this.backup; + debugger; + }); - it ('should greet anonymous', function() { - debugger; - expect(greet()).to.eql('hello anonymous'); - }); + it ('should greet anonymous', function() { + debugger; + expect(greet()).to.eql('hello anonymous'); + }); - describe('with arguments', function() { - before(function() { - this.backup = process.argv; - process.argv = ['node', 'myfile', 'test name']; - }); + describe('with arguments', function() { + before(function() { + this.backup = process.argv; + process.argv = ['node', 'myfile', 'test name']; + }); - after(function() { - process.argv = this.backup; - debugger; - }); + after(function() { + process.argv = this.backup; + debugger; + }); - it('should pull from process.argv', function() { - expect(greet()).to.eql('hello test name'); - }); - }); + it('should pull from process.argv', function() { + expect(greet()).to.eql('hello test name'); + }); + }); }); debugger; - From 59f53fc27e5d5a9f0cb3c5ae228d61407743e06f Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Tue, 5 Apr 2016 08:56:32 -0700 Subject: [PATCH 10/12] more style updates --- isabella_organ/gulpfile.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/isabella_organ/gulpfile.js b/isabella_organ/gulpfile.js index 50d8c3c..73aed48 100644 --- a/isabella_organ/gulpfile.js +++ b/isabella_organ/gulpfile.js @@ -5,24 +5,25 @@ var testFiles = ['./test/**/*.js']; gulp.task('jshint:test', function() { return gulp.src(testFiles) - .pipe(jshint({ - node: true, - globals: { - describe: true, - it: true, - before: true, - after: true - } - })) + .pipe(jshint({ + node: true, + globals: { + describe: true, + it: true, + before: true, + after: true + } + })) .pipe(jshint.reporter('default')); }); gulp.task('jshint:app', function() { return gulp.src(appFiles) - .pipe(jshint({ - node: true - })) - .pipe(jshint.reporter('default')); + .pipe(jshint({ + node: true + })) + .pipe(jshint.reporter('default')); }); + gulp.task('jshint', ['jshint:test', 'jshint:app']); gulp.task('default', ['jshint']); From 181606bfdaa6345d060f2197da849545150356b9 Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Tue, 5 Apr 2016 08:57:18 -0700 Subject: [PATCH 11/12] more style updates --- isabella_organ/gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/isabella_organ/gulpfile.js b/isabella_organ/gulpfile.js index 73aed48..776ad3e 100644 --- a/isabella_organ/gulpfile.js +++ b/isabella_organ/gulpfile.js @@ -14,7 +14,7 @@ gulp.task('jshint:test', function() { after: true } })) - .pipe(jshint.reporter('default')); + .pipe(jshint.reporter('default')); }); gulp.task('jshint:app', function() { From 4d37b2208970e96062f5551bf5d04892226ce8df Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Tue, 5 Apr 2016 08:59:04 -0700 Subject: [PATCH 12/12] more style updates --- isabella_organ/bin/greet.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/isabella_organ/bin/greet.js b/isabella_organ/bin/greet.js index ae073b1..ac2878f 100755 --- a/isabella_organ/bin/greet.js +++ b/isabella_organ/bin/greet.js @@ -2,9 +2,8 @@ var greet = require(__dirname + '/../lib/greet.js'); var bin = exports = module.exports = function() { - console.log(greet(process.argv[2] || 'anonymous')); - return greet(process.argv[2] || 'anonymous'); + console.log(greet(process.argv[2] || 'anonymous')); + return greet(process.argv[2] || 'anonymous'); }; debugger; bin(); -