Re-organized project's source.

Removed "GIT." prefix from error codes.

22 files changed, 82 insertions, 97 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c151e7..32793f6 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,7 @@ set(LUA_GIT2_SRC
 )
 
 if(${USE_PRE_GENERATED_BINDINGS})
-	set(LUA_GIT2_SRC pre_generated-git2.nobj.c)
+	set(LUA_GIT2_SRC src/pre_generated-git2.nobj.c)
 else()
 	# Generate Lua bindings.
 	GenLuaNativeObjects(LUA_GIT2_SRC)
diff --git a/git2.nobj.lua b/git2.nobj.lua
index 47e703a..a20a839 100644
--- a/git2.nobj.lua
+++ b/git2.nobj.lua
@@ -6,7 +6,7 @@ hide_meta_info = false, --true,
 
 include "git2.h",
 
-package "GIT" {
+-- Error codes
 const "SUCCESS"        { 0 },
 const "ERROR"          { -1 },
 const "ENOTOID"        { -2 },
@@ -23,25 +23,24 @@ const "EFLOCKFAIL"     { -12 },
 const "EZLIB"          { -13 },
 const "EBUSY"          { -14 },
 const "EBAREINDEX"     { -15 },
-},
 
 subfiles {
-"repository.nobj.lua",
-"rawobject.nobj.lua",
-"oid.nobj.lua",
-"database.nobj.lua",
-"database_backend.nobj.lua",
-"index.nobj.lua",
-"index_entry.nobj.lua",
-"error.nobj.lua",
-"object.nobj.lua",
-"blob.nobj.lua",
-"signature.nobj.lua",
-"commit.nobj.lua",
-"tree.nobj.lua",
-"tree_entry.nobj.lua",
-"tag.nobj.lua",
-"revwalk.nobj.lua",
+"src/repository.nobj.lua",
+"src/rawobject.nobj.lua",
+"src/oid.nobj.lua",
+"src/database.nobj.lua",
+"src/database_backend.nobj.lua",
+"src/index.nobj.lua",
+"src/index_entry.nobj.lua",
+"src/error.nobj.lua",
+"src/object.nobj.lua",
+"src/blob.nobj.lua",
+"src/signature.nobj.lua",
+"src/commit.nobj.lua",
+"src/tree.nobj.lua",
+"src/tree_entry.nobj.lua",
+"src/tag.nobj.lua",
+"src/revwalk.nobj.lua",
 },
 }
 
