cocoapods 0.36.3 → 0.36.4

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.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +12 -0
  3. data/lib/cocoapods/gem_version.rb +1 -1
  4. data/lib/cocoapods/generator/copy_resources_script.rb +21 -4
  5. metadata +58 -58
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a98a2f9b5683c1f3758671cbd0291869782ca873
4
- data.tar.gz: 2c6ebb55051dd15cf9760ecd073a2aee5078317d
3
+ metadata.gz: 95984b64c13cb23f477eff2906659dbd76d1d522
4
+ data.tar.gz: 2f1c29bfb21e2a5d921a88891da091b02084bb97
5
5
  SHA512:
6
- metadata.gz: 929ee86fc4e3bbc5c48040acde4ca252beef250ea88f4602d9e662c5cb424d0059eadf4c295337b636008458f8b8671602dcd546cc0dddffe2e779fb3b28fa17
7
- data.tar.gz: 428723fe6ff24918d7e15891031e0406f36fec0044634835b5bb3f13aa421ed04fc9f69e1b61a61b8b46f3e86b82df3c99573ddb65d7f872c84b5e6a8a9d0bce
6
+ metadata.gz: ddb355e60588c50b120453daf9a67fb2280f20e45dd1eb853c6f55945fffde882b4126211c8b00358ed7a2c34fa67f56a3ec8fba51526a5f5e5569ebefedaaa1
7
+ data.tar.gz: a41f06c36dd9c75ac731b7f9cc8672fd99625c363bffcd73fa444ad518da23ac897511c157772744a180430a132072701f3d3d3b7e841a39f17c1e7282885018
data/CHANGELOG.md CHANGED
@@ -4,6 +4,18 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
4
4
 
5
5
  To install release candidates run `[sudo] gem install cocoapods --pre`
6
6
 
