rugged 0.26.0b2 → 0.26.0b3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/lib/rugged/version.rb +1 -1
  3. data/vendor/libgit2/include/git2/reset.h +1 -1
  4. data/vendor/libgit2/include/git2/revert.h +1 -1
  5. data/vendor/libgit2/src/diff_tform.c +2 -2
  6. data/vendor/libgit2/src/merge.c +1 -1
  7. data/vendor/libgit2/src/transports/winhttp.c +19 -8
  8. metadata +75 -75
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 531102627a60b977fe0498feaaa9ef74ff2756f3
4
- data.tar.gz: 612617fc8a6078456b44439ba68bdb6891d1e422
3
+ metadata.gz: d9cc30938d532d92ebcc7271244206e5a2ac5784
4
+ data.tar.gz: 9f0d0e5c310a864b9fa686383c62db6487478e83
5
5
  SHA512:
6
- metadata.gz: a6654148d44339c08e7727429f3f7e163c92295b5af8737d62579fe9ef7c61b179f54a9a76815d213afa302d82d1a6769d7d1fb5df0a2023de08ea67f87dec56
7
- data.tar.gz: fa94b1dc85ab86e5f2f2d663f0205ccdc3dcb7a1237c530ed0a046496885c7bda173b6c9266672df40bec36ac11f6ca056565c71b7388f9f5366fd4f2844d6ee
6
+ metadata.gz: a7a3fd2f6319cc78ee065cb0f9c0fdfee71cec7c979210ef07ff3e07c3e509bd55b7b2f19044bcdc0341822e4548b8636ecd328d9b1f8a505c22a99092f019ae
7
+ data.tar.gz: 37a7ac4f679d50ce88bb6e9c5547d5397ca21fde8f983d15009df8b02e771183d7dfc4954919c553bdd50caaa11c1f49566559d719e7579c6086275e5b9188e6
data/lib/rugged/version.rb CHANGED
@@ -4,5 +4,5 @@
4
4
  # For full terms see the included LICENSE file.
5
5
 
6
6
  module Rugged
7
- Version = VERSION = '0.26.0b2'
7
+ Version = VERSION = '0.26.0b3'
8
8
  end
