From 71381f1052c2da581a7c3ba5ac60451d2ef70e78 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Fri, 27 Sep 2013 17:42:13 -0500 Subject: [PATCH] ruby: add Commit class Signed-off-by: Felipe Contreras --- ruby.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ t/t9710-ruby.sh | 21 ++++++++++++ 2 files changed, 107 insertions(+) diff --git a/ruby.c b/ruby.c index 45111e678e..53afa32a42 100644 --- a/ruby.c +++ b/ruby.c @@ -1,12 +1,17 @@ #include "cache.h" #include "exec_cmd.h" #include "refs.h" +#include "object.h" +#include "commit.h" #undef NORETURN #undef PATH_SEP #include +static VALUE git_rb_object; +static VALUE git_rb_commit; + static inline VALUE sha1_to_str(const unsigned char *sha1) { return rb_str_new((const char *)sha1, 20); @@ -19,6 +24,18 @@ static inline VALUE cstr_to_str(const char *str) return rb_str_new2(str); } +static inline char *str_to_cstr(VALUE str) +{ + if (str == Qnil) + return NULL; + return RSTRING_PTR(str); +} + +static inline unsigned char *str_to_sha1(VALUE str) +{ + return (unsigned char *)str_to_cstr(str); +} + static VALUE git_rb_setup_git_directory(VALUE self) { int nongit_ok; @@ -91,8 +108,67 @@ static VALUE git_rb_get_sha1(VALUE self, VALUE name) return sha1_to_str(buf); } +static VALUE git_rb_object_get(VALUE class, VALUE id) +{ + struct object *object; + object = parse_object(str_to_sha1(id)); + return Data_Wrap_Struct(git_rb_object, NULL, NULL, object); +} + +static VALUE git_rb_commit_get(VALUE class, VALUE id) +{ + struct object *object; + object = parse_object(str_to_sha1(id)); + if (!object || object->type != OBJ_COMMIT) + return Qnil; + return Data_Wrap_Struct(git_rb_commit, NULL, NULL, object); +} + +static VALUE git_rb_object_sha1(VALUE self) +{ + struct object *object; + Data_Get_Struct(self, struct object, object); + return sha1_to_str(object->sha1); +} + +static VALUE git_rb_object_type(VALUE self) +{ + struct object *object; + Data_Get_Struct(self, struct object, object); + return INT2FIX(object->type); +} + +static VALUE git_rb_object_to_s(VALUE self) +{ + struct object *object; + Data_Get_Struct(self, struct object, object); + return rb_str_new2(sha1_to_hex(object->sha1)); +} + +static VALUE git_rb_commit_buffer(VALUE self) +{ + struct commit *commit; + Data_Get_Struct(self, struct commit, commit); + return cstr_to_str(commit->buffer); +} + static void git_ruby_init(void) { + VALUE mod; + + mod = rb_define_module("Git"); + + rb_define_global_const("OBJ_BAD", INT2FIX(OBJ_BAD)); + rb_define_global_const("OBJ_NONE", INT2FIX(OBJ_NONE)); + rb_define_global_const("OBJ_COMMIT", INT2FIX(OBJ_COMMIT)); + rb_define_global_const("OBJ_TREE", INT2FIX(OBJ_TREE)); + rb_define_global_const("OBJ_BLOB", INT2FIX(OBJ_BLOB)); + rb_define_global_const("OBJ_TAG", INT2FIX(OBJ_TAG)); + rb_define_global_const("OBJ_OFS_DELTA", INT2FIX(OBJ_OFS_DELTA)); + rb_define_global_const("OBJ_REF_DELTA", INT2FIX(OBJ_REF_DELTA)); + rb_define_global_const("OBJ_ANY", INT2FIX(OBJ_ANY)); + rb_define_global_const("OBJ_MAX", INT2FIX(OBJ_MAX)); + rb_define_global_function("setup_git_directory", git_rb_setup_git_directory, 0); rb_define_global_function("for_each_ref", git_rb_for_each_ref, 0); rb_define_global_function("dwim_ref", git_rb_dwim_ref, 1); @@ -100,6 +176,16 @@ static void git_ruby_init(void) rb_define_global_function("read_ref", git_rb_read_ref, 1); rb_define_global_function("peel_ref", git_rb_peel_ref, 1); rb_define_global_function("get_sha1", git_rb_get_sha1, 1); + + git_rb_object = rb_define_class_under(mod, "Object", rb_cData); + rb_define_singleton_method(git_rb_object, "get", git_rb_object_get, 1); + rb_define_method(git_rb_object, "sha1", git_rb_object_sha1, 0); + rb_define_method(git_rb_object, "type", git_rb_object_type, 0); + rb_define_method(git_rb_object, "to_s", git_rb_object_to_s, 0); + + git_rb_commit = rb_define_class_under(mod, "Commit", git_rb_object); + rb_define_singleton_method(git_rb_commit, "get", git_rb_commit_get, 1); + rb_define_method(git_rb_commit, "buffer", git_rb_commit_buffer, 0); } static int run_ruby_command(const char *cmd, int argc, const char **argv) diff --git a/t/t9710-ruby.sh b/t/t9710-ruby.sh index 37b89fa99c..d04c32abf6 100755 --- a/t/t9710-ruby.sh +++ b/t/t9710-ruby.sh @@ -87,4 +87,25 @@ test_expect_success 'test get_sha1()' ' test_cmp expected actual ' +test_expect_success 'test Object' ' + git ruby > actual <<-EOF && + object = Git::Object.get(get_sha1("HEAD")) + puts object, object.type == OBJ_COMMIT, sha1_to_hex(object.sha1) + EOF + git rev-parse -q --verify HEAD > expected && + echo "true" >> expected && + git rev-parse -q --verify HEAD >> expected && + test_cmp expected actual +' + +test_expect_success 'test Commit' ' + git ruby > actual <<-EOF && + commit = Git::Commit.get(get_sha1("HEAD")) + puts commit, commit.buffer + EOF + git rev-parse -q --verify HEAD > expected && + git cat-file commit HEAD >> expected && + test_cmp expected actual +' + test_done -- 2.32.0.93.g670b81a890