Merge pull request #3 from bjspencer/master

Fixes #2
ThaNarie · Oct 25, 2016 · f108c1c · f108c1c
2 parents 76d23c3 + c14bb21
commit f108c1c
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -46,7 +46,7 @@ module.exports = function (grunt) {
 			demo: {
 				options: {
 					configuration: grunt.file.readJSON('./test/fixtures/tslint.json'),
-					formatter: path.resolve('./teamcity')
+					formatter: path.resolve('./TSHintTeamcityFormatter')
 				},
 				src: ['./test/fixtures/files/**/*.ts']
 			}

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Use it with:
 #### JSHint CLI
 
 ```
-jshint --reporter node_modules/tslint-teamcity-reporter/teamcity.js file.js
+tslint --formatters-dir node_modules/tslint-teamcity-reporter/ --format TSHintTeamcity file.ts
 ```
 
 #### grunt-tslint

diff --git a/teamcity.js → TSHintTeamcityFormatter.js b/teamcity.js → TSHintTeamcityFormatter.js
diff --git a/index.js b/index.js
@@ -1 +1 @@
-module.exports = require(require('path').join(__dirname, 'teamcity.js'));
+module.exports = require(require('path').join(__dirname, 'TSHintTeamcityFormatter.js'));
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tslint-teamcity-reporter",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "A TSLint formatter/reporter for use in TeamCity which groups by files using TeamCity Test Suite",
   "main": "index.js",
   "scripts": {
@@ -26,18 +26,18 @@
   },
   "homepage": "https://github.com/ThaNarie/tslint-teamcity-reporter",
   "peerDependencies": {
-	"tslint": "^3.0.0 || >=3.0.0-dev || >=3.1.0-dev || >=3.2.0-dev || >=3.3.0-dev"
+    "tslint": "^3.0.0 || >=3.0.0-dev || >=3.1.0-dev || >=3.2.0-dev || >=3.3.0-dev"
   },
   "devDependencies": {
-	  "grunt-cli": "~0.1.13",
-	  "grunt": "~0.4.5",
-	  "grunt-tslint": "~3.0.1",
-	  "grunt-contrib-jshint": "0.6.4",
-	  "grunt-run-grunt": "~0.1.0",
-	  "grunt-mocha-test": "~0.7.0",
-	  "grunt-contrib-clean": "~0.5.0",
-	  "grunt-continue": "0.0.1",
-	  "chai": "~1.8.1",
-	  "mocha-unfunk-reporter": "~0.4.0"
+    "grunt-cli": "~0.1.13",
+    "grunt": "~0.4.5",
+    "grunt-tslint": "~3.0.1",
+    "grunt-contrib-jshint": "0.6.4",
+    "grunt-run-grunt": "~0.1.0",
+    "grunt-mocha-test": "~0.7.0",
+    "grunt-contrib-clean": "~0.5.0",
+    "grunt-continue": "0.0.1",
+    "chai": "~1.8.1",
+    "mocha-unfunk-reporter": "~0.4.0"
   }
 }
diff --git a/test/Gruntfile.js b/test/Gruntfile.js
@@ -9,7 +9,7 @@ module.exports = function (grunt) {
 		tslint: {
 			options: {
 				configuration: grunt.file.readJSON('./fixtures/tslint.json'),
-				formatter: path.resolve('./../teamcity.js')
+				formatter: path.resolve('./../TSHintTeamcityFormatter.js')
 			},
 			files: {
 				src: ['fixtures/files/failureA.test.ts', 'fixtures/files/failureB.test.ts']

diff --git a/test/fixtures/files/output.txt b/test/fixtures/files/output.txt
@@ -4,21 +4,21 @@ Running "tslint:files" (tslint) task
 >> ##teamcity[testStarted name='(2,6) variable name must be in camelcase or uppercase']
 >> ##teamcity[testFailed name='(2,6) variable name must be in camelcase or uppercase' message='|[variable-name|] variable name must be in camelcase or uppercase' detailed='']
 >> ##teamcity[testFinished name='(2,6) variable name must be in camelcase or uppercase']
->> ##teamcity[testStarted name='(4,3) duplicate key |'a|'']
->> ##teamcity[testFailed name='(4,3) duplicate key |'a|'' message='|[no-duplicate-key|] duplicate key |'a|'' detailed='']
->> ##teamcity[testFinished name='(4,3) duplicate key |'a|'']
->> ##teamcity[testStarted name='(5,3) missing semicolon']
->> ##teamcity[testFailed name='(5,3) missing semicolon' message='|[semicolon|] missing semicolon' detailed='']
->> ##teamcity[testFinished name='(5,3) missing semicolon']
+>> ##teamcity[testStarted name='(4,3) Duplicate key |'a|'']
+>> ##teamcity[testFailed name='(4,3) Duplicate key |'a|'' message='|[no-duplicate-key|] Duplicate key |'a|'' detailed='']
+>> ##teamcity[testFinished name='(4,3) Duplicate key |'a|'']
+>> ##teamcity[testStarted name='(5,3) Missing semicolon']
+>> ##teamcity[testFailed name='(5,3) Missing semicolon' message='|[semicolon|] Missing semicolon' detailed='']
+>> ##teamcity[testFinished name='(5,3) Missing semicolon']
 >> ##teamcity[testStarted name='(6,2) file should end with a newline']
 >> ##teamcity[testFailed name='(6,2) file should end with a newline' message='|[eofline|] file should end with a newline' detailed='']
 >> ##teamcity[testFinished name='(6,2) file should end with a newline']
 >> ##teamcity[testSuiteFinished name='TSLint: fixtures/files/failureA.test.ts']
 
 >> ##teamcity[testSuiteStarted name='TSLint: fixtures/files/failureB.test.ts']
->> ##teamcity[testStarted name='(2,11) missing semicolon']
->> ##teamcity[testFailed name='(2,11) missing semicolon' message='|[semicolon|] missing semicolon' detailed='']
->> ##teamcity[testFinished name='(2,11) missing semicolon']
+>> ##teamcity[testStarted name='(2,11) Missing semicolon']
+>> ##teamcity[testFailed name='(2,11) Missing semicolon' message='|[semicolon|] Missing semicolon' detailed='']
+>> ##teamcity[testFinished name='(2,11) Missing semicolon']
 >> ##teamcity[testStarted name='(3,9) missing whitespace']
 >> ##teamcity[testFailed name='(3,9) missing whitespace' message='|[whitespace|] missing whitespace' detailed='']
 >> ##teamcity[testFinished name='(3,9) missing whitespace']
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		module.exports = require(require('path').join(__dirname, 'teamcity.js'));
		module.exports = require(require('path').join(__dirname, 'TSHintTeamcityFormatter.js'));