rugged 0.25.0b6 → 0.25.0b7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af6c929ae8035ca49fdd7945f2e36eedff07c1a7
-  data.tar.gz: f05f796386fd1f812f4dce21b958c6d1a801dfa6
+  metadata.gz: bc3490bf1a853d0f30e8c825dca468582cb12e2f
+  data.tar.gz: 9799cb94e85aaacd3aac5be5e2381acd65a1239a
 SHA512:
-  metadata.gz: 22902b9aad7497f1947a391c9ee0dd5d4780a268bf5edf8b3ce18bdbddc269e52b2c1d76a944acc0cc091ef4565dc0f5cb8aa4056fbccfa1d4df317d7ff03aab
-  data.tar.gz: 3654613b8a5f37afc667067a34ebdc898eca94b15b63c3714cb2d7166707cbd3a1f15b244f9899d12721d9dc3ce6f62b22e530e35a3c5701c6862fde908044aa
+  metadata.gz: 756066193b6fce22cd1a2af4818a58c785dbbee0026d1adb07082ba9af3772cead576bf7a5029ba8394d409d8cfdd25da5524ad173dfb6508ed943df3889dd68
+  data.tar.gz: 7ead1eb36914cf7c49decee943477ead775dc03927b3532e6436adbb544848eafa5ba38bddfc2489b60e37fc52087dcae9ead8151005415dacd9eba5d21a8ede

data/ext/rugged/rugged_patch.c

@@ -173,6 +173,13 @@ static VALUE rb_git_diff_patch_stat(VALUE self)
 	return rb_ary_new3(2, INT2FIX(additions), INT2FIX(deletions));
 }
 
+enum {
+	EXCLUDE_CONTEXT   = (1u << 0),
+	EXCLUDE_ADDITIONS = (1u << 1),
+	EXCLUDE_DELETIONS = (1u << 2),
+	EXCLUDE_EOFNL     = (1u << 3)
+};
+
 /*
  *  call-seq:
  *    patch.lines(options = {}) -> int
@@ -191,42 +198,84 @@ static VALUE rb_git_diff_patch_stat(VALUE self)
  *    Boolean value specifying that deletion line counts should be excluded from
  *    the returned total.
  *
+ *  :exclude_eofnl ::
+ *    Boolean value specifying that end-of-file newline change lines should
+ *    be excluded from the returned total.
+ *
  *  Returns the total number of lines in the patch, depending on the options
  *  specified.
  */
 static VALUE rb_git_diff_patch_lines(int argc, VALUE *argv, VALUE self)
 {
 	git_patch *patch;
-	size_t context_lines, additions, deletions;
-	size_t total_out;
+	size_t lines = 0;
 	VALUE rb_options;
 	Data_Get_Struct(self, git_patch, patch);
 
-	context_lines = 0;
-	additions = 0;
-	deletions = 0;
-
-	git_patch_line_stats(&context_lines, &additions, &deletions, patch);
-
-	total_out = context_lines + additions + deletions;
+	int options = 0;
 
 	rb_scan_args(argc, argv, "0:", &rb_options);
 	if (!NIL_P(rb_options)) {
 		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("exclude_context")))) {
-			total_out -= context_lines;
+			options |= EXCLUDE_CONTEXT;
 		}
 
 		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("exclude_additions")))) {
-			total_out -= additions;
+			options |= EXCLUDE_ADDITIONS;
 		}
 
 		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("exclude_deletions")))) {
-			total_out -= deletions;
+			options |= EXCLUDE_DELETIONS;
+		}
+
+		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("exclude_eofnl")))) {
+			options |= EXCLUDE_EOFNL;
 		}
 	}
 
-	return INT2FIX(total_out);
+	if (options == 0) {
+		size_t i = 0, hunks_count = git_patch_num_hunks(patch);
+		for (i = 0; i < hunks_count; ++i) {
+			lines += git_patch_num_lines_in_hunk(patch, i);
+		}
+	} else {
+		size_t i = 0, hunks_count = git_patch_num_hunks(patch);
+		for (i = 0; i < hunks_count; ++i) {
+			size_t lines_in_hunk = git_patch_num_lines_in_hunk(patch, i), l = 0;
+
+			for (l = 0; l < lines_in_hunk; ++l) {
+				const git_diff_line *line;
+				rugged_exception_check(
+					git_patch_get_line_in_hunk(&line, patch, i, l)
+				);
+
+				switch (line->origin) {
+				case GIT_DIFF_LINE_CONTEXT:
+					if (options & EXCLUDE_CONTEXT) continue;
+					break;
+
+				case GIT_DIFF_LINE_ADDITION:
+					if (options & EXCLUDE_ADDITIONS) continue;
+					break;
+
+				case GIT_DIFF_LINE_DELETION:
+					if (options & EXCLUDE_DELETIONS) continue;
+					break;
+
+				case GIT_DIFF_LINE_ADD_EOFNL:
+				case GIT_DIFF_LINE_DEL_EOFNL:
+					if (options & EXCLUDE_EOFNL) continue;
+					break;
+				}
+
+				lines += 1;
+			}
+		}
+	}
+
+	return INT2FIX(lines);
 }
