Merge pull request nodegit#34 from moneal/0.0.6

tbranyen · tbranyen · commit e580b7bb7c50 · 2011-12-14T15:54:25.000-08:00
Node 0.6x fixes by a beautiful man
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 NODE_JS = $(if $(shell test -f /usr/bin/nodejs && echo "true"),nodejs,node)
 NODE_BLD = node-waf
-NODE_LIB_PATH = ~/.node_libraries
+NODE_LIB_PATH = ~/.node_modules
 
 BASE = .
 INSTALL_PATH = $(NODE_LIB_PATH)/nodegit
@@ -22,11 +22,11 @@ debug:
 
 install:
 	@@mkdir -p $(INSTALL_PATH)
-	@@mkdir -p $(INSTALL_PATH)/build/default
+	@@mkdir -p $(INSTALL_PATH)/build/Release
 	@@mkdir -p $(INSTALL_PATH)/lib
 	@@mkdir -p $(INSTALL_PATH)/vendor
 
-	@@cp -f $(BASE)/build/default/nodegit.node $(INSTALL_PATH)/build/default/nodegit.node
+	@@cp -f $(BASE)/build/Release/nodegit.node $(INSTALL_PATH)/build/Release/nodegit.node
 	@@cp -f $(BASE)/lib/* $(INSTALL_PATH)/lib/
 	@@cp -rf $(BASE)/vendor/* $(INSTALL_PATH)/vendor/
 	@@cp -f $(BASE)/package.json $(INSTALL_PATH)/
diff --git a/include/blob.h b/include/blob.h
@@ -137,7 +137,7 @@ class GitBlob : public ObjectWrap {
      * Returns:
      *   completion code integer
      */
-    static int EIO_Lookup(eio_req* req);
+    static void EIO_Lookup(eio_req* req);
     /**
      * Function: EIO_AfterLookup
      *
diff --git a/include/commit.h b/include/commit.h
@@ -8,7 +8,6 @@
 
 #include <v8.h>
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
@@ -23,7 +22,7 @@ using namespace v8;
 /**
  * Class wrapper for libgit2 git_commit
  */
