cocoapods-core 1.0.0.beta.8 → 1.0.0.rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/cocoapods-core/gem_version.rb +1 -1
- data/lib/cocoapods-core/github.rb +7 -3
- data/lib/cocoapods-core/podfile/dsl.rb +4 -6
- data/lib/cocoapods-core/specification/dsl/attribute.rb +13 -13
- data/lib/cocoapods-core/vendor.rb +1 -1
- data/lib/cocoapods-core/vendor/requirement.rb +4 -3
- data/lib/cocoapods-core/vendor/version.rb +44 -27
- metadata +12 -12
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b8172f4984659929a7a0b34b0b76b2277758a1f2
|
4
|
+
data.tar.gz: b524a2733c2d5053b9bd9e842e435a75a070ce07
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: adf5309f5d25b6145aa45736521fa1401632e72cae5ded628f717510b9b9a0cae8b69419812c670f13507097ce4f57ee780b31ad3c039230c41b65964e9bbbbc
|
7
|
+
data.tar.gz: 83d1a4d3e0ca0e8d83abce693425d7a6221f2a119dc9e8744d7c8de78f96b191563f3878174c6443ddf900dffde50fbf8bfb36761b6868390612eb450891c7b7
|
@@ -96,10 +96,14 @@ module Pod
|
|
96
96
|
'Accept' => 'application/vnd.github.chitauri-preview+sha',
|
97
97
|
'If-None-Match' => %("#{commit}"),
|
98
98
|
}
|
99
|
-
response = REST.get(request_url, headers)
|
100
|
-
code = response.status_code
|
101
99
|
|
102
|
-
|
100
|
+
begin
|
101
|
+
response = REST.get(request_url, headers)
|
102
|
+
code = response.status_code
|
103
|
+
code != 304
|
104
|
+
rescue
|
105
|
+
raise Informative, "Failed to connect to GitHub to update the #{repo_id} specs repo - Please check if you are offline, or that GitHub is down"
|
106
|
+
end
|
103
107
|
end
|
104
108
|
|
105
109
|
private
|
@@ -117,12 +117,6 @@ module Pod
|
|
117
117
|
#
|
118
118
|
# ### Build configurations
|
119
119
|
#
|
120
|
-
# *IMPORTANT*: the following syntax is tentative and might change without
|
121
|
-
# notice in future. This feature is released in this state due to
|
122
|
-
# the strong demand for it. You can use it but you might need to change
|
123
|
-
# your Podfile to use future versions of CocoaPods. Anyway a clear and
|
124
|
-
# simple upgrade path will be provided.
|
125
|
-
#
|
126
120
|
# By default dependencies are installed in all the build configurations
|
127
121
|
# of the target. For debug purposes or for other reasons, they can be
|
128
122
|
# only enabled on a list of build configurations.
|
@@ -134,6 +128,10 @@ module Pod
|
|
134
128
|
#
|
135
129
|
# pod 'PonyDebugger', :configuration => 'Debug'
|
136
130
|
#
|
131
|
+
# Note that transitive dependencies are included in all configurations,
|
132
|
+
# you have to manually specify build configurations for them as well in
|
133
|
+
# case this is not desired.
|
134
|
+
#
|
137
135
|
# ------
|
138
136
|
#
|
139
137
|
# ### Subspecs
|
@@ -29,18 +29,18 @@ module Pod
|
|
29
29
|
def initialize(name, options)
|
30
30
|
@name = name
|
31
31
|
|
32
|
-
@multi_platform = options.delete(:multi_platform) { true
|
33
|
-
@
|
34
|
-
@
|
35
|
-
@required = options.delete(:required) { false
|
36
|
-
@singularize = options.delete(:singularize) { false
|
37
|
-
@file_patterns = options.delete(:file_patterns) { false
|
38
|
-
@container = options.delete(:container) { nil
|
39
|
-
@keys = options.delete(:keys) { nil
|
40
|
-
@default_value = options.delete(:default_value) { nil
|
41
|
-
@ios_default = options.delete(:ios_default) { nil
|
42
|
-
@osx_default = options.delete(:osx_default) { nil
|
43
|
-
@types = options.delete(:types) { [String]
|
32
|
+
@multi_platform = options.delete(:multi_platform) { true }
|
33
|
+
@root_only = options.delete(:root_only) { false }
|
34
|
+
@inherited = options.delete(:inherited) { @root_only }
|
35
|
+
@required = options.delete(:required) { false }
|
36
|
+
@singularize = options.delete(:singularize) { false }
|
37
|
+
@file_patterns = options.delete(:file_patterns) { false }
|
38
|
+
@container = options.delete(:container) { nil }
|
39
|
+
@keys = options.delete(:keys) { nil }
|
40
|
+
@default_value = options.delete(:default_value) { nil }
|
41
|
+
@ios_default = options.delete(:ios_default) { nil }
|
42
|
+
@osx_default = options.delete(:osx_default) { nil }
|
43
|
+
@types = options.delete(:types) { [String] }
|
44
44
|
|
45
45
|
unless options.empty?
|
46
46
|
raise StandardError, "Unrecognized options: #{options} for #{self}"
|
@@ -149,7 +149,7 @@ module Pod
|
|
149
149
|
# @note Attributes stored in wrappers are always inherited.
|
150
150
|
#
|
151
151
|
def inherited?
|
152
|
-
|
152
|
+
@inherited
|
153
153
|
end
|
154
154
|
|
155
155
|
#---------------------------------------------------------------------#
|
@@ -9,7 +9,7 @@ module Pod
|
|
9
9
|
#
|
10
10
|
# E.g. https://github.com/CocoaPods/CocoaPods/issues/398
|
11
11
|
#
|
12
|
-
# The following classes are copied from RubyGems `v2.
|
12
|
+
# The following classes are copied from RubyGems `v2.6.3`. The changes
|
13
13
|
# performed to the source files are the following:
|
14
14
|
#
|
15
15
|
# - Namespaced in `Pod::Vendor`
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module Pod::Vendor
|
2
3
|
|
3
4
|
# require "rubygems/version"
|
@@ -91,9 +92,9 @@ module Pod::Vendor
|
|
91
92
|
# specification, like <tt>">= 1.2"</tt>, or a simple version number,
|
92
93
|
# like <tt>"1.2"</tt>.
|
93
94
|
#
|
94
|
-
# parse("> 1.0") # => [">", "1.0"]
|
95
|
-
# parse("1.0") # => ["=", "1.0"]
|
96
|
-
# parse(Gem::Version.new("1.0")) # => ["=, "1.0"]
|
95
|
+
# parse("> 1.0") # => [">", Gem::Version.new("1.0")]
|
96
|
+
# parse("1.0") # => ["=", Gem::Version.new("1.0")]
|
97
|
+
# parse(Gem::Version.new("1.0")) # => ["=, Gem::Version.new("1.0")]
|
97
98
|
|
98
99
|
def self.parse obj
|
99
100
|
return ["=", obj] if Gem::Version === obj
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module Pod::Vendor
|
2
3
|
|
3
4
|
##
|
@@ -109,7 +110,7 @@ module Pod::Vendor
|
|
109
110
|
# Client A needs a stack with basic push/pop capability. They write to the
|
110
111
|
# original interface (no <tt>top</tt>), so their version constraint looks like:
|
111
112
|
#
|
112
|
-
# gem 'stack', '
|
113
|
+
# gem 'stack', '>= 0.0'
|
113
114
|
#
|
114
115
|
# Essentially, any version is OK with Client A. An incompatible change to
|
115
116
|
# the library will cause them grief, but they are willing to take the chance
|
@@ -219,12 +220,14 @@ module Pod::Vendor
|
|
219
220
|
# Pre-release (alpha) parts, e.g, 5.3.1.b.2 => 5.4, are ignored.
|
220
221
|
|
221
222
|
def bump
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
223
|
+
@bump ||= begin
|
224
|
+
segments = self.segments
|
225
|
+
segments.pop while segments.any? { |s| String === s }
|
226
|
+
segments.pop if segments.size > 1
|
227
|
+
|
228
|
+
segments[-1] = segments[-1].succ
|
229
|
+
self.class.new segments.join(".")
|
230
|
+
end
|
228
231
|
end
|
229
232
|
|
230
233
|
##
|
@@ -232,11 +235,11 @@ module Pod::Vendor
|
|
232
235
|
# same precision. Version "1.0" is not the same as version "1".
|
233
236
|
|
234
237
|
def eql? other
|
235
|
-
self.class === other and @version == other.
|
238
|
+
self.class === other and @version == other._version
|
236
239
|
end
|
237
240
|
|
238
241
|
def hash # :nodoc:
|
239
|
-
@
|
242
|
+
@version.hash
|
240
243
|
end
|
241
244
|
|
242
245
|
def init_with coder # :nodoc:
|
@@ -281,7 +284,10 @@ module Pod::Vendor
|
|
281
284
|
# A version is considered a prerelease if it contains a letter.
|
282
285
|
|
283
286
|
def prerelease?
|
284
|
-
|
287
|
+
unless instance_variable_defined? :@prerelease
|
288
|
+
@prerelease = !!(@version =~ /[a-zA-Z]/)
|
289
|
+
end
|
290
|
+
@prerelease
|
285
291
|
end
|
286
292
|
|
287
293
|
def pretty_print q # :nodoc:
|
@@ -293,28 +299,24 @@ module Pod::Vendor
|
|
293
299
|
# Non-prerelease versions return themselves.
|
294
300
|
|
295
301
|
def release
|
296
|
-
|
297
|
-
|
298
|
-
|
299
|
-
|
300
|
-
|
302
|
+
@release ||= if prerelease?
|
303
|
+
segments = self.segments
|
304
|
+
segments.pop while segments.any? { |s| String === s }
|
305
|
+
self.class.new segments.join('.')
|
306
|
+
else
|
307
|
+
self
|
308
|
+
end
|
301
309
|
end
|
302
310
|
|
303
311
|
def segments # :nodoc:
|
304
|
-
|
305
|
-
# segments is lazy so it can pick up version values that come from
|
306
|
-
# old marshaled versions, which don't go through marshal_load.
|
307
|
-
|
308
|
-
@segments ||= @version.scan(/[0-9]+|[a-z]+/i).map do |s|
|
309
|
-
/^\d+$/ =~ s ? s.to_i : s
|
310
|
-
end
|
312
|
+
_segments.dup
|
311
313
|
end
|
312
314
|
|
313
315
|
##
|
314
316
|
# A recommended version for use with a ~> Requirement.
|
315
317
|
|
316
318
|
def approximate_recommendation
|
317
|
-
segments = self.segments
|
319
|
+
segments = self.segments
|
318
320
|
|
319
321
|
segments.pop while segments.any? { |s| String === s }
|
320
322
|
segments.pop while segments.size > 2
|
@@ -331,10 +333,10 @@ module Pod::Vendor
|
|
331
333
|
|
332
334
|
def <=> other
|
333
335
|
return unless Gem::Version === other
|
334
|
-
return 0 if @version == other.
|
336
|
+
return 0 if @version == other._version
|
335
337
|
|
336
|
-
lhsegments =
|
337
|
-
rhsegments = other.
|
338
|
+
lhsegments = _segments
|
339
|
+
rhsegments = other._segments
|
338
340
|
|
339
341
|
lhsize = lhsegments.size
|
340
342
|
rhsize = rhsegments.size
|
@@ -355,6 +357,21 @@ module Pod::Vendor
|
|
355
357
|
|
356
358
|
return 0
|
357
359
|
end
|
358
|
-
end
|
359
360
|
|
361
|
+
protected
|
362
|
+
|
363
|
+
def _version
|
364
|
+
@version
|
365
|
+
end
|
366
|
+
|
367
|
+
def _segments
|
368
|
+
# segments is lazy so it can pick up version values that come from
|
369
|
+
# old marshaled versions, which don't go through marshal_load.
|
370
|
+
# since this version object is cached in @@all, its @segments should be frozen
|
371
|
+
|
372
|
+
@segments ||= @version.scan(/[0-9]+|[a-z]+/i).map do |s|
|
373
|
+
/^\d+$/ =~ s ? s.to_i : s
|
374
|
+
end.freeze
|
375
|
+
end
|
376
|
+
end
|
360
377
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cocoapods-core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.0.
|
4
|
+
version: 1.0.0.rc.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Eloy Duran
|
@@ -9,62 +9,62 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2016-04-
|
12
|
+
date: 2016-04-29 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: activesupport
|
16
16
|
requirement: !ruby/object:Gem::Requirement
|
17
17
|
requirements:
|
18
|
-
- -
|
18
|
+
- - ">="
|
19
19
|
- !ruby/object:Gem::Version
|
20
20
|
version: 4.0.2
|
21
21
|
type: :runtime
|
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: 4.0.2
|
28
28
|
- !ruby/object:Gem::Dependency
|
29
29
|
name: nap
|
30
30
|
requirement: !ruby/object:Gem::Requirement
|
31
31
|
requirements:
|
32
|
-
- - ~>
|
32
|
+
- - "~>"
|
33
33
|
- !ruby/object:Gem::Version
|
34
34
|
version: '1.0'
|
35
35
|
type: :runtime
|
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: '1.0'
|
42
42
|
- !ruby/object:Gem::Dependency
|
43
43
|
name: fuzzy_match
|
44
44
|
requirement: !ruby/object:Gem::Requirement
|
45
45
|
requirements:
|
46
|
-
- - ~>
|
46
|
+
- - "~>"
|
47
47
|
- !ruby/object:Gem::Version
|
48
48
|
version: 2.0.4
|
49
49
|
type: :runtime
|
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: 2.0.4
|
56
56
|
- !ruby/object:Gem::Dependency
|
57
57
|
name: bacon
|
58
58
|
requirement: !ruby/object:Gem::Requirement
|
59
59
|
requirements:
|
60
|
-
- - ~>
|
60
|
+
- - "~>"
|
61
61
|
- !ruby/object:Gem::Version
|
62
62
|
version: '1.1'
|
63
63
|
type: :development
|
64
64
|
prerelease: false
|
65
65
|
version_requirements: !ruby/object:Gem::Requirement
|
66
66
|
requirements:
|
67
|
-
- - ~>
|
67
|
+
- - "~>"
|
68
68
|
- !ruby/object:Gem::Version
|
69
69
|
version: '1.1'
|
70
70
|
description: |-
|
@@ -130,12 +130,12 @@ require_paths:
|
|
130
130
|
- lib
|
131
131
|
required_ruby_version: !ruby/object:Gem::Requirement
|
132
132
|
requirements:
|
133
|
-
- -
|
133
|
+
- - ">="
|
134
134
|
- !ruby/object:Gem::Version
|
135
135
|
version: 2.0.0
|
136
136
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
137
137
|
requirements:
|
138
|
-
- -
|
138
|
+
- - ">="
|
139
139
|
- !ruby/object:Gem::Version
|
140
140
|
version: '0'
|
141
141
|
requirements: []
|