rugged 0.24.6.1 → 0.25.0

data/vendor/libgit2/src/zstream.c

@@ -21,27 +21,38 @@ static int zstream_seterr(git_zstream *zs)
 	if (zs->zerr == Z_MEM_ERROR)
 		giterr_set_oom();
 	else if (zs->z.msg)
-		giterr_set(GITERR_ZLIB, zs->z.msg);
+		giterr_set_str(GITERR_ZLIB, zs->z.msg);
 	else
 		giterr_set(GITERR_ZLIB, "Unknown compression error");
 
 	return -1;
 }
 
-int git_zstream_init(git_zstream *zstream)
+int git_zstream_init(git_zstream *zstream, git_zstream_t type)
 {
-	zstream->zerr = deflateInit(&zstream->z, Z_DEFAULT_COMPRESSION);
+	zstream->type = type;
+
+	if (zstream->type == GIT_ZSTREAM_INFLATE)
+		zstream->zerr = inflateInit(&zstream->z);
+	else
+		zstream->zerr = deflateInit(&zstream->z, Z_DEFAULT_COMPRESSION);
 	return zstream_seterr(zstream);
 }
 
 void git_zstream_free(git_zstream *zstream)
 {
-	deflateEnd(&zstream->z);
+	if (zstream->type == GIT_ZSTREAM_INFLATE)
+		inflateEnd(&zstream->z);
+	else
+		deflateEnd(&zstream->z);
 }
 
 void git_zstream_reset(git_zstream *zstream)
 {
-	deflateReset(&zstream->z);
+	if (zstream->type == GIT_ZSTREAM_INFLATE)
+		inflateReset(&zstream->z);
+	else
+		deflateReset(&zstream->z);
 	zstream->in = NULL;
 	zstream->in_len = 0;
 	zstream->zerr = Z_STREAM_END;
@@ -75,6 +86,11 @@ int git_zstream_get_output(void *out, size_t *out_len, git_zstream *zstream)
 	int zflush = Z_FINISH;
 	size_t out_remain = *out_len;
 
+	if (zstream->in_len && zstream->zerr == Z_STREAM_END) {
+		giterr_set(GITERR_ZLIB, "zlib input had trailing garbage");
+		return -1;
+	}
+
 	while (out_remain > 0 && zstream->zerr != Z_STREAM_END) {
 		size_t out_queued, in_queued, out_used, in_used;
 
@@ -97,7 +113,10 @@ int git_zstream_get_output(void *out, size_t *out_len, git_zstream *zstream)
 		out_queued = (size_t)zstream->z.avail_out;
 
 		/* compress next chunk */
-		zstream->zerr = deflate(&zstream->z, zflush);
+		if (zstream->type == GIT_ZSTREAM_INFLATE)
+			zstream->zerr = inflate(&zstream->z, zflush);
+		else
+			zstream->zerr = deflate(&zstream->z, zflush);
 
 		if (zstream->zerr == Z_STREAM_ERROR)
 			return zstream_seterr(zstream);
@@ -120,12 +139,12 @@ int git_zstream_get_output(void *out, size_t *out_len, git_zstream *zstream)
 	return 0;
 }
 
-int git_zstream_deflatebuf(git_buf *out, const void *in, size_t in_len)
+static int zstream_buf(git_buf *out, const void *in, size_t in_len, git_zstream_t type)
 {
 	git_zstream zs = GIT_ZSTREAM_INIT;
 	int error = 0;
 
-	if ((error = git_zstream_init(&zs)) < 0)
+	if ((error = git_zstream_init(&zs, type)) < 0)
 		return error;
 
 	if ((error = git_zstream_set_input(&zs, in, in_len)) < 0)
@@ -154,3 +173,13 @@ done:
 	git_zstream_free(&zs);
 	return error;
 }
+
+int git_zstream_deflatebuf(git_buf *out, const void *in, size_t in_len)
+{
+	return zstream_buf(out, in, in_len, GIT_ZSTREAM_DEFLATE);
+}
+
+int git_zstream_inflatebuf(git_buf *out, const void *in, size_t in_len)
+{
+	return zstream_buf(out, in, in_len, GIT_ZSTREAM_INFLATE);
+}

data/vendor/libgit2/src/zstream.h

@@ -12,8 +12,14 @@
 #include "common.h"
 #include "buffer.h"
 
+typedef enum {
+	GIT_ZSTREAM_INFLATE,
+	GIT_ZSTREAM_DEFLATE,
+} git_zstream_t;
+
 typedef struct {
 	z_stream z;
+	git_zstream_t type;
 	const char *in;
 	size_t in_len;
 	int zerr;
@@ -21,7 +27,7 @@ typedef struct {
 
 #define GIT_ZSTREAM_INIT {{0}}
 
-int git_zstream_init(git_zstream *zstream);
+int git_zstream_init(git_zstream *zstream, git_zstream_t type);
 void git_zstream_free(git_zstream *zstream);
 
 int git_zstream_set_input(git_zstream *zstream, const void *in, size_t in_len);
@@ -35,5 +41,6 @@ bool git_zstream_done(git_zstream *zstream);
 void git_zstream_reset(git_zstream *zstream);
 
 int git_zstream_deflatebuf(git_buf *out, const void *in, size_t in_len);
+int git_zstream_inflatebuf(git_buf *out, const void *in, size_t in_len);
 
 #endif /* INCLUDE_zstream_h__ */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 0.24.6.1
+  version: 0.25.0
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,50 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 description: |
   Rugged is a Ruby bindings to the libgit2 linkable C Git library. This is
   for testing and using the libgit2 library in a language that is awesome.
@@ -62,9 +62,30 @@ extensions:
 - ext/rugged/extconf.rb
 extra_rdoc_files: []
 files:
-- LICENSE
 - README.md
-- ext/rugged/extconf.rb
+- LICENSE
+- lib/rugged/attributes.rb
+- lib/rugged/blob.rb
+- lib/rugged/branch.rb
+- lib/rugged/commit.rb
+- lib/rugged/console.rb
+- lib/rugged/credentials.rb
+- lib/rugged/diff/delta.rb
+- lib/rugged/diff/hunk.rb
+- lib/rugged/diff/line.rb
+- lib/rugged/diff.rb
+- lib/rugged/index.rb
+- lib/rugged/object.rb
+- lib/rugged/patch.rb
+- lib/rugged/reference.rb
+- lib/rugged/remote.rb
+- lib/rugged/repository.rb
+- lib/rugged/submodule_collection.rb
+- lib/rugged/tag.rb
+- lib/rugged/tree.rb
+- lib/rugged/version.rb
+- lib/rugged/walker.rb
+- lib/rugged.rb
 - ext/rugged/rugged.c
 - ext/rugged/rugged.h
 - ext/rugged/rugged_backend.c
@@ -97,72 +118,12 @@ files:
 - ext/rugged/rugged_tag.c
 - ext/rugged/rugged_tag_collection.c
 - ext/rugged/rugged_tree.c
-- lib/rugged.rb
-- lib/rugged/attributes.rb
-- lib/rugged/blob.rb
-- lib/rugged/branch.rb
-- lib/rugged/commit.rb
-- lib/rugged/console.rb
-- lib/rugged/credentials.rb
-- lib/rugged/diff.rb
-- lib/rugged/diff/delta.rb
-- lib/rugged/diff/hunk.rb
-- lib/rugged/diff/line.rb
-- lib/rugged/index.rb
-- lib/rugged/object.rb
-- lib/rugged/patch.rb
-- lib/rugged/reference.rb
-- lib/rugged/remote.rb
-- lib/rugged/repository.rb
-- lib/rugged/submodule_collection.rb
-- lib/rugged/tag.rb
-- lib/rugged/tree.rb
-- lib/rugged/version.rb
-- lib/rugged/walker.rb
-- vendor/libgit2/AUTHORS
-- vendor/libgit2/CMakeLists.txt
-- vendor/libgit2/COPYING
-- vendor/libgit2/Makefile.embed
 - vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake
 - vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake
 - vendor/libgit2/cmake/Modules/FindGSSAPI.cmake
 - vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake
 - vendor/libgit2/cmake/Modules/FindIconv.cmake
 - vendor/libgit2/cmake/Modules/FindSecurity.cmake
-- vendor/libgit2/deps/http-parser/LICENSE-MIT
-- vendor/libgit2/deps/http-parser/http_parser.c
-- vendor/libgit2/deps/http-parser/http_parser.h
-- vendor/libgit2/deps/regex/config.h
-- vendor/libgit2/deps/regex/regcomp.c
-- vendor/libgit2/deps/regex/regex.c
-- vendor/libgit2/deps/regex/regex.h
-- vendor/libgit2/deps/regex/regex_internal.c
-- vendor/libgit2/deps/regex/regex_internal.h
-- vendor/libgit2/deps/regex/regexec.c
-- vendor/libgit2/deps/winhttp/urlmon.h
-- vendor/libgit2/deps/winhttp/winhttp.def
-- vendor/libgit2/deps/winhttp/winhttp.h
-- vendor/libgit2/deps/winhttp/winhttp64.def
-- vendor/libgit2/deps/zlib/adler32.c
-- vendor/libgit2/deps/zlib/crc32.c
-- vendor/libgit2/deps/zlib/crc32.h
-- vendor/libgit2/deps/zlib/deflate.c
-- vendor/libgit2/deps/zlib/deflate.h
-- vendor/libgit2/deps/zlib/infback.c
-- vendor/libgit2/deps/zlib/inffast.c
-- vendor/libgit2/deps/zlib/inffast.h
-- vendor/libgit2/deps/zlib/inffixed.h
-- vendor/libgit2/deps/zlib/inflate.c
-- vendor/libgit2/deps/zlib/inflate.h
-- vendor/libgit2/deps/zlib/inftrees.c
-- vendor/libgit2/deps/zlib/inftrees.h
-- vendor/libgit2/deps/zlib/trees.c
-- vendor/libgit2/deps/zlib/trees.h
-- vendor/libgit2/deps/zlib/zconf.h
-- vendor/libgit2/deps/zlib/zlib.h
-- vendor/libgit2/deps/zlib/zutil.c
-- vendor/libgit2/deps/zlib/zutil.h
-- vendor/libgit2/include/git2.h
 - vendor/libgit2/include/git2/annotated_commit.h
 - vendor/libgit2/include/git2/attr.h
 - vendor/libgit2/include/git2/blame.h
@@ -198,6 +159,7 @@ files:
 - vendor/libgit2/include/git2/pack.h
 - vendor/libgit2/include/git2/patch.h
 - vendor/libgit2/include/git2/pathspec.h
+- vendor/libgit2/include/git2/proxy.h
 - vendor/libgit2/include/git2/rebase.h
 - vendor/libgit2/include/git2/refdb.h
 - vendor/libgit2/include/git2/reflog.h
@@ -222,13 +184,16 @@ files:
 - vendor/libgit2/include/git2/sys/hashsig.h
 - vendor/libgit2/include/git2/sys/index.h
 - vendor/libgit2/include/git2/sys/mempack.h
+- vendor/libgit2/include/git2/sys/merge.h
 - vendor/libgit2/include/git2/sys/odb_backend.h
 - vendor/libgit2/include/git2/sys/openssl.h
 - vendor/libgit2/include/git2/sys/refdb_backend.h
 - vendor/libgit2/include/git2/sys/reflog.h
 - vendor/libgit2/include/git2/sys/refs.h
+- vendor/libgit2/include/git2/sys/remote.h
 - vendor/libgit2/include/git2/sys/repository.h
 - vendor/libgit2/include/git2/sys/stream.h
+- vendor/libgit2/include/git2/sys/time.h
 - vendor/libgit2/include/git2/sys/transport.h
 - vendor/libgit2/include/git2/tag.h
 - vendor/libgit2/include/git2/trace.h
@@ -237,9 +202,11 @@ files:
 - vendor/libgit2/include/git2/tree.h
 - vendor/libgit2/include/git2/types.h
 - vendor/libgit2/include/git2/version.h
-- vendor/libgit2/libgit2.pc.in
+- vendor/libgit2/include/git2.h
 - vendor/libgit2/src/annotated_commit.c
 - vendor/libgit2/src/annotated_commit.h
+- vendor/libgit2/src/apply.c
+- vendor/libgit2/src/apply.h
 - vendor/libgit2/src/array.h
 - vendor/libgit2/src/attr.c
 - vendor/libgit2/src/attr.h
@@ -282,8 +249,6 @@ files:
 - vendor/libgit2/src/curl_stream.c
 - vendor/libgit2/src/curl_stream.h
 - vendor/libgit2/src/date.c
-- vendor/libgit2/src/delta-apply.c
-- vendor/libgit2/src/delta-apply.h
 - vendor/libgit2/src/delta.c
 - vendor/libgit2/src/delta.h
 - vendor/libgit2/src/describe.c
@@ -293,11 +258,14 @@ files:
 - vendor/libgit2/src/diff_driver.h
 - vendor/libgit2/src/diff_file.c
 - vendor/libgit2/src/diff_file.h
-- vendor/libgit2/src/diff_patch.c
-- vendor/libgit2/src/diff_patch.h
+- vendor/libgit2/src/diff_generate.c
+- vendor/libgit2/src/diff_generate.h
+- vendor/libgit2/src/diff_parse.c
+- vendor/libgit2/src/diff_parse.h
 - vendor/libgit2/src/diff_print.c
 - vendor/libgit2/src/diff_stats.c
 - vendor/libgit2/src/diff_tform.c
+- vendor/libgit2/src/diff_tform.h
 - vendor/libgit2/src/diff_xdiff.c
 - vendor/libgit2/src/diff_xdiff.h
 - vendor/libgit2/src/errors.c
@@ -316,14 +284,14 @@ files:
 - vendor/libgit2/src/global.c
 - vendor/libgit2/src/global.h
 - vendor/libgit2/src/graph.c
-- vendor/libgit2/src/hash.c
-- vendor/libgit2/src/hash.h
 - vendor/libgit2/src/hash/hash_common_crypto.h
 - vendor/libgit2/src/hash/hash_generic.c
 - vendor/libgit2/src/hash/hash_generic.h
 - vendor/libgit2/src/hash/hash_openssl.h
 - vendor/libgit2/src/hash/hash_win32.c
 - vendor/libgit2/src/hash/hash_win32.h
+- vendor/libgit2/src/hash.c
+- vendor/libgit2/src/hash.h
 - vendor/libgit2/src/hashsig.c
 - vendor/libgit2/src/ident.c
 - vendor/libgit2/src/idxmap.h
@@ -339,6 +307,8 @@ files:
 - vendor/libgit2/src/map.h
 - vendor/libgit2/src/merge.c
 - vendor/libgit2/src/merge.h
+- vendor/libgit2/src/merge_driver.c
+- vendor/libgit2/src/merge_driver.h
 - vendor/libgit2/src/merge_file.c
 - vendor/libgit2/src/message.c
 - vendor/libgit2/src/message.h
@@ -368,6 +338,12 @@ files:
 - vendor/libgit2/src/pack-objects.h
 - vendor/libgit2/src/pack.c
 - vendor/libgit2/src/pack.h
+- vendor/libgit2/src/patch.c
+- vendor/libgit2/src/patch.h
+- vendor/libgit2/src/patch_generate.c
+- vendor/libgit2/src/patch_generate.h
+- vendor/libgit2/src/patch_parse.c
+- vendor/libgit2/src/patch_parse.h
 - vendor/libgit2/src/path.c
 - vendor/libgit2/src/path.h
 - vendor/libgit2/src/pathspec.c
@@ -378,6 +354,8 @@ files:
 - vendor/libgit2/src/posix.h
 - vendor/libgit2/src/pqueue.c
 - vendor/libgit2/src/pqueue.h
+- vendor/libgit2/src/proxy.c
+- vendor/libgit2/src/proxy.h
 - vendor/libgit2/src/push.c
 - vendor/libgit2/src/push.h
 - vendor/libgit2/src/rebase.c
@@ -463,6 +441,8 @@ files:
 - vendor/libgit2/src/userdiff.h
 - vendor/libgit2/src/util.c
 - vendor/libgit2/src/util.h
+- vendor/libgit2/src/varint.c
+- vendor/libgit2/src/varint.h
 - vendor/libgit2/src/vector.c
 - vendor/libgit2/src/vector.h
 - vendor/libgit2/src/win32/dir.c
@@ -513,6 +493,44 @@ files:
 - vendor/libgit2/src/xdiff/xutils.h
 - vendor/libgit2/src/zstream.c
 - vendor/libgit2/src/zstream.h
+- vendor/libgit2/deps/http-parser/http_parser.c
+- vendor/libgit2/deps/http-parser/http_parser.h
+- vendor/libgit2/deps/http-parser/LICENSE-MIT
+- vendor/libgit2/deps/regex/config.h
+- vendor/libgit2/deps/regex/regcomp.c
+- vendor/libgit2/deps/regex/regex.c
+- vendor/libgit2/deps/regex/regex.h
+- vendor/libgit2/deps/regex/regex_internal.c
+- vendor/libgit2/deps/regex/regex_internal.h
+- vendor/libgit2/deps/regex/regexec.c
+- vendor/libgit2/deps/winhttp/urlmon.h
+- vendor/libgit2/deps/winhttp/winhttp.def
+- vendor/libgit2/deps/winhttp/winhttp.h
+- vendor/libgit2/deps/winhttp/winhttp64.def
+- vendor/libgit2/deps/zlib/adler32.c
+- vendor/libgit2/deps/zlib/crc32.c
+- vendor/libgit2/deps/zlib/crc32.h
+- vendor/libgit2/deps/zlib/deflate.c
+- vendor/libgit2/deps/zlib/deflate.h
+- vendor/libgit2/deps/zlib/infback.c
+- vendor/libgit2/deps/zlib/inffast.c
+- vendor/libgit2/deps/zlib/inffast.h
+- vendor/libgit2/deps/zlib/inffixed.h
+- vendor/libgit2/deps/zlib/inflate.c
+- vendor/libgit2/deps/zlib/inflate.h
+- vendor/libgit2/deps/zlib/inftrees.c
+- vendor/libgit2/deps/zlib/inftrees.h
+- vendor/libgit2/deps/zlib/trees.c
+- vendor/libgit2/deps/zlib/trees.h
+- vendor/libgit2/deps/zlib/zconf.h
+- vendor/libgit2/deps/zlib/zlib.h
+- vendor/libgit2/deps/zlib/zutil.c
+- vendor/libgit2/deps/zlib/zutil.h
+- vendor/libgit2/CMakeLists.txt
+- vendor/libgit2/AUTHORS
+- vendor/libgit2/COPYING
+- vendor/libgit2/libgit2.pc.in
+- ext/rugged/extconf.rb
 homepage: https://github.com/libgit2/rugged
 licenses:
 - MIT
@@ -523,17 +541,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Rugged is a Ruby binding to the libgit2 linkable library

data/vendor/libgit2/Makefile.embed

@@ -1,60 +0,0 @@
-PLATFORM=$(shell uname -s)
-
-ifneq (,$(CROSS_COMPILE))
-	PREFIX=$(CROSS_COMPILE)-
-else
-	PREFIX=
-endif
-
-MINGW=0
-ifneq (,$(findstring MINGW32,$(PLATFORM)))
-	MINGW=1
-endif
-ifneq (,$(findstring mingw,$(CROSS_COMPILE)))
-	MINGW=1
-endif
-
-rm=rm -f
-AR=$(PREFIX)ar cq
-RANLIB=$(PREFIX)ranlib
-
-LIBNAME=libgit2.a
-
-ifeq ($(MINGW),1)
-	CC=gcc
-else
-	CC=cc
-endif
-
-CC:=$(PREFIX)$(CC)
-
-INCLUDES= -I. -Isrc -Iinclude -Ideps/http-parser -Ideps/zlib
-
-DEFINES= $(INCLUDES) -DNO_VIZ -DSTDC -DNO_GZIP -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $(EXTRA_DEFINES)
-CFLAGS= -g $(DEFINES) -Wall -Wextra -Wno-missing-field-initializers -O2 $(EXTRA_CFLAGS)
-
-SRCS = $(wildcard src/*.c) $(wildcard src/transports/*.c) $(wildcard src/xdiff/*.c) $(wildcard deps/http-parser/*.c) $(wildcard deps/zlib/*.c) src/hash/hash_generic.c
-
-ifeq ($(MINGW),1)
-	SRCS += $(wildcard src/win32/*.c) $(wildcard src/compat/*.c) deps/regex/regex.c
-	INCLUDES += -Ideps/regex
-	DEFINES += -DWIN32 -D_WIN32_WINNT=0x0501 -D__USE_MINGW_ANSI_STDIO=1
-else
-	SRCS += $(wildcard src/unix/*.c) 
-	CFLAGS += -fPIC
-endif
-
-OBJS = $(patsubst %.c,%.o,$(SRCS))
-
-%.c.o:
-	$(CC) $(CFLAGS) -c $*.c
-
-all: $(LIBNAME)
-
-$(LIBNAME): $(OBJS)
-	$(rm) $@
-	$(AR) $@ $(OBJS)
-	$(RANLIB) $@
-
-clean:
-	$(rm) $(OBJS) $(LIBNAME)