Merge pull request #14 from ulfryk/up

Update dependencies

.travis.yml

@@ -3,10 +3,6 @@ node_js:
   - "0.10"
 install:
   - npm install
-before_script:
-  - npm install -g gulp
-  - npm install -g bower
-  - bower install
 script:
-  - gulp ci
-  - cat ./coverage/lcov/lcov.info  | ./node_modules/coveralls/bin/coveralls.js
+  - npm test
+  - cat ./coverage/lcov/lcov.info | ./node_modules/coveralls/bin/coveralls.js

CONTRIBUTING.md

@@ -5,6 +5,6 @@ After cloning git repo run (from project root):
 
 ```
 npm install
-bower install
-gulp
+npm run build
+npm run karma
 ```

Gulpfile.js

@@ -9,16 +9,12 @@ require('require-dir')('./gulp/');
  * emulate ci locally
  */
 gulp.task('default', function (done) {
-    runSequence('ts-lint', 'ts-build', 'karma-ci-short', done);
+    runSequence('ts', 'karma-ci-short', done);
 });
 
 /*
  * ci
  */
 gulp.task('ci', function (done) {
-    runSequence(
-        'ts',
-        'karma-ci',
-        done
-    );
+    runSequence('ts', 'karma-ci', done);
 });

at-angular-resource.ts

@@ -21,7 +21,6 @@ module at {
         public static remove: () => Resource;
         public static save: () => Resource;
         public static delete: () => Resource;
-        constructor(model?: any) { combineResource(this, model); }
         public $get: (params?: Object) => angular.IPromise<this>;
         public $query: (params?: Object) => angular.IPromise<angular.resource.IResourceArray<this>>;
         public $remove: (params?: Object) => angular.IPromise<this>;
@@ -32,14 +31,15 @@ module at {
         public toJSON: () => {
             [index: string]: any;
         };
+        constructor(model?: any) { combineResource(this, model); }
     }
 
     /* istanbul ignore next */
     export class ResourceWithUpdate extends Resource  {
-        constructor(model?: any) { super(model); }
         public static update: () => ResourceWithUpdate;
         public $update: () => angular.IPromise<this>;
         public $promise : angular.IPromise<this>;
+        constructor(model?: any) { super(model); }
     }
 
     export interface IResourceAnnotation {

bower.json

@@ -24,12 +24,9 @@
     "AngularJS"
   ],
   "license": "WTFPL",
-  "main": [
-    "at-angular.ts",
-    "at-angular-resource.ts"
-  ],
+  "main": "at-angular.ts",
   "repository": {
     "type": "git",
     "url": "git://github.com/ulfryk/angular-typescript.git"
   }
-}
+}

gulp/karma.conf.js

@@ -12,19 +12,20 @@ module.exports = function (config) {
             '../test/*.coffee'
         ],
         exclude: [],
-        reporters: ['dots', 'coverage'],
+        reporters: ['mocha', 'coverage'],
         port: 9876,
         runnerPort: 9100,
         colors: true,
         logLevel: config.LOG_WARN,
         autoWatch: true,