data/vendor/libgit2/include/git2/reset.h CHANGED
@@ -53,7 +53,7 @@ typedef enum {
53
53
  *
54
54
  * @param reset_type Kind of reset operation to perform.
55
55
  *
56
- * @param checkout_opts Checkout options to be used for a HARD reset.
56
+ * @param checkout_opts Optional checkout options to be used for a HARD reset.
57
57
  * The checkout_strategy field will be overridden (based on reset_type).
58
58
  * This parameter can be used to propagate notify and progress callbacks.
59
59
  *
data/vendor/libgit2/include/git2/revert.h CHANGED
@@ -75,7 +75,7 @@ GIT_EXTERN(int) git_revert_commit(
75
75
  *
76
76
  * @param repo the repository to revert
77
77
  * @param commit the commit to revert
78
- * @param given_opts merge flags
78
+ * @param given_opts the revert options (or null for defaults)
79
79
  * @return zero on success, -1 on failure.
80
80
  */
81
81
  GIT_EXTERN(int) git_revert(
data/vendor/libgit2/src/diff_tform.c CHANGED
@@ -553,8 +553,8 @@ static int similarity_measure(
553
553
 
554
554
  *score = -1;
555
555
 
556
- /* don't try to compare files of different types */
557
- if (GIT_MODE_TYPE(a_file->mode) != GIT_MODE_TYPE(b_file->mode))
556
+ /* don't try to compare things that aren't files */
557
+ if (!GIT_MODE_ISBLOB(a_file->mode) || !GIT_MODE_ISBLOB(b_file->mode))
558
558
  return 0;
559
559
 
560
560
  /* if exact match is requested, force calculation of missing OIDs now */
data/vendor/libgit2/src/merge.c CHANGED
@@ -1075,7 +1075,7 @@ static int index_entry_similarity_inexact(
1075
1075
  int score = 0;
1076
1076
  int error = 0;
1077
1077
 
1078
- if (GIT_MODE_TYPE(a->mode) != GIT_MODE_TYPE(b->mode))
1078
+ if (!GIT_MODE_ISBLOB(a->mode) || !GIT_MODE_ISBLOB(b->mode))
1079
1079
  return 0;
1080
1080
 
1081
1081
  /* update signature cache if needed */
data/vendor/libgit2/src/transports/winhttp.c CHANGED
@@ -70,6 +70,7 @@ typedef enum {
70
70
  GIT_WINHTTP_AUTH_BASIC = 1,
71
71
  GIT_WINHTTP_AUTH_NTLM = 2,
72
72
  GIT_WINHTTP_AUTH_NEGOTIATE = 4,
73
+ GIT_WINHTTP_AUTH_DIGEST = 8,
73
74
  } winhttp_authmechanism_t;
74
75
 
75
76
  typedef struct {
@@ -131,8 +132,13 @@ done:
131
132
  return error;
132
133
  }
133
134
 
134
- static int apply_userpass_credential_proxy(HINTERNET request, git_cred *cred)
135
+ static int apply_userpass_credential_proxy(HINTERNET request, git_cred *cred, int mechanisms)
135
136
  {
137
+ if (GIT_WINHTTP_AUTH_DIGEST & mechanisms) {
138
+ return _apply_userpass_credential(request, WINHTTP_AUTH_TARGET_PROXY,
139
+ WINHTTP_AUTH_SCHEME_DIGEST, cred);
140
+ }
141
+
136
142
  return _apply_userpass_credential(request, WINHTTP_AUTH_TARGET_PROXY,
137
143
  WINHTTP_AUTH_SCHEME_BASIC, cred);
138
144
  }
@@ -451,7 +457,7 @@ static int winhttp_stream_connect(winhttp_stream *s)
451
457
 
452
458
  if (t->proxy_cred) {
453
459
  if (t->proxy_cred->credtype == GIT_CREDTYPE_USERPASS_PLAINTEXT) {
454
- if ((error = apply_userpass_credential_proxy(s->request, t->proxy_cred)) < 0)
460
+ if ((error = apply_userpass_credential_proxy(s->request, t->proxy_cred, t->auth_mechanisms)) < 0)
455
461
  goto on_error;
456
462
  }
457
463
  }
@@ -588,11 +594,11 @@ static int parse_unauthorized_response(
588
594
  *allowed_types = 0;
589
595
  *allowed_mechanisms = 0;
590
596
 
591
- /* WinHttpQueryHeaders() must be called before WinHttpQueryAuthSchemes().
592
- * We can assume this was already done, since we know we are unauthorized.
597
+ /* WinHttpQueryHeaders() must be called before WinHttpQueryAuthSchemes().
598
+ * We can assume this was already done, since we know we are unauthorized.
593
599
  */
594
600
  if (!WinHttpQueryAuthSchemes(request, &supported, &first, &target)) {
595
- giterr_set(GITERR_OS, "failed to parse supported auth schemes");
601
+ giterr_set(GITERR_OS, "failed to parse supported auth schemes");
596
602
  return -1;
597
603
  }
598
604
 
@@ -612,6 +618,11 @@ static int parse_unauthorized_response(
612
618
  *allowed_mechanisms |= GIT_WINHTTP_AUTH_BASIC;
613
619
  }
614
620
 
621
+ if (WINHTTP_AUTH_SCHEME_DIGEST & supported) {
622
+ *allowed_types |= GIT_CREDTYPE_USERPASS_PLAINTEXT;
623
+ *allowed_mechanisms |= GIT_WINHTTP_AUTH_DIGEST;
624
+ }
625
+
615
626
  return 0;
616
627
  }
617
628
 
@@ -783,7 +794,7 @@ static int winhttp_connect(
783
794
  goto on_error;
784
795
  }
785
796
 
786
-
797
+
787
798
  /* Establish connection */
788
799
  t->connection = WinHttpConnect(
789
800
  t->session,
@@ -863,7 +874,7 @@ static int send_request(winhttp_stream *s, size_t len, int ignore_length)
863
874
  return 0;
864
875
 
865
876
  ignore_flags = no_check_cert_flags;
866
-
877
+
867
878
  if (!WinHttpSetOption(s->request, WINHTTP_OPTION_SECURITY_FLAGS, &ignore_flags, sizeof(ignore_flags))) {
868
879
  giterr_set(GITERR_OS, "failed to set security options");
869
880
  return -1;
@@ -1072,7 +1083,7 @@ replay:
1072
1083
  /* TODO: extract the username from the url, no payload? */
1073
1084
  if (t->owner->proxy.credentials) {
1074
1085
  int cred_error = 1;
1075
- cred_error = t->owner->proxy.credentials(&t->proxy_cred, t->owner->proxy.url, NULL, allowed_types, NULL);
1086
+ cred_error = t->owner->proxy.credentials(&t->proxy_cred, t->owner->proxy.url, NULL, allowed_types, t->owner->proxy.payload);
1076
1087
 
1077
1088
  if (cred_error < 0)
1078
1089
  return cred_error;
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rugged
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.26.0b2
4
+ version: 0.26.0b3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scott Chacon
@@ -9,48 +9,48 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-02-08 00:00:00.000000000 Z
12
+ date: 2017-02-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake-compiler
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ">="
18
+ - - '>='
19
19
  - !ruby/object:Gem::Version
20
20
  version: 0.9.0
21
21
  type: :development
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - ">="
25
+ - - '>='
26
26
  - !ruby/object:Gem::Version
27
27
  version: 0.9.0
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: pry
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - ">="
32
+ - - '>='
33
33
  - !ruby/object:Gem::Version
34
34
  version: '0'
35
35
  type: :development
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - ">="
39
+ - - '>='
40
40
  - !ruby/object:Gem::Version
41
41
  version: '0'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: minitest
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - "~>"
46
+ - - ~>
47
47
  - !ruby/object:Gem::Version
48
48
  version: '5.0'
49
49
  type: :development
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
- - - "~>"
53
+ - - ~>
54
54
  - !ruby/object:Gem::Version
55
55
  version: '5.0'
56
56
  description: |
@@ -62,9 +62,30 @@ extensions:
62
62
  - ext/rugged/extconf.rb
63
63
  extra_rdoc_files: []
64
64
  files:
65
- - LICENSE
66
65
  - README.md
67
- - ext/rugged/extconf.rb
66
+ - LICENSE
67
+ - lib/rugged/attributes.rb
68
+ - lib/rugged/blob.rb
69
+ - lib/rugged/branch.rb
70
+ - lib/rugged/commit.rb
71
+ - lib/rugged/console.rb
72
+ - lib/rugged/credentials.rb
73
+ - lib/rugged/diff/delta.rb
74
+ - lib/rugged/diff/hunk.rb
75
+ - lib/rugged/diff/line.rb
76
+ - lib/rugged/diff.rb
77
+ - lib/rugged/index.rb
78
+ - lib/rugged/object.rb
79
+ - lib/rugged/patch.rb
80
+ - lib/rugged/reference.rb
81
+ - lib/rugged/remote.rb
82
+ - lib/rugged/repository.rb
83
+ - lib/rugged/submodule_collection.rb
84
+ - lib/rugged/tag.rb
85
+ - lib/rugged/tree.rb
86
+ - lib/rugged/version.rb
87
+ - lib/rugged/walker.rb
88
+ - lib/rugged.rb
68
89
  - ext/rugged/rugged.c
69
90
  - ext/rugged/rugged.h
70
91
  - ext/rugged/rugged_backend.c
@@ -97,71 +118,12 @@ files:
97
118
  - ext/rugged/rugged_tag.c
98
119
  - ext/rugged/rugged_tag_collection.c
99
120
  - ext/rugged/rugged_tree.c
100
- - lib/rugged.rb
101
- - lib/rugged/attributes.rb
102
- - lib/rugged/blob.rb
103
- - lib/rugged/branch.rb
104
- - lib/rugged/commit.rb
105
- - lib/rugged/console.rb
106
- - lib/rugged/credentials.rb
107
- - lib/rugged/diff.rb
108
- - lib/rugged/diff/delta.rb
109
- - lib/rugged/diff/hunk.rb
110
- - lib/rugged/diff/line.rb
111
- - lib/rugged/index.rb
112
- - lib/rugged/object.rb
113
- - lib/rugged/patch.rb
114
- - lib/rugged/reference.rb
115
- - lib/rugged/remote.rb
116
- - lib/rugged/repository.rb
117
- - lib/rugged/submodule_collection.rb
118
- - lib/rugged/tag.rb
119
- - lib/rugged/tree.rb
120
- - lib/rugged/version.rb
121
- - lib/rugged/walker.rb
122
- - vendor/libgit2/AUTHORS
123
- - vendor/libgit2/CMakeLists.txt
124
- - vendor/libgit2/COPYING
125
121
  - vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake
126
122
  - vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake
127
123
  - vendor/libgit2/cmake/Modules/FindGSSAPI.cmake
128
124
  - vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake
129
125
  - vendor/libgit2/cmake/Modules/FindIconv.cmake
130
126
  - vendor/libgit2/cmake/Modules/FindSecurity.cmake
131
- - vendor/libgit2/deps/http-parser/LICENSE-MIT
132
- - vendor/libgit2/deps/http-parser/http_parser.c
133
- - vendor/libgit2/deps/http-parser/http_parser.h
134
- - vendor/libgit2/deps/regex/config.h
135
- - vendor/libgit2/deps/regex/regcomp.c
136
- - vendor/libgit2/deps/regex/regex.c
137
- - vendor/libgit2/deps/regex/regex.h
138
- - vendor/libgit2/deps/regex/regex_internal.c
139
- - vendor/libgit2/deps/regex/regex_internal.h
140
- - vendor/libgit2/deps/regex/regexec.c
141
- - vendor/libgit2/deps/winhttp/urlmon.h
142
- - vendor/libgit2/deps/winhttp/winhttp.def
143
- - vendor/libgit2/deps/winhttp/winhttp.h
144
- - vendor/libgit2/deps/winhttp/winhttp64.def
145
- - vendor/libgit2/deps/zlib/adler32.c
146
- - vendor/libgit2/deps/zlib/crc32.c
147
- - vendor/libgit2/deps/zlib/crc32.h
148
- - vendor/libgit2/deps/zlib/deflate.c
149
- - vendor/libgit2/deps/zlib/deflate.h
150
- - vendor/libgit2/deps/zlib/infback.c
151
- - vendor/libgit2/deps/zlib/inffast.c
152
- - vendor/libgit2/deps/zlib/inffast.h
153
- - vendor/libgit2/deps/zlib/inffixed.h
154
- - vendor/libgit2/deps/zlib/inflate.c
155
- - vendor/libgit2/deps/zlib/inflate.h
156
- - vendor/libgit2/deps/zlib/inftrees.c
157
- - vendor/libgit2/deps/zlib/inftrees.h
158
- - vendor/libgit2/deps/zlib/trees.c
159
- - vendor/libgit2/deps/zlib/trees.h
160
- - vendor/libgit2/deps/zlib/zconf.h
161
- - vendor/libgit2/deps/zlib/zlib.h
162
- - vendor/libgit2/deps/zlib/zutil.c
163
- - vendor/libgit2/deps/zlib/zutil.h
164
- - vendor/libgit2/include/git2.h
165
127
  - vendor/libgit2/include/git2/annotated_commit.h
166
128
  - vendor/libgit2/include/git2/attr.h
167
129
  - vendor/libgit2/include/git2/blame.h
@@ -240,7 +202,7 @@ files:
240
202
  - vendor/libgit2/include/git2/tree.h
241
203
  - vendor/libgit2/include/git2/types.h
242
204
  - vendor/libgit2/include/git2/version.h
243
- - vendor/libgit2/libgit2.pc.in
205
+ - vendor/libgit2/include/git2.h
244
206
  - vendor/libgit2/src/annotated_commit.c
245
207
  - vendor/libgit2/src/annotated_commit.h
246
208
  - vendor/libgit2/src/apply.c
@@ -322,14 +284,14 @@ files:
322
284
  - vendor/libgit2/src/global.c
323
285
  - vendor/libgit2/src/global.h
324
286
  - vendor/libgit2/src/graph.c
325
- - vendor/libgit2/src/hash.c
326
- - vendor/libgit2/src/hash.h
327
287
  - vendor/libgit2/src/hash/hash_common_crypto.h
328
288
  - vendor/libgit2/src/hash/hash_generic.c
329
289
  - vendor/libgit2/src/hash/hash_generic.h
330
290
  - vendor/libgit2/src/hash/hash_openssl.h
331
291
  - vendor/libgit2/src/hash/hash_win32.c
332
292
  - vendor/libgit2/src/hash/hash_win32.h
293
+ - vendor/libgit2/src/hash.c
294
+ - vendor/libgit2/src/hash.h
333
295
  - vendor/libgit2/src/hashsig.c
334
296
  - vendor/libgit2/src/ident.c
335
297
  - vendor/libgit2/src/idxmap.h
@@ -531,6 +493,44 @@ files:
531
493
  - vendor/libgit2/src/xdiff/xutils.h
532
494
  - vendor/libgit2/src/zstream.c
533
495
  - vendor/libgit2/src/zstream.h
496
+ - vendor/libgit2/deps/http-parser/http_parser.c
497
+ - vendor/libgit2/deps/http-parser/http_parser.h
498
+ - vendor/libgit2/deps/http-parser/LICENSE-MIT
499
+ - vendor/libgit2/deps/regex/config.h
500
+ - vendor/libgit2/deps/regex/regcomp.c
501
+ - vendor/libgit2/deps/regex/regex.c
502
+ - vendor/libgit2/deps/regex/regex.h
503
+ - vendor/libgit2/deps/regex/regex_internal.c
504
+ - vendor/libgit2/deps/regex/regex_internal.h
505
+ - vendor/libgit2/deps/regex/regexec.c
506
+ - vendor/libgit2/deps/winhttp/urlmon.h
507
+ - vendor/libgit2/deps/winhttp/winhttp.def
508
+ - vendor/libgit2/deps/winhttp/winhttp.h
509
+ - vendor/libgit2/deps/winhttp/winhttp64.def
510
+ - vendor/libgit2/deps/zlib/adler32.c
511
+ - vendor/libgit2/deps/zlib/crc32.c
512
+ - vendor/libgit2/deps/zlib/crc32.h
513
+ - vendor/libgit2/deps/zlib/deflate.c
514
+ - vendor/libgit2/deps/zlib/deflate.h
515
+ - vendor/libgit2/deps/zlib/infback.c
516
+ - vendor/libgit2/deps/zlib/inffast.c
517
+ - vendor/libgit2/deps/zlib/inffast.h
518
+ - vendor/libgit2/deps/zlib/inffixed.h
519
+ - vendor/libgit2/deps/zlib/inflate.c
520
+ - vendor/libgit2/deps/zlib/inflate.h
521
+ - vendor/libgit2/deps/zlib/inftrees.c
522
+ - vendor/libgit2/deps/zlib/inftrees.h
523
+ - vendor/libgit2/deps/zlib/trees.c
524
+ - vendor/libgit2/deps/zlib/trees.h
525
+ - vendor/libgit2/deps/zlib/zconf.h
526
+ - vendor/libgit2/deps/zlib/zlib.h
527
+ - vendor/libgit2/deps/zlib/zutil.c
528
+ - vendor/libgit2/deps/zlib/zutil.h
529
+ - vendor/libgit2/CMakeLists.txt
530
+ - vendor/libgit2/AUTHORS
531
+ - vendor/libgit2/COPYING
532
+ - vendor/libgit2/libgit2.pc.in
533
+ - ext/rugged/extconf.rb
534
534
  homepage: https://github.com/libgit2/rugged
535
535
  licenses:
536
536
  - MIT
@@ -541,17 +541,17 @@ require_paths:
541
541
  - lib
542
542
  required_ruby_version: !ruby/object:Gem::Requirement
543
543
  requirements:
544
- - - ">="
544
+ - - '>='
545
545
  - !ruby/object:Gem::Version
546
546
  version: 1.9.3
547
547
  required_rubygems_version: !ruby/object:Gem::Requirement
548
548
  requirements:
549
- - - ">"
549
+ - - '>'
550
550
  - !ruby/object:Gem::Version
551
551
  version: 1.3.1
552
552
  requirements: []
553
553
  rubyforge_project:
554
- rubygems_version: 2.6.8
554
+ rubygems_version: 2.0.14.1
555
555
  signing_key:
556
556
  specification_version: 4
557
557
  summary: Rugged is a Ruby binding to the libgit2 linkable library