pj-nodegit 0.27.1 → 0.28.2

package/include/worktree_prune_options.h

@@ -1,40 +1,43 @@
-// This is a generated file, modify: generate/templates/templates/class_header.h
+// This is a generated file, modify: generate/templates/templates/struct_header.h
 
+// generated from struct_header.h
 #ifndef GITWORKTREEPRUNEOPTIONS_H
 #define GITWORKTREEPRUNEOPTIONS_H
 #include <nan.h>
 #include <string>
-#include <queue>
 #include <utility>
-#include <unordered_map>
-#include <sstream>
 
 #include "async_baton.h"
-#include "nodegit_wrapper.h"
-#include "promise_completion.h"
+#include "async_worker.h"
+#include "callback_wrapper.h"
+#include "context.h"
 #include "reference_counter.h"
+#include "nodegit_wrapper.h"
+#include "configurable_class_wrapper.h"
+#include "v8_helpers.h"
 
 extern "C" {
-#include <git2.h>
-}
-
-#include "../include/typedefs.h"
-
+  #include <git2.h>
+ }
 
+ 
 using namespace node;
 using namespace v8;
 
 class GitWorktreePruneOptions;
-
+class ConfigurableGitWorktreePruneOptions;
+ 
 struct GitWorktreePruneOptionsTraits {
   typedef GitWorktreePruneOptions cppClass;
   typedef git_worktree_prune_options cType;
-
+  typedef ConfigurableGitWorktreePruneOptions configurableCppClass;
+ 
   static const bool isDuplicable = false;
   static void duplicate(git_worktree_prune_options **dest, git_worktree_prune_options *src) {
      Nan::ThrowError("duplicate called on GitWorktreePruneOptions which cannot be duplicated");
    }
 
+  static std::string className() { return "GitWorktreePruneOptions"; };
   static const bool isSingleton = false;
   static const bool isFreeable = true;
   static void free(git_worktree_prune_options *raw) {
@@ -44,29 +47,26 @@ struct GitWorktreePruneOptionsTraits {
     }
    }
 };
