Merge branch 'dev'

.editorconfig

@@ -9,7 +9,7 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[GNUmakefile]
+[Makefile]
 indent_style = tab
 
 [package.json]

.gitignore

@@ -1,6 +1,7 @@
 node_modules/
 lib-cov/
 html-report/
+lcov.info
 bin/svgo-profiling
 *.sublime-*
 *.log

.travis.yml

@@ -6,14 +6,12 @@ node_js:
   - 0.10
   - 0.11
 
-branches:
-  only:
-    - master
+matrix:
+  allow_failures:
+    - node_js: 0.11
 
 branches:
   only:
     - master
 
-matrix:
-  allow_failures:
-    - node_js: 0.11
+script: make travis

Makefile

@@ -0,0 +1,21 @@
+test:
+	@NODE_ENV=test ./node_modules/.bin/mocha
+
+lib-cov:
+	@./node_modules/.bin/istanbul instrument --output lib-cov --no-compact --variable global.__coverage__ lib
+
+coverage: lib-cov
+	@COVERAGE=1 ISTANBUL_REPORTERS=text-summary ./node_modules/.bin/mocha --reporter mocha-istanbul
+	@rm -rf lib-cov
+
+coveralls: lib-cov
+	@COVERAGE=1 ISTANBUL_REPORTERS=lcovonly ./node_modules/.bin/mocha --reporter mocha-istanbul
+	@cat lcov.info | ./node_modules/.bin/coveralls
+	@rm -rf lib-cov lcov.info
+
+travis: test coveralls
+
+jshint:
+	@jshint --show-non-errors .
+
+.PHONY: test

README.md

@@ -3,7 +3,7 @@
 
 <img src="http://soulshine.in/svgo.svg" width="200" height="200" alt="logo"/>
 
-## SVGO v0.3.1 [![Build Status](https://secure.travis-ci.org/svg/svgo.png)](http://travis-ci.org/svg/svgo)
+## SVGO [![NPM version](https://badge.fury.io/js/svgo.png)](https://npmjs.org/package/svgo) [![Dependency Status](https://gemnasium.com/svg/svgo.png)](https://gemnasium.com/svg/svgo) [![Build Status](https://secure.travis-ci.org/svg/svgo.png)](https://travis-ci.org/svg/svgo) [![Coverage Status](https://coveralls.io/repos/svg/svgo/badge.png?branch=master)](https://coveralls.io/r/svg/svgo)
 
 **SVG O**ptimizer is a Nodejs-based tool for optimizing SVG vector graphics files.
 ![](https://mc.yandex.ru/watch/18431326)

README.ru.md

@@ -3,7 +3,7 @@
 
 <img src="http://soulshine.in/svgo.svg" width="200" height="200" alt="logo"/>
 
-## SVGO v0.3.1 [![Build Status](https://secure.travis-ci.org/svg/svgo.png)](http://travis-ci.org/svg/svgo)
+## SVGO [![NPM version](https://badge.fury.io/js/svgo.png)](https://npmjs.org/package/svgo) [![Dependency Status](https://gemnasium.com/svg/svgo.png)](https://gemnasium.com/svg/svgo) [![Build Status](https://secure.travis-ci.org/svg/svgo.png)](https://travis-ci.org/svg/svgo) [![Coverage Status](https://coveralls.io/repos/svg/svgo/badge.png?branch=master)](https://coveralls.io/r/svg/svgo)
 
 **SVG** **O**ptimizer – это инструмент для оптимизации векторной графики в формате SVG, написанный на Node.js.
 ![](https://mc.yandex.ru/watch/18431326)

package.json

@@ -32,9 +32,7 @@
     "example": "./examples"
   },
   "scripts": {
-    "test": "./node_modules/.bin/mocha",
-    "cover": "./node_modules/.bin/istanbul instrument --output lib-cov --no-compact --variable global.__coverage__ lib && ./node_modules/.bin/mocha --reporter mocha-istanbul --recursive",
-    "jshint": "jshint --show-non-errors ."
+    "test": "make test"
   },
   "dependencies": {
     "sax": "~0.5.0",
@@ -47,7 +45,8 @@
     "mocha": "~1.9.0",
     "should": "~1.2.0",
     "istanbul": "~0.1.0",
-    "mocha-istanbul": ""
+    "mocha-istanbul": "",
+    "coveralls": ""
   },
   "engines": {
     "node": ">=0.6.0"

test/config/_index.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var cover = process.argv[3] === 'mocha-istanbul',
-    CONFIG = require(cover ? '../../lib-cov/svgo/config' : '../../lib/svgo/config');
+var CONFIG = require(process.env.COVERAGE ?
+                     '../../lib-cov/svgo/config' :
+                     '../../lib/svgo/config');
 
 describe('config', function() {
 

test/plugins/_index.js

@@ -3,7 +3,9 @@
 var FS = require('fs'),
     PATH = require('path'),
     regFilename = /^(.*)\.(\d+)\.svg$/,
-    SVGO = require('../../lib/svgo');
+    SVGO = require(process.env.COVERAGE ?
+                   '../../lib-cov/svgo':
+                   '../../lib/svgo');
 
 describe('plugins tests', function() {
 

test/svg2js/_index.js

@@ -3,8 +3,9 @@
 var SHOULD = require('should'),
     FS = require('fs'),
     PATH = require('path'),
-    cover = process.argv[3] === 'mocha-istanbul',
-    svg2js = require(cover ? '../../lib-cov/svgo/svg2js' : '../../lib/svgo/svg2js');
+    SVG2JS = require(process.env.COVERAGE ?
+                     '../../lib-cov/svgo/svg2js' :
+                     '../../lib/svgo/svg2js');
 
 describe('svg2js', function() {
 
@@ -20,7 +21,7 @@ describe('svg2js', function() {
                     throw err;
                 }
 
-                svg2js(data, function(result) {
+                SVG2JS(data, function(result) {
                     root = result;
                     done();
                 });