pj-nodegit 0.18.5 → 0.18.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pj-nodegit",
   "description": "Node.js libgit2 asynchronous native bindings",
-  "version": "0.18.5",
+  "version": "0.18.6",
   "homepage": "http://nodegit.org",
   "keywords": [
     "libgit2",
@@ -44,7 +44,7 @@
     "lodash": "^4.17.14",
     "nan": "^2.14.0",
     "node-gyp": "^8.4.1",
-    "node-pre-gyp": "^0.17.0",
+    "@mapbox/node-pre-gyp": "^1.0.7",
     "ramda": "^0.25.0",
     "tar-fs": "^1.16.3"
   },
@@ -78,11 +78,10 @@
     "generateMissingTests": "node generate/scripts/generateMissingTests",
     "generateNativeCode": "node generate/scripts/generateNativeCode",
     "install": "node lifecycleScripts/preinstall && node lifecycleScripts/install",
-    "installDebug": "BUILD_DEBUG=true npm run install",
-    "lint": "jshint lib test/tests test/utils examples lifecycleScripts",
+    "installDebug": "BUILD_DEBUG=true npm install",
+    "lint": "jshint lib test/tests test/utils lifecycleScripts",
     "mergecov": "lcov-result-merger 'test/**/*.info' 'test/coverage/merged.lcov' && ./lcov-1.10/bin/genhtml test/coverage/merged.lcov --output-directory test/coverage/report",
     "mocha": "mocha --expose-gc test/runner test/tests --timeout 15000",
-    "mergefile": "mocha test/mergefile",
     "mochaDebug": "mocha --expose-gc --debug-brk test/runner test/tests --timeout 15000",
     "postinstall": "node lifecycleScripts/postinstall",
     "prepublish": "npm run babel",

package/lib/README.md

@@ -1,3 +0,0 @@
-## /lib
-
-  Contains javascript extensions for the generated NodeGit modules. Any additional behavior on top of the standard libgit2 behavior will be found here.

package/lib/attr.js

@@ -1,20 +0,0 @@
-var util = require("util");
-var NodeGit = require("../");
-
-NodeGit.Attr.STATES = {};
-var DEPRECATED_STATES = {
-  UNSPECIFIED_T: "UNSPECIFIED",
-  TRUE_T: "TRUE",
-  FALSE_T: "FALSE",
-  VALUE_T: "STRING"
-};
-
-Object.keys(DEPRECATED_STATES).forEach((key) => {
-  const newKey = DEPRECATED_STATES[key];
-  Object.defineProperty(NodeGit.Attr.STATES, key, {
-    get: util.deprecate(
-      () => NodeGit.Attr.VALUE[newKey],
-      `Use NodeGit.Attr.VALUE.${newKey} instead of NodeGit.Attr.STATES.${key}.`
-    )
-  });
-});

package/lib/blame.js

@@ -1,20 +0,0 @@
-var NodeGit = require("../");
-var normalizeOptions = NodeGit.Utils.normalizeOptions;
-var Blame = NodeGit.Blame;
-
-var _file = Blame.file;
-
-/**
- * Retrieve the blame of a file
- *
- * @async
- * @param {Repository} repo that contains the file
- * @param {String} path to the file to get the blame of
- * @param {BlameOptions} [options] Options for the blame
- * @return {Blame} the blame
- */
-Blame.file = function(repo, path, options) {
-  options = normalizeOptions(options, NodeGit.BlameOptions);
-
-  return _file.call(this, repo, path, options);
-};

package/lib/blob.js

