Fixed Reassigning parameter lint rules

unitejs · Aug 28, 2017 · e932de0 · e932de0
1 parent 3db56d3
commit e932de0
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 41 deletions.
diff --git a/.npmignore b/.npmignore
@@ -12,8 +12,7 @@ src/
 .eslintignore
 .eslintrc.json
 .travis.yml
-gulpfile.js
+./gulpfile.js
 tsconfig.json
 tslint.json
 test/unit/reports/**/*
-TODO.md
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,10 @@ node_js:
   - "node"
 install:
   - npm install
-script:
-  - gulp build
-  - gulp unit
-  - gulp coveralls
+script: 
+  - gulp build || travis_terminate 1
+  - gulp unit || travis_terminate 1
+  - gulp coveralls || travis_terminate 1
+cache:
+  directories:
+  - node_modules
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,24 +1,34 @@
+# v0.2.1
+
+* Fixed Reassigning parameter lint rules
+
 # v0.2.0
+
 * Finalise API
 * Unit Tests and Fixes
 
 # v0.1.4
+
 * Housekeeping and CI Integration
 
 # v0.1.3
+
 * Housekeeping and CI Integration
 
 # v0.1.2
+
 * Added png to icns conversion
 
 # v0.1.1
+
 * Rationalised logging/display interfaces
 
 # v0.1.0
+
 * Added svg to png conversion
 * Added png to ico conversion
 * Added svg to mask conversion
 
 # v0.0.1
-* Initial version
 
+* Initial version
diff --git a/dist/svg.js b/dist/svg.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -65,7 +65,7 @@ gulp.task("build-transpile", () => {
         .pipe(gulp.dest(distFolder))
         .on("end", () => {
             if (errorCount > 0) {
-                process.exit();
+                process.exit(1);
             }
         }));
 
@@ -138,7 +138,7 @@ gulp.task("unit-transpile", () => {
         .pipe(gulp.dest(unitDistFolder))
         .on("end", () => {
             if (errorCount > 0) {
-                process.exit();
+                process.exit(1);
             }
         });
 });
@@ -176,6 +176,8 @@ gulp.task("unit-runner", () => {
         .pipe(mocha({
             "reporter": "spec",
             "timeout": "360000"
+        }).on("error", () => {
+            process.exit(1);
         }))
         .pipe(istanbul.writeReports({
             "dir": unitReportsFolder,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "unitejs-image",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Core code for manipulating images",
   "repository": {
     "type": "git",
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@types/chai": "^4.0.4",
     "@types/mocha": "^2.2.42",
-    "@types/node": "^8.0.24",
+    "@types/node": "^8.0.25",
     "@types/phantom": "^3.2.3",
     "@types/sinon": "^2.3.3",
     "chai": "^4.1.1",
@@ -51,7 +51,7 @@
     "remap-istanbul": "^0.9.5",
     "run-sequence": "^2.0.0",
     "sinon": "^3.2.1",
-    "tslint": "^5.6.0",
+    "tslint": "^5.7.0",
     "tslint-microsoft-contrib": "^5.0.1",
     "typescript": "^2.5.1"
   },
@@ -60,6 +60,6 @@
     "jimp": "^0.2.28",
     "phantom": "^4.0.5",
     "text-encoding": "^0.6.4",
-    "unitejs-framework": "^0.8.0"
+    "unitejs-framework": "^0.8.1"
   }
 }
diff --git a/src/svg.ts b/src/svg.ts
@@ -64,17 +64,10 @@ export class SVG {
                 logger.info("height", { height });
             }
 
-            if (marginX === undefined) {
-                marginX = 0;
-            } else {
-                logger.info("marginX", { marginX });
-            }
-
-            if (marginY === undefined) {
-                marginY = 0;
-            } else {
-                logger.info("marginY", { marginY });
-            }
+            const mX = marginX === undefined ? 0 : marginX;
+            const mY = marginY === undefined ? 0 : marginY;
+            logger.info("marginX", { mX });
+            logger.info("marginY", { mY });
 
             if (background !== null && background !== undefined && background.length > 0) {
                 if (!ParameterValidation.isColor(logger, "background", background)) {
@@ -94,10 +87,11 @@ export class SVG {
                     style += ` body { background-color: ${background}}`;
                 }
 
-                const reducedWidth = width - (marginX * 2);
+                const reducedWidth = width - (mX * 2);
+                style += ` img { position: absolute; left: ${mX}px; top: ${mY}px}`;
                 const reducedHeight = height - (marginY * 2);
 
-                style += ` img { position: absolute; left: ${marginX}px; top: ${marginY}px}`;
+                style += ` img { position: absolute; left: ${mX}px; top: ${mY}px}`;
 
                 const svgFilename = fileSystem.pathAbsolute(fileSystem.pathCombine(sourceFolder, sourceFile));