+  
+class ConfigurableGitWorktreePruneOptions : public nodegit::ConfigurableClassWrapper<GitWorktreePruneOptionsTraits> {
+  friend class nodegit::ConfigurableClassWrapper<GitWorktreePruneOptionsTraits>;
 
-class GitWorktreePruneOptions : public
-  NodeGitWrapper<GitWorktreePruneOptionsTraits>
-{
-    // grant full access to base class
-    friend class NodeGitWrapper<GitWorktreePruneOptionsTraits>;
-   public:
-    static void InitializeComponent (v8::Local<v8::Object> target);
+public:
+  static v8ConversionResult fromJavascript(nodegit::Context *nodegitContext, v8::Local<v8::Value> input);
+  ~ConfigurableGitWorktreePruneOptions();
 
- 
+  ConfigurableGitWorktreePruneOptions(const ConfigurableGitWorktreePruneOptions &) = delete;
+  ConfigurableGitWorktreePruneOptions(ConfigurableGitWorktreePruneOptions &&) = delete;
+  ConfigurableGitWorktreePruneOptions &operator=(const ConfigurableGitWorktreePruneOptions &) = delete;
+  ConfigurableGitWorktreePruneOptions &operator=(ConfigurableGitWorktreePruneOptions &&) = delete;
+
+     
+private:
+  ConfigurableGitWorktreePruneOptions(nodegit::Context *nodegitContext);
+  ConfigurableGitWorktreePruneOptions() = delete;
+  Nan::Global<Value> promiseError;
 
-  private:
-    GitWorktreePruneOptions()
-      : NodeGitWrapper<GitWorktreePruneOptionsTraits>(
-           "A new GitWorktreePruneOptions cannot be instantiated."
-       )
-    {}
-    GitWorktreePruneOptions(git_worktree_prune_options *raw, bool selfFreeing, v8::Local<v8::Object> owner = v8::Local<v8::Object>())
-      : NodeGitWrapper<GitWorktreePruneOptionsTraits>(raw, selfFreeing, owner)
-    {}
-    ~GitWorktreePruneOptions();
-     static NAN_METHOD(Version);
-    static NAN_METHOD(Flags);
+       
 };
 
 #endif

package/include/wrapper.h

@@ -9,15 +9,14 @@
 #include <node.h>
 
 #include "nan.h"
+#include "context.h"
 
 using namespace node;
 using namespace v8;
 
 class Wrapper : public Nan::ObjectWrap {
   public:
-
-    static Nan::Persistent<FunctionTemplate> constructor_template;
-    static void InitializeComponent (v8::Local<v8::Object> target);
+    static void InitializeComponent (v8::Local<v8::Object> target, nodegit::Context *nodegitContext);
 
     void *GetValue();
     static v8::Local<v8::Value> New(const void *raw);

package/include/writestream.h

@@ -4,15 +4,21 @@
 #define GITWRITESTREAM_H
 #include <nan.h>
 #include <string>
-#include <queue>
 #include <utility>
-#include <unordered_map>
+#include <algorithm>
+#include <set>
+#include <unordered_set>
 #include <sstream>
 
 #include "async_baton.h"
+#include "async_worker.h"
+#include "cleanup_handle.h"
+#include "context.h"
+#include "lock_master.h"
 #include "nodegit_wrapper.h"
 #include "promise_completion.h"
 #include "reference_counter.h"
+#include "worker_pool.h"
 
 extern "C" {
 #include <git2.h>
@@ -25,16 +31,17 @@ using namespace node;
 using namespace v8;
 
 class GitWritestream;
-
+ 
 struct GitWritestreamTraits {
   typedef GitWritestream cppClass;
   typedef git_writestream cType;
-
+ 
   static const bool isDuplicable = false;
   static void duplicate(git_writestream **dest, git_writestream *src) {
      Nan::ThrowError("duplicate called on GitWritestream which cannot be duplicated");
    }
 
+  static std::string className() { return "GitWritestream"; };
   static const bool isSingleton = false;
   static const bool isFreeable = true;
   static void free(git_writestream *raw) {
@@ -51,7 +58,12 @@ class GitWritestream : public
     // grant full access to base class
     friend class NodeGitWrapper<GitWritestreamTraits>;
    public:
-    static void InitializeComponent (v8::Local<v8::Object> target);
+    GitWritestream(const GitWritestream &) = delete;
+    GitWritestream(GitWritestream &&) = delete;
+    GitWritestream &operator=(const GitWritestream &) = delete;
+    GitWritestream &operator=(GitWritestream &&) = delete;
+
+    static void InitializeComponent (v8::Local<v8::Object> target, nodegit::Context *nodegitContext);
 
  
 
@@ -65,6 +77,6 @@ class GitWritestream : public
       : NodeGitWrapper<GitWritestreamTraits>(raw, selfFreeing, owner)
     {}
     ~GitWritestream();
- };
+};
 
 #endif

package/lifecycleScripts/install.js

@@ -1,5 +1,6 @@
 var buildFlags = require("../utils/buildFlags");
 var spawn = require("child_process").spawn;
+var path = require("path");
 
 module.exports = function install() {
   console.log("[nodegit] Running install script");
@@ -28,7 +29,12 @@ module.exports = function install() {
   }
 
   return new Promise(function(resolve, reject) {
-    var spawnedNodePreGyp = spawn(nodePreGyp, args);
+    var spawnedNodePreGyp = spawn(nodePreGyp, args, {
+      env: Object.assign({}, process.env, {
+        npm_config_node_gyp: path.join(__dirname, "..", "node_modules",
+          "node-gyp", "bin", "node-gyp.js")
+      })
+    });
 
     spawnedNodePreGyp.stdout.on("data", function(data) {
       console.info(data.toString().trim());

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pj-nodegit",
   "description": "Node.js libgit2 asynchronous native bindings",
-  "version": "0.27.01",
+  "version": "0.28.2",
   "homepage": "http://nodegit.org",
   "keywords": [
     "libgit2",
@@ -28,22 +28,22 @@
   "main": "dist/nodegit.js",
   "repository": {
     "type": "git",
-    "url": "git://github.com/nodegit/nodegit.git"
+    "url": "git://github.com/pj-nodegit/nodegit.git"
   },
   "directories": {
     "build": "./build",
     "lib": "./lib"
   },
   "engines": {
-    "node": ">= 6"
+    "node": ">= 12.19.0 < 13 || >= 14.10.0"
   },
   "dependencies": {
     "fs-extra": "^7.0.0",
     "got": "^10.7.0",
     "json5": "^2.1.0",
     "lodash": "^4.17.14",
-    "nan": "^2.14.0",
-    "node-gyp": "^4.0.0",
+    "nan": "^2.14.1",
+    "node-gyp": "^7.1.2",
     "node-pre-gyp": "^0.13.0",
     "ramda": "^0.25.0",
     "tar-fs": "^1.16.3"
@@ -66,7 +66,7 @@
   "binary": {
     "module_name": "nodegit",
     "module_path": "./build/Release/",
-    "host": "https://axonodegit.s3.amazonaws.com/nodegit/pj-nodegit/"
+    "host": "https://axonodegit.s3.amazonaws.com/nodegit/nodegit/"
   },
   "scripts": {
     "babel": "babel --presets es2015 -d ./dist ./lib",
@@ -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",