7
+ ## 0.36.4
8
+
9
+ ##### Bug Fixes
10
+
11
+ * Fixes various problems with Pods that use xcasset bundles. Pods that
12
+ use xcassets can now be used with the `pod :path` option.
13
+ [Kyle Fuller](https://github.com/kylef)
14
+ [#1549](https://github.com/CocoaPods/CocoaPods/issues/1549)
15
+ [#3384](https://github.com/CocoaPods/CocoaPods/pull/3383)
16
+ [#3358](https://github.com/CocoaPods/CocoaPods/pull/3358)
17
+
18
+
7
19
  ## 0.36.3
8
20
 
9
21
  ##### Bug Fixes
data/lib/cocoapods/gem_version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Pod
2
2
  # The version of the cocoapods command line tool.
3
3
  #
4
- VERSION = '0.36.3' unless defined? Pod::VERSION
4
+ VERSION = '0.36.4' unless defined? Pod::VERSION
5
5
  end
data/lib/cocoapods/generator/copy_resources_script.rb CHANGED
@@ -1,3 +1,5 @@
1
+ # rubocop:disable LineLength
2
+
1
3
  module Pod
2
4
  module Generator
3
5
  class CopyResourcesScript
@@ -96,7 +98,13 @@ mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
96
98
  RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
97
99
  > "$RESOURCES_TO_COPY"
98
100
 
99
- XCASSET_FILES=""
101
+ XCASSET_FILES=()
102
+
103
+ realpath() {
104
+ DIRECTORY=$(cd "${1%/*}" && pwd)
105
+ FILENAME="${1##*/}"
106
+ echo "$DIRECTORY/$FILENAME"
107
+ }
100
108
 
101
109
  install_resource()
102
110
  {
@@ -128,7 +136,8 @@ install_resource()
128
136
  xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm"
129
137
  ;;
130
138
  *.xcassets)
131
- XCASSET_FILES="$XCASSET_FILES '${PODS_ROOT}/$1'"
139
+ ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1")
140
+ XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
132
141
  ;;
133
142
  /*)
134
143
  echo "$1"
@@ -169,8 +178,16 @@ then
169
178
  TARGET_DEVICE_ARGS="--target-device mac"
170
179
  ;;
171
180
  esac
172
- while read line; do XCASSET_FILES="$XCASSET_FILES '$line'"; done <<<$(find "$PWD" -name "*.xcassets" | egrep -v "^$PODS_ROOT")
173
- echo $XCASSET_FILES | xargs actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
181
+
182
+ # Find all other xcassets (this unfortunately includes those of path pods and other targets).
183
+ OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
184
+ while read line; do
185
+ if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
186
+ XCASSET_FILES+=("$line")
187
+ fi
188
+ done <<<"$OTHER_XCASSETS"
189
+
190
+ printf "%s\\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
174
191
  fi
175
192
  EOS
176
193
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cocoapods
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.36.3
4
+ version: 0.36.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eloy Duran
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-03-31 00:00:00.000000000 Z
12
+ date: 2015-04-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: cocoapods-core
@@ -17,222 +17,222 @@ dependencies:
17
17
  requirements:
18
18
  - - '='
19
19
  - !ruby/object:Gem::Version
20
- version: 0.36.3
20
+ version: 0.36.4
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
- version: 0.36.3
27
+ version: 0.36.4
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: claide
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - "~>"
32
+ - - ~>
33
33
  - !ruby/object:Gem::Version
34
34
  version: 0.8.1
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: 0.8.1
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: xcodeproj
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - "~>"
46
+ - - ~>
47
47
  - !ruby/object:Gem::Version
48
48
  version: 0.23.1
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: 0.23.1
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: cocoapods-downloader
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
- - - "~>"
60
+ - - ~>
61
61
  - !ruby/object:Gem::Version
62
62
  version: 0.9.0
63
63
  type: :runtime
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: 0.9.0
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: cocoapods-plugins
72
72
  requirement: !ruby/object:Gem::Requirement
73
73
  requirements:
74
- - - "~>"
74
+ - - ~>
75
75
  - !ruby/object:Gem::Version
76
76
  version: 0.4.1
77
77
  type: :runtime
78
78
  prerelease: false
79
79
  version_requirements: !ruby/object:Gem::Requirement
80
80
  requirements:
81
- - - "~>"
81
+ - - ~>
82
82
  - !ruby/object:Gem::Version
83
83
  version: 0.4.1
84
84
  - !ruby/object:Gem::Dependency
85
85
  name: cocoapods-try
86
86
  requirement: !ruby/object:Gem::Requirement
87
87
  requirements:
88
- - - "~>"
88
+ - - ~>
89
89
  - !ruby/object:Gem::Version
90
90
  version: 0.4.3
91
91
  type: :runtime
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
- - - "~>"
95
+ - - ~>
96
96
  - !ruby/object:Gem::Version
97
97
  version: 0.4.3
98
98
  - !ruby/object:Gem::Dependency
99
99
  name: cocoapods-trunk
100
100
  requirement: !ruby/object:Gem::Requirement
101
101
  requirements:
102
- - - "~>"
102
+ - - ~>
103
103
  - !ruby/object:Gem::Version
104
104
  version: 0.6.0
105
105
  type: :runtime
106
106
  prerelease: false
107
107
  version_requirements: !ruby/object:Gem::Requirement
108
108
  requirements:
109
- - - "~>"
109
+ - - ~>
110
110
  - !ruby/object:Gem::Version
111
111
  version: 0.6.0
112
112
  - !ruby/object:Gem::Dependency
113
113
  name: molinillo
114
114
  requirement: !ruby/object:Gem::Requirement
115
115
  requirements:
116
- - - "~>"
116
+ - - ~>
117
117
  - !ruby/object:Gem::Version
118
118
  version: 0.2.1
119
119
  type: :runtime
120
120
  prerelease: false
121
121
  version_requirements: !ruby/object:Gem::Requirement
122
122
  requirements:
123
- - - "~>"
123
+ - - ~>
124
124
  - !ruby/object:Gem::Version
125
125
  version: 0.2.1
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: colored
128
128
  requirement: !ruby/object:Gem::Requirement
129
129
  requirements:
130
- - - "~>"
130
+ - - ~>
131
131
  - !ruby/object:Gem::Version
132
132
  version: '1.2'
133
133
  type: :runtime
134
134
  prerelease: false
135
135
  version_requirements: !ruby/object:Gem::Requirement
136
136
  requirements:
137
- - - "~>"
137
+ - - ~>
138
138
  - !ruby/object:Gem::Version
139
139
  version: '1.2'
140
140
  - !ruby/object:Gem::Dependency
141
141
  name: escape
142
142
  requirement: !ruby/object:Gem::Requirement
143
143
  requirements:
144
- - - "~>"
144
+ - - ~>
145
145
  - !ruby/object:Gem::Version
146
146
  version: 0.0.4
147
147
  type: :runtime
148
148
  prerelease: false
149
149
  version_requirements: !ruby/object:Gem::Requirement
150
150
  requirements:
151
- - - "~>"
151
+ - - ~>
152
152
  - !ruby/object:Gem::Version
153
153
  version: 0.0.4
154
154
  - !ruby/object:Gem::Dependency
155
155
  name: open4
156
156
  requirement: !ruby/object:Gem::Requirement
157
157
  requirements:
158
- - - "~>"
158
+ - - ~>
159
159
  - !ruby/object:Gem::Version
160
160
  version: '1.3'
161
161
  type: :runtime
162
162
  prerelease: false
163
163
  version_requirements: !ruby/object:Gem::Requirement
164
164
  requirements:
165
- - - "~>"
165
+ - - ~>
166
166
  - !ruby/object:Gem::Version
167
167
  version: '1.3'
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: activesupport
170
170
  requirement: !ruby/object:Gem::Requirement
171
171
  requirements:
172
- - - ">="
172
+ - - '>='
173
173
  - !ruby/object:Gem::Version
174
174
  version: 3.2.15
175
175
  type: :runtime
176
176
  prerelease: false
177
177
  version_requirements: !ruby/object:Gem::Requirement
178
178
  requirements:
179
- - - ">="
179
+ - - '>='
180
180
  - !ruby/object:Gem::Version
181
181
  version: 3.2.15
182
182
  - !ruby/object:Gem::Dependency
183
183
  name: nap
184
184
  requirement: !ruby/object:Gem::Requirement
185
185
  requirements:
186
- - - "~>"
186
+ - - ~>
187
187
  - !ruby/object:Gem::Version
188
188
  version: '0.8'
189
189
  type: :runtime
190
190
  prerelease: false
191
191
  version_requirements: !ruby/object:Gem::Requirement
192
192
  requirements:
193
- - - "~>"
193
+ - - ~>
194
194
  - !ruby/object:Gem::Version
195
195
  version: '0.8'
196
196
  - !ruby/object:Gem::Dependency
197
197
  name: bundler
198
198
  requirement: !ruby/object:Gem::Requirement
199
199
  requirements:
200
- - - "~>"
200
+ - - ~>
201
201
  - !ruby/object:Gem::Version
202
202
  version: '1.3'
203
203
  type: :development
204
204
  prerelease: false
205
205
  version_requirements: !ruby/object:Gem::Requirement
206
206
  requirements:
207
- - - "~>"
207
+ - - ~>
208
208
  - !ruby/object:Gem::Version
209
209
  version: '1.3'
210
210
  - !ruby/object:Gem::Dependency
211
211
  name: rake
212
212
  requirement: !ruby/object:Gem::Requirement
213
213
  requirements:
214
- - - ">="
214
+ - - '>='
215
215
  - !ruby/object:Gem::Version
216
216
  version: '0'
217
217
  type: :development
218
218
  prerelease: false
219
219
  version_requirements: !ruby/object:Gem::Requirement
220
220
  requirements:
221
- - - ">="
221
+ - - '>='
222
222
  - !ruby/object:Gem::Version
223
223
  version: '0'
224
224
  - !ruby/object:Gem::Dependency
225
225
  name: bacon
226
226
  requirement: !ruby/object:Gem::Requirement
227
227
  requirements:
228
- - - "~>"
228
+ - - ~>
229
229
  - !ruby/object:Gem::Version
230
230
  version: '1.1'
231
231
  type: :development
232
232
  prerelease: false
233
233
  version_requirements: !ruby/object:Gem::Requirement
234
234
  requirements:
235
- - - "~>"
235
+ - - ~>
236
236
  - !ruby/object:Gem::Version
237
237
  version: '1.1'
238
238
  description: |-
@@ -250,46 +250,40 @@ executables:
250
250
  extensions: []
251
251
  extra_rdoc_files: []
252
252
  files:
253
- - CHANGELOG.md
254
- - LICENSE
255
- - README.md
256
- - bin/pod
257
- - bin/sandbox-pod
258
- - lib/cocoapods.rb
259
- - lib/cocoapods/command.rb
260
253
  - lib/cocoapods/command/init.rb
261
254
  - lib/cocoapods/command/inter_process_communication.rb
262
255
  - lib/cocoapods/command/lib.rb
263
256
  - lib/cocoapods/command/list.rb
264
257
  - lib/cocoapods/command/outdated.rb
265
258
  - lib/cocoapods/command/project.rb
266
- - lib/cocoapods/command/repo.rb
267
259
  - lib/cocoapods/command/repo/add.rb
268
260
  - lib/cocoapods/command/repo/lint.rb
269
261
  - lib/cocoapods/command/repo/list.rb
270
262
  - lib/cocoapods/command/repo/push.rb
271
263
  - lib/cocoapods/command/repo/remove.rb
272
264
  - lib/cocoapods/command/repo/update.rb
265
+ - lib/cocoapods/command/repo.rb
273
266
  - lib/cocoapods/command/search.rb
274
267
  - lib/cocoapods/command/setup.rb
275
- - lib/cocoapods/command/spec.rb
276
268
  - lib/cocoapods/command/spec/cat.rb
277
269
  - lib/cocoapods/command/spec/create.rb
278
270
  - lib/cocoapods/command/spec/edit.rb
279
271
  - lib/cocoapods/command/spec/lint.rb
280
272
  - lib/cocoapods/command/spec/which.rb
273
+ - lib/cocoapods/command/spec.rb
274
+ - lib/cocoapods/command.rb
281
275
  - lib/cocoapods/config.rb
282
276
  - lib/cocoapods/downloader.rb
283
277
  - lib/cocoapods/executable.rb
284
- - lib/cocoapods/external_sources.rb
285
278
  - lib/cocoapods/external_sources/abstract_external_source.rb
286
279
  - lib/cocoapods/external_sources/downloader_source.rb
287
280
  - lib/cocoapods/external_sources/path_source.rb
288
281
  - lib/cocoapods/external_sources/podspec_source.rb
282
+ - lib/cocoapods/external_sources.rb
289
283
  - lib/cocoapods/gem_version.rb
290
- - lib/cocoapods/generator/acknowledgements.rb
291
284
  - lib/cocoapods/generator/acknowledgements/markdown.rb
292
285
  - lib/cocoapods/generator/acknowledgements/plist.rb
286
+ - lib/cocoapods/generator/acknowledgements.rb
293
287
  - lib/cocoapods/generator/bridge_support.rb
294
288
  - lib/cocoapods/generator/copy_resources_script.rb
295
289
  - lib/cocoapods/generator/dummy_source.rb
@@ -300,44 +294,50 @@ files:
300
294
  - lib/cocoapods/generator/prefix_header.rb
301
295
  - lib/cocoapods/generator/target_environment_header.rb
302
296
  - lib/cocoapods/generator/umbrella_header.rb
303
- - lib/cocoapods/generator/xcconfig.rb
304
297
  - lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
305
298
  - lib/cocoapods/generator/xcconfig/private_pod_xcconfig.rb
306
299
  - lib/cocoapods/generator/xcconfig/public_pod_xcconfig.rb
307
300
  - lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
301
+ - lib/cocoapods/generator/xcconfig.rb
308
302
  - lib/cocoapods/hooks/installer_representation.rb
309
303
  - lib/cocoapods/hooks/library_representation.rb
310
304
  - lib/cocoapods/hooks/pod_representation.rb
311
305
  - lib/cocoapods/hooks_manager.rb
312
- - lib/cocoapods/installer.rb
313
- - lib/cocoapods/installer/analyzer.rb
314
306
  - lib/cocoapods/installer/analyzer/locking_dependency_analyzer.rb
315
307
  - lib/cocoapods/installer/analyzer/sandbox_analyzer.rb
308
+ - lib/cocoapods/installer/analyzer.rb
316
309
  - lib/cocoapods/installer/file_references_installer.rb
317
310
  - lib/cocoapods/installer/hooks_context.rb
318
311
  - lib/cocoapods/installer/migrator.rb
319
312
  - lib/cocoapods/installer/pod_source_installer.rb
320
- - lib/cocoapods/installer/target_installer.rb
321
313
  - lib/cocoapods/installer/target_installer/aggregate_target_installer.rb
322
314
  - lib/cocoapods/installer/target_installer/pod_target_installer.rb
323
- - lib/cocoapods/installer/user_project_integrator.rb
324
- - lib/cocoapods/installer/user_project_integrator/target_integrator.rb
315
+ - lib/cocoapods/installer/target_installer.rb
325
316
  - lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb
317
+ - lib/cocoapods/installer/user_project_integrator/target_integrator.rb
318
+ - lib/cocoapods/installer/user_project_integrator.rb
319
+ - lib/cocoapods/installer.rb
326
320
  - lib/cocoapods/open_uri.rb
327
321
  - lib/cocoapods/project.rb
328
- - lib/cocoapods/resolver.rb
329
322
  - lib/cocoapods/resolver/lazy_specification.rb
330
- - lib/cocoapods/sandbox.rb
323
+ - lib/cocoapods/resolver.rb
331
324
  - lib/cocoapods/sandbox/file_accessor.rb
332
325
  - lib/cocoapods/sandbox/headers_store.rb
333
326
  - lib/cocoapods/sandbox/path_list.rb
327
+ - lib/cocoapods/sandbox.rb
334
328
  - lib/cocoapods/sources_manager.rb
335
- - lib/cocoapods/target.rb
336
329
  - lib/cocoapods/target/aggregate_target.rb
337
330
  - lib/cocoapods/target/pod_target.rb
338
- - lib/cocoapods/user_interface.rb
331
+ - lib/cocoapods/target.rb
339
332
  - lib/cocoapods/user_interface/error_report.rb
333
+ - lib/cocoapods/user_interface.rb
340
334
  - lib/cocoapods/validator.rb
335
+ - lib/cocoapods.rb
336
+ - bin/pod
337
+ - bin/sandbox-pod
338
+ - README.md
339
+ - LICENSE
340
+ - CHANGELOG.md
341
341
  homepage: https://github.com/CocoaPods/CocoaPods
342
342
  licenses:
343
343
  - MIT
@@ -348,17 +348,17 @@ require_paths:
348
348
  - lib
349
349
  required_ruby_version: !ruby/object:Gem::Requirement
350
350
  requirements:
351
- - - ">="
351
+ - - '>='
352
352
  - !ruby/object:Gem::Version
353
353
  version: 2.0.0
354
354
  required_rubygems_version: !ruby/object:Gem::Requirement
355
355
  requirements:
356
- - - ">="
356
+ - - '>='
357
357
  - !ruby/object:Gem::Version
358
358
  version: '0'
359
359
  requirements: []
360
360
  rubyforge_project:
361
- rubygems_version: 2.4.6
361
+ rubygems_version: 2.0.14
362
362
  signing_key:
363
363
  specification_version: 3
364
364
  summary: The Cocoa library package manager.