diff --git a/blob.nobj.lua b/src/blob.nobj.lua
index 9dcaf20..fbe213c 100644
--- a/blob.nobj.lua
+++ b/src/blob.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_blob Blob;
-]]
-
 object "Blob" {
+	c_source [[
+typedef git_blob Blob;
+]],
 	extends "Object",
 	constructor "new" {
 		var_in{"Repository *", "repo"},
diff --git a/commit.nobj.lua b/src/commit.nobj.lua
index ae99777..d82fbf1 100644
--- a/commit.nobj.lua
+++ b/src/commit.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_commit Commit;
-]]
-
 object "Commit" {
+	c_source [[
+typedef git_commit Commit;
+]],
 	extends "Object",
 	constructor "new" {
 		var_in{"Repository *", "repo"},
diff --git a/database.nobj.lua b/src/database.nobj.lua
index 0f65269..895a8a0 100644
--- a/database.nobj.lua
+++ b/src/database.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_odb Database;
-]]
-
 object "Database" {
+	c_source [[
+typedef git_odb Database;
+]],
 	constructor "new" {
 		var_out{"GitError", "err"},
 		c_source [[
diff --git a/database_backend.nobj.lua b/src/database_backend.nobj.lua
index 4a8d139..4837f59 100644
--- a/database_backend.nobj.lua
+++ b/src/database_backend.nobj.lua
@@ -18,7 +18,8 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
+object "DatabaseBackend" {
+	c_source [[
 //typedef struct RawObject RawObject;
 #include <git2/odb_backend.h>
 
@@ -161,9 +162,7 @@ static void database_backend_free_cb(git_odb_backend *backend)
 	DatabaseBackend_unref(lua_backend);
 }
 
-]]
-
-object "DatabaseBackend" {
+]],
 	constructor {
 		var_in{"lua_State *", "L"},
 		c_source [[
diff --git a/error.nobj.lua b/src/error.nobj.lua
index 3e41620..3e41620 100644
--- a/error.nobj.lua
+++ b/src/error.nobj.lua
diff --git a/index.nobj.lua b/src/index.nobj.lua
index d536563..35a35c6 100644
--- a/index.nobj.lua
+++ b/src/index.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_index Index;
-]]
-
 object "Index" {
+	c_source [[
+typedef git_index Index;
+]],
 	constructor "bare" {
 		var_in{"const char *", "index_path"},
 		var_out{"GitError", "err"},
diff --git a/index_entry.nobj.lua b/src/index_entry.nobj.lua
index e3b11b6..97ed382 100644
--- a/index_entry.nobj.lua
+++ b/src/index_entry.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_index_entry IndexEntry;
-]]
-
 object "IndexEntry" {
+	c_source [[
+typedef git_index_entry IndexEntry;
+]],
 	const "NAMEMASK" { 0x0fff },
 	const "STAGEMASK" { 0x3000 },
 	const "EXTENDED" { 0x4000 },
diff --git a/object.nobj.lua b/src/object.nobj.lua
index 2af52df..394aa9d 100644
--- a/object.nobj.lua
+++ b/src/object.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_object Object;
-]]
-
 object "Object" {
+	c_source [[
+typedef git_object Object;
+]],
 	dyn_caster {
 		caster_type = "switch",
 		value_function = "git_object_type",
diff --git a/oid.nobj.lua b/src/oid.nobj.lua
index 6de87bb..10f1b07 100644
--- a/oid.nobj.lua
+++ b/src/oid.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_oid OID;
-]]
-
 object "OID" {
+	c_source [[
+typedef git_oid OID;
+]],
 	userdata_type = 'simple',
 	constructor "str" {
     var_in{"const char *", "hex"},
diff --git a/pre_generated-git2.nobj.c b/src/pre_generated-git2.nobj.c
index 12b3e03..12b3e03 100644
--- a/pre_generated-git2.nobj.c
+++ b/src/pre_generated-git2.nobj.c
diff --git a/rawobject.nobj.lua b/src/rawobject.nobj.lua
index ec087e2..dad57e5 100644
--- a/rawobject.nobj.lua
+++ b/src/rawobject.nobj.lua
@@ -18,7 +18,8 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
+object "RawObject" {
+	c_source [[
 typedef struct RawObject {
 	git_rawobj git;
 	int ref;
@@ -54,32 +55,30 @@ static void RawObject_from_git_rawobj(lua_State *L, RawObject *raw, git_rawobj *
 	}
 }
 
-]]
-
-object "RawObject" {
+]],
 	userdata_type = 'embed',
 	default = 'NULL',
-	constructor "header" {
+	constructor "new" {
 		var_in{"const char *", "type"},
-		var_in{"size_t", "len"},
+		var_in{"const char *", "data"},
 		c_source [[
 	RawObject raw; /* temp. storage, this gets copied. */
 	${this} = &(raw);
-	raw.git.data = NULL;
-	raw.git.len = ${len};
 	raw.git.type = git_object_string2type(${type});
 	raw.ref = LUA_REFNIL;
+	RawObject_set_data_and_ref(L, &raw, ${data}, ${data}_len, ${data::idx});
 ]],
 	},
-	constructor "new" {
+	constructor "header" {
 		var_in{"const char *", "type"},
-		var_in{"const char *", "data"},
+		var_in{"size_t", "len"},
 		c_source [[
 	RawObject raw; /* temp. storage, this gets copied. */
 	${this} = &(raw);
+	raw.git.data = NULL;
+	raw.git.len = ${len};
 	raw.git.type = git_object_string2type(${type});
 	raw.ref = LUA_REFNIL;
-	RawObject_set_data_and_ref(L, &raw, ${data}, ${data}_len, ${data::idx});
 ]],
 	},
 	destructor "close" {
diff --git a/repository.nobj.lua b/src/repository.nobj.lua
index dbdef00..fbe0939 100644
--- a/repository.nobj.lua
+++ b/src/repository.nobj.lua
@@ -18,12 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_repository Repository;
-
-]]
-
 object "Repository" {
+	c_source [[
+typedef git_repository Repository;
+]],
 	constructor "open" {
 		var_in{"const char *", "path"},
 		var_out{"GitError", "err"},
diff --git a/revwalk.nobj.lua b/src/revwalk.nobj.lua
index 43395e4..ed5f44b 100644
--- a/revwalk.nobj.lua
+++ b/src/revwalk.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_revwalk RevWalk;
-]]
-
 object "RevWalk" {
+	c_source [[
+typedef git_revwalk RevWalk;
+]],
 	extends "Object",
 	const "SORT_NONE"        { 0x00 },
 	const "SORT_TOPOLOGICAL" { 0x01 },
diff --git a/signature.nobj.lua b/src/signature.nobj.lua
index 5f9eb9c..9dcd187 100644
--- a/signature.nobj.lua
+++ b/src/signature.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_signature Signature;
-]]
-
 object "Signature" {
+	c_source [[
+typedef git_signature Signature;
+]],
 	constructor {
 		c_call "Signature *" "git_signature_new"
 			{ "const char *", "name", "const char *", "email", "time_t", "time", "int", "offset" },
diff --git a/tag.nobj.lua b/src/tag.nobj.lua
index 1a81847..76d0100 100644
--- a/tag.nobj.lua
+++ b/src/tag.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_tag Tag;
-]]
-
 object "Tag" {
+	c_source [[
+typedef git_tag Tag;
+]],
 	extends "Object",
 	constructor "new" {
 		var_in{"Repository *", "repo"},
diff --git a/tree.nobj.lua b/src/tree.nobj.lua
index 4fc3e92..8b7ccc1 100644
--- a/tree.nobj.lua
+++ b/src/tree.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_tree Tree;
-]]
-
 object "Tree" {
+	c_source [[
+typedef git_tree Tree;
+]],
 	extends "Object",
 	constructor "new" {
 		var_in{"Repository *", "repo"},
diff --git a/tree_entry.nobj.lua b/src/tree_entry.nobj.lua
index 44ce9de..507ce20 100644
--- a/tree_entry.nobj.lua
+++ b/src/tree_entry.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_tree_entry TreeEntry;
-]]
-
 object "TreeEntry" {
+	c_source [[
+typedef git_tree_entry TreeEntry;
+]],
 	method "name" {
 		c_call "const char *" "git_tree_entry_name" {}
 	},
diff --git a/test_backend.lua b/tests/test_backend.lua
index 30e7212..98e46c9 100644
--- a/test_backend.lua
+++ b/tests/test_backend.lua
@@ -1,7 +1,7 @@
 #!/usr/bin/env lua
 
 local build_dir = arg[1]
-local git_path = arg[2] or "./test_rep/.git/"
+local git_path = arg[2] or "./tests/test_rep/.git/"
 -- Make it easier to test
 if ( build_dir ) then
     package.cpath = build_dir .. "?.so;" .. package.cpath
@@ -10,6 +10,7 @@ end
 require"git2"
 require"utils"
 
+print(dump(git2))
 local function dump_rawobj(obj)
 	print('dump RawObject:', obj)
 	if obj == nil then
@@ -43,18 +44,18 @@ on_read = function(oid)
 	print("------------------- read callback:", oid)
 	raw_obj = get_obj(oid)
 	if not raw_obj then
-		return nil, git2.GIT.ENOTFOUND
+		return nil, git2.ENOTFOUND
 	end
-	return raw_obj, git2.GIT.SUCCESS
+	return raw_obj, git2.SUCCESS
 end,
 on_read_header = function(oid)
 	local raw_obj = nil
 	print("------------------- read_header callback:", oid)
 	raw_obj = get_obj(oid)
 	if not raw_obj then
-		return nil, git2.GIT.ENOTFOUND
+		return nil, git2.ENOTFOUND
 	end
-	return raw_obj, git2.GIT.SUCCESS
+	return raw_obj, git2.SUCCESS
 end,
 on_write = function(raw_obj)
 	local oid = raw_obj:hash()
@@ -66,16 +67,16 @@ on_write = function(raw_obj)
 	local oid_str = tostring(oid)
 	-- put raw object in cache
 	obj_cache[oid_str] = raw_obj
-	return oid, git2.GIT.SUCCESS
+	return oid, git2.SUCCESS
 end,
 on_exists = function(oid)
 	local raw_obj = nil
 	print("------------------- exists callback:", oid)
 	raw_obj = get_obj(oid)
 	if not raw_obj then
-		return raw_obj, git2.GIT.ENOTFOUND
+		return raw_obj, git2.ENOTFOUND
 	end
-	return git2.GIT.SUCCESS
+	return git2.SUCCESS
 end,
 on_free = function()
 	print("------------------- free callback:")
@@ -84,7 +85,7 @@ end,
 
 local backend = git2.DatabaseBackend(cbs, 0)
 
---print('add backend:', assert(db:add_backend(backend)))
+print('add backend:', assert(db:add_backend(backend)))
 
 print('create test blob:')
 local raw_obj = git2.RawObject.new('blob',"any ol content will do")
@@ -119,6 +120,7 @@ else
 	print("Created repository with no backends from git repository:", git_path)
 end
 db = rep:database()
+backend = git2.DatabaseBackend(cbs, 0)
 print("add backend repository's database:", assert(db:add_backend(backend)))
 
 print()
diff --git a/test_rep.git.tbz b/tests/test_rep.git.tbz
index 6235845..6235845 100644
--- a/test_rep.git.tbz
+++ b/tests/test_rep.git.tbz
diff --git a/test_rep.lua b/tests/test_rep.lua
index bd9e626..9c25d25 100644
--- a/test_rep.lua
+++ b/tests/test_rep.lua
@@ -1,7 +1,7 @@
 #!/usr/bin/env lua
 
 local build_dir = arg[1]
-local git_path = arg[2] or "./test_rep/.git"
+local git_path = arg[2] or "./tests/test_rep/.git"
 -- Make it easier to test
 if ( build_dir ) then
     package.cpath = build_dir .. "?.so;" .. package.cpath