+
 /*
  *  call-seq:
  *    patch.bytesize(options = {}) -> int
@@ -256,21 +305,19 @@ static VALUE rb_git_diff_patch_bytesize(int argc, VALUE *argv, VALUE self)
 	int include_context, include_hunk_headers, include_file_headers;
 	Data_Get_Struct(self, git_patch, patch);
 
-	include_context = 1;
-	include_hunk_headers = 1;
-	include_file_headers = 1;
+	include_context = include_hunk_headers = include_file_headers = 1;
 
 	rb_scan_args(argc, argv, "0:", &rb_options);
 	if (!NIL_P(rb_options)) {
-		if (rb_hash_aref(rb_options, CSTR2SYM("include_context")) == Qfalse) {
+		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("exclude_context")))) {
 			include_context = 0;
 		}
 
-		if (rb_hash_aref(rb_options, CSTR2SYM("include_hunk_headers")) == Qfalse) {
+		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("exclude_hunk_headers")))) {
 			include_hunk_headers = 0;
 		}
 
-		if (rb_hash_aref(rb_options, CSTR2SYM("include_file_headers")) == Qfalse) {
+		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("exclude_file_headers")))) {
 			include_file_headers = 0;
 		}
 	}
@@ -286,20 +333,36 @@ static int patch_print_cb(
 	const git_diff_line *line,
 	void *payload)
 {
-	VALUE rb_str = (VALUE)payload;
+	VALUE rb_buffer = (VALUE)payload;
 
 	switch (line->origin) {
 		case GIT_DIFF_LINE_CONTEXT:
 		case GIT_DIFF_LINE_ADDITION:
 		case GIT_DIFF_LINE_DELETION:
-			rb_str_cat(rb_str, &line->origin, 1);
+			rb_ary_push(rb_buffer, rb_str_new(&line->origin, 1));
 	}
 
-	rb_str_cat(rb_str, line->content, line->content_len);
+	rb_ary_push(rb_buffer, rb_str_new(line->content, line->content_len));
 
 	return GIT_OK;
 }
 
+static int patch_print_header_cb(
+	const git_diff_delta *delta,
+	const git_diff_hunk *hunk,
+	const git_diff_line *line,
+	void *payload)
+{
+	VALUE rb_buffer = (VALUE)payload;
+
+	if (line->origin == GIT_DIFF_LINE_FILE_HDR) {
+		rb_ary_push(rb_buffer, rb_str_new(line->content, line->content_len));
+		return GIT_OK;
+	} else {
+		return GIT_ITEROVER;
+	}
+}
+
 /*
  *  call-seq:
  *    patch.to_s -> str
@@ -309,14 +372,35 @@ static int patch_print_cb(
 static VALUE rb_git_diff_patch_to_s(VALUE self)
 {
 	git_patch *patch;
-	VALUE rb_str = rb_str_new(NULL, 0);
+	VALUE rb_buffer = rb_ary_new();
 	Data_Get_Struct(self, git_patch, patch);
 
-	rugged_exception_check(git_patch_print(patch, patch_print_cb, (void*)rb_str));
+	rugged_exception_check(git_patch_print(patch, patch_print_cb, (void*)rb_buffer));
 
-	return rb_str;
+	return rb_ary_join(rb_buffer, Qnil);
 }
 
+/*
+ *  call-seq:
+ *    patch.header -> str
+ *
+ *  Returns only the header of the patch as a string.
+ */
+static VALUE rb_git_diff_patch_header(VALUE self)
+{
+	git_patch *patch;
+	int error = 0;
+	VALUE rb_buffer = rb_ary_new();
+	Data_Get_Struct(self, git_patch, patch);
+
+	error = git_patch_print(patch, patch_print_header_cb, (void*)rb_buffer);
+	if (error && error != GIT_ITEROVER)
+		rugged_exception_check(error);
+
+	return rb_ary_join(rb_buffer, Qnil);
+}
+
+
 void Init_rugged_patch(void)
 {
 	rb_cRuggedPatch = rb_define_class_under(rb_mRugged, "Patch", rb_cObject);
@@ -329,6 +413,7 @@ void Init_rugged_patch(void)
 
 	rb_define_method(rb_cRuggedPatch, "delta", rb_git_diff_patch_delta, 0);
 
+	rb_define_method(rb_cRuggedPatch, "header", rb_git_diff_patch_header, 0);
 	rb_define_method(rb_cRuggedPatch, "to_s", rb_git_diff_patch_to_s, 0);
 
 	rb_define_method(rb_cRuggedPatch, "each_hunk", rb_git_diff_patch_each_hunk, 0);

data/lib/rugged/version.rb

@@ -1,3 +1,3 @@
 module Rugged
-  Version = VERSION = '0.25.0b6'
+  Version = VERSION = '0.25.0b7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 0.25.0b6
+  version: 0.25.0b7
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler