From 86db4b273e1369e22ba99bdf74779518764f310c Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 5 Dec 2014 06:39:20 -0500 Subject: [PATCH] feature(packer) packer -> jag --- lib/server/packer.js | 88 --------------------------------------- lib/server/rest.js | 2 +- lib/server/rest/fs/put.js | 2 +- package.json | 1 + 4 files changed, 3 insertions(+), 90 deletions(-) delete mode 100644 lib/server/packer.js diff --git a/lib/server/packer.js b/lib/server/packer.js deleted file mode 100644 index 379562d9..00000000 --- a/lib/server/packer.js +++ /dev/null @@ -1,88 +0,0 @@ -(function() { - 'use strict'; - - var DIR = './', - DIR_LIB = DIR + '../', - - path = require('path'), - fs = require('fs'), - zlib = require('zlib'), - - tar = require('tar'), - fstream = require('fstream'), - - pipe = require('pipe-io'), - files = require('files-io'), - - Util = require(DIR_LIB + 'util'); - - exports.pack = function(from, to, callback) { - isDir(from, function(is) { - var dir, name, - - optionsDir = { path: from, type: 'Directory' }, - optionsTar = { noProprietary: true }, - - streamDir, - streamTar, - streamZip = zlib.createGzip(), - streamFile, - - isStr = Util.type.string(to), - options = { - gzip: true - }; - - if (!is) { - files.pipe(from, to, options, callback); - } else { - streamDir = fstream.Reader(optionsDir); - streamTar = tar.Pack(optionsTar); - - if (!isStr) { - streamFile = to; - } else { - dir = path.dirname(to); - name = path.basename(to, '.gz'); - to = dir + path.sep + name + '.tar.gz'; - - streamFile = fs.createWriteStream(to); - } - - pipe([ - streamDir, - streamTar, - streamZip, - streamFile - ], callback); - } - }); - }; - - exports.unpack = function(from, to, callback) { - var write, - isTarGz = /\.tar\.gz$/.test(from), - - options = { - gunzip : true - }; - - if (isTarGz) - write = tar.Extract({ path: to }); - else - write = to; - - files.pipe(from, write, options, callback); - }; - - function isDir(name, callback) { - fs.stat(name, function(error, stat) { - var isDir; - - if (!error) - isDir = stat.isDirectory(); - - callback(isDir); - }); - } -})(); diff --git a/lib/server/rest.js b/lib/server/rest.js index 3ab59710..f013fc9a 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -22,7 +22,7 @@ markdown = require(DIR + 'rest/markdown'), github = require(DIR + 'github'), - packer = require(DIR + 'packer'), + packer = require('jag'), tryRequire = require('./tryRequire'), tryOptions = {log: true, exit: true}, diff --git a/lib/server/rest/fs/put.js b/lib/server/rest/fs/put.js index ecb7cf60..791dfebb 100644 --- a/lib/server/rest/fs/put.js +++ b/lib/server/rest/fs/put.js @@ -10,7 +10,7 @@ check = require('checkup'), exec = require('execon'), - packer = require(DIR_SERVER + 'packer'), + packer = require('jag'), tryRequire = require(DIR_SERVER + 'tryRequire'), tryOptions = {log: true, exit: true}, diff --git a/package.json b/package.json index 22126125..10f2b9e8 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "flop": "~1.0.25", "fstream": "~1.0.2", "http-auth": "~2.2.3", + "jag": "~1.0.0", "join-io": "~1.3.0", "js-beautify": "~1.5.4", "marked": "~0.3.2",