From ef1751bccdacaab69755243a0e859f8dd386543e Mon Sep 17 00:00:00 2001 From: Planeshifter Date: Fri, 20 Mar 2015 18:50:01 -0400 Subject: [PATCH 1/3] [UPDATE] dotfiles, README.md, dependencies --- .gitattributes | 1 + .jshintignore | 14 ++++++++++++++ .npmignore | 1 + .travis.yml | 11 +++++++++-- Makefile | 25 +++++++++++++++++++------ README.md | 12 +++++------- lib/index.js | 8 ++++---- package.json | 12 +++++++++--- 8 files changed, 62 insertions(+), 22 deletions(-) create mode 100644 .gitattributes create mode 100644 .jshintignore diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..176a458 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto diff --git a/.jshintignore b/.jshintignore new file mode 100644 index 0000000..3163c22 --- /dev/null +++ b/.jshintignore @@ -0,0 +1,14 @@ + +# Directories # +############### +build/ +reports/ +dist/ + +# Node.js # +########### +/node_modules/ + +# Git # +####### +.git* diff --git a/.npmignore b/.npmignore index 7de8cda..9db298d 100644 --- a/.npmignore +++ b/.npmignore @@ -47,5 +47,6 @@ Desktop.ini # Utilities # ############# .jshintrc +.jshintignore .travis.yml .editorconfig diff --git a/.travis.yml b/.travis.yml index 7c16620..29cff27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,12 @@ language: node_js node_js: - - "0.10" + - '0.12' + - '0.11' + - '0.10' + - '0.8' + - 'iojs' +before_install: + - npm update -g npm after_script: - - npm run coveralls \ No newline at end of file + - npm run coveralls + diff --git a/Makefile b/Makefile index f5648d1..8f4ec98 100644 --- a/Makefile +++ b/Makefile @@ -8,22 +8,18 @@ NODE_ENV ?= test # NOTES # -NOTES ?= 'TODO|FIXME' +NOTES ?= 'TODO|FIXME|WARNING|HACK|NOTE' # MOCHA # -# Specify the test framework bin locations: MOCHA ?= ./node_modules/.bin/mocha _MOCHA ?= ./node_modules/.bin/_mocha - -# Specify the mocha reporter: MOCHA_REPORTER ?= spec # ISTANBUL # -# Istanbul configuration: ISTANBUL ?= ./node_modules/.bin/istanbul ISTANBUL_OUT ?= ./reports/coverage ISTANBUL_REPORT ?= lcov @@ -31,6 +27,12 @@ ISTANBUL_LCOV_INFO_PATH ?= $(ISTANBUL_OUT)/lcov.info ISTANBUL_HTML_REPORT_PATH ?= $(ISTANBUL_OUT)/lcov-report/index.html +# JSHINT # + +JSHINT ?= ./node_modules/.bin/jshint +JSHINT_REPORTER ?= ./node_modules/jshint-stylish/stylish.js + + # FILES # @@ -100,6 +102,18 @@ view-istanbul-report: +# LINT # + +.PHONY: lint lint-jshint + +lint: lint-jshint + +lint-jshint: node_modules + $(JSHINT) \ + --reporter $(JSHINT_REPORTER) \ + ./ + + # NODE # # Installing node_modules: @@ -117,7 +131,6 @@ clean-node: # CLEAN # - .PHONY: clean clean: diff --git a/README.md b/README.md index d00787b..efef08e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -logspace +Logspace === [![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Coverage Status][coveralls-image]][coveralls-url] [![Dependencies][dependencies-image]][dependencies-url] @@ -16,8 +16,6 @@ For use in the browser, use [browserify](https://github.com/substack/node-browse ## Usage -To use the module, - ``` javascript var logspace = require( 'compute-logspace' ); ``` @@ -69,7 +67,7 @@ $ node ./examples/index.js ### Unit -Unit tests use the [Mocha](http://visionmedia.github.io/mocha) test framework with [Chai](http://chaijs.com) assertions. To run the tests, execute the following command in the top-level application directory: +Unit tests use the [Mocha](http://mochajs.org) test framework with [Chai](http://chaijs.com) assertions. To run the tests, execute the following command in the top-level application directory: ``` bash $ make test @@ -93,15 +91,15 @@ $ make view-cov ``` +--- ## License -[MIT license](http://opensource.org/licenses/MIT). +[MIT license](http://opensource.org/licenses/MIT). ---- ## Copyright -Copyright © 2014. Athan Reines. +Copyright © 2014-2015. Athan Reines. [npm-image]: http://img.shields.io/npm/v/compute-logspace.svg diff --git a/lib/index.js b/lib/index.js index e3a3b0a..b756053 100644 --- a/lib/index.js +++ b/lib/index.js @@ -18,7 +18,7 @@ * LICENSE: * MIT * -* Copyright (c) 2014. Athan Reines. +* Copyright (c) 2014-2015. Athan Reines. * * * AUTHOR: @@ -51,16 +51,16 @@ function logspace( a, b, len ) { d; if ( typeof a !== 'number' || a !== a ) { - throw new TypeError( 'logspace()::invalid input argument. Exponent of start value must be numeric.' ); + throw new TypeError( 'logspace()::invalid input argument. Exponent of start value must be numeric. Value: `' + a + '`.' ); } if ( typeof b !== 'number' || b !== b ) { - throw new TypeError( 'logspace()::invalid input argument. Exponent of stop value must be numeric.' ); + throw new TypeError( 'logspace()::invalid input argument. Exponent of stop value must be numeric. Value: `' + b + '`.' ); } if ( arguments.length < 3 ) { len = 10; } else { if ( !isInteger( len ) || len < 0 ) { - throw new TypeError( 'logspace()::invalid input argument. Length must be a positive integer.' ); + throw new TypeError( 'logspace()::invalid input argument. Length must be a positive integer. Value: `' + len + '`.' ); } if ( len === 0 ) { return []; diff --git a/package.json b/package.json index 3b64846..c05b430 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,10 @@ { "name": "Athan Reines", "email": "kgryte@gmail.com" + }, + { + "name": "Philipp Burckhardt", + "email": "pburckhardt@outlook.com" } ], "scripts": { @@ -42,10 +46,12 @@ "validate.io-integer": "^1.0.1" }, "devDependencies": { - "chai": "1.x.x", - "mocha": "1.x.x", + "chai": "2.x.x", "coveralls": "^2.11.1", - "istanbul": "^0.3.0" + "istanbul": "^0.3.0", + "jshint": "^2.6.3", + "jshint-stylish": "^1.0.1", + "mocha": "2.x.x" }, "licenses": [ { From d39b065b6e12127c91a352526bf18b4c4f32558d Mon Sep 17 00:00:00 2001 From: Planeshifter Date: Fri, 20 Mar 2015 19:02:47 -0400 Subject: [PATCH 2/3] [UPDATE] use validate.io modules --- lib/index.js | 9 +++++---- package.json | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/index.js b/lib/index.js index b756053..1226b9f 100644 --- a/lib/index.js +++ b/lib/index.js @@ -30,7 +30,8 @@ // MODULES // -var isInteger = require( 'validate.io-integer' ); +var isNumber = require( 'validate.io-number-primitive' ), + isNonNegativeInteger = require( 'validate.io-nonnegative-integer' ); // LOGSPACE // @@ -50,16 +51,16 @@ function logspace( a, b, len ) { tmp, d; - if ( typeof a !== 'number' || a !== a ) { + if ( !isNumber( a ) ) { throw new TypeError( 'logspace()::invalid input argument. Exponent of start value must be numeric. Value: `' + a + '`.' ); } - if ( typeof b !== 'number' || b !== b ) { + if ( !isNumber( b ) ) { throw new TypeError( 'logspace()::invalid input argument. Exponent of stop value must be numeric. Value: `' + b + '`.' ); } if ( arguments.length < 3 ) { len = 10; } else { - if ( !isInteger( len ) || len < 0 ) { + if ( !isNonNegativeInteger( len ) ) { throw new TypeError( 'logspace()::invalid input argument. Length must be a positive integer. Value: `' + len + '`.' ); } if ( len === 0 ) { diff --git a/package.json b/package.json index c05b430..aab0ad4 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,8 @@ "url": "https://github.com/compute-io/logspace/issues" }, "dependencies": { - "validate.io-integer": "^1.0.1" + "validate.io-nonnegative-integer": "^1.0.0", + "validate.io-number-primitive": "^1.0.0" }, "devDependencies": { "chai": "2.x.x", From a735e4f8cbbf8ebb165fd1b486bca3b27dfb557d Mon Sep 17 00:00:00 2001 From: Planeshifter Date: Sun, 24 May 2015 04:48:09 -0400 Subject: [PATCH 3/3] [UPDATE] LICENSE, remove preamble --- LICENSE | 4 ++-- Makefile | 11 +++++++++-- README.md | 2 +- lib/index.js | 28 ---------------------------- package.json | 7 +------ test/test.js | 1 + 6 files changed, 14 insertions(+), 39 deletions(-) diff --git a/LICENSE b/LICENSE index 2fe3939..93cf2ea 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014 Athan Reines. +Copyright (c) 2014-2015 The Compute.io Authors. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. diff --git a/Makefile b/Makefile index 8f4ec98..3234fbb 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,14 @@ # Set the node.js environment to test: NODE_ENV ?= test +# Kernel name: +KERNEL ?= $(shell uname -s) + +ifeq ($(KERNEL), Darwin) + OPEN ?= open +else + OPEN ?= xdg-open +endif # NOTES # @@ -98,8 +106,7 @@ test-istanbul-mocha: node_modules view-cov: view-istanbul-report view-istanbul-report: - open $(ISTANBUL_HTML_REPORT_PATH) - + $(OPEN) $(ISTANBUL_HTML_REPORT_PATH) # LINT # diff --git a/README.md b/README.md index efef08e..2c8d753 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ $ make view-cov ## Copyright -Copyright © 2014-2015. Athan Reines. +Copyright © 2014-2015. The Compute.io Authors. [npm-image]: http://img.shields.io/npm/v/compute-logspace.svg diff --git a/lib/index.js b/lib/index.js index 1226b9f..6c2dcb3 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1,31 +1,3 @@ -/** -* -* COMPUTE: logspace -* -* -* DESCRIPTION: -* - Generates a logarithmically spaced numeric array. -* -* -* NOTES: -* [1] -* -* -* TODO: -* [1] -* -* -* LICENSE: -* MIT -* -* Copyright (c) 2014-2015. Athan Reines. -* -* -* AUTHOR: -* Athan Reines. kgryte@gmail.com. 2014. -* -*/ - 'use strict'; // MODULES // diff --git a/package.json b/package.json index aab0ad4..c95a7d0 100644 --- a/package.json +++ b/package.json @@ -54,10 +54,5 @@ "jshint-stylish": "^1.0.1", "mocha": "2.x.x" }, - "licenses": [ - { - "type": "MIT", - "url": "http://www.opensource.org/licenses/MIT" - } - ] + "license": "MIT" } diff --git a/test/test.js b/test/test.js index 6b190a6..3530610 100644 --- a/test/test.js +++ b/test/test.js @@ -1,3 +1,4 @@ +/* global require, describe, it */ 'use strict'; // MODULES //