update to version 1.3.1

nuintun · May 19, 2015 · 3612328 · 3612328
1 parent 6c50648
commit 3612328
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 20 deletions.
diff --git a/examples/execute.js b/examples/execute.js
@@ -1,13 +1,20 @@
 /**
  * Created by Newton on 2014/4/2.
  */
-var ADODB = require('../lib/client'),
-  connection = ADODB.open('Provider=Microsoft.Jet.OLEDB.4.0;Data Source=node-adodb.mdb;');
+
+'use strict';
+
+// External lib
+var ADODB = require('../'),
+  colors = require('colors/safe');
+
+// Variable declaration
+var connection = ADODB.open('Provider=Microsoft.Jet.OLEDB.4.0;Data Source=node-adodb.mdb;');
 
 ADODB.debug = true;
 
 connection
   .execute('INSERT INTO Users(UserName, UserSex, UserAge) VALUES ("Newton", "Male", 25)')
   .on('done', function (data){
-    console.log('Result:'.green.bold, JSON.stringify(data, null, '  ').bold);
+    console.log(colors.green.bold('Result:'), colors.bold(JSON.stringify(data, null, '  ')));
   });
diff --git a/examples/executeScalar.js b/examples/executeScalar.js
@@ -1,13 +1,20 @@
 /**
  * Created by Newton on 2014/4/2.
  */
-var ADODB = require('../lib/client'),
-  connection = ADODB.open('Provider=Microsoft.Jet.OLEDB.4.0;Data Source=node-adodb.mdb;');
+
+'use strict';
+
+// External lib
+var ADODB = require('../'),
+  colors = require('colors/safe');
+
+// Variable declaration
+var connection = ADODB.open('Provider=Microsoft.Jet.OLEDB.4.0;Data Source=node-adodb.mdb;');
 
 ADODB.debug = true;
 
 connection
   .executeScalar('INSERT INTO Users(UserName, UserSex, UserAge) VALUES ("Newton", "Male", 25)', 'SELECT @@Identity AS id')
   .on('done', function (data){
-    console.log('Result:'.green.bold, JSON.stringify(data, null, '  ').bold);
+    console.log(colors.green.bold('Result:'), colors.bold(JSON.stringify(data, null, '  ')));
   });
diff --git a/examples/query.js b/examples/query.js
@@ -1,13 +1,20 @@
 /**
  * Created by Newton on 2014/4/2.
  */
-var ADODB = require('../lib/client'),
-  connection = ADODB.open('Provider=Microsoft.Jet.OLEDB.4.0;Data Source=node-adodb.mdb;');
+
+'use strict';
+
+// External lib
+var ADODB = require('../'),
+  colors = require('colors/safe');
+
+// Variable declaration
+var connection = ADODB.open('Provider=Microsoft.Jet.OLEDB.4.0;Data Source=node-adodb.mdb;');
 
 ADODB.debug = true;
 
 connection
   .query('SELECT * FROM Users')
   .on('done', function (data){
-    console.log('Result:'.green.bold, JSON.stringify(data, null, '  ').bold);
+    console.log(colors.green.bold('Result:'), colors.bold(JSON.stringify(data, null, '  ')));
   });
diff --git a/lib/client.js b/lib/client.js
@@ -4,6 +4,7 @@
 
 'use strict';
 
+// External lib
 var config = require('./config'),
   Execute = require('./execute'),
   Query = require('./query'),

diff --git a/lib/execute.js b/lib/execute.js
@@ -4,6 +4,7 @@
 
 'use strict';
 
+// External lib
 var util = require('util'),
   proxy = require('./proxy'),
   eventemitter = require('events').EventEmitter;

diff --git a/lib/executeScalar.js b/lib/executeScalar.js
@@ -4,6 +4,7 @@
 
 'use strict';
 
+// External lib
 var util = require('util'),
   proxy = require('./proxy'),
   eventemitter = require('events').EventEmitter;

diff --git a/lib/proxy.js b/lib/proxy.js
@@ -4,14 +4,16 @@
 
 'use strict';
 
-require('colors');
-
+// External lib
 var fs = require('fs'),
   path = require('path'),
   config = require('./config'),
+  colors = require('colors/safe'),
   iconv = require('iconv-lite'),
-  spawn = require('child_process').spawn,
-  adodb = path.join(__dirname, 'adodb.js'),
+  spawn = require('child_process').spawn;
+
+// Variable declaration
+var adodb = path.join(__dirname, 'adodb.js'),
   sysroot = process.env['systemroot'] || process.env['windir'],
   x64 = fs.existsSync(path.join(sysroot, 'SysWOW64')),
   cscript = path.join(sysroot, x64 ? 'SysWOW64' : 'System32', 'cscript.exe');
@@ -39,8 +41,8 @@ exports.exec = function (method, params, done, fail, encoding){
   // Set encoding
   encoding = isString(encoding) && encoding.trim() ? encoding : config.encoding;
 
-  config.debug && console.log('Exec:'.green.bold, method.cyan.bold);
-  config.debug && console.log('Params:'.green.bold, JSON.stringify(params, null, '  ').cyan.bold);
+  config.debug && console.log(colors.green.bold('Exec:'), colors.cyan.bold(method));
+  config.debug && console.log(colors.green.bold('Params:'), colors.cyan.bold(JSON.stringify(params, null, '  ')));
 
   // Params encode to base64
   params = (new Buffer(JSON.stringify(params))).toString('base64');
@@ -68,12 +70,12 @@ exports.exec = function (method, params, done, fail, encoding){
       message: (data instanceof Buffer ? iconv.decode(data, encoding) : data).replace(/\r\n/img, '')
     };
 
-    config.debug && console.log('Error:'.red.bold, JSON.stringify(data, null, ' ').cyan.bold);
+    config.debug && console.log(colors.yellow.bold('Error:'), colors.red.bold(JSON.stringify(data, null, ' ')));
     fail(data);
   });
 
   // Exec error
   stdio.on('error', function (error){
-    console.log('Exec Error:'.red.bold, JSON.stringify(error, null, '  ').cyan.bold);
+    console.log(colors.yellow.bold('Exec Error:'), colors.red.bold(JSON.stringify(error, null, '  ')));
   });
 };
diff --git a/lib/query.js b/lib/query.js
@@ -4,6 +4,7 @@
 
 'use strict';
 
+// External lib
 var util = require('util'),
   proxy = require('./proxy'),
   eventemitter = require('events').EventEmitter;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-adodb",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "main": "index.js",
   "license": "MIT",
   "keywords": [
@@ -29,8 +29,8 @@
     "url": "https://github.com/nuintun/node-adodb.git"
   },
   "dependencies": {
-    "iconv-lite": "~0.4.8",
-    "colors": "~1.0.3"
+    "iconv-lite": "^0.4.8",
+    "colors": "^1.1.0"
   },
   "devDependencies": {},
   "readmeFilename": "README.md"