pod-builder 0.3.5 → 0.3.6
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/pod_builder/podfile.rb +1 -2
- data/lib/pod_builder/podfile_item.rb +30 -37
- data/lib/pod_builder/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0dcdd8172ce23bbc1288b3414b9c2967de43a999a90cd825c14c58899e00d168
|
4
|
+
data.tar.gz: c0a812e95bbaf9c5c40dfa9385358f14726ca2f85ea028c339f12e820ac8d754
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7434e06a402a7700b8b4ecaa58587ada1743a65d542b0eb9427a2b316f569a7715be3776f1ee1ceab122fadbedd5135b10cc31878b9207db14e713f8def464eb
|
7
|
+
data.tar.gz: 975bc31a12bc5f699f6ac90965c9a171f85ed9a092ef7227c8d1d1a7f538bd09794450b744a4eed7fb8877ae4ec4cfd7c6728547a7ad0c13152287eb1c583378
|
data/lib/pod_builder/podfile.rb
CHANGED
@@ -267,8 +267,7 @@ module PodBuilder
|
|
267
267
|
return
|
268
268
|
end
|
269
269
|
|
270
|
-
|
271
|
-
lines.each do |line|
|
270
|
+
File.read(podfile_path).each_line do |line|
|
272
271
|
stripped_line = strip_line(line)
|
273
272
|
unless !stripped_line.start_with?("#")
|
274
273
|
next
|
@@ -121,25 +121,21 @@ module PodBuilder
|
|
121
121
|
@is_external = false
|
122
122
|
end
|
123
123
|
|
124
|
-
@vendored_items = recursive_vendored_items(spec)
|
124
|
+
@vendored_items = recursive_vendored_items(spec, all_specs)
|
125
125
|
|
126
126
|
@frameworks = []
|
127
|
-
@frameworks += extract_array(spec, "framework")
|
128
|
-
@frameworks += extract_array(spec, "frameworks")
|
129
|
-
@frameworks += extract_array(spec.root, "framework")
|
130
|
-
@frameworks += extract_array(spec.root, "frameworks")
|
131
|
-
|
132
127
|
@weak_frameworks = []
|
133
|
-
@weak_frameworks += extract_array(spec, "weak_frameworks")
|
134
|
-
@weak_frameworks += extract_array(spec, "weak_frameworks")
|
135
|
-
@weak_frameworks += extract_array(spec.root, "weak_frameworks")
|
136
|
-
@weak_frameworks += extract_array(spec.root, "weak_frameworks")
|
137
|
-
|
138
128
|
@libraries = []
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
129
|
+
spec_and_dependencies(spec, all_specs).each do |spec|
|
130
|
+
@frameworks += extract_array(spec, "framework")
|
131
|
+
@frameworks += extract_array(spec, "frameworks")
|
132
|
+
|
133
|
+
@weak_frameworks += extract_array(spec, "weak_framework")
|
134
|
+
@weak_frameworks += extract_array(spec, "weak_frameworks")
|
135
|
+
|
136
|
+
@libraries += extract_array(spec, "library")
|
137
|
+
@libraries += extract_array(spec, "libraries")
|
138
|
+
end
|
143
139
|
|
144
140
|
@version = spec.root.version.version
|
145
141
|
@available_versions = spec.respond_to?(:spec_source) ? spec.spec_source.versions(@root_name)&.map(&:to_s) : [@version]
|
@@ -327,34 +323,24 @@ module PodBuilder
|
|
327
323
|
|
328
324
|
private
|
329
325
|
|
330
|
-
def recursive_vendored_items(spec)
|
326
|
+
def recursive_vendored_items(spec, all_specs)
|
331
327
|
items = []
|
332
328
|
|
333
|
-
items += [spec.root.attributes_hash["vendored_frameworks"]]
|
334
|
-
items += [spec.root.attributes_hash["vendored_framework"]]
|
335
|
-
items += [spec.root.attributes_hash["vendored_libraries"]]
|
336
|
-
items += [spec.root.attributes_hash["vendored_library"]]
|
337
|
-
|
338
|
-
items += [spec.attributes_hash["vendored_frameworks"]]
|
339
|
-
items += [spec.attributes_hash["vendored_framework"]]
|
340
|
-
items += [spec.attributes_hash["vendored_libraries"]]
|
341
|
-
items += [spec.attributes_hash["vendored_library"]]
|
342
|
-
|
343
329
|
supported_platforms = spec.available_platforms.flatten.map(&:name).map(&:to_s)
|
344
330
|
|
345
|
-
|
346
|
-
|
347
|
-
|
348
|
-
|
331
|
+
spec_and_dependencies(spec, all_specs).each do |spec|
|
332
|
+
items += [spec.attributes_hash["vendored_frameworks"]]
|
333
|
+
items += [spec.attributes_hash["vendored_framework"]]
|
334
|
+
items += [spec.attributes_hash["vendored_libraries"]]
|
335
|
+
items += [spec.attributes_hash["vendored_library"]]
|
349
336
|
|
350
|
-
|
351
|
-
|
352
|
-
|
353
|
-
|
354
|
-
|
355
|
-
items = items.flatten.compact
|
337
|
+
items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_frameworks"] }
|
338
|
+
items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_framework"] }
|
339
|
+
items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_libraries"] }
|
340
|
+
items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_library"] }
|
341
|
+
end
|
356
342
|
|
357
|
-
return items.flatten
|
343
|
+
return items.flatten.uniq.compact
|
358
344
|
end
|
359
345
|
|
360
346
|
def extract_array(spec, key)
|
@@ -378,5 +364,12 @@ module PodBuilder
|
|
378
364
|
|
379
365
|
return source_files + root_source_files
|
380
366
|
end
|
367
|
+
|
368
|
+
def spec_and_dependencies(spec, all_specs)
|
369
|
+
specs = all_specs.select { |x| spec.dependencies.map(&:name).include?(x.name) }
|
370
|
+
specs += [spec, spec.root]
|
371
|
+
|
372
|
+
return specs.compact.uniq
|
373
|
+
end
|
381
374
|
end
|
382
375
|
end
|
data/lib/pod_builder/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: pod-builder
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Tomas Camin
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2019-01-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|