Merge pull request #14 from rtfpessoa/merge-npm

Merge npm package

.gitignore

@@ -14,3 +14,10 @@
 # Maven
 log/
 target/
+
+# Node
+node_modules/
+npm-debug.log
+
+# Bower
+bower_components/

README.md

@@ -22,7 +22,9 @@ Diff to Html generates pretty HTML diffs from git word diff output.
 
 * [Node Module](https://www.npmjs.org/package/diff2html)
 
-* Manually download and import `diff2html.js` into your page
+* [Bower Package](http://bower.io/search/?q=diff2html)
+
+* Manually download and import `dist/diff2html.min.js` into your page
 
 ## How to use
 

bin/diff2html

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require("../src/diff2html.js");

bower.json

@@ -2,38 +2,55 @@
   "name": "diff2html",
   "version": "0.2.5",
   "homepage": "https://github.com/rtfpessoa/diff2html",
+  "description": "Fast Diff to colorized HTML",
+  "keywords": [
+    "git",
+    "diff",
+    "pretty",
+    "side",
+    "line",
+    "side-by-side",
+    "line-by-line",
+    "character",
+    "highlight",
+    "pretty",
+    "color",
+    "html",
+    "diff2html",
+    "difftohtml",
+    "colorized"
+  ],
+
   "authors": [
     "Rodrigo Fernandes <rtfrodrigo@gmail.com>"
   ],
+
   "repository": {
-  "type": "git",
-  "url": "git://github.com/rtfpessoa/diff2html.git"
+    "type": "git",
+    "url": "git://github.com/rtfpessoa/diff2html.git"
   },
-  "description": "Fast Diff to colorized HTML",
+
   "main": "./src/diff2html.js",
-  "keywords": [
-      "git",
-      "diff",
-      "pretty",
-      "side",
-      "line",
-      "side-by-side",
-      "line-by-line",
-      "character",
-      "highlight",
-      "pretty",
-      "color",
-      "html",
-      "diff2html",
-      "difftohtml",
-      "colorized"
-  ],
+
   "license": "MIT",
+
+  "moduleType": [
+    "globals",
+    "node"
+  ],
+
+  "dependencies": {
+    "jsdiff": ">= 1.4.0"
+  },
+
   "ignore": [
     "**/.*",
     "node_modules",
     "bower_components",
     "test",
-    "tests"
+    "tests",
+    "bin",
+    "package.json",
+    "release.sh"
   ]
 }

package.json

@@ -0,0 +1,67 @@
+{
+  "name":     "diff2html",
+  "version":  "0.2.4",
+  "homepage": "https://www.github.com/rtfpessoa/diff2html",
+  "description": "Fast Diff to colorized HTML",
+  "keywords": [
+      "git",
+      "diff",
+      "pretty",
+      "side",
+      "line",
+      "side-by-side",
+      "line-by-line",
+      "character",
+      "highlight",
+      "pretty",
+      "color",
+      "html",
+      "diff2html",
+      "difftohtml",
+      "colorized"
+    ],
+
+  "author": {
+    "name":  "Rodrigo Fernandes",
+    "email": "rtfrodrigo@gmail.com"
+  },
+
+  "repository": {
+    "type": "git",
+    "url": "https://www.github.com/rtfpessoa/diff2html.git"
+  },
+
+  "bugs": {
+    "url": "https://www.github.com/rtfpessoa/diff2html/issues"
+  },
+
+  "engines": {
+      "node": ">=0.10"
+  },
+
+  "preferGlobal": "true",
+
+  "scripts": {
+    "test": ""
+  },
+
+  "bin": {
+    "diff2html-lib": "./bin/diff2html"
+  },
+
+  "main": "./src/diff2html.js",
+
+  "dependencies": {
+    "diff": "1.4.0"
+  },
+
+  "devDependencies": {},
+
+  "license": "MIT",
+
+  "files": [
+    "bin",
+    "lib",
+    "src"
+  ]
+}

src/printer-utils.js

@@ -8,7 +8,9 @@
 (function (global, undefined) {
 
   // dirty hack for browser compatibility
-  var jsDiff = (typeof JsDiff !== "undefined" && JsDiff) || require("../lib/diff.js");
+  var jsDiff = (typeof JsDiff !== "undefined" && JsDiff) ||
+    require("diff") ||
+    require("../lib/diff.js");
   var utils = require("./utils.js").Utils;
 
   function PrinterUtils() {