deploygate 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dfa2aaa4fb89cc3c6d42911b5c7546fbae07bc23b708d14337087a8debd3f1e
-  data.tar.gz: cc02a7b75d851d3fef7a8e776d27cce845f942ffaf4f6871d4841c9166ea4872
+  metadata.gz: e26a75a780ab7329ffc720f8079dab243dea92f8bb9da2812048ea3723689411
+  data.tar.gz: 8df10988c1771edb5213e8f6134771c724a11020eb2c90735226f7a74169274d
 SHA512:
-  metadata.gz: 34083bf5b446f8e1f61bb85cd479af29bb601ec93e830bd9b67bd9de9cd00336b0cc0fd5eae8a07458242ae59f7dc6f6e6db135ff21be016734ed28020c33822
-  data.tar.gz: 0b2a45ba2161ddfb4f8a2e894f0fbe73d1a76c03cb956353ba0156802883acced0424c2f456ecef2e8be956e1718b5444c8b7e34faf468facedf2c5afcc336f9
+  metadata.gz: 1fcadb4104eae72a1df1aa1b92c21f8365a7e7c85c2f480b589ec00e6c06bccedd1e3deacf779065101b09328e40b5c67ba5eec01c7d145f51283c25dbb3d6f1
+  data.tar.gz: d6d4b39edb2dff06b54d292137962e1065f2145baad9572b3c9001349df6cb2050aa09874bc8f756886e5f28edae10e830f5a67be46e5e6be4b3d328efc5d92f

data/config/locales/en.yml

@@ -158,7 +158,6 @@ en:
         finish: 'Finish cleaning local Provisionig Profiles'
     analyze:
       target_bundle_identifier:
-        bundle_identifier_different: 'This xcode project Bundle Identifier has been two registered. "%{plist_id}" and "%{product_id}"'
         prompt: |
           Please input your app bundle identifier
           Example: com.example.ios

data/lib/deploygate/commands/deploy/build.rb

@@ -39,9 +39,9 @@ module DeployGate
             target_scheme = analyze.scheme
 
             # TODO: Support export method option (ex: --method adhoc)
-            method = nil
             codesigning_identity= nil
             provisioning_style = analyze.provisioning_style
+            provisioning_profile_info = nil
             if (!over_xcode?(8) && provisioning_style == nil) ||
                 provisioning_style == DeployGate::Xcode::Analyze::PROVISIONING_STYLE_MANUAL
 
@@ -57,6 +57,13 @@ module DeployGate
 
               method = DeployGate::Xcode::Export.method(target_provisioning_profile)
               codesigning_identity = DeployGate::Xcode::Export.codesigning_identity(target_provisioning_profile)
+
+              profile = FastlaneCore::ProvisioningProfile.parse(target_provisioning_profile)
+              provisioning_profile_info = {
+                  provisioningProfiles: {
+                      "#{bundle_identifier}" => profile['Name']
+                  }
+              }
             else
               method = select_method
             end
@@ -65,6 +72,7 @@ module DeployGate
                 analyze,
                 target_scheme,
                 codesigning_identity,
+                provisioning_profile_info,
                 build_configuration,
                 method,
                 over_xcode?(9) && codesigning_identity.nil?

data/lib/deploygate/version.rb

@@ -1,3 +1,3 @@
 module DeployGate
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

data/lib/deploygate/xcode/analyze.rb

@@ -51,12 +51,11 @@ module DeployGate
               end
           plist_bundle_identifier = convert_bundle_identifier(plist_bundle_identifier)
 
-          if product_bundle_identifier != plist_bundle_identifier
-            raise BundleIdentifierDifferentError,
-                  I18n.t('xcode.analyze.target_bundle_identifier.bundle_identifier_different', plist_id: plist_bundle_identifier, product_id: product_bundle_identifier)
-          end
-
-          bundle_identifier = product_bundle_identifier
+          bundle_identifier = if plist_bundle_identifier.blank?
+                                product_bundle_identifier
+                              else
+                                plist_bundle_identifier
+                              end
           bundle_identifier.gsub!(/\$\(PRODUCT_NAME:.+\)/, product_name)
         rescue BundleIdentifierDifferentError => e
           raise e
@@ -94,12 +93,13 @@ module DeployGate
 
       def provisioning_style
         target = target_provisioning_info
+        build_settings = target_build_configration.build_settings
 
         style = PROVISIONING_STYLE_MANUAL
         if target
           # Manual or Automatic or nil (Xcode7 below)
           begin
-            style = target['ProvisioningStyle']
+            style = target['ProvisioningStyle'] || build_settings['CODE_SIGN_STYLE']
           rescue
             # Not catch error
           end

data/lib/deploygate/xcode/ios.rb

@@ -12,6 +12,7 @@ module DeployGate
         # @param [Analyze] ios_analyze
         # @param [String] target_scheme
         # @param [String] codesigning_identity
+        # @param [String] provisioning_profile_info
         # @param [String] build_configuration
         # @param [String] export_method
         # @param [Boolean] allow_provisioning_updates
@@ -19,6 +20,7 @@ module DeployGate
         def build(ios_analyze,
                   target_scheme,
                   codesigning_identity,
+                  provisioning_profile_info = nil,
                   build_configuration = nil,
                   export_method = DeployGate::Xcode::Export::AD_HOC,
                   allow_provisioning_updates = false)
@@ -32,6 +34,7 @@ module DeployGate
           }
           values[:codesigning_identity] = codesigning_identity if codesigning_identity
           values[:export_xcargs] = '-allowProvisioningUpdates' if allow_provisioning_updates
+          values[:export_options] = provisioning_profile_info if provisioning_profile_info
 
           v = FastlaneCore::Configuration.create(Gym::Options.available_options, values)
 

data/spec/deploygate/xcode/ios_spec.rb

@@ -33,7 +33,7 @@ describe DeployGate::Xcode::Ios do
       allow(FastlaneCore::Project).to receive(:new).and_return(ProjectMock.new)
 
       expect {
-        DeployGate::Xcode::Ios.build(AnalyzeMock.new, '', '', '',  'not support export method')
+        DeployGate::Xcode::Ios.build(AnalyzeMock.new, '', '', nil, '',  'not support export method')
       }.to raise_error DeployGate::Xcode::Ios::NotSupportExportMethodError
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploygate
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - deploygate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -419,7 +419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A command-line interface for DeployGate