-        browsers: ['PhantomJS'],
+        browsers: ['PhantomJS2'],
         plugins: [
             'karma-jasmine',
             'karma-coffee-preprocessor',
             'karma-coverage',
             'karma-chrome-launcher',
-            'karma-phantomjs-launcher'
+            'karma-mocha-reporter',
+            'karma-phantomjs2-launcher'
         ],
         preprocessors: {
             '../.tmp/at-*.js': ['coverage'],

gulp/karma.js

@@ -33,7 +33,7 @@ gulp.task('karma-ci', function (done) {
 gulp.task('karma-ci-short', function (done) {
     return new Server({
         configFile: config,
-        coverageReporter: {type : 'text-summary'},
+        coverageReporter: {type : 'text'},
         singleRun: true,
         autoWatch: false
     }, done).start();
@@ -59,4 +59,4 @@ gulp.task('coverage', function (done) {
         'karma-coverage',
         done
     );
-});
+});

package.json

@@ -1,11 +1,19 @@
 {
   "name": "angular-typescript",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "TypeScript 1.5+ annotations (decorators) for AngularJS 1.x",
   "repository": {
     "type": "git",
     "url": "git://github.com/ulfryk/angular-typescript.git"
   },
+  "scripts": {
+    "postinstall": "bower install",
+    "build": "gulp ts",
+    "karma": "gulp karma-ci-short",
+    "test": "gulp ci",
+    "tdd": "gulp karma-tdd",
+    "coverage": "gulp karma-coverage"
+  },
   "keywords": [
     "TypeScript",
     "AngularJS"
@@ -14,23 +22,25 @@
   "license": "WTFPL",
   "dependencies": {},
   "devDependencies": {
-    "coveralls": "2.11.6",
-    "del": "2.2.0",
-    "gulp": "3.9.0",
-    "gulp-tslint": "4.2.2",
-    "gulp-typescript": "2.10.0",
+    "bower": "1.7.9",
+    "coveralls": "2.11.9",
+    "del": "2.2.1",
+    "gulp": "3.9.1",
+    "gulp-tslint": "5.0.0",
+    "gulp-typescript": "2.13.6",
     "jasmine-core": "2.4.1",
-    "karma": "0.13.16",
-    "karma-chrome-launcher": "0.2.2",
-    "karma-coffee-preprocessor": "0.3.0",
-    "karma-coverage": "0.5.3",
-    "karma-jasmine": "0.3.6",
-    "karma-phantomjs-launcher": "0.2.2",
+    "karma": "1.1.0",
+    "karma-chrome-launcher": "1.0.1",
+    "karma-coffee-preprocessor": "1.0.0",
+    "karma-coverage": "1.0.0",
+    "karma-jasmine": "1.0.2",
+    "karma-mocha-reporter": "2.0.4",
+    "karma-phantomjs2-launcher": "0.5.0",
     "merge-stream": "1.0.0",
-    "phantomjs": "1.9.19",
+    "phantomjs2": "2.2.0",
     "require-dir": "0.3.0",
-    "run-sequence": "1.1.5",
-    "tslint": "3.2.1",
-    "typescript": "1.7.5"
+    "run-sequence": "1.2.1",
+    "tslint": "3.12.1",
+    "typescript": "1.8.10"
   }
 }

test/directive.ts

@@ -12,6 +12,8 @@ module test {
         // Static fields hold directive configuration
         public static controller: string = 'TestComponentCtrl as ctrl';
 
+        public static restrict: string = 'E';
+
         public static link: angular.IDirectiveLinkFn = (
             scope: IFirstComponentScope,
             element: angular.IAugmentedJQuery,
@@ -21,15 +23,15 @@ module test {
             ctrl.setCtrlName('FAKE_CTRL_NAME');
         };
 
-        public static restrict: string = 'E';
-
         public static template: angular.IDirectiveCompileFn = (tElement: angular.IAugmentedJQuery) => {
             tElement.addClass('test-component');
             return '<span>{{ name }}</span><span>{{ ctrl.name }}</span>';
         };
 
         // And the rest are simple Ctrl instance members
+        /* tslint:disable:member-ordering */
         public name: string;
+        /* tslint:enable:member-ordering */
 
         constructor(
             @inject('$scope') $scope: IFirstComponentScope,

ts/tslint.json

@@ -46,7 +46,6 @@
   "no-eval": true,
   "no-string-literal": true,
   "no-switch-case-fall-through": true,
-  "no-trailing-comma": true,
   "no-trailing-whitespace": true,
   "no-unused-expression": true,
   "no-unused-variable": true,
@@ -91,4 +90,4 @@
     "check-type",
     "check-typecast"
   ]
-}
+}