From 3b06584286e61e158d47d59954b362cf28c8e421 Mon Sep 17 00:00:00 2001 From: Gregor Anders Date: Mon, 30 Mar 2015 02:08:47 +0200 Subject: [PATCH 1/8] v0.0.7 development --- README.md | 6 +++--- bower.json | 2 +- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 752a9e9..df862d7 100644 --- a/README.md +++ b/README.md @@ -13,13 +13,13 @@ using [RequireJS](http://requirejs.org/) written in [TypeScript](http://www.type [npm-image]: https://badge.fury.io/js/angular-require-typescript-seed.svg [travis-url]: https://travis-ci.org/gregoranders/arts -[travis-image]: https://travis-ci.org/gregoranders/arts.svg?branch=master +[travis-image]: https://travis-ci.org/gregoranders/arts.svg?branch=development [daviddm-url]: https://david-dm.org/gregoranders/arts [daviddm-image]: https://david-dm.org/gregoranders/arts.svg -[coverall-url]: https://coveralls.io/repos/gregoranders/arts?branch=master -[coverall-image]: https://coveralls.io/repos/gregoranders/arts/badge.svg?branch=master +[coverall-url]: https://coveralls.io/repos/gregoranders/arts?branch=development +[coverall-image]: https://coveralls.io/repos/gregoranders/arts/badge.svg?branch=development [gitter-url]: https://gitter.im/gregoranders/arts [gitter-image]: https://badges.gitter.im/gregoranders/arts.png diff --git a/bower.json b/bower.json index 92b2ebd..158e2f9 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "angular-require-typescript-seed", "description": "angular-require-typescript-seed - the AngularJS and RequireJS using TypeScript Seed", - "version": "0.0.6", + "version": "0.0.7", "homepage": "https://github.com/gregoranders/angular-require-typescript-seed", "author": "Gregor Anders ", "license": "BSD-3-Clause", diff --git a/package.json b/package.json index 0aa49e1..00f5a4e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "title": "arts - the AngularJS and RequireJS using TypeScript Seed", "name": "angular-require-typescript-seed", "description": "angular-require-typescript-seed - the AngularJS and RequireJS using TypeScript Seed", - "version": "0.0.6", + "version": "0.0.7", "homepage": "https://github.com/gregoranders/angular-require-typescript-seed", "author": { "email": "gregor.anders@gmail.com", From 7c4d6181f8eb10cbf96678837794f55377ac3b2c Mon Sep 17 00:00:00 2001 From: Gregor Anders Date: Mon, 30 Mar 2015 02:25:11 +0200 Subject: [PATCH 2/8] removed --- bower.json | 1 - 1 file changed, 1 deletion(-) diff --git a/bower.json b/bower.json index 158e2f9..132a2cc 100644 --- a/bower.json +++ b/bower.json @@ -6,7 +6,6 @@ "author": "Gregor Anders ", "license": "BSD-3-Clause", "private": false, - "appPath": "./build/release", "ignore": [ "**/.*", "build", From deb10e74f3a1300efb109a2424bcb3c5431f96c3 Mon Sep 17 00:00:00 2001 From: Gregor Anders Date: Mon, 30 Mar 2015 02:44:11 +0200 Subject: [PATCH 3/8] more work on structure --- README.md | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- bower.json | 2 ++ package.json | 2 ++ 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index df862d7..8159239 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,61 @@ +[![Dependency Status][daviddm-image]][daviddm-url] +[![NPM version][npm-image]][npm-url] +[![Downloads][downloads-image]][npm-url] +[![Build Status][travis-image]][travis-url] +[![Coverage Status][coverall-image]][coverall-url] +[![License][license-image]][license-url] [![Gitter][gitter-image]][gitter-url] + # angular-require-typescript-seed **the AngularJS and RequireJS using TypeScript Seed** -[![Dependency Status][daviddm-image]][daviddm-url] [![NPM version][npm-image]][npm-url] [![Downloads][downloads-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Coverage Status][coverall-image]][coverall-url] [![License][license-image]][license-url] [![Gitter][gitter-image]][gitter-url] This project is an application skeleton for a typical [AngularJS](http://angularjs.org/) web app using [RequireJS](http://requirejs.org/) written in [TypeScript](http://www.typescriptlang.org/). +## Building + +In order to build ensure that you have [Git](http://git-scm.com/downloads) and [Node.js](http://nodejs.org/) installed. + +### Manually +Clone a copy of the repo: + +``` +git clone https://github.com/gregoranders/arts.git +``` + +Change to the arts directory: + +``` +cd arts +``` + +Run build: + +``` +npm test +``` + +### NPM + +``` +npm install angular-require-typescript-seed +``` + +Change to the arts directory: + +``` +cd node_modules/angular-require-typescript-seed +``` + +Run build: + +``` +npm test +``` + + + [downloads-image]: http://img.shields.io/npm/dm/angular-require-typescript-seed.svg [npm-url]: https://npmjs.org/package/angular-require-typescript-seed diff --git a/bower.json b/bower.json index 132a2cc..563c2c3 100644 --- a/bower.json +++ b/bower.json @@ -15,7 +15,9 @@ ], "keywords": [ "angular", + "angularjs", "require", + "requirejs", "typescript", "jasmine", "gulp", diff --git a/package.json b/package.json index 00f5a4e..65095e4 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,9 @@ }, "keywords": [ "angular", + "angularjs", "require", + "requirejs", "typescript", "jquery", "jasmine", From 406887130b5a3d9c1d912769b2eed9ca1fe62dcc Mon Sep 17 00:00:00 2001 From: Gregor Anders Date: Mon, 30 Mar 2015 02:52:14 +0200 Subject: [PATCH 4/8] refactored Travis CI build --- .travis.yml | 2 +- README.md | 8 +++++++- package.json | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1df9cd3..a6101f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ before_script: - export DISPLAY=:99.0 - sudo chmod 1777 /dev/shm - Xvfb :99.0 -extension RANDR > /dev/null & - - npm test > /dev/null + - npm run-script coverall > /dev/null - node_modules/.bin/gulp build:release - node_modules/.bin/gulp run:server & - sleep 5 diff --git a/README.md b/README.md index 8159239..1fe196f 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,12 @@ cd arts Run build: +``` +npm build +``` + +Run tests: + ``` npm test ``` @@ -48,7 +54,7 @@ Change to the arts directory: cd node_modules/angular-require-typescript-seed ``` -Run build: +Run tests: ``` npm test diff --git a/package.json b/package.json index 65095e4..5b2bf70 100644 --- a/package.json +++ b/package.json @@ -82,12 +82,13 @@ }, "scripts": { "transpile-config": "tsc --target ES5 --sourcemap --outDir ./conf conf/gulpconf.ts && tsc --target ES5 --sourcemap --outDir ./conf conf/gulpfunc.ts && tsc --target ES5 --sourcemap --outDir ./ gulpfile.ts", + "coverall": "gulp run:test:unit:ci && cd build/development && mv test-coverage/*/lcov.info . && cat lcov.info | ../../node_modules/.bin/coveralls", "postinstall": "bower install && webdriver-manager update && npm run-script transpile-config", "prestart": "npm install", "start": "gulp build && gulp run:server", "pretest": "npm install && gulp build", - "test": "gulp run:test:unit:ci && cd build/development && mv test-coverage/*/lcov.info . && cat lcov.info | ../../node_modules/.bin/coveralls" + "test": "gulp run:test:unit" } } From 12c55d30b3db51502ff19f1323278ce73d313799 Mon Sep 17 00:00:00 2001 From: Gregor Anders Date: Mon, 30 Mar 2015 03:05:13 +0200 Subject: [PATCH 5/8] fixed npm commands --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5b2bf70..438d5ec 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ }, "scripts": { "transpile-config": "tsc --target ES5 --sourcemap --outDir ./conf conf/gulpconf.ts && tsc --target ES5 --sourcemap --outDir ./conf conf/gulpfunc.ts && tsc --target ES5 --sourcemap --outDir ./ gulpfile.ts", - "coverall": "gulp run:test:unit:ci && cd build/development && mv test-coverage/*/lcov.info . && cat lcov.info | ../../node_modules/.bin/coveralls", + "coverall": "gulp build && gulp run:test:unit:ci && cd build/development && mv test-coverage/*/lcov.info . && cat lcov.info | ../../node_modules/.bin/coveralls", "postinstall": "bower install && webdriver-manager update && npm run-script transpile-config", "prestart": "npm install", From 4297ace3c6f8a139cd2e32e4971047893ec80434 Mon Sep 17 00:00:00 2001 From: Gregor Anders Date: Mon, 30 Mar 2015 03:14:25 +0200 Subject: [PATCH 6/8] some more open source tools --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1fe196f..2166b1f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,9 @@ [![Downloads][downloads-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Coverage Status][coverall-image]][coverall-url] -[![License][license-image]][license-url] [![Gitter][gitter-image]][gitter-url] +[![License][license-image]][license-url] +[![Issues][issues-image]][issues-url] +[![Gitter][gitter-image]][gitter-url] # angular-require-typescript-seed **the AngularJS and RequireJS using TypeScript Seed** @@ -80,4 +82,7 @@ npm test [gitter-image]: https://badges.gitter.im/gregoranders/arts.png [license-url]: https://github.com/gregoranders/arts/blob/master/LICENSE -[license-image]: https://img.shields.io/npm/l/angular-require-typescript-seed.svg \ No newline at end of file +[license-image]: https://img.shields.io/npm/l/angular-require-typescript-seed.svg + +[issues-url]: https://github.com/gregoranders/arts/issues +[issues-image]: https://img.shields.io/github/issues-raw/gregoranders/arts.svg \ No newline at end of file From 417fa53b5346e0c42442178d1a5b44f36bb1c540 Mon Sep 17 00:00:00 2001 From: Gregor Anders Date: Mon, 30 Mar 2015 03:24:56 +0200 Subject: [PATCH 7/8] some more open source tools --- README.md | 14 +++++++++++++- package.json | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2166b1f..546291a 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,9 @@ [![Build Status][travis-image]][travis-url] [![Coverage Status][coverall-image]][coverall-url] [![License][license-image]][license-url] +[![Release][release-image]][release-url] +[![Tag][tag-image]][tag-url] +[![Node][node-image]][node-url] [![Issues][issues-image]][issues-url] [![Gitter][gitter-image]][gitter-url] @@ -85,4 +88,13 @@ npm test [license-image]: https://img.shields.io/npm/l/angular-require-typescript-seed.svg [issues-url]: https://github.com/gregoranders/arts/issues -[issues-image]: https://img.shields.io/github/issues-raw/gregoranders/arts.svg \ No newline at end of file +[issues-image]: https://img.shields.io/github/issues-raw/gregoranders/arts.svg + +[tag-url]: https://github.com/gregoranders/arts/tags +[tag-image]: https://img.shields.io/github/tag/gregoranders/arts.svg + +[release-url]: https://github.com/gregoranders/arts/releases +[release-image]: https://img.shields.io/github/release/gregoranders/arts.svg + +[node-url]: https://nodejs.org/ +[node-image]: https://img.shields.io/node/v/angular-require-typescript-seed.svg \ No newline at end of file diff --git a/package.json b/package.json index 438d5ec..f2cf457 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,8 @@ "url": "git://github.com/gregoranders/arts.git" }, "engines": { - "node": "~0.10.0" + "node": "~0.10.0", + "node": "~0.12.0" }, "keywords": [ "angular", From 613148d80b12a4f2a2f9f543e56d653c480822de Mon Sep 17 00:00:00 2001 From: Gregor Anders Date: Mon, 30 Mar 2015 03:33:46 +0200 Subject: [PATCH 8/8] v0.0.7 release --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 546291a..6678033 100644 --- a/README.md +++ b/README.md @@ -73,13 +73,13 @@ npm test [npm-image]: https://badge.fury.io/js/angular-require-typescript-seed.svg [travis-url]: https://travis-ci.org/gregoranders/arts -[travis-image]: https://travis-ci.org/gregoranders/arts.svg?branch=development +[travis-image]: https://travis-ci.org/gregoranders/arts.svg?branch=master [daviddm-url]: https://david-dm.org/gregoranders/arts [daviddm-image]: https://david-dm.org/gregoranders/arts.svg -[coverall-url]: https://coveralls.io/repos/gregoranders/arts?branch=development -[coverall-image]: https://coveralls.io/repos/gregoranders/arts/badge.svg?branch=development +[coverall-url]: https://coveralls.io/repos/gregoranders/arts?branch=master +[coverall-image]: https://coveralls.io/repos/gregoranders/arts/badge.svg?branch=master [gitter-url]: https://gitter.im/gregoranders/arts [gitter-image]: https://badges.gitter.im/gregoranders/arts.png