rugged 0.28.4.1 → 1.0.1

data/ext/rugged/rugged_tag.c

@@ -15,6 +15,8 @@ extern VALUE rb_cRuggedReference;
 VALUE rb_cRuggedTag;
 VALUE rb_cRuggedTagAnnotation;
 
+extern const rb_data_type_t rugged_object_type;
+
 /*
  *  call-seq:
  *    annotation.target -> object
@@ -31,7 +33,7 @@ static VALUE rb_git_tag_annotation_target(VALUE self)
 	int error;
 	VALUE owner;
 
-	Data_Get_Struct(self, git_tag, tag);
+	TypedData_Get_Struct(self, git_tag, &rugged_object_type, tag);
 	owner = rugged_owner(self);
 
 	error = git_tag_target(&target, tag);
@@ -55,7 +57,7 @@ static VALUE rb_git_tag_annotation_target_id(VALUE self)
 	git_tag *tag;
 	const git_oid *target_oid;
 
-	Data_Get_Struct(self, git_tag, tag);
+	TypedData_Get_Struct(self, git_tag, &rugged_object_type, tag);
 
 	target_oid = git_tag_target_id(tag);
 
@@ -77,7 +79,7 @@ static VALUE rb_git_tag_annotation_target_id(VALUE self)
 static VALUE rb_git_tag_annotation_target_type(VALUE self)
 {
 	git_tag *tag;
-	Data_Get_Struct(self, git_tag, tag);
+	TypedData_Get_Struct(self, git_tag, &rugged_object_type, tag);
 
 	return rugged_otype_new(git_tag_target_type(tag));
 }
@@ -93,7 +95,7 @@ static VALUE rb_git_tag_annotation_target_type(VALUE self)
 static VALUE rb_git_tag_annotation_name(VALUE self)
 {
 	git_tag *tag;
-	Data_Get_Struct(self, git_tag, tag);
+	TypedData_Get_Struct(self, git_tag, &rugged_object_type, tag);
 
 	return rb_str_new_utf8(git_tag_name(tag));
 }
@@ -113,7 +115,7 @@ static VALUE rb_git_tag_annotation_tagger(VALUE self)
 	git_tag *tag;
 	const git_signature *tagger;
 
-	Data_Get_Struct(self, git_tag, tag);
+	TypedData_Get_Struct(self, git_tag, &rugged_object_type, tag);
 	tagger = git_tag_tagger(tag);
 
 	if (!tagger)
@@ -136,7 +138,7 @@ static VALUE rb_git_tag_annotation_message(VALUE self)
 	git_tag *tag;
 	const char *message;
 
-	Data_Get_Struct(self, git_tag, tag);
+	TypedData_Get_Struct(self, git_tag, &rugged_object_type, tag);
 	message = git_tag_message(tag);
 
 	if (!message)

data/ext/rugged/rugged_tree.c

@@ -18,6 +18,8 @@ extern VALUE rb_cRuggedCommit;
 VALUE rb_cRuggedTree;
 VALUE rb_cRuggedTreeBuilder;
 
+extern const rb_data_type_t rugged_object_type;
+
 static VALUE rb_git_treeentry_fromC(const git_tree_entry *entry)
 {
 	VALUE rb_entry;
@@ -72,7 +74,7 @@ static VALUE rb_git_treeentry_fromC(const git_tree_entry *entry)
 static VALUE rb_git_tree_entrycount(VALUE self)
 {
 	git_tree *tree;
-	Data_Get_Struct(self, git_tree, tree);
+	TypedData_Get_Struct(self, git_tree, &rugged_object_type, tree);
 
 	return INT2FIX(git_tree_entrycount(tree));
 }
@@ -115,7 +117,7 @@ static VALUE rb_git_tree_entrycount_recursive(int argc, VALUE* argv, VALUE self)
 	struct rugged_treecount_cb_payload payload;
 	VALUE rb_limit;
 
-	Data_Get_Struct(self, git_tree, tree);
+	TypedData_Get_Struct(self, git_tree, &rugged_object_type, tree);
 
 	rb_scan_args(argc, argv, "01", &rb_limit);
 
@@ -158,7 +160,7 @@ static VALUE rb_git_tree_entrycount_recursive(int argc, VALUE* argv, VALUE self)
 static VALUE rb_git_tree_get_entry(VALUE self, VALUE entry_id)
 {
 	git_tree *tree;
-	Data_Get_Struct(self, git_tree, tree);
+	TypedData_Get_Struct(self, git_tree, &rugged_object_type, tree);
 
 	if (TYPE(entry_id) == T_FIXNUM)
 		return rb_git_treeentry_fromC(git_tree_entry_byindex(tree, FIX2INT(entry_id)));
@@ -189,7 +191,7 @@ static VALUE rb_git_tree_get_entry_by_oid(VALUE self, VALUE rb_oid)
 {
 	git_tree *tree;
 	git_oid oid;
-	Data_Get_Struct(self, git_tree, tree);
+	TypedData_Get_Struct(self, git_tree, &rugged_object_type, tree);
 
 	Check_Type(rb_oid, T_STRING);
 	rugged_exception_check(git_oid_fromstr(&oid, StringValueCStr(rb_oid)));
@@ -222,7 +224,7 @@ static VALUE rb_git_tree_each(VALUE self)
 	size_t i, count;
 
 	RETURN_ENUMERATOR(self, 0, 0);
-	Data_Get_Struct(self, git_tree, tree);
+	TypedData_Get_Struct(self, git_tree, &rugged_object_type, tree);
 
 	count = git_tree_entrycount(tree);
 
@@ -287,7 +289,7 @@ static VALUE rb_git_tree_walk(VALUE self, VALUE rb_mode)
 	int error, mode = 0, exception = 0;
 	ID id_mode;
 
-	Data_Get_Struct(self, git_tree, tree);
+	TypedData_Get_Struct(self, git_tree, &rugged_object_type, tree);
 
 	if (!rb_block_given_p())
 		return rb_funcall(self, rb_intern("to_enum"), 2, CSTR2SYM("walk"), rb_mode);
@@ -325,7 +327,7 @@ static VALUE rb_git_tree_path(VALUE self, VALUE rb_path)
 	git_tree *tree;
 	git_tree_entry *entry;
 	VALUE rb_entry;
-	Data_Get_Struct(self, git_tree, tree);
+	TypedData_Get_Struct(self, git_tree, &rugged_object_type, tree);
 	Check_Type(rb_path, T_STRING);
 
 	error = git_tree_entry_bypath(&entry, tree, StringValueCStr(rb_path));
@@ -352,7 +354,7 @@ static VALUE rb_git_diff_tree_to_index(VALUE self, VALUE rb_repo, VALUE rb_self,
 	rugged_parse_diff_options(&opts, rb_options);
 
 	if (RTEST(rb_self)) {
-		Data_Get_Struct(rb_self, git_tree, tree);
+		TypedData_Get_Struct(rb_self, git_tree, &rugged_object_type, tree);
 	}
 
 	error = git_diff_tree_to_index(&diff, repo, tree, index, &opts);
@@ -392,10 +394,10 @@ static VALUE rb_git_diff_tree_to_tree(VALUE self, VALUE rb_repo, VALUE rb_tree,
 	Data_Get_Struct(rb_repo, git_repository, repo);
 
 	if(RTEST(rb_tree))
-	    Data_Get_Struct(rb_tree, git_tree, tree);
+	    TypedData_Get_Struct(rb_tree, git_tree, &rugged_object_type, tree);
 
 	if(RTEST(rb_other_tree))
-	    Data_Get_Struct(rb_other_tree, git_tree, other_tree);
+	    TypedData_Get_Struct(rb_other_tree, git_tree, &rugged_object_type, other_tree);
 
 	rugged_parse_diff_options(&opts, rb_options);
 
@@ -435,7 +437,7 @@ static VALUE rb_git_tree_diff_workdir(int argc, VALUE *argv, VALUE self)
 	rb_scan_args(argc, argv, "00:", &rb_options);
 	rugged_parse_diff_options(&opts, rb_options);
 
-	Data_Get_Struct(self, git_tree, tree);
+	TypedData_Get_Struct(self, git_tree, &rugged_object_type, tree);
 	owner = rugged_owner(self);
 	Data_Get_Struct(owner, git_repository, repo);
 
@@ -558,12 +560,12 @@ static VALUE rb_git_tree_merge(int argc, VALUE *argv, VALUE self)
 	else if (!NIL_P(rb_ancestor_tree) && !rb_obj_is_kind_of(rb_ancestor_tree, rb_cRuggedTree))
 		rb_raise(rb_eTypeError, "Expecting a Rugged::Tree instance");
 
-	Data_Get_Struct(self, git_tree, tree);
+	TypedData_Get_Struct(self, git_tree, &rugged_object_type, tree);
 	Data_Get_Struct(rb_repo, git_repository, repo);
-	Data_Get_Struct(rb_other_tree, git_tree, other_tree);
+	TypedData_Get_Struct(rb_other_tree, git_tree, &rugged_object_type, other_tree);
 
 	if (!NIL_P(rb_ancestor_tree))
-		Data_Get_Struct(rb_ancestor_tree, git_tree, ancestor_tree);
+		TypedData_Get_Struct(rb_ancestor_tree, git_tree, &rugged_object_type, ancestor_tree);
 	else
 		ancestor_tree = NULL;
 
@@ -693,7 +695,7 @@ static VALUE rb_git_tree_update(VALUE self, VALUE rb_updates)
 	int nupdates, error;
 	git_oid id;
 
-	Data_Get_Struct(self, git_tree, tree);
+	TypedData_Get_Struct(self, git_tree, &rugged_object_type, tree);
 	repo = git_tree_owner(tree);
 
 	parse_tree_updates(&updates, &nupdates, rb_updates);
@@ -734,7 +736,7 @@ static VALUE rb_git_treebuilder_new(int argc, VALUE *argv, VALUE klass)
 		if (!rb_obj_is_kind_of(rb_object, rb_cRuggedTree))
 			rb_raise(rb_eTypeError, "A Rugged::Tree instance is required");
 
-		Data_Get_Struct(rb_object, git_tree, tree);
+		TypedData_Get_Struct(rb_object, git_tree, &rugged_object_type, tree);
 	}
 
 	rugged_check_repo(rb_repo);

data/lib/rugged/commit.rb

@@ -5,7 +5,6 @@
 
 module Rugged
   class Commit
-
     def self.prettify_message(msg, strip_comments = true)
       Rugged::prettify_message(msg, strip_comments)
     end
@@ -30,7 +29,7 @@ module Rugged
     #
     # See Rugged::Tree#diff_workdir for more details.
     def diff_workdir(options = {})
-      self.tree.diff_workdir(options)
+      self.tree.diff_workdir(**options)
     end
 
     # The time when this commit was made effective. This is the same value

data/lib/rugged/repository.rb

@@ -30,7 +30,7 @@ module Rugged
       options[:strategy] ||= :safe
       options.delete(:paths)
 
-      return checkout_head(options) if target == "HEAD"
+      return checkout_head(**options) if target == "HEAD"
 
       if target.kind_of?(Rugged::Branch)
         branch = target
@@ -39,7 +39,7 @@ module Rugged
       end
 
       if branch
-        self.checkout_tree(branch.target, options)
+        self.checkout_tree(branch.target, **options)
 
         if branch.remote?
           references.create("HEAD", branch.target_id, force: true)
@@ -49,7 +49,7 @@ module Rugged
       else
         commit = Commit.lookup(self, self.rev_parse_oid(target))
         references.create("HEAD", commit.oid, force: true)
-        self.checkout_tree(commit, options)
+        self.checkout_tree(commit, **options)
       end
     end
 
@@ -250,12 +250,11 @@ module Rugged
       (blob.type == :blob) ? blob : nil
     end
 
-    def fetch(remote_or_url, *args)
+    def fetch(remote_or_url, *args, **kwargs)
       unless remote_or_url.kind_of? Remote
         remote_or_url = remotes[remote_or_url] || remotes.create_anonymous(remote_or_url)
       end
-
-      remote_or_url.fetch(*args)
+      remote_or_url.fetch(*args, **kwargs)
     end
 
     # Push a list of refspecs to the given remote.

data/lib/rugged/submodule_collection.rb

@@ -26,8 +26,8 @@ module Rugged
     #
     # Returns the newly created +submodule+
     def add(url, path, options = {})
-      submodule = setup_add(url, path, options)
-      clone_submodule(submodule.repository, options)
+      submodule = setup_add(url, path, **options)
+      clone_submodule(submodule.repository, **options)
       submodule.finalize_add
     end
 
@@ -40,9 +40,9 @@ module Rugged
     # 1. fetches the remote
     # 2. sets up a master branch to be tracking origin/master
     # 3. checkouts the submodule
-    def clone_submodule(repo, fetch_options)
+    def clone_submodule(repo, **fetch_options)
       # the remote was just added by setup_add, no need to check presence
-      repo.remotes['origin'].fetch(fetch_options)
+      repo.remotes['origin'].fetch(**fetch_options)
 
       repo.branches.create('master','origin/master')
       repo.branches['master'].upstream = repo.branches['origin/master']

data/lib/rugged/version.rb

@@ -4,5 +4,5 @@
 # For full terms see the included LICENSE file.
 
 module Rugged
-  Version = VERSION = '0.28.4.1'
+  Version = VERSION = '1.0.1'
 end

data/vendor/libgit2/AUTHORS

@@ -23,6 +23,7 @@ Dmitry Kovega
 Emeric Fermas
 Emmanuel Rodriguez
 Eric Myhre
+Erik Aigner
 Florian Forster
 Holger Weiss
 Ingmar Vanhassel

data/vendor/libgit2/CMakeLists.txt

@@ -12,7 +12,7 @@
 # > cmake --build . --target install
 
 PROJECT(libgit2 C)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1)
 CMAKE_POLICY(SET CMP0015 NEW)
 IF(POLICY CMP0051)
 	CMAKE_POLICY(SET CMP0051 NEW)
@@ -36,6 +36,7 @@ INCLUDE(AddCFlagIfSupported)
 INCLUDE(FindPkgLibraries)
 INCLUDE(FindThreads)
 INCLUDE(FindStatNsec)
+INCLUDE(GNUInstallDirs)
 INCLUDE(IdeSplitSources)
 INCLUDE(FeatureSummary)
 INCLUDE(EnableWarnings)
@@ -50,21 +51,28 @@ OPTION(BUILD_EXAMPLES			"Build library usage example apps"			OFF)
 OPTION(BUILD_FUZZERS			"Build the fuzz targets"				OFF)
 OPTION(TAGS				"Generate tags"						OFF)
 OPTION(PROFILE				"Generate profiling information"			OFF)
-OPTION(ENABLE_TRACE			"Enables tracing support"				OFF)
+OPTION(ENABLE_TRACE			"Enables tracing support"				ON)
 OPTION(LIBGIT2_FILENAME			"Name of the produced binary"				OFF)
-
-   SET(SHA1_BACKEND 			"CollisionDetection"			       CACHE STRING
-       "Backend to use for SHA1. One of Generic, OpenSSL, Win32, CommonCrypto, mbedTLS, CollisionDetection.")
 OPTION(USE_SSH				"Link with libssh2 to enable SSH support"		 ON)
 OPTION(USE_HTTPS			"Enable HTTPS support. Can be set to a specific backend" ON)
+OPTION(USE_SHA1				"Enable SHA1. Can be set to CollisionDetection(ON)/HTTPS/Generic" ON)
 OPTION(USE_GSSAPI			"Link with libgssapi for SPNEGO auth"			OFF)
 OPTION(USE_STANDALONE_FUZZERS		"Enable standalone fuzzers (compatible with gcc)"	OFF)
-OPTION(VALGRIND				"Configure build for valgrind"				OFF)
-OPTION(USE_EXT_HTTP_PARSER		"Use system HTTP_Parser if available"			 ON)
+OPTION(USE_LEAK_CHECKER			"Run tests with leak checker"				OFF)
 OPTION(DEBUG_POOL			"Enable debug pool allocator"				OFF)
 OPTION(ENABLE_WERROR			"Enable compilation with -Werror"			OFF)
 OPTION(USE_BUNDLED_ZLIB    		"Use the bundled version of zlib"			OFF)
+   SET(USE_HTTP_PARSER			"" CACHE STRING "Specifies the HTTP Parser implementation; either system or builtin.")
 OPTION(DEPRECATE_HARD			"Do not include deprecated functions in the library"	OFF)
+   SET(REGEX_BACKEND			"" CACHE STRING "Regular expression implementation. One of regcomp_l, pcre2, pcre, regcomp, or builtin.")
+
+IF (UNIX)
+	IF (NOT USE_HTTPS)
+	    OPTION(USE_NTLMCLIENT		"Enable NTLM support on Unix."				OFF )
+	ELSE()
+	    OPTION(USE_NTLMCLIENT		"Enable NTLM support on Unix."				ON )
+	ENDIF()
+ENDIF()
 
 IF (UNIX AND NOT APPLE)
 	OPTION(ENABLE_REPRODUCIBLE_BUILDS "Enable reproducible builds"				OFF)
@@ -103,8 +111,8 @@ STRING(REGEX REPLACE "^.*LIBGIT2_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" LIBGIT2_V
 STRING(REGEX REPLACE "^.*LIBGIT2_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" LIBGIT2_VERSION_REV "${GIT2_HEADER}")
 SET(LIBGIT2_VERSION_STRING "${LIBGIT2_VERSION_MAJOR}.${LIBGIT2_VERSION_MINOR}.${LIBGIT2_VERSION_REV}")
 
-FILE(STRINGS "${libgit2_SOURCE_DIR}/include/git2/version.h" GIT2_HEADER_SOVERSION REGEX "^#define LIBGIT2_SOVERSION [0-9]+$")
-STRING(REGEX REPLACE "^.*LIBGIT2_SOVERSION ([0-9]+)$" "\\1" LIBGIT2_SOVERSION "${GIT2_HEADER_SOVERSION}")
+FILE(STRINGS "${libgit2_SOURCE_DIR}/include/git2/version.h" GIT2_HEADER_SOVERSION REGEX "^#define LIBGIT2_SOVERSION \"([0-9.]+)\"$")
+STRING(REGEX REPLACE "^.*LIBGIT2_SOVERSION \"([0-9.]+)\"$" "\\1" LIBGIT2_SOVERSION "${GIT2_HEADER_SOVERSION}")
 
 IF (DEPRECATE_HARD)
 	ADD_DEFINITIONS(-DGIT_DEPRECATE_HARD)
@@ -232,10 +240,22 @@ ELSE ()
 	ENABLE_WARNINGS(shift-count-overflow)
 	ENABLE_WARNINGS(unused-const-variable)
 	ENABLE_WARNINGS(unused-function)
-	ENABLE_WARNINGS(format)
-	ENABLE_WARNINGS(format-security)
 	ENABLE_WARNINGS(int-conversion)
-	DISABLE_WARNINGS(documentation-deprecated-sync)
+
+	# MinGW uses gcc, which expects POSIX formatting for printf, but
+	# uses the Windows C library, which uses its own format specifiers.
+	# Disable format specifier warnings.
+	IF(MINGW)
+		DISABLE_WARNINGS(format)
+		DISABLE_WARNINGS(format-security)
+	ELSE()
+		ENABLE_WARNINGS(format)
+		ENABLE_WARNINGS(format-security)
+	ENDIF()
+
+	IF("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
+		DISABLE_WARNINGS(documentation-deprecated-sync)
+	ENDIF()
 
 	IF (PROFILE)
 		SET(CMAKE_C_FLAGS "-pg ${CMAKE_C_FLAGS}")
@@ -243,6 +263,11 @@ ELSE ()
 	ENDIF ()
 ENDIF()
 
+# Ensure that MinGW provides the correct header files.
+IF (WIN32 AND NOT CYGWIN)
+	ADD_DEFINITIONS(-DWIN32 -D_WIN32_WINNT=0x0600)
+ENDIF()
+
 IF( NOT CMAKE_CONFIGURATION_TYPES )
 	# Build Debug by default
 	IF (NOT CMAKE_BUILD_TYPE)
@@ -310,10 +335,5 @@ IF(BUILD_FUZZERS)
 	ADD_SUBDIRECTORY(fuzzers)
 ENDIF()
 
-IF(CMAKE_VERSION VERSION_GREATER 3)
-	FEATURE_SUMMARY(WHAT ENABLED_FEATURES DESCRIPTION "Enabled features:")
-	FEATURE_SUMMARY(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:")
-ELSE()
-	PRINT_ENABLED_FEATURES()
-	PRINT_DISABLED_FEATURES()
-ENDIF()
+FEATURE_SUMMARY(WHAT ENABLED_FEATURES DESCRIPTION "Enabled features:")
+FEATURE_SUMMARY(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:")

data/vendor/libgit2/COPYING

@@ -991,3 +991,31 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+----------------------------------------------------------------------
+
+The bundled wildmatch code is licensed under the BSD license:
+
+Copyright Rich Salz.
+All rights reserved.
+
+Redistribution and use in any form are permitted provided that the
+following restrictions are are met:
+
+1.  Source distributions must retain this entire copyright notice
+    and comment.
+2.  Binary distributions must include the acknowledgement ``This
+    product includes software developed by Rich Salz'' in the
+    documentation or other materials provided with the
+    distribution.  This must not be represented as an endorsement
+   or promotion without specific prior written permission.
+3.  The origin of this software must not be misrepresented, either
+    by explicit claim or by omission.  Credits must appear in the
+    source and documentation.
+4.  Altered versions must be plainly marked as such in the source
+    and documentation and must not be misrepresented as being the
+    original software.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

data/vendor/libgit2/cmake/Modules/EnableWarnings.cmake

@@ -7,5 +7,9 @@ MACRO(DISABLE_WARNINGS flag)
 ENDMACRO()
 
 IF(ENABLE_WERROR)
-	ADD_C_FLAG_IF_SUPPORTED(-Werror)
+	IF(MSVC)
+		ADD_COMPILE_OPTIONS(-WX)
+	ELSE()
+		ADD_C_FLAG_IF_SUPPORTED(-Werror)
+	ENDIF()
 ENDIF()

data/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake

@@ -10,14 +10,14 @@ FIND_PATH(COREFOUNDATION_INCLUDE_DIR NAMES CoreFoundation.h)
 FIND_LIBRARY(COREFOUNDATION_LIBRARIES NAMES CoreFoundation)
 IF (COREFOUNDATION_INCLUDE_DIR AND COREFOUNDATION_LIBRARIES)
 	IF (NOT CoreFoundation_FIND_QUIETLY)
-		MESSAGE("-- Found CoreFoundation ${COREFOUNDATION_LIBRARIES}")
+		MESSAGE(STATUS "Found CoreFoundation ${COREFOUNDATION_LIBRARIES}")
 	ENDIF()
 	SET(COREFOUNDATION_FOUND TRUE)
 	SET(COREFOUNDATION_LDFLAGS "-framework CoreFoundation")
 ENDIF ()
 
 IF (CoreFoundation_FIND_REQUIRED AND NOT COREFOUNDATION_FOUND)
-	MESSAGE(FATAL "-- CoreFoundation not found")
+	MESSAGE(FATAL_ERROR "CoreFoundation not found")
 ENDIF()
 
 MARK_AS_ADVANCED(