Added blobs

Tim Branyen · tbranyen · commit 09c72e6839d7 · 2011-02-25T01:18:01.000-05:00
diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "vendor/rimraf"]
 	path = vendor/rimraf
 	url = git://github.com/isaacs/rimraf.git
-[submodule "vendor/libgit2"]
-	path = vendor/libgit2
-	url = git://github.com/libgit2/libgit2.git
diff --git a/src/blob.cc b/src/blob.cc
@@ -0,0 +1,57 @@
+/*
+Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
+*/
+
+#include <v8.h>
+#include <node.h>
+#include <node_events.h>
+
+#include <git2.h>
+
+#include "repo.h"
+#include "blob.h"
+
+using namespace v8;
+using namespace node;
+
+void Blob::Initialize (Handle<v8::Object> target) {
+  HandleScope scope;
+
+  Local<FunctionTemplate> t = FunctionTemplate::New(New);
+  
+  constructor_template = Persistent<FunctionTemplate>::New(t);
+  constructor_template->InstanceTemplate()->SetInternalFieldCount(1);
+  constructor_template->SetClassName(String::NewSymbol("Blob"));
+
+  target->Set(String::NewSymbol("Blob"), constructor_template->GetFunction());
+}
+
+git_blob* Blob::GetValue() {
+  return this->blob;
+}
+
+void Blob::SetValue(git_blob* blob) {
+  this->blob = blob;
+}
+
+int Blob::New(git_repository* repo) {
+  return git_blob_new(&this->blob, repo);
+}
+
+Handle<Value> Blob::New(const Arguments& args) {
+  HandleScope scope;
+
+  Blob *blob = new Blob();
+
+  if(args.Length() == 0 || !args[0]->IsObject()) {
+    return ThrowException(Exception::Error(String::New("Repo is required and must be an Object.")));
+  }
+
+  Repo *repo = ObjectWrapper::Unwrap<Repo>(args[0]);
+  int err = blob->New(repo);
+    
+  blob->Wrap(args.This());
+
+  return args.This();
+}
+Persistent<FunctionTemplate> Blob::constructor_template;
diff --git a/src/blob.h b/src/blob.h
@@ -0,0 +1,38 @@
+/*
+Copyright (c) 2011, Tim Branyen @tbranyen <tim@tabdeveloper.com>
+*/
+
+#ifndef BLOB_H
+#define BLOB_H
+
+#include <v8.h>
+#include <node.h>
+#include <node_events.h>
+
+#include <git2.h>
+
+#include "repo.h"
+
+using namespace v8;
+using namespace node;
+
+class Blob : public EventEmitter {
+  public:
+    static Persistent<FunctionTemplate> constructor_template;
+    static void Initialize(Handle<v8::Object> target);
+    // Synchronous
+    int New(git_blob **blob, git_repository *repo)
+    git_blob* GetValue();
+    void SetValue(git_blob* blob);
+
+  protected:
+    Blob() {};
+    ~Blob() {};
+
+    static Handle<Value> New(const Arguments& args);
+
+  private:
+    git_blob *blob;
+};
+
+#endif
diff --git a/src/commit.cc b/src/commit.cc
@@ -34,6 +34,10 @@ git_commit* Commit::GetValue() {
   return this->commit;
 }
 
+void Commit::SetValue(git_commit* commit) {
+  this->commit = commit;
+}
+
 int Commit::Lookup(Repo *repo, Oid *oid) {
   return git_commit_lookup(&this->commit, repo->GetValue(), oid->GetValue());
 }
diff --git a/src/commit.h b/src/commit.h
@@ -26,6 +26,7 @@ class Commit : public EventEmitter {
     int Lookup(Repo *repo, Oid *oid);
     // Synchronous
     git_commit* GetValue();
+    void SetValue(git_commit* commit);
 
   protected:
     Commit() {}
diff --git a/wscript b/wscript
@@ -2,10 +2,17 @@ import Options, Utils
 from os import system
 from os.path import exists, abspath
 
+VERSION = '0.0.1'
+APPNAME = 'nodegit2'
+srcdir = '.'
+blddir = 'build'
+
 def set_options(opt):
+  opt.tool_options('gcc')
   opt.tool_options('compiler_cxx')
 
 def configure(conf):
+  conf.check_tool('gcc')
   conf.check_tool('compiler_cxx')
   conf.check_tool('node_addon')
 
@@ -19,9 +26,11 @@ def configure(conf):
     #Popen('python waf configure build-static', shell=True).wait()
 
 def build(bld):
-  system('cd vendor/libgit2/; python waf configure build-static')
+  #libgit2 = bld.new_task_gen('wafadmin')
+  #libgit2.features = 'waf configure build-static'
+  #libgit2.target = 'libgit2'
 
   obj = bld.new_task_gen('cxx', 'shlib', 'node_addon')
   obj.target = 'nodegit2'
   obj.source = 'src/base.cc src/error.cc src/reference.cc src/repo.cc src/commit.cc src/oid.cc src/revwalk.cc'
-  obj.uselib = 'GIT2'
+  #obj.uselib_local = 'libgit2'

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,10 @@ git_commit* Commit::GetValue() {`
`34`	`34`	`return this->commit;`
`35`	`35`	`}`
`36`	`36`
	`37`	`+void Commit::SetValue(git_commit* commit) {`
	`38`	`+ this->commit = commit;`
	`39`	`+}`
	`40`	`+`
`37`	`41`	`int Commit::Lookup(Repo repo, Oid oid) {`
`38`	`42`	`return git_commit_lookup(&this->commit, repo->GetValue(), oid->GetValue());`
`39`	`43`	`}`