-class GitCommit : public EventEmitter {
+class GitCommit : public ObjectWrap {
   public:
     /**
      * v8::FunctionTemplate used to create Node.js constructor
@@ -59,7 +58,7 @@ class GitCommit : public EventEmitter {
     static Handle<Value> New(const Arguments& args);
 
     static Handle<Value> Lookup(const Arguments& args);
-    static int EIO_Lookup(eio_req *req);
+    static void EIO_Lookup(eio_req *req);
     static int EIO_AfterLookup(eio_req *req);
 
     static Handle<Value> Close(const Arguments& args);
diff --git a/include/error.h b/include/error.h
@@ -7,7 +7,6 @@
 #define ERROR_H
 
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
diff --git a/include/index.h b/include/index.h
@@ -7,7 +7,6 @@
 #define INDEX_H
 
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
diff --git a/include/object.h b/include/object.h
@@ -7,7 +7,6 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 
 #include <v8.h>
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
@@ -19,7 +18,7 @@ using namespace node;
 /**
  * Class wrapper for libgit2 git_object
  */
-class GitObject : public EventEmitter {
+class GitObject : public ObjectWrap {
   public:
     /**
      * v8::FunctionTemplate used to create Node.js constructor
diff --git a/include/odb.h b/include/odb.h
@@ -7,7 +7,6 @@
 #define ODB_H
 
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
diff --git a/include/odb_backend.h b/include/odb_backend.h
@@ -7,7 +7,6 @@
 #define ODB_BACKEND_H
 
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
diff --git a/include/oid.h b/include/oid.h
@@ -7,14 +7,13 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 
 #include <v8.h>
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
 using namespace node;
 using namespace v8;
 
-class GitOid : public EventEmitter {
+class GitOid : public ObjectWrap {
   public:
     static Persistent<FunctionTemplate> constructor_template;
     static void Initialize (Handle<v8::Object> target);
diff --git a/include/reference.h b/include/reference.h
@@ -7,7 +7,6 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 
 #include <v8.h>
 #include <node.h>
-#include <node_events.h>
 #include <string>
 
 #include "../vendor/libgit2/include/git2.h"
@@ -18,7 +17,7 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 using namespace node;
 using namespace v8;
 
-class GitReference : public EventEmitter {
+class GitReference : public ObjectWrap {
   public:
     static Persistent<FunctionTemplate> constructor_template;
     static void Initialize(Handle<v8::Object> target);
@@ -33,7 +32,7 @@ class GitReference : public EventEmitter {
     static Handle<Value> New(const Arguments& args);
 
     static Handle<Value> Lookup(const Arguments& args);
-    static int EIO_Lookup(eio_req* req);
+    static void EIO_Lookup(eio_req* req);
     static int EIO_AfterLookup(eio_req* req);
 
     static Handle<Value> Oid(const Arguments& args);
diff --git a/include/repo.h b/include/repo.h
@@ -7,7 +7,6 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 
 #include <v8.h>
 #include <node.h>
-#include <node_events.h>
 #include <string>
 
 #include "../vendor/libgit2/include/git2.h"
@@ -17,7 +16,7 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 using namespace node;
 using namespace v8;
 
-class GitRepo : public EventEmitter {
+class GitRepo : public ObjectWrap {
   public:
     static Persistent<FunctionTemplate> constructor_template;
     static void Initialize(Handle<v8::Object> target);
@@ -43,7 +42,7 @@ class GitRepo : public EventEmitter {
     static Handle<Value> New(const Arguments& args);
 
     static Handle<Value> Open(const Arguments& args);
-    static int EIO_Open(eio_req* req);
+    static void EIO_Open(eio_req* req);
     static int EIO_AfterOpen(eio_req* req);
 
     static Handle<Value> Lookup(const Arguments& args);
@@ -53,7 +52,7 @@ class GitRepo : public EventEmitter {
     static Handle<Value> Free(const Arguments& args);
 
     static Handle<Value> Init(const Arguments& args);
-    static int EIO_Init(eio_req* req);
+    static void EIO_Init(eio_req* req);
     static int EIO_AfterInit(eio_req* req);
 
   private:
diff --git a/include/revwalk.h b/include/revwalk.h
@@ -7,7 +7,6 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 
 #include <v8.h>
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
@@ -17,7 +16,7 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 using namespace node;
 using namespace v8;
 
-class GitRevWalk : public EventEmitter {
+class GitRevWalk : public ObjectWrap {
   public:
     static Persistent<FunctionTemplate> constructor_template;
     static void Initialize(Handle<v8::Object> target);
@@ -42,7 +41,7 @@ class GitRevWalk : public EventEmitter {
     static Handle<Value> Hide(const Arguments& args);
 
     static Handle<Value> Next(const Arguments& args);
-    static int EIO_Next(eio_req* req);
+    static void EIO_Next(eio_req* req);
     static int EIO_AfterNext(eio_req* req);
 
     static Handle<Value> Sorting(const Arguments& args);
diff --git a/include/sig.h b/include/sig.h
@@ -7,7 +7,6 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 
 #include <v8.h>
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
@@ -16,7 +15,7 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 using namespace v8;
 using namespace node;
 
-class GitSig : public EventEmitter {
+class GitSig : public ObjectWrap {
   public:
     static Persistent<FunctionTemplate> constructor_template;
     static void Initialize(Handle<v8::Object> target);
diff --git a/include/tag.h b/include/tag.h
@@ -7,7 +7,6 @@
 #define TAG_H
 
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
diff --git a/include/tree.h b/include/tree.h
@@ -7,7 +7,6 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 
 #include <v8.h>
 #include <node.h>
-#include <node_events.h>
 #include <string>
 
 #include "../vendor/libgit2/include/git2.h"
@@ -21,7 +20,7 @@ using namespace node;
 /**
  * Class wrapper for libgit2 git_tree
  */
-class GitTree : public EventEmitter {
+class GitTree : public ObjectWrap {
   public:
     /**
      * v8::FunctionTemplate used to create Node.js constructor
@@ -98,10 +97,10 @@ class GitTree : public EventEmitter {
     static int EIO_AfterLookup(eio_req *req);
     static Handle<Value> EntryCount(const Arguments& args);
     static Handle<Value> EntryByIndex(const Arguments& args);
-    static int EIO_EntryByIndex(eio_req *req);
+    static void EIO_EntryByIndex(eio_req *req);
     static int EIO_AfterEntryByIndex(eio_req *req);
     static Handle<Value> EntryByName(const Arguments& args);
-    static int EIO_EntryByName(eio_req *req);
+    static void EIO_EntryByName(eio_req *req);
     static int EIO_AfterEntryByName(eio_req *req);
     static Handle<Value> SortEntries(const Arguments& args);
     static Handle<Value> ClearEntries(const Arguments& args);
diff --git a/include/tree_entry.h b/include/tree_entry.h
@@ -7,7 +7,6 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 
 #include <v8.h>
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
@@ -22,7 +21,7 @@ using namespace node;
 /**
  * Class wrapper for libgit2 git_tree_entry
  */
-class GitTreeEntry : EventEmitter {
+class GitTreeEntry : ObjectWrap {
   public:
     /**
      * v8::FunctionTemplate used to create Node.js constructor
diff --git a/lib/index.js b/lib/index.js
@@ -24,6 +24,6 @@ exports.tree = require("./tree.js").tree;
 exports.entry = require("./tree_entry.js").entry;
 
 // Assign raw api to module
-exports.raw = require("../build/default/nodegit");
+exports.raw = require("../build/Release/nodegit");
 // Set version
 exports.version = "0.0.6";
diff --git a/src/base.cc b/src/base.cc
@@ -4,7 +4,6 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 
 #include <v8.h>
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
diff --git a/src/blob.cc b/src/blob.cc
@@ -111,13 +111,12 @@ Handle<Value> GitBlob::Lookup(const Arguments& args) {
   return scope.Close( Undefined() );
 }
 
-int GitBlob::EIO_Lookup(eio_req* req) {
+void GitBlob::EIO_Lookup(eio_req* req) {
   lookup_request* ar = static_cast<lookup_request* >(req->data);
 
   git_oid oid = ar->oid->GetValue();
   ar->err = ar->blob->Lookup(ar->repo->GetValue(), &oid);
 
-  return 0;
 }
 
 int GitBlob::EIO_AfterLookup(eio_req* req) {
diff --git a/src/commit.cc b/src/commit.cc
@@ -6,7 +6,6 @@
 #include <string.h>
 #include <v8.h>
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
@@ -147,13 +146,12 @@ Handle<Value> GitCommit::Lookup(const Arguments& args) {
   return scope.Close( Undefined() );
 }
 
-int GitCommit::EIO_Lookup(eio_req *req) {
+void GitCommit::EIO_Lookup(eio_req *req) {
   lookup_request *ar = static_cast<lookup_request *>(req->data);
 
   git_oid oid = ar->oid->GetValue();
   ar->err = ar->commit->Lookup(ar->repo->GetValue(), &oid);
 
-  return 0;
 }
 
 int GitCommit::EIO_AfterLookup(eio_req *req) {
diff --git a/src/error.cc b/src/error.cc
@@ -5,7 +5,6 @@
 
 #include <v8.h>
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
diff --git a/src/object.cc b/src/object.cc
@@ -4,7 +4,6 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 
 #include <v8.h>
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
diff --git a/src/oid.cc b/src/oid.cc
@@ -4,7 +4,6 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 
 #include <v8.h>
 #include <node.h>
-#include <node_events.h>
 
 #include "../vendor/libgit2/include/git2.h"
 
diff --git a/src/reference.cc b/src/reference.cc
@@ -4,7 +4,6 @@ Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
 
 #include <v8.h>
 #include <node.h>
-#include <node_events.h>
 #include <string>
 
 #include "../vendor/libgit2/include/git2.h"
@@ -94,14 +93,13 @@ Handle<Value> GitReference::Lookup(const Arguments& args) {
   return scope.Close( Undefined() );
 }
 
-int GitReference::EIO_Lookup(eio_req *req) {
+void GitReference::EIO_Lookup(eio_req *req) {
   lookup_request *ar = static_cast<lookup_request *>(req->data);
 
   git_repository* repo = ar->repo->GetValue();
 
   ar->err = ar->ref->Lookup(repo, ar->name.c_str());
 
-  return 0;
 }
 
 int GitReference::EIO_AfterLookup(eio_req *req) {
diff --git a/src/repo.cc b/src/repo.cc
diff --git a/src/revwalk.cc b/src/revwalk.cc
diff --git a/src/sig.cc b/src/sig.cc
diff --git a/src/tree.cc b/src/tree.cc
diff --git a/src/tree_entry.cc b/src/tree_entry.cc
diff --git a/test/index.js b/test/index.js

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ class GitBlob : public ObjectWrap {`
`137`	`137`	`* Returns:`
`138`	`138`	`* completion code integer`
`139`	`139`	`*/`
`140`		`- static int EIO_Lookup(eio_req* req);`
	`140`	`+ static void EIO_Lookup(eio_req* req);`
`141`	`141`	`/**`
`142`	`142`	`* Function: EIO_AfterLookup`
`143`	`143`	`*`