cocoapods-packager 1.3.0 → 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/.rubocop-cocoapods.yml +1 -0
- data/.rubocop.yml +19 -0
- data/.travis.yml +4 -1
- data/Gemfile +2 -1
- data/Gemfile.lock +54 -41
- data/Rakefile +2 -2
- data/cocoapods-packager.gemspec +1 -1
- data/lib/cocoapods-packager/builder.rb +135 -44
- data/lib/cocoapods-packager/framework.rb +1 -1
- data/lib/cocoapods-packager/mangle.rb +4 -4
- data/lib/cocoapods-packager/pod_utils.rb +175 -21
- data/lib/cocoapods-packager/spec_builder.rb +13 -17
- data/lib/cocoapods-packager/symbols.rb +4 -3
- data/lib/cocoapods_packager.rb +1 -1
- data/lib/pod/command/package.rb +40 -15
- data/spec/command/error_spec.rb +7 -0
- data/spec/command/package_spec.rb +189 -13
- data/spec/command/subspecs_spec.rb +2 -2
- data/spec/fixtures/KFData.podspec +2 -2
- data/spec/fixtures/LibraryConsumerDemo/LibraryConsumer.xcodeproj/project.pbxproj +39 -23
- data/spec/fixtures/LibraryConsumerDemo/LibraryConsumer/AppDelegate.m +2 -1
- data/spec/fixtures/LibraryConsumerDemo/Podfile +4 -0
- data/spec/fixtures/LibraryDemo.podspec +4 -2
- data/spec/fixtures/NikeKit.podspec +1 -1
- data/spec/fixtures/PackagerTest/PackagerTest.xcodeproj/project.pbxproj +36 -20
- data/spec/fixtures/PackagerTest/Podfile.lock +3 -1
- data/spec/fixtures/a.podspec +1 -1
- data/spec/fixtures/foo-bar.podspec +1 -1
- data/spec/integration/project_spec.rb +24 -3
- data/spec/pod/utils_spec.rb +40 -9
- data/spec/specification/builder_spec.rb +7 -7
- data/spec/specification/spec_builder_spec.rb +1 -1
- metadata +10 -4
@@ -6,7 +6,9 @@ Pod::Spec.new do |s|
|
|
6
6
|
s.source = { :git => 'https://github.com/olegam/LibraryDemo.git', :tag => s.version.to_s }
|
7
7
|
s.source_files = 'sources/**/*.{h,m}'
|
8
8
|
s.requires_arc = true
|
9
|
-
s.ios.deployment_target = '
|
9
|
+
s.ios.deployment_target = '6.0'
|
10
10
|
s.osx.deployment_target = '10.9'
|
11
11
|
|
12
|
-
|
12
|
+
s.license = 'GPL' # :trollface:
|
13
|
+
s.homepage = 'https://www.youtube.com/watch?v=32UGD0fV45g'
|
14
|
+
end
|
@@ -6,7 +6,7 @@ Pod::Spec.new do |s|
|
|
6
6
|
s.license = {:type => 'MIT', :file => 'LICENSE'}
|
7
7
|
s.authors = { 'Boris Bügling' => 'http://buegling.com' }
|
8
8
|
s.source = { :git => 'https://github.com/neonichu/NikeKit.git', :tag => s.version.to_s }
|
9
|
-
s.platform = :ios, '
|
9
|
+
s.platform = :ios, '8.0'
|
10
10
|
|
11
11
|
s.public_header_files = '*.h'
|
12
12
|
s.source_files = '*.{h,m}'
|
@@ -7,6 +7,7 @@
|
|
7
7
|
objects = {
|
8
8
|
|
9
9
|
/* Begin PBXBuildFile section */
|
10
|
+
06C49FBB8D44715480415078 /* libPods-PackagerTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B50A03E1C68D6EA050ADDB4 /* libPods-PackagerTest.a */; };
|
10
11
|
A1DE56B919AA4A97000339C6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1DE56B819AA4A97000339C6 /* Foundation.framework */; };
|
11
12
|
A1DE56BB19AA4A97000339C6 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1DE56BA19AA4A97000339C6 /* CoreGraphics.framework */; };
|
12
13
|
A1DE56BD19AA4A97000339C6 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1DE56BC19AA4A97000339C6 /* UIKit.framework */; };
|
@@ -20,7 +21,6 @@
|
|
20
21
|
A1DE56DC19AA4A97000339C6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A1DE56DA19AA4A97000339C6 /* InfoPlist.strings */; };
|
21
22
|
A1DE56DE19AA4A97000339C6 /* PackagerTestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A1DE56DD19AA4A97000339C6 /* PackagerTestTests.m */; };
|
22
23
|
A1DE56E819AA4AC4000339C6 /* NikeKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1DE56E719AA4AC4000339C6 /* NikeKit.framework */; };
|
23
|
-
EF1616E64C6F45BE9B377A32 /* libPods-PackagerTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 38EC8BF834704005B8AE03E6 /* libPods-PackagerTest.a */; };
|
24
24
|
/* End PBXBuildFile section */
|
25
25
|
|
26
26
|
/* Begin PBXContainerItemProxy section */
|
@@ -34,8 +34,9 @@
|
|
34
34
|
/* End PBXContainerItemProxy section */
|
35
35
|
|
36
36
|
/* Begin PBXFileReference section */
|
37
|
-
|
38
|
-
|
37
|
+
551F7332E67FB33B4FD37276 /* Pods-PackagerTest.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PackagerTest.release.xcconfig"; path = "Pods/Target Support Files/Pods-PackagerTest/Pods-PackagerTest.release.xcconfig"; sourceTree = "<group>"; };
|
38
|
+
9B50A03E1C68D6EA050ADDB4 /* libPods-PackagerTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PackagerTest.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
39
|
+
A0F1D7427B53DCDF0F9C99C4 /* Pods-PackagerTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PackagerTest.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PackagerTest/Pods-PackagerTest.debug.xcconfig"; sourceTree = "<group>"; };
|
39
40
|
A1DE56B519AA4A97000339C6 /* PackagerTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PackagerTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
40
41
|
A1DE56B819AA4A97000339C6 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
|
41
42
|
A1DE56BA19AA4A97000339C6 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
|
@@ -53,7 +54,6 @@
|
|
53
54
|
A1DE56DB19AA4A97000339C6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
54
55
|
A1DE56DD19AA4A97000339C6 /* PackagerTestTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PackagerTestTests.m; sourceTree = "<group>"; };
|
55
56
|
A1DE56E719AA4AC4000339C6 /* NikeKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = NikeKit.framework; sourceTree = "<group>"; };
|
56
|
-
B7874038A2A0571A3948D0D5 /* Pods-PackagerTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PackagerTest.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PackagerTest/Pods-PackagerTest.debug.xcconfig"; sourceTree = "<group>"; };
|
57
57
|
/* End PBXFileReference section */
|
58
58
|
|
59
59
|
/* Begin PBXFrameworksBuildPhase section */
|
@@ -65,7 +65,7 @@
|
|
65
65
|
A1DE56BB19AA4A97000339C6 /* CoreGraphics.framework in Frameworks */,
|
66
66
|
A1DE56BD19AA4A97000339C6 /* UIKit.framework in Frameworks */,
|
67
67
|
A1DE56B919AA4A97000339C6 /* Foundation.framework in Frameworks */,
|
68
|
-
|
68
|
+
06C49FBB8D44715480415078 /* libPods-PackagerTest.a in Frameworks */,
|
69
69
|
);
|
70
70
|
runOnlyForDeploymentPostprocessing = 0;
|
71
71
|
};
|
@@ -82,11 +82,11 @@
|
|
82
82
|
/* End PBXFrameworksBuildPhase section */
|
83
83
|
|
84
84
|
/* Begin PBXGroup section */
|
85
|
-
|
85
|
+
71D95E6AA2488D1DB8BAC401 /* Pods */ = {
|
86
86
|
isa = PBXGroup;
|
87
87
|
children = (
|
88
|
-
|
89
|
-
|
88
|
+
A0F1D7427B53DCDF0F9C99C4 /* Pods-PackagerTest.debug.xcconfig */,
|
89
|
+
551F7332E67FB33B4FD37276 /* Pods-PackagerTest.release.xcconfig */,
|
90
90
|
);
|
91
91
|
name = Pods;
|
92
92
|
sourceTree = "<group>";
|
@@ -98,7 +98,7 @@
|
|
98
98
|
A1DE56D719AA4A97000339C6 /* PackagerTestTests */,
|
99
99
|
A1DE56B719AA4A97000339C6 /* Frameworks */,
|
100
100
|
A1DE56B619AA4A97000339C6 /* Products */,
|
101
|
-
|
101
|
+
71D95E6AA2488D1DB8BAC401 /* Pods */,
|
102
102
|
);
|
103
103
|
sourceTree = "<group>";
|
104
104
|
};
|
@@ -119,7 +119,7 @@
|
|
119
119
|
A1DE56E719AA4AC4000339C6 /* NikeKit.framework */,
|
120
120
|
A1DE56BC19AA4A97000339C6 /* UIKit.framework */,
|
121
121
|
A1DE56D119AA4A97000339C6 /* XCTest.framework */,
|
122
|
-
|
122
|
+
9B50A03E1C68D6EA050ADDB4 /* libPods-PackagerTest.a */,
|
123
123
|
);
|
124
124
|
name = Frameworks;
|
125
125
|
sourceTree = "<group>";
|
@@ -171,11 +171,12 @@
|
|
171
171
|
isa = PBXNativeTarget;
|
172
172
|
buildConfigurationList = A1DE56E119AA4A97000339C6 /* Build configuration list for PBXNativeTarget "PackagerTest" */;
|
173
173
|
buildPhases = (
|
174
|
-
|
174
|
+
6639007332D318BA22B78898 /* [CP] Check Pods Manifest.lock */,
|
175
175
|
A1DE56B119AA4A97000339C6 /* Sources */,
|
176
176
|
A1DE56B219AA4A97000339C6 /* Frameworks */,
|
177
177
|
A1DE56B319AA4A97000339C6 /* Resources */,
|
178
|
-
|
178
|
+
E32FAE278D58BC5B3F788CE7 /* [CP] Embed Pods Frameworks */,
|
179
|
+
E4E1E4640AC6D4A3D67EC563 /* [CP] Copy Pods Resources */,
|
179
180
|
);
|
180
181
|
buildRules = (
|
181
182
|
);
|
@@ -258,14 +259,14 @@
|
|
258
259
|
/* End PBXResourcesBuildPhase section */
|
259
260
|
|
260
261
|
/* Begin PBXShellScriptBuildPhase section */
|
261
|
-
|
262
|
+
6639007332D318BA22B78898 /* [CP] Check Pods Manifest.lock */ = {
|
262
263
|
isa = PBXShellScriptBuildPhase;
|
263
264
|
buildActionMask = 2147483647;
|
264
265
|
files = (
|
265
266
|
);
|
266
267
|
inputPaths = (
|
267
268
|
);
|
268
|
-
name = "Check Pods Manifest.lock";
|
269
|
+
name = "[CP] Check Pods Manifest.lock";
|
269
270
|
outputPaths = (
|
270
271
|
);
|
271
272
|
runOnlyForDeploymentPostprocessing = 0;
|
@@ -273,14 +274,29 @@
|
|
273
274
|
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
|
274
275
|
showEnvVarsInLog = 0;
|
275
276
|
};
|
276
|
-
|
277
|
+
E32FAE278D58BC5B3F788CE7 /* [CP] Embed Pods Frameworks */ = {
|
277
278
|
isa = PBXShellScriptBuildPhase;
|
278
279
|
buildActionMask = 2147483647;
|
279
280
|
files = (
|
280
281
|
);
|
281
282
|
inputPaths = (
|
282
283
|
);
|
283
|
-
name = "
|
284
|
+
name = "[CP] Embed Pods Frameworks";
|
285
|
+
outputPaths = (
|
286
|
+
);
|
287
|
+
runOnlyForDeploymentPostprocessing = 0;
|
288
|
+
shellPath = /bin/sh;
|
289
|
+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PackagerTest/Pods-PackagerTest-frameworks.sh\"\n";
|
290
|
+
showEnvVarsInLog = 0;
|
291
|
+
};
|
292
|
+
E4E1E4640AC6D4A3D67EC563 /* [CP] Copy Pods Resources */ = {
|
293
|
+
isa = PBXShellScriptBuildPhase;
|
294
|
+
buildActionMask = 2147483647;
|
295
|
+
files = (
|
296
|
+
);
|
297
|
+
inputPaths = (
|
298
|
+
);
|
299
|
+
name = "[CP] Copy Pods Resources";
|
284
300
|
outputPaths = (
|
285
301
|
);
|
286
302
|
runOnlyForDeploymentPostprocessing = 0;
|
@@ -370,7 +386,7 @@
|
|
370
386
|
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
371
387
|
GCC_WARN_UNUSED_FUNCTION = YES;
|
372
388
|
GCC_WARN_UNUSED_VARIABLE = YES;
|
373
|
-
IPHONEOS_DEPLOYMENT_TARGET =
|
389
|
+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
374
390
|
ONLY_ACTIVE_ARCH = YES;
|
375
391
|
SDKROOT = iphoneos;
|
376
392
|
};
|
@@ -402,7 +418,7 @@
|
|
402
418
|
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
403
419
|
GCC_WARN_UNUSED_FUNCTION = YES;
|
404
420
|
GCC_WARN_UNUSED_VARIABLE = YES;
|
405
|
-
IPHONEOS_DEPLOYMENT_TARGET =
|
421
|
+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
406
422
|
SDKROOT = iphoneos;
|
407
423
|
VALIDATE_PRODUCT = YES;
|
408
424
|
};
|
@@ -410,7 +426,7 @@
|
|
410
426
|
};
|
411
427
|
A1DE56E219AA4A97000339C6 /* Debug */ = {
|
412
428
|
isa = XCBuildConfiguration;
|
413
|
-
baseConfigurationReference =
|
429
|
+
baseConfigurationReference = A0F1D7427B53DCDF0F9C99C4 /* Pods-PackagerTest.debug.xcconfig */;
|
414
430
|
buildSettings = {
|
415
431
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
416
432
|
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
|
@@ -428,7 +444,7 @@
|
|
428
444
|
};
|
429
445
|
A1DE56E319AA4A97000339C6 /* Release */ = {
|
430
446
|
isa = XCBuildConfiguration;
|
431
|
-
baseConfigurationReference =
|
447
|
+
baseConfigurationReference = 551F7332E67FB33B4FD37276 /* Pods-PackagerTest.release.xcconfig */;
|
432
448
|
buildSettings = {
|
433
449
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
434
450
|
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
|
data/spec/fixtures/a.podspec
CHANGED
@@ -6,7 +6,7 @@ Pod::Spec.new do |s|
|
|
6
6
|
s.license = {:type => 'MIT', :file => 'LICENSE'}
|
7
7
|
s.authors = { 'Boris Bügling' => 'http://buegling.com' }
|
8
8
|
s.source = { :git => 'https://github.com/neonichu/NikeKit.git', :tag => s.version.to_s }
|
9
|
-
s.platform = :ios, '
|
9
|
+
s.platform = :ios, '8.0'
|
10
10
|
|
11
11
|
s.public_header_files = '*.h'
|
12
12
|
s.source_files = '*.{h,m}'
|
@@ -6,7 +6,7 @@ Pod::Spec.new do |s|
|
|
6
6
|
s.license = {:type => 'MIT', :file => 'LICENSE'}
|
7
7
|
s.authors = { 'Boris Bügling' => 'http://buegling.com' }
|
8
8
|
s.source = { :git => 'https://github.com/neonichu/NikeKit.git', :tag => s.version.to_s }
|
9
|
-
s.platform = :ios, '
|
9
|
+
s.platform = :ios, '8.0'
|
10
10
|
|
11
11
|
s.public_header_files = '*.h'
|
12
12
|
s.source_files = '*.{h,m}'
|
@@ -1,6 +1,9 @@
|
|
1
1
|
require File.expand_path('../../spec_helper', __FILE__)
|
2
2
|
|
3
3
|
module Pod
|
4
|
+
|
5
|
+
DONT_CODESIGN = true
|
6
|
+
|
4
7
|
describe Command::Spec::Package do
|
5
8
|
describe 'IntegrationTests' do
|
6
9
|
after do
|
@@ -10,7 +13,7 @@ module Pod
|
|
10
13
|
end
|
11
14
|
|
12
15
|
it 'Allow integration into project alongside CocoaPods' do
|
13
|
-
|
16
|
+
Pod::Config.instance.sources_manager.stubs(:search).returns(nil)
|
14
17
|
|
15
18
|
command = Command.parse(%w{ package spec/fixtures/NikeKit.podspec })
|
16
19
|
command.run
|
@@ -27,8 +30,26 @@ module Pod
|
|
27
30
|
$?.exitstatus.should == 0
|
28
31
|
end
|
29
32
|
|
33
|
+
it 'Allow integration of dynamic framework into project alongside CocoaPods' do
|
34
|
+
Pod::Config.instance.sources_manager.stubs(:search).returns(nil)
|
35
|
+
|
36
|
+
command = Command.parse(%w{ package spec/fixtures/NikeKit.podspec --dynamic })
|
37
|
+
command.run
|
38
|
+
`cp -Rp NikeKit-*/ios/NikeKit.framework spec/fixtures/PackagerTest`
|
39
|
+
|
40
|
+
log = ''
|
41
|
+
|
42
|
+
Dir.chdir('spec/fixtures/PackagerTest') do
|
43
|
+
`pod install 2>&1`
|
44
|
+
log << `xcodebuild -workspace PackagerTest.xcworkspace -scheme PackagerTest -sdk iphonesimulator CODE_SIGN_IDENTITY=- 2>&1`
|
45
|
+
end
|
46
|
+
|
47
|
+
puts log if $?.exitstatus != 0
|
48
|
+
$?.exitstatus.should == 0
|
49
|
+
end
|
50
|
+
|
30
51
|
it 'allows integration of a library without dependencies' do
|
31
|
-
|
52
|
+
Pod::Config.instance.sources_manager.stubs(:search).returns(nil)
|
32
53
|
|
33
54
|
command = Command.parse(%w{ package spec/fixtures/LibraryDemo.podspec })
|
34
55
|
command.run
|
@@ -43,7 +64,7 @@ module Pod
|
|
43
64
|
|
44
65
|
puts log if $?.exitstatus != 0
|
45
66
|
$?.exitstatus.should == 0
|
46
|
-
end
|
67
|
+
end
|
47
68
|
end
|
48
69
|
end
|
49
70
|
end
|
data/spec/pod/utils_spec.rb
CHANGED
@@ -2,26 +2,57 @@ require File.expand_path('../../spec_helper', __FILE__)
|
|
2
2
|
|
3
3
|
module Pod
|
4
4
|
describe Command::Package do
|
5
|
+
after do
|
6
|
+
Dir.glob("Pods").each { |dir| Pathname.new(dir).rmtree }
|
7
|
+
end
|
8
|
+
|
5
9
|
it "uses additional spec repos passed on the command line" do
|
6
|
-
|
10
|
+
Pod::Config.instance.sources_manager.stubs(:search).returns(nil)
|
7
11
|
nil::NilClass.any_instance.stubs(:install!)
|
8
|
-
Installer.expects(:new).with {
|
9
|
-
|
10
|
-
|
12
|
+
Installer.expects(:new).with {
|
13
|
+
|sandbox, podfile| podfile.sources == ['foo', 'bar']
|
14
|
+
}
|
11
15
|
|
12
16
|
command = Command.parse(%w{ package spec/fixtures/KFData.podspec --spec-sources=foo,bar})
|
13
|
-
command.send(:install_pod, :osx)
|
17
|
+
command.send(:install_pod, :osx, nil)
|
18
|
+
|
14
19
|
end
|
15
20
|
|
16
21
|
it "uses only the master repo if no spec repos were passed" do
|
17
|
-
|
22
|
+
Pod::Config.instance.sources_manager.stubs(:search).returns(nil)
|
18
23
|
nil::NilClass.any_instance.stubs(:install!)
|
19
|
-
Installer.expects(:new).with {
|
20
|
-
|sandbox, podfile| podfile.sources == ['https://github.com/CocoaPods/Specs.git']
|
24
|
+
Installer.expects(:new).with {
|
25
|
+
|sandbox, podfile| podfile.sources == ['https://github.com/CocoaPods/Specs.git']
|
21
26
|
}
|
22
27
|
|
23
28
|
command = Command.parse(%w{ package spec/fixtures/KFData.podspec })
|
24
|
-
command.send(:install_pod, :osx)
|
29
|
+
command.send(:install_pod, :osx, nil)
|
30
|
+
end
|
31
|
+
|
32
|
+
it "creates seperate static and dynamic target if dynamic is passed" do
|
33
|
+
source_dir = Dir.pwd
|
34
|
+
|
35
|
+
Pod::Config.instance.sources_manager.stubs(:search).returns(nil)
|
36
|
+
|
37
|
+
command = Command.parse(%w{ package spec/fixtures/NikeKit.podspec -dynamic})
|
38
|
+
t, w = command.send(:create_working_directory)
|
39
|
+
|
40
|
+
command.config.installation_root = Pathname.new(w)
|
41
|
+
command.config.sandbox_root = 'Pods'
|
42
|
+
|
43
|
+
static_sandbox = command.send(:build_static_sandbox, true)
|
44
|
+
static_installer = command.send(:install_pod, :ios, static_sandbox)
|
45
|
+
|
46
|
+
dynamic_sandbox = command.send(:build_dynamic_sandbox, static_sandbox, static_installer)
|
47
|
+
command.send(:install_dynamic_pod, dynamic_sandbox, static_sandbox, static_installer)
|
48
|
+
|
49
|
+
static_sandbox_dir = Dir.new(Dir.pwd << "/Pods/Static")
|
50
|
+
dynamic_sandbox_dir = Dir.new(Dir.pwd << "/Pods/Dynamic")
|
51
|
+
|
52
|
+
static_sandbox_dir.to_s.should.not.be.empty
|
53
|
+
dynamic_sandbox_dir.to_s.should.not.be.empty
|
54
|
+
|
55
|
+
Dir.chdir(source_dir)
|
25
56
|
end
|
26
57
|
end
|
27
58
|
end
|
@@ -6,24 +6,24 @@ module Pod
|
|
6
6
|
describe 'compiler flags' do
|
7
7
|
before do
|
8
8
|
@spec = Specification.from_file('spec/fixtures/Builder.podspec')
|
9
|
-
@builder = Builder.new(nil, nil, nil, @spec, nil, nil)
|
9
|
+
@builder = Builder.new(nil, nil, nil, nil, @spec, nil, nil, nil, nil, nil)
|
10
10
|
end
|
11
11
|
|
12
12
|
it "includes proper compiler flags for iOS" do
|
13
|
-
@builder.expects(:xcodebuild).with(
|
14
|
-
@builder.compile
|
13
|
+
@builder.expects(:xcodebuild).with("GCC_PREPROCESSOR_DEFINITIONS='$(inherited) PodsDummy_Pods_Builder=PodsDummy_PodPackage_Builder' -DBASE_FLAG -DIOS_FLAG", "ARCHS='x86_64 i386 arm64 armv7 armv7s' OTHER_CFLAGS='-fembed-bitcode -Qunused-arguments'").returns(nil)
|
14
|
+
@builder.send(:compile, Platform.new(:ios))
|
15
15
|
end
|
16
16
|
|
17
17
|
it "includes proper compiler flags for OSX" do
|
18
|
-
@builder.expects(:xcodebuild).with("GCC_PREPROCESSOR_DEFINITIONS='PodsDummy_Pods_Builder=PodsDummy_PodPackage_Builder' -DBASE_FLAG -DOSX_FLAG").returns(nil)
|
19
|
-
@builder.compile
|
18
|
+
@builder.expects(:xcodebuild).with("GCC_PREPROCESSOR_DEFINITIONS='$(inherited) PodsDummy_Pods_Builder=PodsDummy_PodPackage_Builder' -DBASE_FLAG -DOSX_FLAG", nil).returns(nil)
|
19
|
+
@builder.send(:compile, Platform.new(:osx))
|
20
20
|
end
|
21
21
|
end
|
22
22
|
|
23
23
|
describe 'on build failure' do
|
24
24
|
before do
|
25
25
|
@spec = Specification.from_file('spec/fixtures/Builder.podspec')
|
26
|
-
@builder = Builder.new(nil, nil, nil, @spec, nil, nil)
|
26
|
+
@builder = Builder.new(nil, nil, nil, nil, @spec, nil, nil, nil, nil, nil)
|
27
27
|
end
|
28
28
|
|
29
29
|
it 'dumps report and terminates' do
|
@@ -31,7 +31,7 @@ module Pod
|
|
31
31
|
|
32
32
|
should.raise SystemExit do
|
33
33
|
# TODO: check that it dumps report
|
34
|
-
@builder.compile
|
34
|
+
@builder.send(:compile, Platform.new(:ios))
|
35
35
|
end
|
36
36
|
end
|
37
37
|
end
|
@@ -24,7 +24,7 @@ module Pod
|
|
24
24
|
describe 'Preserve attributes from source specification' do
|
25
25
|
before do
|
26
26
|
@spec = Specification.from_file('spec/fixtures/Builder.podspec')
|
27
|
-
@builder = SpecBuilder.new(@spec, nil, false)
|
27
|
+
@builder = SpecBuilder.new(@spec, nil, false, nil)
|
28
28
|
end
|
29
29
|
|
30
30
|
it "preserves platform.frameworks" do
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cocoapods-packager
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.4.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kyle Fuller
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2016-06-06 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: cocoapods
|
@@ -17,14 +17,20 @@ dependencies:
|
|
17
17
|
requirements:
|
18
18
|
- - '>='
|
19
19
|
- !ruby/object:Gem::Version
|
20
|
-
version: 0.
|
20
|
+
version: 1.0.0
|
21
|
+
- - <
|
22
|
+
- !ruby/object:Gem::Version
|
23
|
+
version: '2.0'
|
21
24
|
type: :runtime
|
22
25
|
prerelease: false
|
23
26
|
version_requirements: !ruby/object:Gem::Requirement
|
24
27
|
requirements:
|
25
28
|
- - '>='
|
26
29
|
- !ruby/object:Gem::Version
|
27
|
-
version: 0.
|
30
|
+
version: 1.0.0
|
31
|
+
- - <
|
32
|
+
- !ruby/object:Gem::Version
|
33
|
+
version: '2.0'
|
28
34
|
- !ruby/object:Gem::Dependency
|
29
35
|
name: bundler
|
30
36
|
requirement: !ruby/object:Gem::Requirement
|