deploygate 0.6.4 → 0.6.5

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0dfa2aaa4fb89cc3c6d42911b5c7546fbae07bc23b708d14337087a8debd3f1e
4
- data.tar.gz: cc02a7b75d851d3fef7a8e776d27cce845f942ffaf4f6871d4841c9166ea4872
3
+ metadata.gz: e26a75a780ab7329ffc720f8079dab243dea92f8bb9da2812048ea3723689411
4
+ data.tar.gz: 8df10988c1771edb5213e8f6134771c724a11020eb2c90735226f7a74169274d
5
5
  SHA512:
6
- metadata.gz: 34083bf5b446f8e1f61bb85cd479af29bb601ec93e830bd9b67bd9de9cd00336b0cc0fd5eae8a07458242ae59f7dc6f6e6db135ff21be016734ed28020c33822
7
- data.tar.gz: 0b2a45ba2161ddfb4f8a2e894f0fbe73d1a76c03cb956353ba0156802883acced0424c2f456ecef2e8be956e1718b5444c8b7e34faf468facedf2c5afcc336f9
6
+ metadata.gz: 1fcadb4104eae72a1df1aa1b92c21f8365a7e7c85c2f480b589ec00e6c06bccedd1e3deacf779065101b09328e40b5c67ba5eec01c7d145f51283c25dbb3d6f1
7
+ data.tar.gz: d6d4b39edb2dff06b54d292137962e1065f2145baad9572b3c9001349df6cb2050aa09874bc8f756886e5f28edae10e830f5a67be46e5e6be4b3d328efc5d92f
@@ -158,7 +158,6 @@ en:
158
158
  finish: 'Finish cleaning local Provisionig Profiles'
159
159
  analyze:
160
160
  target_bundle_identifier:
161
- bundle_identifier_different: 'This xcode project Bundle Identifier has been two registered. "%{plist_id}" and "%{product_id}"'
162
161
  prompt: |
163
162
  Please input your app bundle identifier
164
163
  Example: com.example.ios
@@ -39,9 +39,9 @@ module DeployGate
39
39
  target_scheme = analyze.scheme
40
40
 
41
41
  # TODO: Support export method option (ex: --method adhoc)
42
- method = nil
43
42
  codesigning_identity= nil
44
43
  provisioning_style = analyze.provisioning_style
44
+ provisioning_profile_info = nil
45
45
  if (!over_xcode?(8) && provisioning_style == nil) ||
46
46
  provisioning_style == DeployGate::Xcode::Analyze::PROVISIONING_STYLE_MANUAL
47
47
 
@@ -57,6 +57,13 @@ module DeployGate
57
57
 
58
58
  method = DeployGate::Xcode::Export.method(target_provisioning_profile)
59
59
  codesigning_identity = DeployGate::Xcode::Export.codesigning_identity(target_provisioning_profile)
60
+
61
+ profile = FastlaneCore::ProvisioningProfile.parse(target_provisioning_profile)
62
+ provisioning_profile_info = {
63
+ provisioningProfiles: {
64
+ "#{bundle_identifier}" => profile['Name']
65
+ }
66
+ }
60
67
  else
61
68
  method = select_method
62
69
  end
@@ -65,6 +72,7 @@ module DeployGate
65
72
  analyze,
66
73
  target_scheme,
67
74
  codesigning_identity,
75
+ provisioning_profile_info,
68
76
  build_configuration,
69
77
  method,
70
78
  over_xcode?(9) && codesigning_identity.nil?
@@ -1,3 +1,3 @@
1
1
  module DeployGate
2
- VERSION = '0.6.4'
2
+ VERSION = '0.6.5'
3
3
  end
@@ -51,12 +51,11 @@ module DeployGate
51
51
  end
52
52
  plist_bundle_identifier = convert_bundle_identifier(plist_bundle_identifier)
53
53
 
54
- if product_bundle_identifier != plist_bundle_identifier
55
- raise BundleIdentifierDifferentError,
56
- I18n.t('xcode.analyze.target_bundle_identifier.bundle_identifier_different', plist_id: plist_bundle_identifier, product_id: product_bundle_identifier)
57
- end
58
-
59
- bundle_identifier = product_bundle_identifier
54
+ bundle_identifier = if plist_bundle_identifier.blank?
55
+ product_bundle_identifier
56
+ else
57
+ plist_bundle_identifier
58
+ end
60
59
  bundle_identifier.gsub!(/\$\(PRODUCT_NAME:.+\)/, product_name)
61
60
  rescue BundleIdentifierDifferentError => e
62
61
  raise e
@@ -94,12 +93,13 @@ module DeployGate
94
93
 
95
94
  def provisioning_style
96
95
  target = target_provisioning_info
96
+ build_settings = target_build_configration.build_settings
97
97
 
98
98
  style = PROVISIONING_STYLE_MANUAL
99
99
  if target
100
100
  # Manual or Automatic or nil (Xcode7 below)
101
101
  begin
102
- style = target['ProvisioningStyle']
102
+ style = target['ProvisioningStyle'] || build_settings['CODE_SIGN_STYLE']
103
103
  rescue
104
104
  # Not catch error
105
105
  end
@@ -12,6 +12,7 @@ module DeployGate
12
12
  # @param [Analyze] ios_analyze
13
13
  # @param [String] target_scheme
14
14
  # @param [String] codesigning_identity
15
+ # @param [String] provisioning_profile_info
15
16
  # @param [String] build_configuration
16
17
  # @param [String] export_method
17
18
  # @param [Boolean] allow_provisioning_updates
@@ -19,6 +20,7 @@ module DeployGate
19
20
  def build(ios_analyze,
20
21
  target_scheme,
21
22
  codesigning_identity,
23
+ provisioning_profile_info = nil,
22
24
  build_configuration = nil,
23
25
  export_method = DeployGate::Xcode::Export::AD_HOC,
24
26
  allow_provisioning_updates = false)
@@ -32,6 +34,7 @@ module DeployGate
32
34
  }
33
35
  values[:codesigning_identity] = codesigning_identity if codesigning_identity
34
36
  values[:export_xcargs] = '-allowProvisioningUpdates' if allow_provisioning_updates
37
+ values[:export_options] = provisioning_profile_info if provisioning_profile_info
35
38
 
36
39
  v = FastlaneCore::Configuration.create(Gym::Options.available_options, values)
37
40
 
@@ -33,7 +33,7 @@ describe DeployGate::Xcode::Ios do
33
33
  allow(FastlaneCore::Project).to receive(:new).and_return(ProjectMock.new)
34
34
 
35
35
  expect {
36
- DeployGate::Xcode::Ios.build(AnalyzeMock.new, '', '', '', 'not support export method')
36
+ DeployGate::Xcode::Ios.build(AnalyzeMock.new, '', '', nil, '', 'not support export method')
37
37
  }.to raise_error DeployGate::Xcode::Ios::NotSupportExportMethodError
38
38
  end
39
39
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: deploygate
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.4
4
+ version: 0.6.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - deploygate
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-03-26 00:00:00.000000000 Z
11
+ date: 2018-08-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: json
@@ -419,7 +419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
419
419
  version: '0'
420
420
  requirements: []
421
421
  rubyforge_project:
422
- rubygems_version: 2.7.6
422
+ rubygems_version: 2.7.7
423
423
  signing_key:
424
424
  specification_version: 4
425
425
  summary: A command-line interface for DeployGate