new root index.js. breakage expected.

Author: ctalkington

index.js

@@ -0,0 +1,19 @@
+/**
+ * node-archiver
+ *
+ * Copyright (c) 2015 Chris Talkington.
+ * Licensed under the MIT license.
+ * https://github.com/archiverjs/node-archiver/blob/master/LICENSE
+ */
+
+var Archiver = require('./lib/core');
+
+module.exports = Archiver;
+
+module.exports.create = function(format, options) {
+  return new Archiver(format, options);
+};
+
+module.exports.registerFormat = function(format, module) {
+  throw new Error('registerFormat is no longer supported.');
+};

lib/archiver.js

@@ -5,17 +5,26 @@
  * Licensed under the MIT license.
  * https://github.com/archiverjs/node-archiver/blob/master/LICENSE-MIT
  */
+var async = require('async');
 var fs = require('fs');
-var inherits = require('util').inherits;
-var Transform = require('readable-stream').Transform;
+var util = require('./util');
 
-var async = require('async');
+// built-in plugins
+var pjson = require('archiver-json');
+var ptar = require('archiver-tar');
+var pzip = require('archiver-zip');
 
-var util = require('./util');
+var inherits = require('util').inherits;
+var Transform = require('readable-stream').Transform;
 
-var Archiver = module.exports = function(options) {
+var Archiver = module.exports = function(format, options) {
   if (!(this instanceof Archiver)) {
-    return new Archiver(options);
+    return new Archiver(format, options);
+  }
+
+  if (typeof format !== 'string') {
+    options = format;
+    format = 'zip';
   }
 
   options = this.options = util.defaults(options, {
@@ -43,6 +52,18 @@ var Archiver = module.exports = function(options) {
     finalized: false,
     modulePiped: false
   };
+
+  this._streams = [];
+
+  if (format === 'zip') {
+    this.use(pzip());
+  } else if (format === 'tar') {
+    this.use(ptar());
+  } else if (format === 'json') {
+    this.use(pjson());
+  } else {
+    this.emit(error, new Error('no format plugin'));
+  }
 };
 
 inherits(Archiver, Transform);
@@ -485,4 +506,9 @@ Archiver.prototype.setModule = function(module) {
 
 Archiver.prototype.pointer = function() {
   return this._pointer;
+};
+
+Archiver.prototype.use = function(plugin) {
+  this._streams.push(plugin);
+  return this;
 };

lib/core.js

@@ -15,8 +15,9 @@
     "url": "https://github.com/archiverjs/node-archiver/issues"
   },
   "license": "MIT",
-  "main": "lib/archiver.js",
+  "main": "index.js",
   "files": [
+    "index.js",
     "lib"
   ],
   "engines": {
@@ -27,9 +28,9 @@
     "bench": "node benchmark/simple/pack-zip.js"
   },
   "dependencies": {
-    "archiver-json": "~0.0.1",
-    "archiver-tar": "~0.0.1",
-    "archiver-zip": "~0.0.1",
+    "archiver-json": "~0.1.0",
+    "archiver-tar": "~0.1.0",
+    "archiver-zip": "~0.1.0",
     "async": "~0.9.0",
     "buffer-crc32": "~0.2.1",
     "glob": "~4.3.0",

package.json

@@ -12,7 +12,7 @@ var UnBufferedStream = helpers.UnBufferedStream;
 var WriteHashStream = helpers.WriteHashStream;
 var binaryBuffer = helpers.binaryBuffer;
 
-var archiver = require('../lib/archiver');
+var archiver = require('../');
 
 var testBuffer = binaryBuffer(1024 * 16);
 

test/archiver.js

@@ -6,7 +6,7 @@ var tar = require('tar');
 var yauzl = require('yauzl');
 var WriteStream = fs.createWriteStream;
 
-var archiver = require('../lib/archiver');
+var archiver = require('../');
 var helpers = require('./helpers');
 var binaryBuffer = helpers.binaryBuffer;