cocoapods-trunk 1.3.1 → 1.4.0
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/.travis.yml +1 -0
- data/CHANGELOG.md +14 -0
- data/Gemfile.lock +43 -33
- data/lib/cocoapods_trunk.rb +1 -1
- data/lib/pod/command/trunk/push.rb +20 -9
- data/spec/command/trunk/push_spec.rb +14 -9
- data/spec/spec_helper.rb +1 -1
- metadata +3 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 744d02fa3ed37e9d6c313dd262aa67fcca2137965e30a381cd4af0004f742c93
|
4
|
+
data.tar.gz: 836f46995a910739e85f6a226cc877f55ff6e8ad69049dbdaeff15dd0348a3aa
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8edb2b0d1896106606bb16c2609a983be66a4ca09440aabd6994382b9f693bb39b3bb5b55ad41005307221de71cceb89c7a3e7eee68666958aec047321264ab3
|
7
|
+
data.tar.gz: 2d0db6f6be1b910a1ab9ce85978dca81821dd784eab7e79bcf27c7cbae9431dbe9b72ff97459397b0ac45deca55ef5acf75797474e66428e0057745d491a5329
|
data/.travis.yml
CHANGED
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,17 @@
|
|
1
|
+
## 1.4.0 (2019-08-21)
|
2
|
+
|
3
|
+
##### Enhancements
|
4
|
+
|
5
|
+
* None.
|
6
|
+
|
7
|
+
##### Bug Fixes
|
8
|
+
|
9
|
+
* Update to get the master spec repo from `Source::Manager` for validation - effectively
|
10
|
+
use the new CDN `TrunkSource` for podspec validation and not a hard-coded URL
|
11
|
+
[Igor Makarov](https://github.com/igor-makarov)
|
12
|
+
[#132](https://github.com/CocoaPods/cocoapods-trunk/pull/132)
|
13
|
+
[CocoaPods#9112](https://github.com/CocoaPods/CocoaPods/issues/9112)
|
14
|
+
|
1
15
|
## 1.3.1 (2018-08-16)
|
2
16
|
|
3
17
|
##### Enhancements
|
data/Gemfile.lock
CHANGED
@@ -1,42 +1,44 @@
|
|
1
1
|
GIT
|
2
2
|
remote: https://github.com/CocoaPods/CLAide.git
|
3
|
-
revision:
|
3
|
+
revision: b5ced9cc141df732e8027078543eb92fc6447567
|
4
4
|
branch: master
|
5
5
|
specs:
|
6
|
-
claide (1.0.
|
6
|
+
claide (1.0.3)
|
7
7
|
|
8
8
|
GIT
|
9
9
|
remote: https://github.com/CocoaPods/CocoaPods.git
|
10
|
-
revision:
|
10
|
+
revision: af83e4713771bc98dd7f903cc81c4fbc8866812c
|
11
11
|
branch: master
|
12
12
|
specs:
|
13
|
-
cocoapods (1.
|
13
|
+
cocoapods (1.8.0.beta.1)
|
14
14
|
activesupport (>= 4.0.2, < 5)
|
15
15
|
claide (>= 1.0.2, < 2.0)
|
16
|
-
cocoapods-core (= 1.
|
17
|
-
cocoapods-deintegrate (>= 1.0.
|
18
|
-
cocoapods-downloader (>= 1.
|
16
|
+
cocoapods-core (= 1.8.0.beta.1)
|
17
|
+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
|
18
|
+
cocoapods-downloader (>= 1.2.2, < 2.0)
|
19
19
|
cocoapods-plugins (>= 1.0.0, < 2.0)
|
20
20
|
cocoapods-search (>= 1.0.0, < 2.0)
|
21
21
|
cocoapods-stats (>= 1.0.0, < 2.0)
|
22
|
-
cocoapods-trunk (= 1.
|
22
|
+
cocoapods-trunk (= 1.4.0)
|
23
23
|
cocoapods-try (>= 1.1.0, < 2.0)
|
24
24
|
colored2 (~> 3.1)
|
25
25
|
escape (~> 0.0.4)
|
26
|
-
fourflusher (
|
26
|
+
fourflusher (>= 2.3.0, < 3.0)
|
27
27
|
gh_inspector (~> 1.0)
|
28
|
-
molinillo (~> 0.6.
|
28
|
+
molinillo (~> 0.6.6)
|
29
29
|
nap (~> 1.0)
|
30
|
-
ruby-macho (~> 1.
|
31
|
-
xcodeproj (>= 1.
|
30
|
+
ruby-macho (~> 1.4)
|
31
|
+
xcodeproj (>= 1.11.1, < 2.0)
|
32
32
|
|
33
33
|
GIT
|
34
34
|
remote: https://github.com/CocoaPods/Core.git
|
35
|
-
revision:
|
35
|
+
revision: 0a6dea961da236995dfde3c7927e4daaf2045820
|
36
36
|
branch: master
|
37
37
|
specs:
|
38
|
-
cocoapods-core (1.
|
38
|
+
cocoapods-core (1.8.0.beta.1)
|
39
39
|
activesupport (>= 4.0.2, < 6)
|
40
|
+
algoliasearch (~> 1.0)
|
41
|
+
concurrent-ruby (~> 1.0)
|
40
42
|
fuzzy_match (~> 2.0.4)
|
41
43
|
nap (~> 1.0)
|
42
44
|
|
@@ -50,43 +52,50 @@ GIT
|
|
50
52
|
PATH
|
51
53
|
remote: .
|
52
54
|
specs:
|
53
|
-
cocoapods-trunk (1.
|
55
|
+
cocoapods-trunk (1.4.0)
|
54
56
|
nap (>= 0.8, < 2.0)
|
55
57
|
netrc (~> 0.11)
|
56
58
|
|
57
59
|
GEM
|
58
60
|
remote: https://rubygems.org/
|
59
61
|
specs:
|
60
|
-
CFPropertyList (
|
61
|
-
activesupport (4.2.
|
62
|
+
CFPropertyList (3.0.0)
|
63
|
+
activesupport (4.2.11.1)
|
62
64
|
i18n (~> 0.7)
|
63
65
|
minitest (~> 5.1)
|
64
66
|
thread_safe (~> 0.3, >= 0.3.4)
|
65
67
|
tzinfo (~> 1.1)
|
66
68
|
addressable (2.5.1)
|
67
69
|
public_suffix (~> 2.0, >= 2.0.2)
|
70
|
+
algoliasearch (1.26.1)
|
71
|
+
httpclient (~> 2.8, >= 2.8.3)
|
72
|
+
json (>= 1.5.1)
|
68
73
|
ast (2.2.0)
|
74
|
+
atomos (0.1.3)
|
69
75
|
bacon (1.2.0)
|
70
|
-
cocoapods-deintegrate (1.0.
|
71
|
-
cocoapods-downloader (1.
|
76
|
+
cocoapods-deintegrate (1.0.4)
|
77
|
+
cocoapods-downloader (1.2.2)
|
72
78
|
cocoapods-plugins (1.0.0)
|
73
79
|
nap
|
74
80
|
cocoapods-search (1.0.0)
|
75
|
-
cocoapods-stats (1.
|
81
|
+
cocoapods-stats (1.1.0)
|
76
82
|
cocoapods-try (1.1.0)
|
77
83
|
codeclimate-test-reporter (0.4.7)
|
78
84
|
simplecov (>= 0.7.1, < 1.0.0)
|
79
85
|
colored2 (3.1.2)
|
86
|
+
concurrent-ruby (1.1.5)
|
80
87
|
crack (0.4.3)
|
81
88
|
safe_yaml (~> 1.0.0)
|
82
89
|
docile (1.1.5)
|
83
90
|
escape (0.0.4)
|
84
91
|
ffi (1.9.10)
|
85
|
-
fourflusher (2.
|
92
|
+
fourflusher (2.3.1)
|
86
93
|
fuzzy_match (2.0.4)
|
87
|
-
gh_inspector (1.
|
94
|
+
gh_inspector (1.1.3)
|
88
95
|
hashdiff (0.3.4)
|
89
|
-
|
96
|
+
httpclient (2.8.3)
|
97
|
+
i18n (0.9.5)
|
98
|
+
concurrent-ruby (~> 1.0)
|
90
99
|
kicker (3.0.0)
|
91
100
|
listen (~> 1.3.0)
|
92
101
|
notify (~> 0.5.2)
|
@@ -95,14 +104,14 @@ GEM
|
|
95
104
|
rb-inotify (>= 0.9)
|
96
105
|
rb-kqueue (>= 0.2)
|
97
106
|
metaclass (0.0.4)
|
98
|
-
minitest (5.
|
107
|
+
minitest (5.11.3)
|
99
108
|
mocha (1.1.0)
|
100
109
|
metaclass (~> 0.0.1)
|
101
110
|
mocha-on-bacon (0.2.2)
|
102
111
|
mocha (>= 0.13.0)
|
103
|
-
molinillo (0.6.
|
112
|
+
molinillo (0.6.6)
|
104
113
|
multi_json (1.11.2)
|
105
|
-
nanaimo (0.2.
|
114
|
+
nanaimo (0.2.6)
|
106
115
|
nap (1.1.0)
|
107
116
|
netrc (0.11.0)
|
108
117
|
notify (0.5.2)
|
@@ -125,7 +134,7 @@ GEM
|
|
125
134
|
rainbow (>= 1.99.1, < 3.0)
|
126
135
|
ruby-progressbar (~> 1.7)
|
127
136
|
unicode-display_width (~> 1.0, >= 1.0.1)
|
128
|
-
ruby-macho (1.
|
137
|
+
ruby-macho (1.4.0)
|
129
138
|
ruby-progressbar (1.7.5)
|
130
139
|
safe_yaml (1.0.4)
|
131
140
|
simplecov (0.9.2)
|
@@ -134,18 +143,19 @@ GEM
|
|
134
143
|
simplecov-html (~> 0.9.0)
|
135
144
|
simplecov-html (0.9.0)
|
136
145
|
thread_safe (0.3.6)
|
137
|
-
tzinfo (1.2.
|
146
|
+
tzinfo (1.2.5)
|
138
147
|
thread_safe (~> 0.1)
|
139
148
|
unicode-display_width (1.0.3)
|
140
|
-
webmock (3.
|
149
|
+
webmock (3.5.1)
|
141
150
|
addressable (>= 2.3.6)
|
142
151
|
crack (>= 0.3.2)
|
143
152
|
hashdiff
|
144
|
-
xcodeproj (1.
|
145
|
-
CFPropertyList (
|
153
|
+
xcodeproj (1.12.0)
|
154
|
+
CFPropertyList (>= 2.3.3, < 4.0)
|
155
|
+
atomos (~> 0.1.3)
|
146
156
|
claide (>= 1.0.2, < 2.0)
|
147
157
|
colored2 (~> 3.1)
|
148
|
-
nanaimo (~> 0.2.
|
158
|
+
nanaimo (~> 0.2.6)
|
149
159
|
|
150
160
|
PLATFORMS
|
151
161
|
ruby
|
@@ -168,4 +178,4 @@ DEPENDENCIES
|
|
168
178
|
webmock
|
169
179
|
|
170
180
|
BUNDLED WITH
|
171
|
-
1.
|
181
|
+
1.17.3
|
data/lib/cocoapods_trunk.rb
CHANGED
@@ -7,7 +7,7 @@ module Pod
|
|
7
7
|
self.summary = 'Publish a podspec'
|
8
8
|
self.description = <<-DESC
|
9
9
|
Publish the podspec at `PATH` to make it available to all users of
|
10
|
-
the ‘
|
10
|
+
the ‘trunk’ spec-repo. If `PATH` is not provided, defaults to the
|
11
11
|
current directory.
|
12
12
|
|
13
13
|
Before pushing the podspec to cocoapods.org, this will perform a local
|
@@ -54,7 +54,7 @@ module Pod
|
|
54
54
|
def validate!
|
55
55
|
super
|
56
56
|
unless token
|
57
|
-
help! 'You need to register a session first.'
|
57
|
+
help! 'You need to run `pod trunk register` to register a session first.'
|
58
58
|
end
|
59
59
|
unless @path
|
60
60
|
help! 'Please specify the path to the podspec file.'
|
@@ -118,7 +118,7 @@ module Pod
|
|
118
118
|
def validate_podspec
|
119
119
|
UI.puts 'Validating podspec'.yellow
|
120
120
|
|
121
|
-
validator = Validator.new(spec,
|
121
|
+
validator = Validator.new(spec, [master_repo_url])
|
122
122
|
validator.allow_warnings = @allow_warnings
|
123
123
|
validator.use_frameworks = @use_frameworks
|
124
124
|
if validator.respond_to?(:use_modular_headers=)
|
@@ -140,17 +140,28 @@ module Pod
|
|
140
140
|
end
|
141
141
|
|
142
142
|
def update_master_repo
|
143
|
-
sources_manager = if defined?(Pod::SourcesManager)
|
144
|
-
Pod::SourcesManager
|
145
|
-
else
|
146
|
-
config.sources_manager
|
147
|
-
end
|
148
143
|
if sources_manager.master_repo_functional?
|
149
|
-
sources_manager.update(
|
144
|
+
sources_manager.update(master_repo_name)
|
150
145
|
else
|
151
146
|
Setup.invoke
|
152
147
|
end
|
153
148
|
end
|
149
|
+
|
150
|
+
def master_repo_name
|
151
|
+
sources_manager.master.first.name
|
152
|
+
end
|
153
|
+
|
154
|
+
def master_repo_url
|
155
|
+
sources_manager.master.first.url
|
156
|
+
end
|
157
|
+
|
158
|
+
def sources_manager
|
159
|
+
if defined?(Pod::SourcesManager)
|
160
|
+
Pod::SourcesManager
|
161
|
+
else
|
162
|
+
config.sources_manager
|
163
|
+
end
|
164
|
+
end
|
154
165
|
end
|
155
166
|
end
|
156
167
|
end
|
@@ -104,6 +104,7 @@ module Pod
|
|
104
104
|
describe 'validation' do
|
105
105
|
before do
|
106
106
|
Installer.any_instance.stubs(:aggregate_targets).returns([])
|
107
|
+
Installer.any_instance.stubs(:pod_targets).returns([])
|
107
108
|
|
108
109
|
Validator.any_instance.stubs(:check_file_patterns)
|
109
110
|
Validator.any_instance.stubs(:validate_url)
|
@@ -116,6 +117,8 @@ module Pod
|
|
116
117
|
%i(prepare resolve_dependencies download_dependencies).each do |m|
|
117
118
|
Installer.any_instance.stubs(m)
|
118
119
|
end
|
120
|
+
Command::Trunk::Push.any_instance.stubs(:master_repo_url).
|
121
|
+
returns(Pod::TrunkSource::TRUNK_REPO_URL)
|
119
122
|
end
|
120
123
|
|
121
124
|
it 'passes the SWIFT_VERSION to the Validator' do
|
@@ -136,13 +139,13 @@ module Pod
|
|
136
139
|
|
137
140
|
it 'validates specs as frameworks by default' do
|
138
141
|
Validator.any_instance.expects(:podfile_from_spec).
|
139
|
-
with(:ios, '8.0', true, []).once.returns(Podfile.new)
|
142
|
+
with(:ios, '8.0', true, [], nil).once.returns(Podfile.new)
|
140
143
|
Validator.any_instance.expects(:podfile_from_spec).
|
141
|
-
with(:osx, nil, true, []).once.returns(Podfile.new)
|
144
|
+
with(:osx, nil, true, [], nil).once.returns(Podfile.new)
|
142
145
|
Validator.any_instance.expects(:podfile_from_spec).
|
143
|
-
with(:tvos, nil, true, []).once.returns(Podfile.new)
|
146
|
+
with(:tvos, nil, true, [], nil).once.returns(Podfile.new)
|
144
147
|
Validator.any_instance.expects(:podfile_from_spec).
|
145
|
-
with(:watchos, nil, true, []).once.returns(Podfile.new)
|
148
|
+
with(:watchos, nil, true, [], nil).once.returns(Podfile.new)
|
146
149
|
|
147
150
|
cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec))
|
148
151
|
cmd.send(:validate_podspec)
|
@@ -150,13 +153,13 @@ module Pod
|
|
150
153
|
|
151
154
|
it 'validates specs as libraries if requested' do
|
152
155
|
Validator.any_instance.expects(:podfile_from_spec).
|
153
|
-
with(:ios, nil, false, []).once.returns(Podfile.new)
|
156
|
+
with(:ios, nil, false, [], nil).once.returns(Podfile.new)
|
154
157
|
Validator.any_instance.expects(:podfile_from_spec).
|
155
|
-
with(:osx, nil, false, []).once.returns(Podfile.new)
|
158
|
+
with(:osx, nil, false, [], nil).once.returns(Podfile.new)
|
156
159
|
Validator.any_instance.expects(:podfile_from_spec).
|
157
|
-
with(:tvos, nil, false, []).once.returns(Podfile.new)
|
160
|
+
with(:tvos, nil, false, [], nil).once.returns(Podfile.new)
|
158
161
|
Validator.any_instance.expects(:podfile_from_spec).
|
159
|
-
with(:watchos, nil, false, []).once.returns(Podfile.new)
|
162
|
+
with(:watchos, nil, false, [], nil).once.returns(Podfile.new)
|
160
163
|
|
161
164
|
cmd = Command.parse(%w(trunk push spec/fixtures/BananaLib.podspec --use-libraries))
|
162
165
|
cmd.send(:validate_podspec)
|
@@ -231,11 +234,13 @@ module Pod
|
|
231
234
|
@cmd.stubs(:validate_podspec)
|
232
235
|
@cmd.stubs(:push_to_trunk).returns([200, success_json])
|
233
236
|
Command::Trunk::Push.any_instance.unstub(:update_master_repo)
|
237
|
+
Command::Trunk::Push.any_instance.stubs(:master_repo_name).
|
238
|
+
returns(Pod::TrunkSource::TRUNK_REPO_NAME)
|
234
239
|
end
|
235
240
|
|
236
241
|
it 'updates the master repo when it exists' do
|
237
242
|
Config.instance.sources_manager.stubs(:master_repo_functional?).returns(true)
|
238
|
-
Config.instance.sources_manager.expects(:update).with(
|
243
|
+
Config.instance.sources_manager.expects(:update).with(Pod::TrunkSource::TRUNK_REPO_NAME).twice
|
239
244
|
|
240
245
|
@cmd.run
|
241
246
|
end
|
data/spec/spec_helper.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cocoapods-trunk
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.4.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Eloy Durán
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2019-08-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: nap
|
@@ -133,8 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
133
133
|
- !ruby/object:Gem::Version
|
134
134
|
version: '0'
|
135
135
|
requirements: []
|
136
|
-
|
137
|
-
rubygems_version: 2.7.7
|
136
|
+
rubygems_version: 3.0.3
|
138
137
|
signing_key:
|
139
138
|
specification_version: 4
|
140
139
|
summary: Interact with trunk.cocoapods.org
|