@@ -1,73 +0,0 @@
-var util = require("util");
-var NodeGit = require("../");
-var Blob = NodeGit.Blob;
-var LookupWrapper = NodeGit.Utils.lookupWrapper;
-var TreeEntry = NodeGit.TreeEntry;
-var normalizeOptions = NodeGit.Utils.normalizeOptions;
-
-var _filteredContent = Blob.filteredContent;
-var _filter = Blob.prototype.filter;
-
-/**
-* Retrieves the blob pointed to by the oid
-* @async
-* @param {Repository} repo The repo that the blob lives in
-* @param {String|Oid|Blob} id The blob to lookup
-* @return {Blob}
-*/
-Blob.lookup = LookupWrapper(Blob);
-
-/**
- * Retrieve the content of the Blob.
- *
- * @return {Buffer} Contents as a buffer.
- */
-Blob.prototype.content = function() {
-  return this.rawcontent().toBuffer(this.rawsize());
-};
-
-/**
- * Retrieve the Blob's type.
- *
- * @return {Number} The filemode of the blob.
- */
-Blob.prototype.filemode = function() {
-  var FileMode = TreeEntry.FILEMODE;
-
-  return this.isBinary() ? FileMode.EXECUTABLE : FileMode.BLOB;
-};
-
-/**
- * Retrieve the Blob's content as String.
- *
- * @return {String} Contents as a string.
- */
-Blob.prototype.toString = function() {
-  return this.content().toString();
-};
-
-/**
- * Get a buffer with the filtered content of a blob.
- *
- * This applies filters as if the blob was being checked out to the
- * working directory under the specified filename. This may apply
- * CRLF filtering or other types of changes depending on the file
- * attributes set for the blob and the content detected in it.
- *
- * @async
- * @param asPath Path used for file attribute lookups, etc.
- * @param opts Options to use for filtering the blob
- * @return {Promise<string>}
- */
-Blob.prototype.filter = function(asPath, opts) {
-  if (opts) {
-    opts = normalizeOptions(opts, NodeGit.BlobFilterOptions);
-  }
-  return _filter.call(this, asPath, opts);
-};
-
-Blob.filteredContent = util.deprecate(
-  _filteredContent,
-  "NodeGit.Blob.filteredContent is deprecated" +
-  " use NodeGit.Blob.prototype.filter instead."
-);

package/lib/branch.js

@@ -1,19 +0,0 @@
-var NodeGit = require("../");
-var Branch = NodeGit.Branch;
-
-var _remoteName = Branch.remoteName;
-
-/**
- * Retrieve the Branch's Remote Name as a String.
- *
- *  @async
- * @param {Repository} repo The repo to get the remote name from
- * @param {String} the refname of the branch
- * @return {String} remote name as a string.
- */
-Branch.remoteName = function(repo, remoteRef) {
-  return _remoteName.call(this, repo, remoteRef)
-    .then(function(remoteNameBuffer) {
-      return remoteNameBuffer.toString();
-    });
-};

package/lib/buf.js

@@ -1,11 +0,0 @@
-const { Buf } = require("../");
-
-/**
- * Sets the content of a GitBuf to a string.
- * @param {string} The utf8 value to set in the buffer.
- *                 The string will be null terminated.
- */
-Buf.prototype.setString = function(content) {
-  const buf = Buffer.from(content + "\0", "utf8");
-  this.set(buf, buf.length);
-};

package/lib/checkout.js

@@ -1,51 +0,0 @@
-var NodeGit = require("../");
-var normalizeOptions = NodeGit.Utils.normalizeOptions;
-
-var Checkout = NodeGit.Checkout;
-var _head = Checkout.head;
-var _index = Checkout.index;
-var _tree = Checkout.tree;
-
-/**
-* Patch head checkout to automatically coerce objects.
-*
-* @async
-* @param {Repository} repo The repo to checkout head
-* @param {CheckoutOptions} [options] Options for the checkout
-* @return {Void} checkout complete
-*/
-Checkout.head = function(url, options) {
-  options = normalizeOptions(options || {}, NodeGit.CheckoutOptions);
-
-  return _head.call(this, url, options);
-};
-
-/**
-* Patch index checkout to automatically coerce objects.
-*
-* @async
-* @param {Repository} repo The repo to checkout an index
-* @param {Index} index The index to checkout
-* @param {CheckoutOptions} [options] Options for the checkout
-* @return {Void} checkout complete
-*/
-Checkout.index = function(repo, index, options) {
-  options = normalizeOptions(options || {}, NodeGit.CheckoutOptions);
-
-  return _index.call(this, repo, index, options);
-};
-
-/**
-* Patch tree checkout to automatically coerce objects.
-*
-* @async
-* @param {Repository} repo
-* @param {String|Tree|Commit|Reference} treeish
-* @param {CheckoutOptions} [options]
-* @return {Void} checkout complete
-*/
-Checkout.tree = function(repo, treeish, options) {
-  options = normalizeOptions(options || {}, NodeGit.CheckoutOptions);
-
-  return _tree.call(this, repo, treeish, options);
-};

package/lib/cherrypick.js

@@ -1,73 +0,0 @@
-var NodeGit = require("../");
-var shallowClone = NodeGit.Utils.shallowClone;
-var normalizeOptions = NodeGit.Utils.normalizeOptions;
-
-var Cherrypick = NodeGit.Cherrypick;
-var _cherrypick = Cherrypick.cherrypick;
-var _commit = Cherrypick.commit;
-
-/**
-* Cherrypick a commit and, changing the index and working directory
-*
-* @async
-* @param {Repository}         repo      The repo to checkout head
-* @param {Commit}             commit    The commit to cherrypick
-* @param {CherrypickOptions}  [options] Options for the cherrypick
-* @return {int} 0 on success, -1 on failure
-*/
-Cherrypick.cherrypick = function(repo, commit, options) {
-  var mergeOpts;
-  var checkoutOpts;
-
-  if (options) {
-    options = shallowClone(options);
-    mergeOpts = options.mergeOpts;
-    checkoutOpts = options.checkoutOpts;
-    delete options.mergeOpts;
-    delete options.checkoutOpts;
-  }
-
-  options = normalizeOptions(options, NodeGit.CherrypickOptions);
-
-  if (mergeOpts) {
-    options.mergeOpts =
-      normalizeOptions(mergeOpts, NodeGit.MergeOptions);
-  }
-
-  if (checkoutOpts) {
-    options.checkoutOpts =
-      normalizeOptions(checkoutOpts, NodeGit.CheckoutOptions);
-  }
-
-  return _cherrypick.call(this, repo, commit, options);
-};
-
-/**
-* Cherrypicks the given commit against "our" commit, producing an index that
-* reflects the result of the cherrypick. The index is not backed by a repo.
-*
-* @async
-* @param {Repository}   repo              The repo to cherrypick commits
-* @param {Commit}       cherrypick_commit The commit to cherrypick
-* @param {Commit}       our_commit        The commit to revert against
-* @param {int}          mainline          The parent of the revert commit (1 or
-*                                         2) if it's a merge, 0 otherwise
-* @param {MergeOptions} [merge_options]   Merge options for the cherrypick
-* @return {int}   0 on success, -1 on failure
-*/
-Cherrypick.commit = function(
-    repo,
-    cherrypick_commit,
-    our_commit,
-    mainline,
-    merge_options) {
-  merge_options = normalizeOptions(merge_options, NodeGit.MergeOptions);
-
-  return _commit.call(
-    this,
-    repo,
-    cherrypick_commit,
-    our_commit,
-    mainline,
-    merge_options);
-};

package/lib/clone.js

@@ -1,33 +0,0 @@
-var NodeGit = require("../");
-var shallowClone = NodeGit.Utils.shallowClone;
-var normalizeFetchOptions = NodeGit.Utils.normalizeFetchOptions;
-var normalizeOptions = NodeGit.Utils.normalizeOptions;
-
-var Clone = NodeGit.Clone;
-var _clone = Clone.clone;
-
-/**
- * Patch repository cloning to automatically coerce objects.
- *
- * @async
- * @param {String} url url of the repository
- * @param {String} local_path local path to store repository
- * @param {CloneOptions} [options]
- * @return {Repository} repo
- */
-Clone.clone = function(url, local_path, options) {
-  var fetchOpts = normalizeFetchOptions(options && options.fetchOpts);
-
-  if (options) {
-    options = shallowClone(options);
-    delete options.fetchOpts;
-  }
-
-  options = normalizeOptions(options, NodeGit.CloneOptions);
-
-  if (options) {
-    options.fetchOpts = fetchOpts;
-  }
-
-  return _clone.call(this, url, local_path, options);
-};